mirror of
https://github.com/shouptech/humulus.git
synced 2026-02-03 22:29:42 +00:00
Compare commits
2 commits
b911dc9c53
...
c219ae3301
| Author | SHA1 | Date | |
|---|---|---|---|
| c219ae3301 | |||
| 756be12a2a |
12 changed files with 61 additions and 53 deletions
|
|
@ -13,3 +13,5 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from humulus.app import create_app
|
from humulus.app import create_app
|
||||||
|
|
||||||
|
__all__ = ['create_app', ]
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,6 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import os
|
|
||||||
|
|
||||||
from flask import Flask, render_template
|
from flask import Flask, render_template
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ from flask import abort, current_app, g
|
||||||
from flask.cli import with_appcontext
|
from flask.cli import with_appcontext
|
||||||
from slugify import slugify
|
from slugify import slugify
|
||||||
|
|
||||||
|
|
||||||
def get_couch():
|
def get_couch():
|
||||||
"""Connect to the configured CouchDB."""
|
"""Connect to the configured CouchDB."""
|
||||||
if 'couch' not in g:
|
if 'couch' not in g:
|
||||||
|
|
|
||||||
|
|
@ -123,9 +123,11 @@ def sort_hops(hops, form=False):
|
||||||
by_use[hop['use']].append(hop)
|
by_use[hop['use']].append(hop)
|
||||||
|
|
||||||
if form:
|
if form:
|
||||||
key = lambda hop: float(hop.duration.data)
|
def key(hop):
|
||||||
|
return float(hop.duration.data)
|
||||||
else:
|
else:
|
||||||
key = lambda hop: float(hop['duration'])
|
def key(hop):
|
||||||
|
return float(hop['duration'])
|
||||||
|
|
||||||
hops_sorted = sorted(by_use['FWH'], key=key, reverse=True)
|
hops_sorted = sorted(by_use['FWH'], key=key, reverse=True)
|
||||||
hops_sorted.extend(sorted(by_use['Boil'], key=key, reverse=True))
|
hops_sorted.extend(sorted(by_use['Boil'], key=key, reverse=True))
|
||||||
|
|
|
||||||
|
|
@ -37,8 +37,8 @@ bp = Blueprint('recipes', __name__, url_prefix='/recipes')
|
||||||
class FermentableForm(Form):
|
class FermentableForm(Form):
|
||||||
"""Form for fermentables.
|
"""Form for fermentables.
|
||||||
|
|
||||||
CSRF is disabled for this form.yeast.form (using `Form as parent class) because it
|
CSRF is disabled for this form.yeast.form (using `Form as parent class)
|
||||||
is never used by itself.
|
because it is never used by itself.
|
||||||
"""
|
"""
|
||||||
name = StringField('Name', validators=[DataRequired()])
|
name = StringField('Name', validators=[DataRequired()])
|
||||||
type = SelectField('Type', validators=[DataRequired()],
|
type = SelectField('Type', validators=[DataRequired()],
|
||||||
|
|
@ -67,8 +67,8 @@ class FermentableForm(Form):
|
||||||
class HopForm(Form):
|
class HopForm(Form):
|
||||||
"""Form for hops.
|
"""Form for hops.
|
||||||
|
|
||||||
CSRF is disabled for this form.yeast.form (using `Form as parent class) because it
|
CSRF is disabled for this form.yeast.form (using `Form as parent class)
|
||||||
is never used by itself.
|
because it is never used by itself.
|
||||||
"""
|
"""
|
||||||
name = StringField('Name', validators=[DataRequired()])
|
name = StringField('Name', validators=[DataRequired()])
|
||||||
use = SelectField('Usage', validators=[DataRequired()],
|
use = SelectField('Usage', validators=[DataRequired()],
|
||||||
|
|
@ -96,8 +96,8 @@ class HopForm(Form):
|
||||||
class YeastForm(Form):
|
class YeastForm(Form):
|
||||||
"""Form for yeast.
|
"""Form for yeast.
|
||||||
|
|
||||||
CSRF is disabled for this form.yeast.form (using `Form as parent class) because it
|
CSRF is disabled for this form.yeast.form (using `Form as parent class)
|
||||||
is never used by itself.
|
because it is never used by itself.
|
||||||
"""
|
"""
|
||||||
name = StringField('Name', validators=[Optional()])
|
name = StringField('Name', validators=[Optional()])
|
||||||
type = SelectField('Type', default='',
|
type = SelectField('Type', default='',
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,8 @@ def sub_to_doc(sub):
|
||||||
doc['ibu']['low'] = (sub.find('./stats/ibu/low').text
|
doc['ibu']['low'] = (sub.find('./stats/ibu/low').text
|
||||||
if sub.find('./stats/ibu/low') is not None else '0')
|
if sub.find('./stats/ibu/low') is not None else '0')
|
||||||
doc['ibu']['high'] = (sub.find('./stats/ibu/high').text
|
doc['ibu']['high'] = (sub.find('./stats/ibu/high').text
|
||||||
if sub.find('./stats/ibu/high') is not None else '100')
|
if sub.find('./stats/ibu/high') is not None
|
||||||
|
else '100')
|
||||||
doc['og']['low'] = (sub.find('./stats/og/low').text
|
doc['og']['low'] = (sub.find('./stats/og/low').text
|
||||||
if sub.find('./stats/og/low') is not None else '1.0')
|
if sub.find('./stats/og/low') is not None else '1.0')
|
||||||
doc['og']['high'] = (sub.find('./stats/og/high').text
|
doc['og']['high'] = (sub.find('./stats/og/high').text
|
||||||
|
|
@ -77,11 +78,13 @@ def sub_to_doc(sub):
|
||||||
doc['srm']['low'] = (sub.find('./stats/srm/low').text
|
doc['srm']['low'] = (sub.find('./stats/srm/low').text
|
||||||
if sub.find('./stats/srm/low') is not None else '0')
|
if sub.find('./stats/srm/low') is not None else '0')
|
||||||
doc['srm']['high'] = (sub.find('./stats/srm/high').text
|
doc['srm']['high'] = (sub.find('./stats/srm/high').text
|
||||||
if sub.find('./stats/srm/high') is not None else '100')
|
if sub.find('./stats/srm/high') is not None
|
||||||
|
else '100')
|
||||||
doc['abv']['low'] = (sub.find('./stats/abv/low').text
|
doc['abv']['low'] = (sub.find('./stats/abv/low').text
|
||||||
if sub.find('./stats/abv/low') is not None else '0')
|
if sub.find('./stats/abv/low') is not None else '0')
|
||||||
doc['abv']['high'] = (sub.find('./stats/abv/high').text
|
doc['abv']['high'] = (sub.find('./stats/abv/high').text
|
||||||
if sub.find('./stats/abv/high') is not None else '100')
|
if sub.find('./stats/abv/high') is not None
|
||||||
|
else '100')
|
||||||
return doc
|
return doc
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ import pytest
|
||||||
from humulus import create_app
|
from humulus import create_app
|
||||||
from humulus.couch import build_couch, get_couch, put_doc
|
from humulus.couch import build_couch, get_couch, put_doc
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def app():
|
def app():
|
||||||
dbname = 'test_{}'.format(str(uuid.uuid4()))
|
dbname = 'test_{}'.format(str(uuid.uuid4()))
|
||||||
|
|
@ -126,7 +127,8 @@ def app():
|
||||||
})
|
})
|
||||||
|
|
||||||
# Add a test style
|
# Add a test style
|
||||||
put_doc({'$type': 'style',
|
put_doc({
|
||||||
|
'$type': 'style',
|
||||||
'_id': '1A',
|
'_id': '1A',
|
||||||
'abv': {'high': '100', 'low': '0'},
|
'abv': {'high': '100', 'low': '0'},
|
||||||
'appearance': 'Good looking',
|
'appearance': 'Good looking',
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,6 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from flask import session
|
|
||||||
|
|
||||||
|
|
||||||
def test_login(client, auth):
|
def test_login(client, auth):
|
||||||
# Test GET
|
# Test GET
|
||||||
|
|
@ -43,6 +41,7 @@ def test_login(client, auth):
|
||||||
assert session['logged_in']
|
assert session['logged_in']
|
||||||
assert session.permanent
|
assert session.permanent
|
||||||
|
|
||||||
|
|
||||||
def test_logout(client, auth):
|
def test_logout(client, auth):
|
||||||
# Login
|
# Login
|
||||||
auth.login()
|
auth.login()
|
||||||
|
|
|
||||||
|
|
@ -12,10 +12,9 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import uuid
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from humulus.couch import *
|
from humulus.couch import put_doc, get_doc, update_doc, put_designs, get_view
|
||||||
|
|
||||||
|
|
||||||
def test_put_doc(app):
|
def test_put_doc(app):
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,8 @@
|
||||||
|
|
||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
|
|
||||||
from humulus.filters import *
|
from humulus.filters import (recipe_abv, recipe_fg, recipe_ibu, sort_hops,
|
||||||
|
recipe_ibu_ratio, recipe_og, recipe_srm, ferm_pct)
|
||||||
from humulus.recipes import HopForm
|
from humulus.recipes import HopForm
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ import json
|
||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
|
|
||||||
from humulus.couch import get_db, get_doc, put_doc
|
from humulus.couch import get_doc
|
||||||
from humulus.recipes import FermentableForm, HopForm, RecipeForm, YeastForm
|
from humulus.recipes import FermentableForm, HopForm, RecipeForm, YeastForm
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -41,7 +41,6 @@ def test_index(client):
|
||||||
response.data
|
response.data
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
# Test sort by name descending
|
# Test sort by name descending
|
||||||
response = client.get('/recipes/?descending=true&sort_by=name')
|
response = client.get('/recipes/?descending=true&sort_by=name')
|
||||||
assert (
|
assert (
|
||||||
|
|
@ -119,6 +118,7 @@ def test_index(client):
|
||||||
response.data
|
response.data
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_create(client, app, auth):
|
def test_create(client, app, auth):
|
||||||
"""Test success in creating a recipe document."""
|
"""Test success in creating a recipe document."""
|
||||||
# Test GET without login
|
# Test GET without login
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,8 @@ def test_import_styles(monkeypatch):
|
||||||
monkeypatch.setattr('humulus.styles.put_doc', fake_put_doc)
|
monkeypatch.setattr('humulus.styles.put_doc', fake_put_doc)
|
||||||
|
|
||||||
import_styles(None)
|
import_styles(None)
|
||||||
assert PutRecorder.doc == {'$type': 'style',
|
assert PutRecorder.doc == {
|
||||||
|
'$type': 'style',
|
||||||
'_id': '1A',
|
'_id': '1A',
|
||||||
'abv': {'high': '100', 'low': '0'},
|
'abv': {'high': '100', 'low': '0'},
|
||||||
'appearance': 'Good looking',
|
'appearance': 'Good looking',
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue