dan/parsley
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bumped versions

Browse Source
This commit is contained in:
Dan Elbert 2018-09-12 11:15:04 -05:00
parent b802542869
commit 128bfcd535
14 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Gemfile
View File

@ -1,15 +1,15 @@
source 'https://rubygems.org'
gem 'rails', '5.2.1'
gem 'pg', '~> 1.0.0'
gem 'pg', '~> 1.1.3'
gem 'webpacker', '3.5.3'
gem 'webpacker', '3.5.5'
gem 'bootsnap', '>= 1.1.0', require: false
gem 'jbuilder', '~> 2.7'
#gem 'jbuilder', git: 'https://github.com/rails/jbuilder', branch: 'master'
gem 'oj', '~> 3.6.2'
gem 'oj', '~> 3.6.8'
gem 'kaminari', '~> 1.1.1'
gem 'unitwise', '~> 2.2.0'
@ -24,14 +24,14 @@ gem 'tzinfo-data'
group :development, :test do
gem 'puma', '~> 3.11'
gem 'puma', '~> 3.12'
gem 'sqlite3'
gem 'guard', '~> 2.14.0'
gem 'guard', '~> 2.14.2'
gem 'guard-rspec', require: false
gem 'rspec-rails', '~> 3.7.2'
gem 'rspec-rails', '~> 3.8.0'
gem 'rails-controller-testing'
gem 'factory_bot_rails', '~> 4.8.2'
gem 'database_cleaner', '~> 1.6.2'
gem 'factory_bot_rails', '~> 4.11.1'
gem 'database_cleaner', '~> 1.7.0'
end

66
Gemfile.lock
View File

