cookbook 0.1.2 → 0.1.6

data/spec/models/cookbook/use_spec.rb

@@ -42,17 +42,6 @@ RSpec.describe Cookbook::Use, type: :model do
     it { should belong_to(:use_in) }
   end
 
-  describe 'Scopes' do
-    describe '.recipe_uses' do
-      subject { Cookbook::Use.recipe_uses }
-      it { should include(full_use) }
-    end
-    describe '.ingredient_uses' do
-      subject { Cookbook::Use.ingredient_uses }
-      it { should include(full_use) }
-    end
-  end
-
   describe 'Methods' do
     describe '#quantity' do
       describe 'when min and max exist' do
@@ -61,11 +50,11 @@ RSpec.describe Cookbook::Use, type: :model do
       end
       describe 'with just min' do
         subject { use_no_max_no_unit.quantity }
-        it { should eq '0.25' } # ndash, not hyphen
+        it { should eq '0.25' }
       end
       describe 'with just max' do
         subject { use_no_min_no_unit.quantity }
-        it { should eq '2' } # ndash, not hyphen
+        it { should eq '2' }
       end
     end
     describe '#quantity and unit' do

data/spec/models/how_to_spec.rb

@@ -7,12 +7,12 @@ RSpec.describe HowTo, type: :model do
     it { should have_many(:uses) }
 
     it { should_not have_many(:ingredient_uses) }
-    it { should_not have_many(:ingredients).through(:uses) }
+    it { should_not have_many(:ingredients).through(:ingredient_uses) }
 
     it { should have_many(:supply_uses) }
-    it { should have_many(:supplies).through(:uses) }
+    it { should have_many(:supplies).through(:supply_uses) }
 
     it { should have_many(:tool_uses) }
-    it { should have_many(:tools).through(:uses) }
+    it { should have_many(:tools).through(:tool_uses) }
   end
 end

data/spec/models/recipe_spec.rb

@@ -7,12 +7,12 @@ RSpec.describe Recipe, type: :model do
     it { should have_many(:uses) }
 
     it { should have_many(:ingredient_uses) }
-    it { should have_many(:ingredients).through(:uses) }
+    it { should have_many(:ingredients).through(:ingredient_uses) }
 
     it { should have_many(:supply_uses) }
-    it { should have_many(:supplies).through(:uses) }
+    it { should have_many(:supplies).through(:supply_uses) }
 
     it { should have_many(:tool_uses) }
-    it { should have_many(:tools).through(:uses) }
+    it { should have_many(:tools).through(:tool_uses) }
   end
 end

data/spec/requests/how_tos_spec.rb

@@ -69,13 +69,13 @@ module Cookbook
       let(:new_attributes) do
         {
           name: 'Foo',
-          tool_uses_attributes: [
-            {
+          tool_uses_attributes: {
+            0 => {
               use_of_id: tool.id,
               use_of_type: 'Tool',
               note: 'Test Note'
             }
-          ]
+          }
         }
       end
       context 'with valid parameters' do

data/spec/requests/recipes_spec.rb

@@ -71,13 +71,13 @@ module Cookbook
       let(:new_attributes) do
         {
           name: 'Foo',
-          ingredient_uses_attributes: [
-            {
+          ingredient_uses_attributes: {
+            0 => {
               use_of_id: ingredient.id,
               use_of_type: 'Ingredient',
               note: 'Test Note'
             }
-          ]
+          }
         }
       end
       context 'with valid parameters' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookbook
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - Loren Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -339,14 +339,17 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- app/assets/javascript/cookbook/addFields.js
+- app/assets/javascript/cookbook/application.js
+- app/assets/javascript/cookbook/removeFields.js
 - app/assets/stylesheets/cookbook/application.scss
 - app/controllers/concerns/cookbook/params.rb
 - app/helpers/cookbook/application_helper.rb
 - app/models/cookbook/use.rb
 - app/views/cookbook/_fields.html.haml
+- app/views/cookbook/_use_fields.html.haml
 - app/views/cookbook/_used_in.html.haml
 - app/views/cookbook/_uses_of.html.haml
-- app/views/cookbook/uses/_fields.html.haml
 - bin/rails
 - config/initializers/simple_form.rb
 - config/locales/simple_form.en.yml

data/app/views/cookbook/uses/_fields.html.haml

@@ -1,17 +0,0 @@
-:ruby
-  table_sym = form.object_name.gsub(/[^\[]+\[([^\]]+)_uses_attributes\].*/, "\\1").pluralize
-  model = table_sym.to_s.classify.constantize
-  collection = if Cookbook.configuration.authorize_with == :cancancan
-                 model.accessible_by(current_ability, :select)
-               else
-                 model.all
-               end
-= form.hidden_field :use_of_type, value: model.model_name.to_s
-= form.input :use_of_id, collection: collection, as: :select, label_method: model.label_method, value_method: :id, selected: form.object.use_of_id, include_blank: "Select #{model.model_name.human}"
-= form.input :quantity_minimum
-= form.input :quantity_maximum
-= form.input :unit
-= form.input :sort
-= form.input :preparation, hint: 'like "crushed" or "greased"'
-= form.input :note, hint: 'like "to taste"'
-= link_to_remove_nested(form, link_classes: 'button button-danger')