datastax_rails 1.0.14.2 → 1.0.14.10

data/lib/datastax_rails/attribute_methods/definition.rb

@@ -12,7 +12,7 @@ module DatastaxRails
         value ||= coder.default
         return unless value
       
-        value = (value.kind_of?(String) || value.kind_of?(Array)) ? coder.decode(value) : value
+        value = coder.decode(value)
         coder.wrap(record, name, value)
       end
       

data/lib/datastax_rails/persistence.rb

@@ -100,9 +100,9 @@ module DatastaxRails
       def encode_attributes(attributes, schema_version)
         encoded = {"schema_version" => schema_version.to_s}
         attributes.each do |column_name, value|
-          if value.nil?
-            encoded[column_name.to_s] = ""
-          else
+          # if value.nil?
+            # encoded[column_name.to_s] = ""
+          # else
             encoded_value = attribute_definitions[column_name.to_sym].coder.encode(value)
             if(encoded_value.is_a?(Array))
               encoded_value.each_with_index do |chunk,i|
@@ -111,7 +111,7 @@ module DatastaxRails
             else
               encoded[column_name.to_s] = encoded_value
             end
-          end
+          # end
         end
         encoded
       end

data/lib/datastax_rails/relation/search_methods.rb

@@ -71,7 +71,7 @@ module DatastaxRails
     #   end
     def limit(value)
       clone.tap do |r|
-        r.per_page_value = value
+        r.per_page_value = value.to_i
       end
     end
     alias :per_page :limit
@@ -81,7 +81,7 @@ module DatastaxRails
     #   Model.page(2)
     def page(value)
       clone.tap do |r|
-        r.page_value = value
+        r.page_value = value.to_i
       end
     end
     
@@ -104,7 +104,7 @@ module DatastaxRails
       return self if attrs.blank?
       
       clone.tap do |r|
-        r.group_values += args.flatten
+        r.group_values += attrs.flatten
       end
     end
     

data/lib/datastax_rails/relation/spawn_methods.rb

@@ -86,7 +86,7 @@ module DatastaxRails
       result
     end
     
-    VALID_FIND_OPTIONS = [:conditions, :limit, :offset, :order, :group, :page, :per_page]
+    VALID_FIND_OPTIONS = [:conditions, :limit, :select, :offset, :order, :group, :page, :per_page]
     def apply_finder_options(options) #:nodoc:
       relation = clone
       return relation unless options
@@ -95,12 +95,11 @@ module DatastaxRails
       finders = options.dup
       finders.delete_if { |key, value| value.nil? }
       
-      ([:group, :order, :limit, :offset, :page, :per_page] & finders.keys).each do |finder|
+      ([:group, :order, :limit, :offset, :page, :per_page, :select] & finders.keys).each do |finder|
         relation = relation.send(finder, finders[finder])
       end
       
       relation = relation.where(finders[:conditions]) if options.has_key?(:conditions)
-      
       relation
     end
   end

data/lib/datastax_rails/serializers/xml_serializer.rb

@@ -172,6 +172,9 @@ module DatastaxRails
     #     end
     #   end
     def to_xml(options = {}, &block)
+      options[:methods] ||= []
+      options[:methods] << :id
+      options[:methods].uniq!
       XmlSerializer.new(self, options).serialize(&block)
     end
   end

data/lib/datastax_rails/tasks/column_family.rb

@@ -110,19 +110,19 @@ module DatastaxRails
           uri = URI.parse(solr_url)
           Net::HTTP.start(uri.host, uri.port) do |http|
             if force || solrconfig_digest != sm_digests['solrconfig'] 
-              puts "Posting Solr Config file to '#{uri.path}/solrconfig.xml'"
+              puts "Posting Solr Config file to '#{solr_url}/solrconfig.xml'"
               http.post(uri.path+"/solrconfig.xml", solrconfig)
               sleep(5) if Rails.env.production?
               DatastaxRails::Cql::Update.new(SchemaMigration, model.column_family).columns(:solrconfig => solrconfig_digest).execute
             end
             if force || stopwords_digest != sm_digests['stopwords']
-              puts "Posting Solr Stopwords file to '#{uri.path}/stopwords.txt'"
+              puts "Posting Solr Stopwords file to '#{solr_url}/stopwords.txt'"
               http.post(uri.path+"/stopwords.txt", stopwords)
               sleep(5) if Rails.env.production?
               DatastaxRails::Cql::Update.new(SchemaMigration, model.column_family).columns(:stopwords => stopwords_digest).execute
             end
             if force || schema_digest != sm_digests['digest']
