granite-form 0.5.0 → 0.6.1

data/spec/granite/form/active_record/associations_spec.rb

@@ -57,16 +57,19 @@ describe Granite::Form::ActiveRecord::Associations do
     describe '#projects' do
       specify do
         expect { user.projects << Project.new }
-          .not_to change { user.read_attribute(:projects) }
+          .not_to(change { user.read_attribute(:projects) })
       end
+
       specify do
         expect { user.projects << Project.new(title: 'First') }
-          .not_to change { user.read_attribute(:projects) }
+          .not_to(change { user.read_attribute(:projects) })
       end
+
       specify do
         expect { user.projects << Project.new(title: 'First') }
-          .not_to change { user.projects.reload.count }
+          .not_to(change { user.projects.reload.count })
       end
+
       specify do
         user.projects << Project.new(title: 'First')
         user.save
@@ -77,12 +80,14 @@ describe Granite::Form::ActiveRecord::Associations do
     describe '#profile' do
       specify do
         expect { user.profile = Profile.new(first_name: 'google.com') }
-          .not_to change { user.read_attribute(:profile) }
+          .not_to(change { user.read_attribute(:profile) })
       end
+
       specify do
         expect { user.profile = Profile.new(first_name: 'google.com') }
           .to change { user.profile }.from(nil).to(an_instance_of(Profile))
       end
+
       specify do
         user.profile = Profile.new(first_name: 'google.com')
         user.save
@@ -110,8 +115,9 @@ describe Granite::Form::ActiveRecord::Associations do
     describe '#projects' do
       specify do
         expect { user.projects << Project.new(title: 'First') }
-          .not_to change { user.read_attribute(:projects) }
+          .not_to(change { user.read_attribute(:projects) })
       end
+
       specify do
         user.projects << Project.new(title: 'First')
         user.save
@@ -120,19 +126,21 @@ describe Granite::Form::ActiveRecord::Associations do
 
       context do
         let(:project) { Project.new(title: 'First') }
+
         before { project.build_author(name: 'Author') }
 
         specify do
           expect { user.projects << project }
-            .not_to change { user.read_attribute(:projects) }
+            .not_to(change { user.read_attribute(:projects) })
         end
+
         specify do
           expect do
             user.projects << project
             user.save
           end
             .to change { user.reload.read_attribute(:projects) }.from([])
-            .to([{'title' => 'First', 'author' => {'name' => 'Author'}}])
+            .to([{ 'title' => 'First', 'author' => { 'name' => 'Author' } }])
         end
       end
     end
@@ -142,22 +150,25 @@ describe Granite::Form::ActiveRecord::Associations do
         expect { user.profile = Profile.new(first_name: 'google.com') }
           .to change { user.profile }.from(nil).to(an_instance_of(Profile))
       end
+
       specify do
         user.profile = Profile.new(first_name: 'google.com')
         user.save
         expect(user.reload.profile.first_name).to eq('google.com')
       end
+
       specify do
         expect { user.profile = Profile.new(first_name: 'google.com') }
-          .not_to change { user.read_attribute(:profile) }
+          .not_to(change { user.read_attribute(:profile) })
       end
+
       specify do
         expect do
           user.profile = Profile.new(first_name: 'google.com')
           user.save
         end
           .to change { user.reload.read_attribute(:profile) }.from(nil)
-          .to({first_name: 'google.com', last_name: nil, admin: nil}.to_json)
+          .to({ first_name: 'google.com', last_name: nil, admin: nil }.to_json)
       end
     end
   end
@@ -167,7 +178,8 @@ describe Granite::Form::ActiveRecord::Associations do
       expect do
         stub_class(:book, ActiveRecord::Base) do
           embeds_one :author, class_name: 'Borogoves'
-        end.reflect_on_association(:author).klass end.to raise_error NameError
+        end.reflect_on_association(:author).klass
+      end.to raise_error NameError
     end
 
     specify do
@@ -176,7 +188,8 @@ describe Granite::Form::ActiveRecord::Associations do
           embeds_many :projects, class_name: 'Borogoves' do
             attribute :title
           end
-        end.reflect_on_association(:projects).klass end.to raise_error NameError
+        end.reflect_on_association(:projects).klass
+      end.to raise_error NameError
     end
   end
 
@@ -194,13 +207,22 @@ describe Granite::Form::ActiveRecord::Associations do
 
     specify { expect(User.reflect_on_association(:projects).klass).to eq(User::Project) }
     specify { expect(User.new.projects).to eq([]) }
-    specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to be_a(Granite::Form::Model::Associations::Collection::Embedded) }
-    specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to match([have_attributes(title: 'Project')]) }
+
+    specify do
+      expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects)
+        .to be_a(Granite::Form::Model::Associations::Collection::Embedded)
+    end
+
+    specify do
+      expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects)
+        .to match([have_attributes(title: 'Project')])
+    end
 
     specify { expect(User.reflect_on_association(:profile).klass).to eq(User::Profile) }
     specify { expect(User.reflect_on_association(:profile).klass).to be < Profile }
     specify { expect(User.new.profile).to be_nil }
     specify { expect(User.new.tap { |u| u.build_profile(first_name: 'Profile') }.profile).to be_a(User::Profile) }
+
     specify do
       expect(User.new.tap { |u| u.build_profile(first_name: 'Profile') }.profile)
         .to have_attributes(first_name: 'Profile', last_name: nil, admin: nil, age: nil)

data/spec/granite/form/config_spec.rb

@@ -4,7 +4,8 @@ describe Granite::Form::Config do
   subject { Granite::Form::Config.send :new }
 
   describe '#include_root_in_json' do
-    its(:include_root_in_json) { should == false }
+    its(:include_root_in_json) { is_expected.to eq false }
+
     specify do
       expect { subject.include_root_in_json = true }
         .to change { subject.include_root_in_json }.from(false).to(true)
@@ -12,7 +13,8 @@ describe Granite::Form::Config do
   end
 
   describe '#i18n_scope' do
-    its(:i18n_scope) { should == :granite }
+    its(:i18n_scope) { is_expected.to eq :granite }
+
     specify do
       expect { subject.i18n_scope = :data_model }
         .to change { subject.i18n_scope }.from(:granite).to(:data_model)
@@ -20,11 +22,12 @@ describe Granite::Form::Config do
   end
 
   describe '#logger' do
-    its(:logger) { should be_a Logger }
+    its(:logger) { is_expected.to be_a Logger }
   end
 
   describe '#primary_attribute' do
-    its(:primary_attribute) { should == :id }
+    its(:primary_attribute) { is_expected.to eq :id }
+
     specify do
       expect { subject.primary_attribute = :identified }
         .to change { subject.primary_attribute }.from(:id).to(:identified)
@@ -42,6 +45,7 @@ describe Granite::Form::Config do
           end
         }.from(nil).to(an_instance_of(Proc))
     end
+
     specify { expect { subject.normalizer(:wrong) }.to raise_error Granite::Form::NormalizerMissing }
   end
 

data/spec/granite/form/model/associations/embeds_many_spec.rb

@@ -25,19 +25,20 @@ describe Granite::Form::Model::Associations::EmbedsMany do
   let(:user) { User.new(name: 'User') }
   let(:association) { user.association(:projects) }
 
-  let(:existing_user) { User.instantiate name: 'Rick', projects: [{title: 'Genesis'}] }
+  let(:existing_user) { User.instantiate name: 'Rick', projects: [{ title: 'Genesis' }] }
   let(:existing_association) { existing_user.association(:projects) }
 
   context 'callbacks' do
     before do
       User.class_eval do
         embeds_many :projects,
-          before_add: ->(object) { callbacks.push([:before_add, object]) },
-          after_add: ->(object) { callbacks.push([:after_add, object]) }
+                    before_add: ->(object) { callbacks.push([:before_add, object]) },
+                    after_add: ->(object) { callbacks.push([:after_add, object]) }
 
         collection :callbacks, Array
       end
     end
+
     let(:project1) { Project.new(title: 'Project1') }
     let(:project2) { Project.new(title: 'Project2') }
 
@@ -54,18 +55,18 @@ describe Granite::Form::Model::Associations::EmbedsMany do
       end
         .to change { user.callbacks }
         .to([
-          [:before_add, project1], [:after_add, project1],
-          [:before_add, project2], [:after_add, project2]
-        ])
+              [:before_add, project1], [:after_add, project1],
+              [:before_add, project2], [:after_add, project2]
+            ])
     end
 
     specify do
       expect { association.concat(project1, project2) }
         .to change { user.callbacks }
         .to([
-          [:before_add, project1], [:after_add, project1],
-          [:before_add, project2], [:after_add, project2]
-        ])
+              [:before_add, project1], [:after_add, project1],
+              [:before_add, project2], [:after_add, project2]
+            ])
     end
 
     specify do
@@ -75,18 +76,18 @@ describe Granite::Form::Model::Associations::EmbedsMany do
       end
         .to change { user.callbacks }
         .to([
-          [:before_add, project1], [:after_add, project1],
-          [:before_add, project2], [:after_add, project2]
-        ])
+              [:before_add, project1], [:after_add, project1],
+              [:before_add, project2], [:after_add, project2]
+            ])
     end
 
     specify do
       expect { association.writer([project2, project1]) }
         .to change { user.callbacks }
         .to([
-          [:before_add, project2], [:after_add, project2],
-          [:before_add, project1], [:after_add, project1]
-        ])
+              [:before_add, project2], [:after_add, project2],
+              [:before_add, project1], [:after_add, project1]
+            ])
     end
 
     specify do
@@ -97,18 +98,18 @@ describe Granite::Form::Model::Associations::EmbedsMany do
       end
         .to change { user.callbacks }
         .to([
-          [:before_add, project1], [:after_add, project1],
-          [:before_add, project2], [:after_add, project2]
-        ])
+              [:before_add, project1], [:after_add, project1],
+              [:before_add, project2], [:after_add, project2]
+            ])
     end
 
     context 'default' do
       before do
         User.class_eval do
           embeds_many :projects,
-            before_add: ->(owner, object) { owner.callbacks.push([:before_add, object]) },
-            after_add: ->(owner, object) { owner.callbacks.push([:after_add, object]) },
-            default: -> { {title: 'Project1'} }
+                      before_add: ->(owner, object) { owner.callbacks.push([:before_add, object]) },
+                      after_add: ->(owner, object) { owner.callbacks.push([:after_add, object]) },
+                      default: -> { { title: 'Project1' } }
 
           collection :callbacks, Array
         end
@@ -118,9 +119,9 @@ describe Granite::Form::Model::Associations::EmbedsMany do
         expect { association.concat(project2) }
           .to change { user.callbacks }
           .to([
-            [:before_add, project2], [:after_add, project2],
-            [:before_add, project1], [:after_add, project1]
-          ])
+                [:before_add, project2], [:after_add, project2],
+                [:before_add, project1], [:after_add, project1]
+              ])
       end
     end
   end
@@ -134,14 +135,17 @@ describe Granite::Form::Model::Associations::EmbedsMany do
     let(:project) { Project.new(title: 'Project') }
 
     specify { expect(association.build.embedder).to eq(user) }
+
     specify do
       expect { association.writer([project]) }
         .to change { project.embedder }.from(nil).to(user)
     end
+
     specify do
       expect { association.concat(project) }
         .to change { project.embedder }.from(nil).to(user)
     end
+
     specify do
       expect { association.target = [project] }
         .to change { project.embedder }.from(nil).to(user)
@@ -150,7 +154,7 @@ describe Granite::Form::Model::Associations::EmbedsMany do
     context 'default' do
       before do
         User.class_eval do
-          embeds_many :projects, default: -> { {title: 'Project1'} }
+          embeds_many :projects, default: -> { { title: 'Project1' } }
         end
       end
 
@@ -184,22 +188,24 @@ describe Granite::Form::Model::Associations::EmbedsMany do
 
     specify do
       expect { association.build(title: 'Swordfish') }
-        .not_to change { user.read_attribute(:projects) }
+        .not_to(change { user.read_attribute(:projects) })
     end
+
     specify do
       expect { association.build(title: 'Swordfish') }
         .to change { association.reader.map(&:attributes) }
-        .from([]).to([{'title' => 'Swordfish'}])
+        .from([]).to([{ 'title' => 'Swordfish' }])
     end
 
     specify do
       expect { existing_association.build(title: 'Swordfish') }
-        .not_to change { existing_user.read_attribute(:projects) }
+        .not_to(change { existing_user.read_attribute(:projects) })
     end
+
     specify do
       expect { existing_association.build(title: 'Swordfish') }
         .to change { existing_association.reader.map(&:attributes) }
-        .from([{'title' => 'Genesis'}]).to([{'title' => 'Genesis'}, {'title' => 'Swordfish'}])
+        .from([{ 'title' => 'Genesis' }]).to([{ 'title' => 'Genesis' }, { 'title' => 'Swordfish' }])
     end
   end
 
@@ -210,27 +216,41 @@ describe Granite::Form::Model::Associations::EmbedsMany do
   end
 
   describe '#default' do
-    before { User.embeds_many :projects, default: -> { {title: 'Default'} } }
     before do
+      User.embeds_many :projects, default: -> { { title: 'Default' } }
       Project.class_eval do
         include Granite::Form::Model::Primary
         primary :title
       end
     end
+
     let(:new_project) { Project.new.tap { |p| p.title = 'Project' } }
     let(:existing_user) { User.instantiate name: 'Rick' }
 
     specify { expect(association.target.map(&:title)).to eq(['Default']) }
     specify { expect(association.target.map(&:new_record?)).to eq([true]) }
-    specify { expect { association.replace([new_project]) }.to change { association.target.map(&:title) }.to eq(['Project']) }
+
+    specify do
+      expect { association.replace([new_project]) }
+        .to change { association.target.map(&:title) }
+        .to eq(['Project'])
+    end
+
     specify { expect { association.replace([]) }.to change { association.target }.to([]) }
 
     specify { expect(existing_association.target).to eq([]) }
-    specify { expect { existing_association.replace([new_project]) }.to change { existing_association.target.map(&:title) }.to(['Project']) }
-    specify { expect { existing_association.replace([]) }.not_to change { existing_association.target } }
+
+    specify do
+      expect { existing_association.replace([new_project]) }
+        .to change { existing_association.target.map(&:title) }
+        .to(['Project'])
+    end
+
+    specify { expect { existing_association.replace([]) }.not_to(change { existing_association.target }) }
 
     context do
-      before { Project.send(:include, Granite::Form::Model::Dirty) }
+      before { Project.include Granite::Form::Model::Dirty }
+
       specify { expect(association.target.any?(&:changed?)).to eq(false) }
     end
   end
@@ -250,18 +270,20 @@ describe Granite::Form::Model::Associations::EmbedsMany do
 
     context do
       before { association.build(title: 'Swordfish') }
+
       specify do
         expect { association.reload }
-          .to change { association.reader.map(&:attributes) }.from([{'title' => 'Swordfish'}]).to([])
+          .to change { association.reader.map(&:attributes) }.from([{ 'title' => 'Swordfish' }]).to([])
       end
     end
 
     context do
       before { existing_association.build(title: 'Swordfish') }
+
       specify do
         expect { existing_association.reload }
           .to change { existing_association.reader.map(&:attributes) }
-          .from([{'title' => 'Genesis'}, {'title' => 'Swordfish'}]).to([{'title' => 'Genesis'}])
+          .from([{ 'title' => 'Genesis' }, { 'title' => 'Swordfish' }]).to([{ 'title' => 'Genesis' }])
       end
     end
   end
@@ -270,7 +292,7 @@ describe Granite::Form::Model::Associations::EmbedsMany do
     let!(:project) { association.build(title: 'Genesis') }
 
     specify do
-      expect { association.sync }.to change { user.read_attribute(:projects) }.from(nil).to([{'title' => 'Genesis'}])
+      expect { association.sync }.to change { user.read_attribute(:projects) }.from(nil).to([{ 'title' => 'Genesis' }])
     end
 
     context 'when embedding is nested' do
@@ -288,19 +310,20 @@ describe Granite::Form::Model::Associations::EmbedsMany do
 
       specify do
         expect { association.sync }.to change { user.read_attribute(:projects) }
-          .from(nil).to([{'title' => 'Genesis', 'deadline' => {'enabled' => true}}])
+          .from(nil).to([{ 'title' => 'Genesis', 'deadline' => { 'enabled' => true } }])
       end
     end
   end
 
   describe '#clear' do
     specify { expect(association.clear).to eq(true) }
-    specify { expect { association.clear }.not_to change { association.reader } }
+    specify { expect { association.clear }.not_to(change { association.reader }) }
 
     specify { expect(existing_association.clear).to eq(true) }
+
     specify do
       expect { existing_association.clear }
-        .to change { existing_association.reader.map(&:attributes) }.from([{'title' => 'Genesis'}]).to([])
+        .to change { existing_association.reader.map(&:attributes) }.from([{ 'title' => 'Genesis' }]).to([])
     end
   end
 
@@ -312,6 +335,7 @@ describe Granite::Form::Model::Associations::EmbedsMany do
 
     context do
       before { association.build }
+
       specify { expect(association.reader.last).to be_a Project }
       specify { expect(association.reader.last).not_to be_persisted }
       specify { expect(association.reader.size).to eq(1) }
@@ -320,6 +344,7 @@ describe Granite::Form::Model::Associations::EmbedsMany do
 
     context do
       before { existing_association.build(title: 'Swordfish') }
+
       specify { expect(existing_association.reader.size).to eq(2) }
       specify { expect(existing_association.reader.last.title).to eq('Swordfish') }
       specify { expect(existing_association.reader(true).size).to eq(1) }
@@ -342,37 +367,45 @@ describe Granite::Form::Model::Associations::EmbedsMany do
     specify { expect(association.writer([])).to eq([]) }
 
     specify { expect(association.writer([new_project1])).to eq([new_project1]) }
