ninja-model 0.9.3 → 0.9.4

data/.gitignore

@@ -2,7 +2,7 @@
 *.cache
 *.log
 *.pid
-tmp/**/*
+tmp/
 doc/*
 .DS_Store
 *.sqlite3
@@ -12,7 +12,7 @@ doc/plugins
 doc/*.dot
 coverage/*
 *.sw?
-vendor/plugins/ns_web
+vendor/bundle
 Gemfile.lock
 .bundle
 *.gem

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2 do
+guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/lib/ninja_model/base.rb

@@ -152,6 +152,24 @@ module NinjaModel
       compute_type(klass)
     end
 
+    def attribute_for_inspect(attr_name)
+      value = read_attribute(attr_name)
+      if value.is_a?(String) && value.length > 50
+        "#{value[0..50]}...".inspect
+      elsif value.is_a?(Date) || value.is_a?(Time)
+        %("#{value.to_s(:db)}")
+      else
+        value.inspect
+      end
+    end
+
+    def inspect
+      attributes_as_nice_string = self.class.attribute_names.collect { |attr|
+        "#{attr}: #{attribute_for_inspect(attr)}"
+      }.compact.join(', ')
+      "#<#{self.class} #{attributes_as_nice_string}>"
+    end
+
 
     private
 

data/lib/ninja_model/validation.rb

@@ -6,7 +6,6 @@ module NinjaModel
     included do
       include ActiveModel::Validations
       include ActiveModel::Validations::Callbacks
-      define_model_callbacks :validation
     end
 
     def save(options={})
@@ -22,7 +21,7 @@ module NinjaModel
     protected
 
     def perform_validations(options)
-      perform_validation = options[:validate] != false
+      perform_validation = options[:validat] != false
       perform_validation ? valid?(options[:context]) : true
     end
   end

data/lib/ninja_model/version.rb

@@ -1,3 +1,3 @@
 module NinjaModel
- VERSION = "0.9.3"
+ VERSION = "0.9.4"
 end

data/ninja-model.gemspec

@@ -18,15 +18,15 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activerecord',  '~> 3.1.0'
-  s.add_dependency 'rake',          '~> 0.9.2'
+  s.add_dependency 'activerecord',  '~> 3.1.12'
+  s.add_dependency 'rake'
 
-  s.add_development_dependency 'rspec',     	'~> 2.8.0'
-  s.add_development_dependency 'mocha',     	'~> 0.10.0'
-  s.add_development_dependency 'guard-rspec',	'~> 0.5.10'
+  s.add_development_dependency 'rspec',     	'~> 2.13.0'
+  s.add_development_dependency 'mocha',     	'~> 0.13.0'
+  s.add_development_dependency 'guard-rspec',	'~> 3.0.0'
   s.add_development_dependency 'libnotify',		'~> 0.6.0'
   s.add_development_dependency 'yard',          '~> 0.7.4'
   s.add_development_dependency 'redcarpet',     '~> 2.0.0'
   s.add_development_dependency 'sqlite3',       '~> 1.3.5'
-  s.add_development_dependency 'factory_girl',  '~> 2.5.0'
+  s.add_development_dependency 'factory_girl',  '~> 4.2.0'
 end

data/spec/lib/ninja_model/associations/belongs_to_association_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe NinjaModel::Associations::BelongsToAssociation do
-  let(:user) { Factory(:user) }
-  let(:post) { Factory(:post, :user_id => user.id) }
+  let(:user) { FactoryGirl.create(:user) }
+  let(:post) { FactoryGirl.create(:post, user_id: user.id) }
 
   context 'with an ActiveRecord parent' do
     describe 'accessing the association directly' do
@@ -28,12 +28,12 @@ describe NinjaModel::Associations::BelongsToAssociation do
       describe 'accessing the association directly' do
         it 'should trigger a fetch' do
           NinjaModel::Relation.any_instance.expects(:to_a).returns(post)
-          t = Tag.new(:post_id => post.id)
+          t = Tag.new(post_id: post.id)
           t.post
         end
 
         it 'should assign the proper predicates' do
-          t = Tag.new(:post_id => post.id)
+          t = Tag.new(post_id: post.id)
           predicates = t.association(:post).scoped.predicates
           predicates.count.should eql(1)
           predicates.first.attribute.should eql(:id)
@@ -47,12 +47,12 @@ describe NinjaModel::Associations::BelongsToAssociation do
       describe 'accessing the association directly' do
         it 'should trigger a fetch' do
           NinjaModel::Relation.any_instance.expects(:to_a).returns(post)
-          c = Category.new(:post_id => post.id)
+          c = Category.new(post_id: post.id)
           c.post
         end
 
         it 'should assign the proper predicates' do
-          c = Category.new(:post_id => post.id)
+          c = Category.new(post_id: post.id)
           predicates = c.association(:post).scoped.predicates
           predicates.count.should eql(1)
           predicates.first.attribute.should eql(:id)
@@ -68,7 +68,7 @@ describe NinjaModel::Associations::BelongsToAssociation do
     end
 
     it 'should properly update the ids when assigning a new instance' do
-      t = Factory(:tag)
+      t = FactoryGirl.create(:tag)
       t.post = post
       t.post_id.should eql(post.id)
     end

data/spec/lib/ninja_model/associations/has_many_association_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe NinjaModel::Associations::HasManyAssociation do
-  let(:user) { Factory(:user) }
+  let(:user) { FactoryGirl.create(:user) }
 
   context 'with an ActiveRecord parent' do
 
@@ -48,8 +48,8 @@ describe NinjaModel::Associations::HasManyAssociation do
 
   context 'with a NinjaModel parent' do
 
-    let(:post) { Factory(:post) }
-    let!(:tags) { FactoryGirl.create_list(:tag, 2, :post_id => 1) }
+    let(:post) { FactoryGirl.create(:post) }
+    let!(:tags) { FactoryGirl.create_list(:tag, 2, post_id: 1) }
 
     context 'and an ActiveRecord association' do
       it 'should return an Array' do
@@ -61,7 +61,7 @@ describe NinjaModel::Associations::HasManyAssociation do
       end
 
       it 'should allow chaining queries' do
-        post.tags.where(:name => 'Tag 2').count.should eql(1)
+        post.tags.where(name: 'Tag 2').count.should eql(1)
       end
 
       describe 'building an associated object' do
@@ -88,7 +88,7 @@ describe NinjaModel::Associations::HasManyAssociation do
       end
 
       it 'should allow chaining' do
-        predicates = post.categories.where(:name => 'foo').predicates
+        predicates = post.categories.where(name: 'foo').predicates
         predicates.count.should eql(2)
         predicates.first.attribute.should eql(:post_id)
         predicates.first.meth.should eql(:eq)

data/spec/lib/ninja_model/associations/has_one_association_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe NinjaModel::Associations::HasOneAssociation do
-  let(:user) { Factory(:user) }
-  let(:post) { Factory(:post, :user_id => user.id) }
-  let(:bio) { Factory(:bio, :user_id => user.id) }
+  let(:user) { FactoryGirl.create(:user) }
+  let(:post) { FactoryGirl.create(:post, user: user) }
+  let(:bio) { FactoryGirl.create(:bio, user: user) }
 
   context 'with an ActiveRecord parent' do
     describe 'accessing the association directly' do
@@ -24,7 +24,7 @@ describe NinjaModel::Associations::HasOneAssociation do
 
   context 'with a NinjaModel parent' do
     context 'and an ActiveRecord child' do
-      let!(:email_address) { Factory(:email_address, :bio_id => bio.id) }
+      let!(:email_address) { FactoryGirl.create(:email_address, bio: bio) }
       describe 'accessing the association directly' do
         it 'should retrieve the record' do
           bio.email_address.should be_kind_of(EmailAddress)
@@ -38,12 +38,12 @@ describe NinjaModel::Associations::HasOneAssociation do
       end
 
       it 'should allow creating the association' do
-        bio.create_email_address(:email => 'foo@bar.com').should be_true
+        bio.create_email_address(email: 'foo@bar.com').should be_true
       end
     end
 
     context 'and a NinjaModel child' do
-      let(:body) { Factory(:body, :post_id => post.id) }
+      let(:body) { FactoryGirl.create(:body, post: post) }
       describe 'accessing the association directly' do
         it 'should trigger a fetch' do
           NinjaModel::Relation.any_instance.expects(:to_a).returns([body])
@@ -64,14 +64,14 @@ describe NinjaModel::Associations::HasOneAssociation do
         # We have to stub to_a here because building will try and retrieve the
         # existing record to remove ownership
         #
-        NinjaModel::Relation.any_instance.stubs(:to_a).returns([])
+        NinjaModel::Relation.any_instance.stubs(to_a: [])
         body = post.build_body
         body.should be_kind_of(Body)
         body.post_id.should eql(post.id)
       end
 
       it 'should allow creating the association' do
-        NinjaModel::Relation.any_instance.stubs(:to_a).returns([])
+        NinjaModel::Relation.any_instance.stubs(to_a: [])
         Body.any_instance.stubs(:create).returns(true)
         post.create_body(:text => 'Foobar')
       end

data/spec/lib/ninja_model/callbacks_spec.rb

@@ -0,0 +1,257 @@
+require 'spec_helper'
+
+describe NinjaModel::Callbacks do
+  let(:adapter) { mock('Adapter') }
+  class CallbackModel < NinjaModel::Base
+    attribute :testing, :integer
+
+    before_validation :before_validation_callback
+    after_validation :after_validation_callback
+
+    before_save :before_save_callback
+    after_save :after_save_callback
+    around_save :around_save_callback
+
+    before_create :before_create_callback
+    after_create :after_create_callback
+    around_create :around_create_callback
+
+    before_update :before_update_callback
+    after_update :after_update_callback
+    around_update :around_update_callback
+
+    before_destroy :before_destroy_callback
+    after_destroy :after_destroy_callback
+    around_destroy :around_destroy_callback
+
+    def before_validation_callback; true; end
+    def after_validation_callback; true; end
+
+    def before_save_callback; true; end
+    def after_save_callback; true; end
+    def around_save_callback; yield; end
+
+    def before_create_callback; true; end
+    def after_create_callback; true; end
+    def around_create_callback; yield; end
+
+    def before_update_callback; true; end
+    def after_update_callback; true; end
+    def around_update_callback; yield; end
+
+    def before_destroy_callback; true; end
+    def after_destroy_callback; true; end
+    def around_destroy_callback; yield; end
+  end
+
+  before {
+    @obj = CallbackModel.new
+    @obj.class.stubs(adapter: adapter)
+  }
+
+  describe 'save' do
+    context 'on a new record' do
+      before do
+        @obj.stubs(new_record?: true)
+        adapter.stubs(create: true)
+      end
+
+      it 'should call the before_validation callback' do
+        @obj.expects(:before_validation_callback)
+        @obj.save
+      end
+      it 'should call the after_validation callback' do
+        @obj.expects(:after_validation_callback)
+        @obj.save
+      end
+
+      it 'should call the before_create callback' do
+        @obj.expects(:before_create_callback)
+        @obj.save
+      end
+      it 'should call the after_create callback' do
+        @obj.expects(:after_create_callback)
+        @obj.save
+      end
+      it 'should call the around_create callback' do
+        @obj.expects(:around_create_callback).yields
+        @obj.save
+      end
+
+      it 'should call the before_save callback' do
+        @obj.expects(:before_save_callback)
+        @obj.save
+      end
+      it 'should call the after_save callback' do
+        @obj.expects(:after_save_callback)
+        @obj.save
+      end
+      it 'should call the around_save callback' do
+        @obj.expects(:around_save_callback).yields
+        @obj.save
+      end
+
+      it 'should not call the before_update_callback' do
+        @obj.expects(:before_update_callback).never
+        @obj.save
+      end
+      it 'should not call the after_update_callback' do
+        @obj.expects(:after_update_callback).never
+        @obj.save
+      end
+      it 'should not call the around_update_callback' do
+        @obj.expects(:around_update_callback).never
+        @obj.save
+      end
+
+      it 'should not call the before_destroy_callback' do
+        @obj.expects(:before_destroy_callback).never
+        @obj.save
+      end
+      it 'should not call the after_destroy_callback' do
+        @obj.expects(:after_destroy_callback).never
+        @obj.save
+      end
+      it 'should not call the around_destroy_callback' do
+        @obj.expects(:around_destroy_callback).never
+        @obj.save
+      end
+    end
+
+    context 'on an existing record' do
+      before do
+        @obj.stubs(new_record?: false)
+        adapter.stubs(update: true)
+      end
+
+      it 'should call the before_validation callback' do
+        @obj.expects(:before_validation_callback)
+        @obj.save
+      end
+      it 'should call the after_validation callback' do
+        @obj.expects(:after_validation_callback)
+        @obj.save
+      end
+
+      it 'should not call the before_create callback' do
+        @obj.expects(:before_create_callback).never
+        @obj.save
+      end
+      it 'should not call the after_create callback' do
+        @obj.expects(:after_create_callback).never
+        @obj.save
+      end
+      it 'should not call the around_create callback' do
+        @obj.expects(:around_create_callback).never
+        @obj.save
+      end
+
+      it 'should call the before_save callback' do
+        @obj.expects(:before_save_callback)
+        @obj.save
+      end
+      it 'should call the after_save callback' do
+        @obj.expects(:after_save_callback)
+        @obj.save
+      end
+      it 'should call the around_save callback' do
+        @obj.expects(:around_save_callback).yields
+        @obj.save
+      end
+
+      it 'should call the before_update_callback' do
+        @obj.expects(:before_update_callback)
+        @obj.save
+      end
+      it 'should call the after_update_callback' do
+        @obj.expects(:after_update_callback)
+        @obj.save
+      end
+      it 'should call the around_update_callback' do
+        @obj.expects(:around_update_callback)
+        @obj.save
+      end
+
+      it 'should not call the before_destroy_callback' do
+        @obj.expects(:before_destroy_callback).never
+        @obj.save
+      end
+      it 'should not call the after_destroy_callback' do
+        @obj.expects(:after_destroy_callback).never
+        @obj.save
+      end
+      it 'should not call the around_destroy_callback' do
+        @obj.expects(:around_destroy_callback).never
+        @obj.save
+      end
+    end
+  end
+
+  describe 'destroy' do
+    before do
+      @obj.stubs(new_record?: false)
+      adapter.stubs(destroy: true)
+    end
+
+    it 'should not call the before_validation callback' do
+      @obj.expects(:before_validation_callback).never
+      @obj.destroy
+    end
+    it 'should not call the after_validation callback' do
+      @obj.expects(:after_validation_callback).never
+      @obj.destroy
+    end
+
+    it 'should not call the before_create callback' do
+      @obj.expects(:before_create_callback).never
+      @obj.destroy
+    end
+    it 'should not call the after_create callback' do
+      @obj.expects(:after_create_callback).never
+      @obj.destroy
+    end
+    it 'should not call the around_create callback' do
+      @obj.expects(:around_create_callback).never
+      @obj.destroy
+    end
+
+    it 'should not call the before_save callback' do
+      @obj.expects(:before_save_callback).never
+      @obj.destroy
+    end
+    it 'should not call the after_save callback' do
+      @obj.expects(:after_save_callback).never
+      @obj.destroy
+    end
+    it 'should not call the around_save callback' do
+      @obj.expects(:around_save_callback).never
+      @obj.destroy
+    end
+
+    it 'should not call the before_update_callback' do
+      @obj.expects(:before_update_callback).never
+      @obj.destroy
+    end
+    it 'should not call the after_update_callback' do
+      @obj.expects(:after_update_callback).never
+      @obj.destroy
+    end
+    it 'should not call the around_update_callback' do
+      @obj.expects(:around_update_callback).never
+      @obj.destroy
+    end
+
+    it 'should call the before_destroy_callback' do
+      @obj.expects(:before_destroy_callback)
+      @obj.destroy
+    end
+    it 'should call the after_destroy_callback' do
+      @obj.expects(:after_destroy_callback)
+      @obj.destroy
+    end
+    it 'should call the around_destroy_callback' do
+      @obj.expects(:around_destroy_callback).yields
+      @obj.destroy
+    end
+  end
+end

data/spec/lib/ninja_model/persistence_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe NinjaModel::Persistence do
+  let(:adapter) { mock('Adapter') }
   class PersistenceModel < NinjaModel::Base
     attribute :testing, :integer
   end
 
   before {
     @obj = PersistenceModel.new
-    @adapter = mock('Adapter')
-    @obj.class.stubs(:adapter).returns(@adapter)
+    @obj.class.stubs(adapter: adapter)
   }
   subject { @obj }
   it { should respond_to(:save) }
@@ -25,94 +25,64 @@ describe NinjaModel::Persistence do
   its(:destroyed?) { should be_false }
 
   describe 'save' do
-    before { subject.stubs(:run_callbacks).yields(true) }
-    it 'should run the save callbacks' do
-      subject.expects(:run_callbacks).with(:save)
-      subject.save
-    end
-
     it 'should call create for a new record' do
-      subject.stubs(:new_record?).returns(true)
+      subject.stubs(new_record?: true)
       subject.expects(:create)
       subject.save
     end
 
     it 'should call update for a persisted record' do
-      subject.stubs(:new_record?).returns(false)
+      subject.stubs(new_record?: false)
       subject.expects(:update)
       subject.save
     end
 
     it 'should clear the changed attributes after successful save' do
       attributes = {}
-      subject.stubs(:changed_attributes).returns(attributes)
-      subject.stubs(:new_record?).returns(false)
-      subject.stubs(:update).returns(true)
+      subject.stubs(changed_attributes: attributes, new_record?: false, update: true)
       attributes.expects(:clear)
       subject.save
     end
 
     it 'should not clear the changed attributes after unsuccessful save' do
       attributes = {}
-      subject.stubs(:changed_attributes).returns(attributes)
-      subject.stubs(:new_record?).returns(false)
-      subject.stubs(:update).returns(false)
+      subject.stubs(changed_attributes: attributes, new_record?: false, update: false)
       attributes.expects(:clear).never
       subject.save
     end
   end
 
   describe 'create' do
-    before {
-      subject.stubs(:run_callbacks).yields(true)
-      @adapter.stubs(:create).returns(true)
-    }
-    it 'should run the create callbacks' do
-      subject.expects(:run_callbacks).with(:create)
-      subject.create
-    end
     it 'should call create on the adapter' do
-      @adapter.expects(:create).with(subject)
+      adapter.expects(:create).with(subject)
       subject.create
     end
     it 'should update the persisted status' do
+      adapter.stubs(create: true)
       subject.create
       subject.persisted?.should be_true
     end
   end
 
   describe 'update' do
-    before {
-      subject.stubs(:run_callbacks).yields(true)
-      @adapter.stubs(:update).returns(true)
-    }
-    it 'should run the update callbacks' do
-      subject.expects(:run_callbacks).with(:update)
-      subject.update
-    end
     it 'should call update on the adapter' do
-      @adapter.expects(:update).with(subject)
+      adapter.expects(:update).with(subject)
       subject.update
     end
   end
 
   describe 'destroy' do
-    before {
-      @adapter.stubs(:destroy).returns(true)
-    }
-    it 'should run the destroy callbacks' do
-      subject.expects(:run_callbacks).with(:destroy)
-      subject.destroy
-    end
     it 'should call destroy on the adapter' do
-      @adapter.expects(:destroy).with(subject)
+      adapter.expects(:destroy).with(subject)
       subject.destroy
     end
     it 'should update the destroyed? status' do
+      adapter.stubs(destroy: true)
       subject.destroy
       subject.destroyed?.should be_true
     end
     it 'should not be persisted afterwards' do
+      adapter.stubs(destroy: true)
       subject.destroy
       subject.persisted?.should be_false
     end
@@ -120,7 +90,7 @@ describe NinjaModel::Persistence do
 
   describe 'reload' do
     it 'should call reload on the adapter' do
-      @adapter.expects(:reload).with(subject)
+      adapter.expects(:reload).with(subject)
       subject.reload
     end
   end
@@ -128,7 +98,7 @@ describe NinjaModel::Persistence do
   describe 'update_attributes' do
     it 'update the attributes hash and save' do
       subject.expects(:save)
-      subject.update_attributes(:testing => 2)
+      subject.update_attributes(testing: 2)
       subject.testing.should eql(2)
     end
   end

data/spec/lib/ninja_model/validation_spec.rb

@@ -14,5 +14,10 @@ describe NinjaModel::Validation do
   it { should respond_to(:valid?) }
 
   describe 'save' do
+    it 'should run the validation callbacks' do
+      subject.expects(:run_callbacks).with(:validation).yields
+      subject.expects(:run_callbacks).with(:validate)
+      subject.save
+    end
   end
 end

data/spec/support/factories/bio.rb

@@ -4,8 +4,7 @@ FactoryGirl.define do
     sequence(:name) { |n| "Name #{n}" }
     to_create { |model|
       model.write_attribute(:id, 1)
-      model.stubs(:persisted?).returns(true)
-      model.stubs(:new_record?).returns(false)
+      model.stubs(persisted?: true, new_record?: false)
     }
   end
 end

data/spec/support/factories/body.rb

@@ -4,8 +4,7 @@ FactoryGirl.define do
     sequence(:text) { |n| "Body #{n}" }
     to_create { |model|
       model.write_attribute(:id, 1)
-      model.stubs(:persisted?).returns(true)
-      model.stubs(:new_record?).returns(false)
+      model.stubs(persisted?: true, new_record?: false)
     }
   end
 end

data/spec/support/factories/post.rb

@@ -5,8 +5,7 @@ FactoryGirl.define do
     published false
     to_create { |model|
       model.write_attribute(:id, 1)
-      model.stubs(:persisted?).returns(true)
-      model.stubs(:new_record?).returns(false)
+      model.stubs(persisted?: true, new_record?: false)
     }
   end
 end

metadata

@@ -1,136 +1,132 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ninja-model
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.4
   prerelease: 
-  version: 0.9.3
 platform: ruby
-authors: 
+authors:
 - Josh Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &16193800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.1.0
+      - !ruby/object:Gem::Version
+        version: 3.1.12
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16193800
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &16192980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16192980
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &16192100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.8.0
+      - !ruby/object:Gem::Version
+        version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16192100
+- !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &16191220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.10.0
+      - !ruby/object:Gem::Version
+        version: 0.13.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16191220
+- !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &16177320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.5.10
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16177320
+- !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &16176640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16176640
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &16175840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16175840
+- !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &16174900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16174900
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &16174300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16174300
+- !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &16173560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
+      - !ruby/object:Gem::Version
+        version: 4.2.0
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *16173560
 description: Pseudo-ORM for Ruby/Rails with an ActiveRecord-like interface
 email: theprime@codingprime.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -194,6 +190,7 @@ files:
 - spec/lib/ninja_model/attribute_methods_spec.rb
 - spec/lib/ninja_model/attribute_spec.rb
 - spec/lib/ninja_model/base_spec.rb
+- spec/lib/ninja_model/callbacks_spec.rb
 - spec/lib/ninja_model/identity_spec.rb
 - spec/lib/ninja_model/persistence_spec.rb
 - spec/lib/ninja_model/predicate_spec.rb
@@ -222,38 +219,35 @@ files:
 - spec/support/matchers/convert.rb
 homepage: http://github.com/t3hpr1m3/ninja-model.git
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 483263405
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2346852410491861994
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 483263405
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2346852410491861994
 requirements: []
-
 rubyforge_project: ninja-model
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Pseudo-ORM for Ruby
-test_files: 
+test_files:
 - spec/db/schema.rb
 - spec/lib/ninja_model/adapters/abstract_adapter_spec.rb
 - spec/lib/ninja_model/adapters/adapter_manager_spec.rb
@@ -265,6 +259,7 @@ test_files:
 - spec/lib/ninja_model/attribute_methods_spec.rb
 - spec/lib/ninja_model/attribute_spec.rb
 - spec/lib/ninja_model/base_spec.rb
+- spec/lib/ninja_model/callbacks_spec.rb
 - spec/lib/ninja_model/identity_spec.rb
 - spec/lib/ninja_model/persistence_spec.rb
 - spec/lib/ninja_model/predicate_spec.rb