datastax_rails 2.0.4 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06972ed110ef94f1e39ad303f9d83b3c012f2840
-  data.tar.gz: 633ea7c7ff603672a07bc70ecb5b62059d12d18d
+  metadata.gz: 515e87cf850c3d9a87ae5b12b2a2ea125ae0af75
+  data.tar.gz: 145680d9780c211dd58172bd8df338df5b245571
 SHA512:
-  metadata.gz: b826619dcf22f443352173c26accb3f994a8b229739aa6ab71e64013a05fed9df1d59af3478f05bbcb21dc19637699ad009dc5c577abf1c87fe2984d29ee05db
-  data.tar.gz: f86a2dec43ce66e55c270b494554b15d4a33ace9e84481d459e5200f32a71c5045575befe6549a4147f04288ac6a28ff8c36ccf4fc256e4046a5bd70997ff180
+  metadata.gz: 0eb3d48eda726e2ae6607df2e5ceb0448ecd7e2181716eba42875e456dc2fd33036492ee1fbccd1f0abb914b03ed3fcf932ca6d42a2caf82e0a70e910445bfd4
+  data.tar.gz: 3108393c7d9fd432f52b45b321fa662e31f777a275721f17cbcb43272464c4da73eba59de3f0ee43c4ea44ee9a79b2dad4ce43217185d605ce1d930a564e8783

data/lib/datastax_rails/base.rb

@@ -357,8 +357,8 @@ module DatastaxRails #:nodoc:
     include Batches
     include AttributeAssignment
     include AttributeMethods
-    include Callbacks
     include Validations
+    include Callbacks
     include Reflection
     include Associations
     include Scoping
@@ -376,7 +376,7 @@ module DatastaxRails #:nodoc:
     class_attribute :default_timezone, :instance_writer => false
     self.default_timezone = :utc
 
-    # Stores the default consistency level (QUORUM by default)    
+    # Stores the default consistency level (QUORUM by default)
     class_attribute :default_consistency
     self.default_consistency = :quorum
 
@@ -441,7 +441,6 @@ module DatastaxRails #:nodoc:
         init_internals
   
         @new_record = false
-  
         run_callbacks :find
         run_callbacks :initialize
       end

data/lib/datastax_rails/callbacks.rb

@@ -258,7 +258,7 @@ module DatastaxRails
       :after_initialize, :after_find, :after_touch, :before_validation, :after_validation,
       :before_save, :around_save, :after_save, :before_create, :around_create,
       :after_create, :before_update, :around_update, :after_update,
-      :before_destroy, :around_destroy, :after_destroy, :after_commit, :after_rollback
+      :before_destroy, :around_destroy, :after_destroy, :after_commit
     ]
 
     module ClassMethods
@@ -276,9 +276,9 @@ module DatastaxRails
       run_callbacks(:destroy) { super }
     end
 
-    def touch(*) #:nodoc:
-      run_callbacks(:touch) { super }
-    end
+    # def touch(*) #:nodoc:
+      # run_callbacks(:touch) { super }
+    # end
 
   private
 

data/lib/datastax_rails/persistence.rb

@@ -147,6 +147,30 @@ module DatastaxRails
       @destroyed = true
       freeze
     end
+    
+    # TODO: Make this work
+    # def touch(name = nil)
+      # raise ActiveRecordError, "can not touch on a new record object" unless persisted?
+# 
+      # attributes = timestamp_attributes_for_update_in_model
+      # attributes << name if name
+# 
+      # unless attributes.empty?
+        # current_time = current_time_from_proper_timezone
+        # changes = {}
+# 
+        # attributes.each do |column|
+          # column = column.to_s
+          # changes[column] = write_attribute(column, current_time)
+        # end
+# 
+        # @changed_attributes.except!(*changes.keys)
+        # primary_key = self.class.primary_key
+        # self.class.unscoped.where(primary_key => self[primary_key]).update_all(changes) == 1
+      # else
+        # true
+      # end
+    # end
 
     # Updates a single attribute and saves the record.
     # This is especially useful for boolean flags on existing records. Also note that

data/lib/datastax_rails/railtie.rb

@@ -20,6 +20,13 @@ module DatastaxRails
         raise "ERROR: datastax.yml does not define a configuration for #{Rails.env} environment"
       end
       DatastaxRails::Base.establish_connection(config[Rails.env].with_indifferent_access)
+      if defined?(PhusionPassenger)
+        PhusionPassenger.on_event(:starting_worker_process) do |forked|
+          if forked
+             DatastaxRails::Base.establish_connection(config[Rails.env].with_indifferent_access)
+          end
+        end
+      end
     end
     
     rake_tasks do

data/lib/datastax_rails/schema/solr.rb

@@ -24,6 +24,9 @@ module DatastaxRails
         if Rails.root.join('config','solr',"#{model.column_family}-schema.xml.erb").exist?
           say "Using custom schema for #{model.name}", :subitem
           ERB.new(Rails.root.join('config','solr',"#{model.column_family}-schema.xml.erb").read, 0, '>').result(binding)
+        elsif Rails.root.join('config','solr','application-schema.xml.erb').exist?
+          say 'Using application default schema', :subitem
+          ERB.new(Rails.root.join('config','solr','application-schema.xml.erb').read, 0, '>').result(binding)
         else
           ERB.new(File.read(File.join(File.dirname(__FILE__),"..","..","..","config","schema.xml.erb")), 0, '>').result(binding)
         end

data/lib/datastax_rails/version.rb

@@ -1,3 +1,3 @@
 module DatastaxRails
-  VERSION = "2.0.4"
+  VERSION = "2.0.7"
 end

data/spec/datastax_rails/base_spec.rb

@@ -1,25 +1,6 @@
 require 'spec_helper'
 
 describe DatastaxRails::Base do
-  it "should run before_save" do
-    p = Person.new(:name => "Jason")
-    p.save
-    p.nickname.should == "Jason"
-  end
-  
-  it "should run after_save" do
-    p = Person.new(:name => "Steve")
-    p.save
-    p.instance_variable_get(:@after_save_ran).should == "yup"
-  end
-  
-  it "should run after_create" do
-    p = Person.new(:name => "Tommy")
-    p.save
-    p.instance_variable_get(:@after_create_ran).should == "yup"
-  end
-  
-  
   it "should raise RecordNotFound when finding a bogus ID" do
     lambda { Person.find("xyzzy") }.should raise_exception(DatastaxRails::RecordNotFound)
   end

data/spec/datastax_rails/callbacks_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+class CallbackTester < Hobby
+  self.column_family = "hobbies"
+  attr_accessor :after_find_called, :after_initialize_called
+  
+  after_find { self.after_find_called = true }
+  after_initialize { self.after_initialize_called = true }
+  
+  %w[before_save before_create after_save after_create before_validation after_validation
+     after_touch before_destroy after_destroy].each do |callback|
+       self.send(callback, callback + "_callback")   # after_save 'after_save_callback'
+       define_method(callback+"_callback") do
+         true
+       end
+     end
+end
+
+describe DatastaxRails::Base do
+  describe "callbacks" do
+    subject { CallbackTester.new }
+    
+    %w[before_save before_create after_save after_create before_validation after_validation].each do |callback|
+      it "runs #{callback}" do
+        expect(subject).to receive(callback+"_callback")
+        subject.save
+      end
+    end
+    
+    %w[after_destroy before_destroy].each do |callback|
+      it "runs #{callback}" do
+        subject.save
+        expect(subject).to receive(callback+"_callback")
+        subject.destroy
+      end
+    end
+    
+    it "runs after_find" do
+      subject.save
+      ct=CallbackTester.find(subject.id)
+      expect(ct.after_find_called).to be_true
+    end
+    
+    it "runs after_initialize" do
+      expect(subject.after_initialize_called).to be_true
+    end
+  end
+end

data/spec/support/models.rb

@@ -13,28 +13,7 @@ class Person < DatastaxRails::Base
   map :str_
   timestamps
   
-  before_create :set_variable2
-  before_save :set_nickname
-  after_save :set_variable
-  after_create :set_variable3
-  
   validates :name, :presence => true, :uniqueness => :true
-  
-  def set_nickname
-    self.nickname ||= self.name
-  end
-  
-  def set_variable
-    @after_save_ran = "yup"
-  end
-  
-  def set_variable2
-    @before_create_ran = "yup"
-  end
-  
-  def set_variable3
-    @after_create_ran = 'yup'
-  end
 end
 
 class Car < DatastaxRails::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datastax_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.7
 platform: ruby
 authors:
 - Jason M. Kusar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -243,6 +243,7 @@ files:
 - spec/datastax_rails/associations_spec.rb
 - spec/datastax_rails/attribute_methods_spec.rb
 - spec/datastax_rails/base_spec.rb
+- spec/datastax_rails/callbacks_spec.rb
 - spec/datastax_rails/column_spec.rb
 - spec/datastax_rails/cql/select_spec.rb
 - spec/datastax_rails/cql/update_spec.rb
@@ -362,6 +363,7 @@ test_files:
 - spec/datastax_rails/inheritance_spec.rb
 - spec/datastax_rails/associations/has_many_association_spec.rb
 - spec/datastax_rails/associations/belongs_to_association_spec.rb
+- spec/datastax_rails/callbacks_spec.rb
 - spec/feature/dynamic_fields_spec.rb
 - spec/feature/overloaded_tables_spec.rb
 - spec/spec.opts