+
     specify do
       expect { association.writer([new_project1]) }
-        .to change { association.reader.map(&:attributes) }.from([]).to([{'title' => 'Project 1'}])
+        .to change { association.reader.map(&:attributes) }.from([]).to([{ 'title' => 'Project 1' }])
     end
 
     specify do
       expect { existing_association.writer([new_project1, Dummy.new, new_project2]) }
         .to raise_error Granite::Form::AssociationTypeMismatch
     end
+
     specify do
-      expect { muffle(Granite::Form::AssociationTypeMismatch) { existing_association.writer([new_project1, Dummy.new, new_project2]) } }
-        .not_to change { existing_association.reader }
+      expect do
+        muffle(Granite::Form::AssociationTypeMismatch) do
+          existing_association.writer([new_project1, Dummy.new, new_project2])
+        end
+      end.not_to(change { existing_association.reader })
     end
 
     specify { expect { existing_association.writer(nil) }.to raise_error NoMethodError }
+
     specify do
       expect { muffle(NoMethodError) { existing_association.writer(nil) } }
-        .not_to change { existing_association.reader }
+        .not_to(change { existing_association.reader })
     end
 
     specify { expect(existing_association.writer([])).to eq([]) }
+
     specify do
       expect { existing_association.writer([]) }
         .to change { existing_association.reader }.to([])
     end
 
     specify { expect(existing_association.writer([new_project1, new_project2])).to eq([new_project1, new_project2]) }
+
     specify do
       expect { existing_association.writer([new_project1, new_project2]) }
         .to change { existing_association.reader.map(&:attributes) }
-        .from([{'title' => 'Genesis'}]).to([{'title' => 'Project 1'}, {'title' => 'Project 2'}])
+        .from([{ 'title' => 'Genesis' }]).to([{ 'title' => 'Project 1' }, { 'title' => 'Project 2' }])
     end
   end
 
@@ -392,39 +425,54 @@ describe Granite::Form::Model::Associations::EmbedsMany do
     specify { expect(existing_association.concat).to eq(existing_user.projects) }
 
     specify { expect(association.concat(new_project1)).to eq([new_project1]) }
+
     specify do
       expect { association.concat(new_project1) }
-        .to change { association.reader.map(&:attributes) }.from([]).to([{'title' => 'Project 1'}])
+        .to change { association.reader.map(&:attributes) }.from([]).to([{ 'title' => 'Project 1' }])
     end
+
     specify do
       expect { association.concat(new_project1) }
-        .not_to change { user.read_attribute(:projects) }
+        .not_to(change { user.read_attribute(:projects) })
     end
 
     specify do
       expect { existing_association.concat(new_project1, invalid_project) }
         .to change { existing_association.reader.map(&:attributes) }
-        .from([{'title' => 'Genesis'}]).to([{'title' => 'Genesis'}, {'title' => 'Project 1'}, {'title' => nil}])
+        .from([{ 'title' => 'Genesis' }])
+        .to([
+              { 'title' => 'Genesis' },
+              { 'title' => 'Project 1' },
+              { 'title' => nil }
+            ])
     end
 
     specify do
       expect { existing_association.concat(new_project1, Dummy.new, new_project2) }
         .to raise_error Granite::Form::AssociationTypeMismatch
     end
+
     specify do
-      expect { muffle(Granite::Form::AssociationTypeMismatch) { existing_association.concat(new_project1, Dummy.new, new_project2) } }
+      expect do
+        muffle(Granite::Form::AssociationTypeMismatch) do
+          existing_association.concat(new_project1, Dummy.new, new_project2)
+        end
+      end
         .to change { existing_association.reader.map(&:attributes) }
-        .from([{'title' => 'Genesis'}]).to([{'title' => 'Genesis'}, {'title' => 'Project 1'}])
+        .from([{ 'title' => 'Genesis' }]).to([{ 'title' => 'Genesis' }, { 'title' => 'Project 1' }])
     end
 
     specify do
       expect(existing_association.concat(new_project1, new_project2))
         .to eq([existing_user.projects.first, new_project1, new_project2])
     end
+
     specify do
       expect { existing_association.concat([new_project1, new_project2]) }
         .to change { existing_association.reader.map(&:attributes) }
-        .from([{'title' => 'Genesis'}]).to([{'title' => 'Genesis'}, {'title' => 'Project 1'}, {'title' => 'Project 2'}])
+        .from([{ 'title' => 'Genesis' }]).to([{ 'title' => 'Genesis' },
+                                              { 'title' => 'Project 1' },
+                                              { 'title' => 'Project 2' }])
     end
   end
 end