-              puts "Posting Solr Schema file to '#{uri.path}/schema.xml'"
+              puts "Posting Solr Schema file to '#{solr_url}/schema.xml'"
               http.post(uri.path+"/schema.xml", schema)
               sleep(5) if Rails.env.production?
               DatastaxRails::Cql::Update.new(SchemaMigration, model.column_family).columns(:digest => schema_digest).execute

data/lib/datastax_rails/types/date_type.rb

@@ -5,11 +5,12 @@ module DatastaxRails
       FORMAT = '%Y-%m-%dT%H:%M:%SZ'
 
       def encode(value)
-        raise ArgumentError.new("#{self} requires a Date") unless value.to_date
+        raise ArgumentError.new("#{self} requires a Date") unless value.kind_of?(Date) || value.kind_of?(Time)
         value.to_date.strftime(FORMAT)
       end
 
       def decode(str)
+        return str if str.kind_of?(Date)
         Date.parse(str) rescue nil
       end
     end

data/lib/datastax_rails/types/float_type.rb

@@ -4,14 +4,14 @@ module DatastaxRails
       DEFAULTS = {:solr_type => 'float', :indexed => true, :stored => true, :multi_valued => false, :sortable => true, :tokenized => false, :fulltext => false}
       REGEX = /\A[-+]?(\d+(\.\d+)?|\.\d+)\Z/
       def encode(float)
-        raise ArgumentError.new("#{self} requires a Float") unless float.kind_of?(Float)
-        float.to_s
+        return -10191980.0 if float.blank?
+        raise ArgumentError.new("#{self} requires a Float. You passed #{float.to_s}") unless float.kind_of?(Float) || (float.kind_of?(String) && float.match(REGEX))
+        float.to_f
       end
 
-      def decode(str)
-        return nil if str.empty?
-        return nil unless str.kind_of?(String) && str.match(REGEX)
-        str.to_f
+      def decode(float)
+        return nil if float.blank? || float == -10191980.0
+        float.to_f
       end
     end
   end

data/lib/datastax_rails/types/integer_type.rb

@@ -4,14 +4,14 @@ module DatastaxRails
       DEFAULTS = {:solr_type => 'int', :indexed => true, :stored => true, :multi_valued => false, :sortable => true, :tokenized => false, :fulltext => false}
       REGEX = /\A[-+]?\d+\Z/
       def encode(int)
-        raise ArgumentError.new("#{self} requires an Integer. You passed #{int.inspect}") unless int.kind_of?(Integer)
-        int.to_s
+        return -10191980 if int.blank?
+        raise ArgumentError.new("#{self} requires an Integer. You passed #{int.to_s}") unless int.kind_of?(Integer) || (int.kind_of?(String) && int.match(REGEX)) 
+        int.to_i
       end
 
-      def decode(str)
-        return nil if str.empty?
-        return nil unless str.kind_of?(String) && str.match(REGEX)
-        str.to_i
+      def decode(int)
+        return nil if int.blank? || int.to_i == -10191980
+        int.to_i
       end
     end
   end

data/lib/datastax_rails/types/string_type.rb

@@ -3,6 +3,7 @@ module DatastaxRails
     class StringType < BaseType
       DEFAULTS = {:solr_type => 'string', :indexed => true, :stored => true, :multi_valued => false, :sortable => true, :tokenized => false, :fulltext => true}
       def encode(str)
+        str = "" unless str
         raise ArgumentError.new("#{self} requires a String") unless str.kind_of?(String)
         str.dup
       end

data/lib/datastax_rails/types/time_type.rb

@@ -10,6 +10,7 @@ module DatastaxRails
       end
 
       def decode(str)
+        return str if str.kind_of?(Time)
         Time.parse(str) rescue nil
       end
     end

data/lib/datastax_rails/version.rb

@@ -1,4 +1,4 @@
 module DatastaxRails
   # The current version of the gem
-  VERSION = "1.0.14.2"
+  VERSION = "1.0.14.10"
 end

data/spec/datastax_rails/types/integer_type_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe DatastaxRails::Types::IntegerType do
+  before(:each) do
+    @coder = DatastaxRails::Types::IntegerType.new
+  end
+  
+  describe "#encode" do
+    it "should store integers as Fixnums" do
+      @coder.encode(12).should be_a_kind_of(Fixnum)
+    end
+    
+    it "should convert properly formatted strings to Fixnums" do
+      @coder.encode("12").should be_a_kind_of(Fixnum)
+    end
+    
+    it "should raise an exception on improperly formatted strings" do
+      lambda { @coder.encode("foo") }.should raise_exception(ArgumentError)
+    end
+    
+    it "should store a sentinel value for nils" do
+      @coder.encode(nil).should == -10191980
+    end
+  end
+  
+  describe "#decode" do
+    it "should return integers" do
+      @coder.decode(12).should == 12
+    end
+    
+    it "should return nil if the sentinel value is found" do
+      @coder.decode(-10191980).should be_nil
+    end
+  end
+end

data/spec/dummy/log/development.log

@@ -1,2 +1,66 @@
 update people using consistency QUORUM SET birthdate = '2012-09-10T00:00:00Z', updated_at = '2012-09-12T19:59:57Z', schema_version = '0' WHERE KEY IN ('ea5d4cec-d679-11e1-90fc-d988657988ea')
   people insert (4.1ms)  ea5d4cec-d679-11e1-90fc-d988657988ea {"birthdate"=>"2012-09-10T00:00:00Z", "updated_at"=>"2012-09-12T19:59:57Z", "schema_version"=>"0"}
+update jobs using consistency QUORUM SET created_at = '2012-09-25T18:49:10Z', title = 'Engineer', updated_at = '2012-09-25T18:49:10Z', schema_version = '0', position_number = 12345 WHERE KEY IN ('b157168c-0741-11e2-9e4f-87f5d0ef990d')
+  jobs insert (44.0ms)  b157168c-0741-11e2-9e4f-87f5d0ef990d {"created_at"=>"2012-09-25T18:49:10Z", "title"=>"Engineer", "updated_at"=>"2012-09-25T18:49:10Z", "schema_version"=>"0", "position_number"=>12345}
+DELETE  FROM jobs USING CONSISTENCY QUORUM WHERE KEY IN ('85c6e32c-9f8a-11e1-8316-f893c43ba585')
+  jobs remove (22.7ms)  #<DatastaxRails::Identity::UUIDKeyFactory:0x7b115f0>
+update jobs using consistency QUORUM SET created_at = '2012-09-25T18:49:10Z', title = 'Engineer', updated_at = '2012-09-25T18:51:39Z', schema_version = '0', position_number = 12345 WHERE KEY IN ('b157168c-0741-11e2-9e4f-87f5d0ef990d')
+  jobs insert (2.8ms)  b157168c-0741-11e2-9e4f-87f5d0ef990d {"created_at"=>"2012-09-25T18:49:10Z", "title"=>"Engineer", "updated_at"=>"2012-09-25T18:51:39Z", "schema_version"=>"0", "position_number"=>12345}
+update jobs using consistency QUORUM SET created_at = '2012-09-25T18:49:10Z', title = 'Engineer', updated_at = '2012-09-25T18:51:57Z', schema_version = '0', position_number = 123456 WHERE KEY IN ('b157168c-0741-11e2-9e4f-87f5d0ef990d')
+  jobs insert (2.3ms)  b157168c-0741-11e2-9e4f-87f5d0ef990d {"created_at"=>"2012-09-25T18:49:10Z", "title"=>"Engineer", "updated_at"=>"2012-09-25T18:51:57Z", "schema_version"=>"0", "position_number"=>123456}
+update jobs using consistency QUORUM SET created_at = '2012-09-25T18:49:10Z', title = 'Engineer', updated_at = '2012-09-25T18:52:15Z', schema_version = '0', position_number = '' WHERE KEY IN ('b157168c-0741-11e2-9e4f-87f5d0ef990d')
+  jobs insert (10002.2ms)  b157168c-0741-11e2-9e4f-87f5d0ef990d {"created_at"=>"2012-09-25T18:49:10Z", "title"=>"Engineer", "updated_at"=>"2012-09-25T18:52:15Z", "schema_version"=>"0", "position_number"=>""}
+update jobs using consistency QUORUM SET created_at = '2012-09-25T18:49:10Z', title = 'Engineer', updated_at = '2012-09-25T18:53:20Z', schema_version = '0', position_number = '' WHERE KEY IN ('b157168c-0741-11e2-9e4f-87f5d0ef990d')
+  jobs insert (10001.9ms)  b157168c-0741-11e2-9e4f-87f5d0ef990d {"created_at"=>"2012-09-25T18:49:10Z", "title"=>"Engineer", "updated_at"=>"2012-09-25T18:53:20Z", "schema_version"=>"0", "position_number"=>""}
+SELECT * FROM schema_migrations USING CONSISTENCY QUORUM WHERE key = 'people' 
+update schema_migrations using consistency QUORUM SET digest = 'ad9a586c6685ac554d946069b03380beb4262237' WHERE KEY IN ('people')
+SELECT * FROM schema_migrations USING CONSISTENCY QUORUM WHERE key = 'cars' 
+update schema_migrations using consistency QUORUM SET digest = '464a9743d7eb329077b695664663d5f37807e3c8' WHERE KEY IN ('cars')
+SELECT * FROM schema_migrations USING CONSISTENCY QUORUM WHERE key = 'jobs' 
+update schema_migrations using consistency QUORUM SET digest = '888a6c5c997a428d9090ae9485e0414ab90be548' WHERE KEY IN ('jobs')
+SELECT * FROM schema_migrations USING CONSISTENCY QUORUM WHERE key = 'boats' 
+update schema_migrations using consistency QUORUM SET digest = 'a62063d2c216babfe5b0a961e6f45cd020277aac' WHERE KEY IN ('boats')
+SELECT * FROM schema_migrations USING CONSISTENCY QUORUM WHERE key = 'hobbies' 
+update schema_migrations using consistency QUORUM SET digest = 'a2d743c761b9bcdbc787d433452edea0e41867cd' WHERE KEY IN ('hobbies')
+update jobs using consistency QUORUM SET updated_at = '2012-09-25T20:00:56Z', schema_version = '0', position_number = '' WHERE KEY IN ('b157168c-0741-11e2-9e4f-87f5d0ef990d')
+  jobs insert (10003.0ms)  b157168c-0741-11e2-9e4f-87f5d0ef990d {"updated_at"=>"2012-09-25T20:00:56Z", "schema_version"=>"0", "position_number"=>""}
+update jobs using consistency QUORUM SET updated_at = '2012-09-25T20:03:54Z', schema_version = '0', position_number = '' WHERE KEY IN ('b157168c-0741-11e2-9e4f-87f5d0ef990d')
+  jobs insert (10002.5ms)  b157168c-0741-11e2-9e4f-87f5d0ef990d {"updated_at"=>"2012-09-25T20:03:54Z", "schema_version"=>"0", "position_number"=>""}
+update jobs using consistency QUORUM SET updated_at = '2012-09-25T20:05:55Z', schema_version = '0', position_number = -10191980 WHERE KEY IN ('b157168c-0741-11e2-9e4f-87f5d0ef990d')
+  jobs insert (3.3ms)  b157168c-0741-11e2-9e4f-87f5d0ef990d {"updated_at"=>"2012-09-25T20:05:55Z", "schema_version"=>"0", "position_number"=>-10191980}
+update hobbies using consistency QUORUM SET schema_version = '0' WHERE KEY IN ('6b422e7c-074e-11e2-8d4b-79683c20ffdf')
+  hobbies insert (7.9ms)  6b422e7c-074e-11e2-8d4b-79683c20ffdf {"schema_version"=>"0"}
+SELECT * FROM schema_migrations USING CONSISTENCY QUORUM WHERE key = 'people' 
+update schema_migrations using consistency QUORUM SET digest = 'a2b198b8a7d1be5ea56eac476d1245f695701d4c' WHERE KEY IN ('people')
+SELECT * FROM schema_migrations USING CONSISTENCY QUORUM WHERE key = 'cars' 
+update schema_migrations using consistency QUORUM SET digest = 'a76b07633e6f52ec64d62d50d2e73dd4686399aa' WHERE KEY IN ('cars')
+SELECT * FROM schema_migrations USING CONSISTENCY QUORUM WHERE key = 'jobs' 
+update schema_migrations using consistency QUORUM SET digest = '5badd69eee9539738d7caf3dae1368ae5fd4d578' WHERE KEY IN ('jobs')
+SELECT * FROM schema_migrations USING CONSISTENCY QUORUM WHERE key = 'boats' 
+update schema_migrations using consistency QUORUM SET digest = 'bcb94bb0c4fbe41b65bada3896cf4fda3a644d0b' WHERE KEY IN ('boats')
+SELECT * FROM schema_migrations USING CONSISTENCY QUORUM WHERE key = 'hobbies' 
+update schema_migrations using consistency QUORUM SET digest = '6e83a0877c2b2b879a31ce1d0bfd251faafccfb0' WHERE KEY IN ('hobbies')
+update hobbies using consistency QUORUM SET schema_version = '0' WHERE KEY IN ('d6bf8848-074e-11e2-900c-dcfeb4b35235')
+  hobbies insert (2.1ms)  d6bf8848-074e-11e2-900c-dcfeb4b35235 {"schema_version"=>"0"}
+update hobbies using consistency QUORUM SET schema_version = '0' WHERE KEY IN ('d9c2a322-074e-11e2-83e8-f51257df591f')
+  hobbies insert (1.4ms)  d9c2a322-074e-11e2-83e8-f51257df591f {"schema_version"=>"0"}
+update hobbies using consistency QUORUM SET schema_version = '0', complexity = 1.0 WHERE KEY IN ('025e0c04-074f-11e2-8e5b-8ba0a9f7edb5')
+  hobbies insert (3.1ms)  025e0c04-074f-11e2-8e5b-8ba0a9f7edb5 {"schema_version"=>"0", "complexity"=>1.0}
+update hobbies using consistency QUORUM SET name = 'Hiking', schema_version = '0', complexity = 1.0 WHERE KEY IN ('3c13ae54-074f-11e2-8292-0d7011b9bb3a')
+  hobbies insert (2.3ms)  3c13ae54-074f-11e2-8292-0d7011b9bb3a {"name"=>"Hiking", "schema_version"=>"0", "complexity"=>1.0}
+update hobbies using consistency QUORUM SET schema_version = '0' WHERE KEY IN ('de14043e-0753-11e2-9f2f-f86b6fc194a2')
+  hobbies insert (2.3ms)  de14043e-0753-11e2-9f2f-f86b6fc194a2 {"schema_version"=>"0"}
+update hobbies using consistency QUORUM SET name = 'Hi', schema_version = '0' WHERE KEY IN ('8d84af80-0755-11e2-82a8-736d24b9f368')
+  hobbies insert (2.5ms)  8d84af80-0755-11e2-82a8-736d24b9f368 {"name"=>"Hi", "schema_version"=>"0"}
+update hobbies using consistency QUORUM SET name = 'hi', schema_version = '0' WHERE KEY IN ('a140d51c-0755-11e2-8c41-235ffd303c4a')
+  hobbies insert (9.2ms)  a140d51c-0755-11e2-8c41-235ffd303c4a {"name"=>"hi", "schema_version"=>"0"}
+update hobbies using consistency QUORUM SET name = 'hi', schema_version = '0' WHERE KEY IN ('19030868-0756-11e2-9874-c880dfb7c32d')
+  hobbies insert (2.4ms)  19030868-0756-11e2-9874-c880dfb7c32d {"name"=>"hi", "schema_version"=>"0"}
+update hobbies using consistency QUORUM SET name = 'hi', schema_version = '0' WHERE KEY IN ('3a4e9d8e-0756-11e2-836e-eb52de18324b')
+  hobbies insert (8.8ms)  3a4e9d8e-0756-11e2-836e-eb52de18324b {"name"=>"hi", "schema_version"=>"0"}
+update hobbies using consistency QUORUM SET name = 'hi', schema_version = '0' WHERE KEY IN ('98170424-0756-11e2-9100-5d9655af83d2')
+  hobbies insert (8.4ms)  98170424-0756-11e2-9100-5d9655af83d2 {"name"=>"hi", "schema_version"=>"0"}
+update hobbies using consistency QUORUM SET name = 'j', schema_version = '0' WHERE KEY IN ('7332d7f8-0758-11e2-93a6-c8fd85e4fc7d')
+  hobbies insert (8.7ms)  7332d7f8-0758-11e2-93a6-c8fd85e4fc7d {"name"=>"j", "schema_version"=>"0"}
+update hobbies using consistency QUORUM SET created_at = '2012-09-25T21:35:31Z', updated_at = '2012-09-25T21:35:31Z', schema_version = '0' WHERE KEY IN ('ee85bbfa-0758-11e2-9b96-52afb52cd9cd')
+  hobbies insert (8.2ms)  ee85bbfa-0758-11e2-9b96-52afb52cd9cd {"created_at"=>"2012-09-25T21:35:31Z", "updated_at"=>"2012-09-25T21:35:31Z", "schema_version"=>"0"}