active_data 1.0.0 → 1.1.0

data/spec/lib/active_data/active_record/associations_spec.rb

@@ -22,29 +22,50 @@ describe ActiveData::ActiveRecord::Associations do
 
       attribute :first_name, String
       attribute :last_name, String
+      attribute :admin, Boolean
     end
 
     stub_class(:user, ActiveRecord::Base) do
       embeds_many :projects
       embeds_one :profile
 
+      # Simulating JSON attribute
+      serialize :projects, JSON
+
+      def read_attribute(name)
+        if name.to_s == 'projects'
+          value = super
+          JSON.parse(value) if value
+        else
+          super
+        end
+      end
+
       validates :projects, associated: true
     end
   end
 
-  its(:projects) { should = [] }
-  its(:profile) { should = nil }
+  let(:user) { User.new }
+
+  specify { expect(user.projects).to eq([]) }
+  specify { expect(user.profile).to be_nil }
 
   context 'new owner' do
-    subject(:user) { User.new }
+    let(:user) { User.new }
 
     describe '#projects' do
-      specify { expect { user.projects << Project.new }
-        .not_to change { user.read_attribute(:projects) } }
-      specify { expect { user.projects << Project.new(title: 'First') }
-        .not_to change { user.read_attribute(:projects) } }
-      specify { expect { user.projects << Project.new(title: 'First') }
-        .not_to change { user.projects.reload.count } }
+      specify do
+        expect { user.projects << Project.new }
+          .not_to change { user.read_attribute(:projects) }
+      end
+      specify do
+        expect { user.projects << Project.new(title: 'First') }
+          .not_to change { user.read_attribute(:projects) }
+      end
+      specify do
+        expect { user.projects << Project.new(title: 'First') }
+          .not_to change { user.projects.reload.count }
+      end
       specify do
         user.projects << Project.new(title: 'First')
         user.save
@@ -53,73 +74,111 @@ describe ActiveData::ActiveRecord::Associations do
     end
 
     describe '#profile' do
-      specify { expect { user.profile = Profile.new(first_name: 'google.com') }
-        .not_to change { user.read_attribute(:profile) } }
-      specify { expect { user.profile = Profile.new(first_name: 'google.com') }
-        .to change { user.profile }.from(nil).to(an_instance_of(Profile)) }
+      specify do
+        expect { user.profile = Profile.new(first_name: 'google.com') }
+          .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
         expect(user.reload.profile.first_name).to eq('google.com')
       end
+
+      context 'with profile already set' do
+        before { user.create_profile(admin: true) }
+
+        specify do
+          user.profile.admin = false
+          user.save
+          expect(user.reload.profile.admin).to eq(false)
+        end
+      end
     end
   end
 
   context 'persisted owner' do
-    subject(:user) { User.create }
+    let(:user) { User.create }
 
     describe '#projects' do
-      specify { expect { user.projects << Project.new }
-        .not_to change { user.read_attribute(:projects) } }
-      specify { expect { user.projects << Project.new(title: 'First') }
-        .to change { user.projects.reload.count }.from(0).to(1) }
-      specify {
+      specify do
+        expect { user.projects << Project.new }
+          .not_to change { user.read_attribute(:projects) }
+      end
+      specify do
+        expect { user.projects << Project.new(title: 'First') }
+          .to change { user.projects.reload.count }.from(0).to(1)
+      end
+      specify do
         user.projects << Project.new(title: 'First')
         user.save
-        expect(user.reload.projects.first.title).to eq('First') }
+        expect(user.reload.projects.first.title).to eq('First')
+      end
 
       context do
         let(:project) { Project.new(title: 'First') }
         before { project.build_author(name: 'Author') }
 
-        specify { expect { user.projects << project }
-          .to change { user.attributes['projects'] }.from(nil)
-          .to([{title: 'First', author: {name: 'Author'}}].to_json) }
-        specify { expect { user.projects << project; user.save }
-          .to change { user.reload.attributes['projects'] }.from(nil)
-          .to([{title: 'First', author: {name: 'Author'}}].to_json) }
+        specify do
+          expect { user.projects << project }
+            .to change { user.read_attribute(:projects) }.from(nil)
+            .to([{'title' => 'First', 'author' => {'name' => 'Author'}}])
+        end
+        specify do
+          expect do
+            user.projects << project
+            user.save
+          end
+            .to change { user.reload.read_attribute(:projects) }.from(nil)
+            .to([{'title' => 'First', 'author' => {'name' => 'Author'}}])
+        end
       end
     end
 
     describe '#profile' do
-      specify { expect { user.profile = Profile.new(first_name: 'google.com') }
-        .to change { user.profile }.from(nil).to(an_instance_of(Profile)) }
-      specify {
+      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
-        expect(user.reload.profile.first_name).to eq('google.com') }
-      specify { expect { user.profile = Profile.new(first_name: 'google.com') }
-        .to change { user.attributes['profile'] }.from(nil)
-        .to({first_name: 'google.com', last_name: nil}.to_json) }
-      specify { expect { user.profile = Profile.new(first_name: 'google.com'); user.save }
-        .to change { user.reload.attributes['profile'] }.from(nil)
-        .to({first_name: 'google.com', last_name: nil}.to_json) }
+        expect(user.reload.profile.first_name).to eq('google.com')
+      end
+      specify do
+        expect { user.profile = Profile.new(first_name: 'google.com') }
+          .to change { user.read_attribute(:profile) }.from(nil)
+          .to({first_name: 'google.com', last_name: nil, admin: nil}.to_json)
+      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)
+      end
     end
   end
 
   context 'class determine errors' do
     specify do
