gotime-cassandra_object 2.10.9 → 2.10.10

data/Gemfile

@@ -3,4 +3,5 @@ gemspec
 
 group :test do
   gem 'cassandra', git: 'git://github.com/twitter/cassandra.git', require: 'cassandra/1.0'
+  gem 'rails', path: '~/code/rails'
 end

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '2.10.9'
+  s.version = '2.10.10'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

data/lib/cassandra_object/base.rb

@@ -38,8 +38,8 @@ module CassandraObject
     include AttributeMethods::Dirty
     include AttributeMethods::Typecasting
     include BelongsTo
-    include Callbacks
     include Validations
+    include Callbacks
     include Timestamps
 
     attr_reader :attributes

data/lib/cassandra_object/callbacks.rb

@@ -4,6 +4,8 @@ module CassandraObject
 
     included do
       extend ActiveModel::Callbacks
+      include ActiveModel::Validations::Callbacks
+
       define_model_callbacks :save, :create, :update, :destroy
     end
 
@@ -24,4 +26,4 @@ module CassandraObject
         _run_update_callbacks { super }
       end
   end
-end
+end

data/lib/cassandra_object/validations.rb

@@ -12,7 +12,6 @@ module CassandraObject
     include ActiveModel::Validations
     
     included do
-      define_model_callbacks :validation
       define_callbacks :validate, scope: :name
     end
     

data/test/unit/callbacks_test.rb

@@ -6,7 +6,7 @@ class CassandraObject::CallbacksTest < CassandraObject::TestCase
     key :uuid
     string :description
 
-    %w(after_save after_create after_update after_destroy).each do |method|
+    %w(before_validation after_validation after_save after_create after_update after_destroy).each do |method|
       send(method) do
         callback_history << method
       end
@@ -24,7 +24,7 @@ class CassandraObject::CallbacksTest < CassandraObject::TestCase
   test 'create' do
     issue = TestIssue.create
 
-    assert_equal ['after_create', 'after_save'], issue.callback_history
+    assert_equal ['before_validation', 'after_validation', 'after_create', 'after_save'], issue.callback_history
   end
 
   test 'update' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.10.9
+  version: 2.10.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70116309308060 !ruby/object:Gem::Requirement
+  requirement: &70306970624500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70116309308060
+  version_requirements: *70306970624500
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70116309307600 !ruby/object:Gem::Requirement
+  requirement: &70306970624040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70116309307600
+  version_requirements: *70306970624040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70116309307220 !ruby/object:Gem::Requirement
+  requirement: &70306968446860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70116309307220
+  version_requirements: *70306968446860
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []