sessionm-cassandra_object 2.2.46 → 2.2.47

data/lib/cassandra_object/base.rb

@@ -36,9 +36,9 @@ module CassandraObject
     include Identity
     include Attributes
     include Persistence
-    include Callbacks
     include Dirty
     include Validations
+    include Callbacks
     include Associations
     include Batches
     include FinderMethods

data/lib/cassandra_object/callbacks.rb

@@ -1,27 +1,37 @@
+require 'active_support/core_ext/array/wrap'
+
 module CassandraObject
   module Callbacks
     extend ActiveSupport::Concern
 
     included do
       extend ActiveModel::Callbacks
-      define_model_callbacks :save, :create, :destroy, :update
+      include ActiveModel::Validations::Callbacks
+
+      define_model_callbacks :initialize, :find, :touch, :only => :after
+      define_model_callbacks :save, :create, :update, :destroy
     end
 
     def destroy #:nodoc:
       _run_destroy_callbacks { super }
     end
 
-    private
-      def create_or_update #:nodoc:
-        _run_save_callbacks { super }
-      end
+    def touch(*) #:nodoc:
+      _run_touch_callbacks { super }
+    end
+
+  private
 
-      def create #:nodoc:
-        _run_create_callbacks { super }
-      end
+    def create_or_update #:nodoc:
+      _run_save_callbacks { super }
+    end
+
+    def create #:nodoc:
+      _run_create_callbacks { super }
+    end
 
-      def update(*) #:nodoc:
-        _run_update_callbacks { super }
-      end
+    def update(*) #:nodoc:
+      _run_update_callbacks { super }
+    end
   end
-end
+end

data/lib/cassandra_object/validations.rb

@@ -11,11 +11,6 @@ module CassandraObject
     extend ActiveSupport::Concern
     include ActiveModel::Validations
     
-    included do
-      define_model_callbacks :validation
-      define_callbacks :validate, :scope => :name
-    end
-    
     module ClassMethods
       def create!(attributes = {})
         new(attributes).tap do |object|
@@ -26,9 +21,7 @@ module CassandraObject
 
     def valid?(context=nil)
       context ||= (new_record? ? :create : :update)
-      run_callbacks :validation do
-        super context
-      end
+      super(context)
     end
 
     def save(options={})

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '2.2.46'
+  s.version = '2.2.47'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 
@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency('rails', "~> 3.0")
+  s.add_runtime_dependency('rails', "~> 3.0.9")
   s.add_runtime_dependency('cassandra', ">= 0.11.3")
 
-  s.add_development_dependency('bundler', "~> 1.0.0")
+  s.add_development_dependency('bundler', ">= 1.0.0")
 end
 

data/test/callbacks_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class CassandraObject::CallbacksTest < CassandraObject::TestCase
+
+  test 'before_validation respects :on' do
+    issue = Issue.new
+    issue.save
+    assert_equal 'default name', issue.name
+
+    # make sure :on => :create is respected
+    issue.name = nil
+    issue.save
+    assert_equal nil, issue.name
+  end
+
+end

data/test/test_helper.rb

@@ -9,6 +9,12 @@ class Issue < CassandraObject::Base
   key :uuid
   attribute :description, :type => :string
   attribute :worth, :type => :decimal, :precision => 100
+  attribute :name, :type => :string
+  before_validation :set_defaults, :on => :create
+
+  def set_defaults
+    self.name ||= 'default name'
+  end
 end
 
 module CassandraObject

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.2.46
+  version: 2.2.47
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70206110473260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70206110473260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70206110472600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,18 +39,28 @@ dependencies:
         version: 0.11.3
   type: :runtime
   prerelease: false
-  version_requirements: *70206110472600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70206110472040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70206110472040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Cassandra ActiveModel
 email: klange@sessionm.com
 executables: []
@@ -121,6 +136,7 @@ files:
 - test/attributes_test.rb
 - test/base_test.rb
 - test/batches_test.rb
+- test/callbacks_test.rb
 - test/connection_test.rb
 - test/consistency_test.rb
 - test/finder_methods_test.rb
@@ -160,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Cassandra ActiveModel
@@ -169,6 +185,7 @@ test_files:
 - test/attributes_test.rb
 - test/base_test.rb
 - test/batches_test.rb
+- test/callbacks_test.rb
 - test/connection_test.rb
 - test/consistency_test.rb
 - test/finder_methods_test.rb