-      expect { stub_class(:book, ActiveRecord::Base) do
-        embeds_one :author, class_name: 'Borogoves'
-      end.reflect_on_association(:author).klass }.to raise_error NameError
+      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
 
     specify do
-      expect { stub_class(:user, ActiveRecord::Base) do
-        embeds_many :projects, class_name: 'Borogoves' do
-          attribute :title
-        end
-      end.reflect_on_association(:projects).klass }.to raise_error NameError
+      expect do
+        stub_class(:user, ActiveRecord::Base) do
+          embeds_many :projects, class_name: 'Borogoves' do
+            attribute :title
+          end
+        end.reflect_on_association(:projects).klass end.to raise_error NameError
     end
   end
 
@@ -144,6 +203,9 @@ describe ActiveData::ActiveRecord::Associations do
     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.create_profile(first_name: 'Profile') }.profile).to be_a(User::Profile) }
-    specify { expect(User.new.tap { |u| u.create_profile(first_name: 'Profile') }.read_attribute(:profile)).to eq({first_name: 'Profile', last_name: nil, age: nil}.to_json) }
+    specify do
+      expect(User.new.tap { |u| u.create_profile(first_name: 'Profile') }.read_attribute(:profile))
+        .to eq({first_name: 'Profile', last_name: nil, admin: nil, age: nil}.to_json)
+    end
   end
 end

data/spec/lib/active_data/active_record/nested_attributes_spec.rb

@@ -1,6 +1,5 @@
-# encoding: UTF-8
 require 'spec_helper'
-require 'lib/active_data/model/nested_attributes'
+require 'shared/nested_attribute_examples'
 
 describe ActiveData::ActiveRecord::NestedAttributes do
   before do

data/spec/lib/active_data/config_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'spec_helper'
 
 describe ActiveData::Config do
@@ -6,14 +5,18 @@ describe ActiveData::Config do
 
   describe '#include_root_in_json' do
     its(:include_root_in_json) { should == false }
-    specify { expect { subject.include_root_in_json = true }
-      .to change { subject.include_root_in_json }.from(false).to(true) }
+    specify do
+      expect { subject.include_root_in_json = true }
+        .to change { subject.include_root_in_json }.from(false).to(true)
+    end
   end
 
   describe '#i18n_scope' do
     its(:i18n_scope) { should == :active_data }
-    specify { expect { subject.i18n_scope = :data_model }
-      .to change { subject.i18n_scope }.from(:active_data).to(:data_model) }
+    specify do
+      expect { subject.i18n_scope = :data_model }
+        .to change { subject.i18n_scope }.from(:active_data).to(:data_model)
+    end
   end
 
   describe '#logger' do
@@ -22,23 +25,42 @@ describe ActiveData::Config do
 
   describe '#primary_attribute' do
     its(:primary_attribute) { should == :id }
-    specify { expect { subject.primary_attribute = :identified }
-      .to change { subject.primary_attribute }.from(:id).to(:identified) }
+    specify do
+      expect { subject.primary_attribute = :identified }
+        .to change { subject.primary_attribute }.from(:id).to(:identified)
+    end
   end
 
   describe '#normalizer' do
-    specify { expect { subject.normalizer(:name) { } }
-      .to change { subject.normalizer(:name) rescue nil }.from(nil).to(an_instance_of(Proc)) }
+    specify do
+      expect { subject.normalizer(:name) {} }
+        .to change {
+          begin
+            subject.normalizer(:name)
+          rescue ActiveData::NormalizerMissing
+            nil
+          end
+        }.from(nil).to(an_instance_of(Proc))
+    end
     specify { expect { subject.normalizer(:wrong) }.to raise_error ActiveData::NormalizerMissing }
   end
 
   describe '#typecaster' do
-    specify { expect { subject.typecaster('Object') { } }
-      .to change { subject.typecaster(Time, Object) rescue nil }.from(nil).to(an_instance_of(Proc)) }
-    specify { expect { subject.typecaster('Object') { } }
-      .to change { subject.typecaster('time', 'object') rescue nil }.from(nil).to(an_instance_of(Proc)) }
-    specify { expect { subject.typecaster('Object') { } }
-      .to change { subject.typecaster(Object) rescue nil }.from(nil).to(an_instance_of(Proc)) }
+    specify do
+      expect { subject.typecaster('Object') {} }
+        .to change { muffle(ActiveData::TypecasterMissing) { subject.typecaster(Time, Object) } }
+        .from(nil).to(an_instance_of(Proc))
+    end
+    specify do
+      expect { subject.typecaster('Object') {} }
+        .to change { muffle(ActiveData::TypecasterMissing) { subject.typecaster('time', 'object') } }
+        .from(nil).to(an_instance_of(Proc))
+    end
+    specify do
+      expect { subject.typecaster('Object') {} }
+        .to change { muffle(ActiveData::TypecasterMissing) { subject.typecaster(Object) } }
+        .from(nil).to(an_instance_of(Proc))
+    end
     specify { expect { subject.typecaster(Object) }.to raise_error ActiveData::TypecasterMissing }
   end
 end