@ -44,20 +44,20 @@ GEM
tzinfo (~> 1.1)
arel (9.0.0)
bcrypt (3.1.12)
bootsnap (1.3.1)
bootsnap (1.3.2)
msgpack (~> 1.0)
builder (3.2.3)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
dalli (2.7.8)
database_cleaner (1.6.2)
database_cleaner (1.7.0)
diff-lcs (1.3)
erubi (1.7.1)
factory_bot (4.8.2)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
factory_bot_rails (4.8.2)
factory_bot (~> 4.8.2)
factory_bot_rails (4.11.1)
factory_bot (~> 4.11.1)
railties (>= 3.0.0)
ffi (1.9.25)
formatador (0.2.5)
@ -123,9 +123,9 @@ GEM
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
oj (3.6.7)
oj (3.6.8)
parslet (1.8.2)
pg (1.0.0)
pg (1.1.3)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
@ -168,27 +168,27 @@ GEM
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
redcarpet (3.4.0)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-rails (3.7.2)
rspec-support (~> 3.8.0)
rspec-rails (3.8.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
ruby_dep (1.5.0)
shellany (0.0.1)
signed_multiset (0.2.1)
@ -211,7 +211,7 @@ GEM
memoizable (~> 0.4)
parslet (~> 1.5)
signed_multiset (~> 0.2)
webpacker (3.5.3)
webpacker (3.5.5)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
@ -226,23 +226,23 @@ DEPENDENCIES
bcrypt (~> 3.1.11)
bootsnap (>= 1.1.0)
dalli (~> 2.7.6)
database_cleaner (~> 1.6.2)
factory_bot_rails (~> 4.8.2)
guard (~> 2.14.0)
database_cleaner (~> 1.7.0)
factory_bot_rails (~> 4.11.1)
guard (~> 2.14.2)
guard-rspec
jbuilder (~> 2.7)
kaminari (~> 1.1.1)
oj (~> 3.6.2)
pg (~> 1.0.0)
puma (~> 3.11)
oj (~> 3.6.8)
pg (~> 1.1.3)
puma (~> 3.12)
rails (= 5.2.1)
rails-controller-testing
redcarpet (~> 3.4.0)
rspec-rails (~> 3.7.2)
rspec-rails (~> 3.8.0)
sqlite3
tzinfo-data
unitwise (~> 2.2.0)
webpacker (= 3.5.3)
webpacker (= 3.5.5)
BUNDLED WITH
1.16.2
1.16.4

2
package.json
View File

@ -1,6 +1,6 @@
{
"dependencies": {
"@rails/webpacker": "^3.5.3",
"@rails/webpacker": "^3.5.5",
"autosize": "^4.0.1",
"bulma": "^0.7.1",
"caniuse-lite": "^1.0.30000815",

4
spec/factories/food_units.rb
View File

@ -1,8 +1,8 @@
FactoryBot.define do
factory :food_unit do
food
name 'Each'
gram_weight 10.5
name { 'Each' }
gram_weight { 10.5 }
end
end

10
spec/factories/foods.rb
View File

@ -1,14 +1,14 @@
FactoryBot.define do
factory :food do
name 'Food'
density nil
notes 'note note note'
name { 'Food' }
density { nil }
notes { 'note note note' }
user
end
factory :food_with_density, parent: :food do
name 'Butter'
density '8 oz/cup'
name { 'Butter' }
density { '8 oz/cup' }
end
end

4
spec/factories/logs.rb
View File

@ -1,7 +1,7 @@
FactoryBot.define do
factory :log do
date "2016-07-06 20:13:14"
rating 1
date { "2016-07-06 20:13:14" }
rating { 1 }
association :source_recipe, factory: :recipe
recipe
user

2
spec/factories/notes.rb
View File

@ -1,6 +1,6 @@
FactoryBot.define do
factory :note do
user
content "MyText"
content { "MyText" }
end
end

2
spec/factories/recipe_ingredients.rb
View File

@ -1,6 +1,6 @@
FactoryBot.define do
factory :recipe_ingredient do
sort_order 1
sort_order { 1 }
recipe
food
end

12
spec/factories/recipes.rb
View File

@ -1,11 +1,11 @@
FactoryBot.define do
factory :recipe do
name "Recipe"
description "desc"
source "source"
yields 4
total_time 20
active_time 10
name { "Recipe" }
description { "desc" }
source { "source" }
yields { 4 }
total_time { 20 }
active_time { 10 }
user
end

6
spec/factories/task_items.rb
View File

@ -1,8 +1,8 @@
FactoryBot.define do
factory :task_item do
task_list
name "MyString"
quantity "MyString"
completed false
name { "MyString" }
quantity { "MyString" }
completed { false }
end
end

6
spec/factories/usda_food_weights.rb
View File

@ -1,9 +1,9 @@
FactoryBot.define do
factory :usda_food_weight do
amount 1
description 'cup'
gram_weight 350
amount { 1 }
description { 'cup' }
gram_weight { 350 }
usda_food
end

60
spec/factories/usda_foods.rb
View File

@ -5,40 +5,40 @@ FactoryBot.define do
end
factory :usda_food do
long_description 'Food'
short_description 'Food'
long_description { 'Food' }
short_description { 'Food' }
ndbn { generate :unique_ndbn }
water 1.0
kcal 101
protein 1.2
lipid 3.4
ash 0
carbohydrates 3.3
fiber 1.2
sugar 10
gram_weight_1 200
gram_weight_2 100
gram_weight_desc_1 '1 cup'
gram_weight_desc_2 '1/2 cup'
refuse_percent 3
water { 1.0 }
kcal { 101 }
protein { 1.2 }
lipid { 3.4 }
ash { 0 }
carbohydrates { 3.3 }
fiber { 1.2 }
sugar { 10 }
gram_weight_1 { 200 }
gram_weight_2 { 100 }
gram_weight_desc_1 { '1 cup' }
gram_weight_desc_2 { '1/2 cup' }
refuse_percent { 3 }
end
factory :salted_butter, parent: :usda_food do
long_description 'Butter, salted'
short_description 'BUTTER,WITH SALT'
water 15.87
kcal 717
protein 0.85
lipid 81.11
ash 2.11
carbohydrates 0.06
fiber 0
sugar 0.06
gram_weight_1 5.0
gram_weight_2 14.2
gram_weight_desc_1 '1 pat, (1\" sq, 1/3\" high)'
gram_weight_desc_2 '1 tbsp'
refuse_percent 0
long_description { 'Butter, salted' }
short_description { 'BUTTER,WITH SALT' }
water { 15.87 }
kcal { 717 }
protein { 0.85 }
lipid { 81.11 }
ash { 2.11 }
carbohydrates { 0.06 }
fiber { 0 }
sugar { 0.06 }
gram_weight_1 { 5.0 }
gram_weight_2 { 14.2 }
gram_weight_desc_1 { '1 pat, (1\" sq, 1/3\" high)' }
gram_weight_desc_2 { '1 tbsp' }
refuse_percent { 0 }
end
end

6
spec/factories/users.rb
View File

@ -11,9 +11,9 @@ FactoryBot.define do
factory :user do
username { generate(:generic_username) }
email { generate(:generic_email) }
full_name "MyString"
password_digest "MyString"
admin false
full_name { "MyString" }
password_digest { "MyString" }
admin { false }
end
end

2
yarn.lock
View File

@ -2,7 +2,7 @@
# yarn lockfile v1
"@rails/webpacker@^3.5.3":
"@rails/webpacker@^3.5.5":
version "3.5.5"
resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-3.5.5.tgz#8911c66bcefc8bc6b91270e92f0d39e3c2d43116"
dependencies: