datastax_rails 2.0.7 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 515e87cf850c3d9a87ae5b12b2a2ea125ae0af75
-  data.tar.gz: 145680d9780c211dd58172bd8df338df5b245571
+  metadata.gz: 9b54cd8a075c5502c6475725ddafe54fb42e434d
+  data.tar.gz: fa5474a8918b6d8fe28fc256039712a196fa4ae7
 SHA512:
-  metadata.gz: 0eb3d48eda726e2ae6607df2e5ceb0448ecd7e2181716eba42875e456dc2fd33036492ee1fbccd1f0abb914b03ed3fcf932ca6d42a2caf82e0a70e910445bfd4
-  data.tar.gz: 3108393c7d9fd432f52b45b321fa662e31f777a275721f17cbcb43272464c4da73eba59de3f0ee43c4ea44ee9a79b2dad4ce43217185d605ce1d930a564e8783
+  metadata.gz: 0236d32acbb3d99c2fa4363b7f6f0bdbbc36fe3ac76d264f086eef30348d91af0ae91f3417492c7c714a95e91f2588aa67173ec33c86b3a29380d3f432875022
+  data.tar.gz: 9540c51c831041f33e077adb933b0a0769cb49ef89f584f89191039df80050748eb5bf9a9272b7c41775879a1eb8b510b7b344e9e1f2177ac7436b14b7ddf59f

data/config/schema.xml.erb

@@ -52,7 +52,7 @@
       <% else %>
     	<field name="<%= field.name %>" type="<%= field.solr_type %>" indexed="<%= field.options[:solr_index] %>" stored="<%= field.options[:solr_store] %>" multiValued="<%= field.options[:multi_valued] %>"/>
     	<% if field.solr_type == 'text' && field.options[:sortable] %>
-    	    <field name="sort_<%= field.name %>" type="string" indexed="true" stored="fase" multiValued="false"/>
+    	    <field name="sort_<%= field.name %>" type="string" indexed="true" stored="false" multiValued="false"/>
     	<% end %>
       <% end %>
     <% end %>

data/lib/datastax_rails/attribute_methods/primary_key.rb

@@ -11,6 +11,11 @@ module DatastaxRails
         key = self.id
         [key] if key
       end
+      
+      # Returns a primary key hash for updates. Wide models override this.
+      def id_for_update
+        {self.class.primary_key.to_s => self.id}
+      end
 
       # Returns the primary key value.
       def id

data/lib/datastax_rails/cql/select.rb

@@ -52,11 +52,12 @@ module DatastaxRails#:nodoc:
         end
         
         @conditions.each do |k,v|
-          @values << v
           if v.kind_of?(Array)
-            conditions << "\"#{k.to_s}\" IN (?)"
+            conditions << "\"#{k.to_s}\" IN (#{('?'*v.size).split(//).join(',')})"
+            @values += v
           else
             conditions << "\"#{k.to_s}\" = ?"
+            @values << v
           end
         end
         

data/lib/datastax_rails/cql/update.rb

@@ -51,9 +51,12 @@ module DatastaxRails
           
           stmt << updates.join(", ")
         end
-        
-        stmt << " WHERE #{@klass.primary_key} IN (?)"
-        @values << @key
+        conditions = []
+        @key.each do |k,v|
+          conditions << "\"#{k.to_s}\" = ?"
+          @values << v
+        end
+        stmt << " WHERE #{conditions.join(" AND ")}"
         stmt.force_encoding('UTF-8')
       end
     end

data/lib/datastax_rails/dynamic_model.rb

@@ -82,7 +82,7 @@ module DatastaxRails
                 timestamp: :ts_, integer: :i_, float: :f_, uuid: :u_}.with_indifferent_access
     
     class_attribute :group_by_attribute
-    class_attribute :declared_attributes
+    class_attribute :virtual_attributes
     
     class << self
       def grouping=(group)
@@ -95,22 +95,18 @@ module DatastaxRails
       
       def attribute(name, options)
         options.symbolize_keys!
-        return super if [:map,:list,:set].include?(options[:type].to_sym)
-        # Only type supported for now
-        options.assert_valid_keys(:type)
-        raise ArgumentError, "Invalid type specified for dynamic attribute: '#{name}: #{options[:type]}'" unless PREFIXES.has_key?(options[:type])
-        self.declared_attributes[name] = PREFIXES[options[:type]].to_s + name.to_s
-        define_method(name) do
-          self.send(PREFIXES[options[:type]])[name]
-        end
-        define_method("#{name.to_s}=") do |val|
-          self.send(PREFIXES[options[:type]])[name] = val
+        unless [:map,:list,:set].include?(options[:type].to_sym)
+          # Only type supported for now
+          options.assert_valid_keys(:type)
+          raise ArgumentError, "Invalid type specified for dynamic attribute: '#{name}: #{options[:type]}'" unless PREFIXES.has_key?(options[:type])
+          self.virtual_attributes[name.to_s] = PREFIXES[options[:type]].to_s + name.to_s
         end
+        super
       end
       
       def inherited(child)
         super
-        child.declared_attributes = child.declared_attributes.nil? ? {}.with_indifferent_access : child.declared_attributes.dup
+        child.virtual_attributes = child.virtual_attributes.nil? ? {}.with_indifferent_access : child.virtual_attributes.dup
         child.column_family = 'dynamic_model'
         child.primary_key = 'id'
         child.cluster_by = 'group'
@@ -123,11 +119,28 @@ module DatastaxRails
       end
       
       def solr_field_name(attr, type = nil)
-        if type
-          PREFIXES[type].to_s + attr.to_s
-        else
-          declared_attributes[attr] || raise(UnknownAttributeError, "Unknown attribute: #{attr}. You must specify a type.")
-        end
+        type ||= self.attribute_definitions[attr].try(:type)
+        raise(UnknownAttributeError, "Collections cannot be mapped") if [:map,:list,:set].include?(type)
+        raise(UnknownAttributeError, "Unknown attribute: #{attr}. You must specify a type.") unless type
+        PREFIXES[type].to_s + attr.to_s
+      end
+    end
+    
+    def write_attribute(attr_name, val)
+      if virtual_attributes.include?(attr_name.to_s)
+        type = self.class.attribute_definitions[attr_name].type
+        self.send(PREFIXES[type])[attr_name] = val
+      else
+        super
+      end
+    end
+    
+    def read_attribute(attr_name)
+      if virtual_attributes.include?(attr_name.to_s)
+        type = self.class.attribute_definitions[attr_name].type
+        self.send(PREFIXES[type])[attr_name]
+      else
+        super
       end
     end
     

data/lib/datastax_rails/persistence.rb

@@ -107,7 +107,7 @@ module DatastaxRails
           if options[:new_record]
             cql.insert.columns(encoded).using(options[:consistency]).execute
           else
-            cql.update(record.id).columns(encoded).using(options[:consistency]).execute
+            cql.update(record.id_for_update).columns(encoded).using(options[:consistency]).execute
           end
         end
         

data/lib/datastax_rails/relation/finder_methods.rb

@@ -190,7 +190,7 @@ module DatastaxRails
       end
   
       def find_some(ids)
-        keys = ids.collect {|id| @klass.attribute_definitions[@klass.primary_key].type_cast(id) || "Couldn't find #{@klass.name} with an invalid ID=#{id}"}
+        keys = ids.collect {|id| @klass.attribute_definitions[@klass.primary_key].type_cast(id) || raise(RecordNotFound,"Couldn't find #{@klass.name} with an invalid ID=#{id}")}
         result = with_cassandra.where(@klass.primary_key => keys).all
   
         expected_size =

data/lib/datastax_rails/schema/solr.rb

@@ -106,7 +106,7 @@ module DatastaxRails
             end
             break
           end
-          DatastaxRails::Cql::Update.new(SchemaMigration, model.column_family).columns(:solrconfig => solrconfig_digest).execute
+          DatastaxRails::Cql::Update.new(SchemaMigration, :cf => model.column_family).columns(:solrconfig => solrconfig_digest).execute
         end
         if force || stopwords_digest != sm_digests['stopwords']
           count += 1
@@ -120,7 +120,7 @@ module DatastaxRails
             end
             break
           end
-          DatastaxRails::Cql::Update.new(SchemaMigration, model.column_family).columns(:stopwords => stopwords_digest).execute
+          DatastaxRails::Cql::Update.new(SchemaMigration, :cf => model.column_family).columns(:stopwords => stopwords_digest).execute
         end
         if force || schema_digest != sm_digests['digest']
           count += 1
@@ -134,7 +134,7 @@ module DatastaxRails
             end
             break
           end
-          DatastaxRails::Cql::Update.new(SchemaMigration, model.column_family).columns(:digest => schema_digest).execute
+          DatastaxRails::Cql::Update.new(SchemaMigration, :cf => model.column_family).columns(:digest => schema_digest).execute
           newcf ? create_solr_core(model) : reindex_solr(model)
         end
         count

data/lib/datastax_rails/version.rb

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

data/lib/datastax_rails/wide_storage_model.rb

@@ -24,5 +24,10 @@ module DatastaxRails
   #   end
   class WideStorageModel < DatastaxRails::Base
     self.abstract_class = true
+    
+    # Returns a primary key hash for updates that includes the cluster key
+    def id_for_update
+      {self.class.primary_key.to_s => self.id, self.class.cluster_by.to_s => self.read_attribute(self.class.cluster_by.to_s)}
+    end
   end
 end

data/spec/datastax_rails/base_spec.rb

@@ -18,6 +18,15 @@ describe DatastaxRails::Base do
       expect(p1).not_to eq(p2)
     end
     
+    it "considers two new objects to be unequal" do
+      expect(Person.new).not_to eq(Person.new)
+    end
+    
+    it "considers the same object equal to itself" do
+      p=Person.new
+      expect(p).to eq(p)
+    end
+    
     it "considers two persisted objects to be equal if their primary keys are equal" do
       Person.commit_solr
       p1=Person.create!(:name => 'Jim')

data/spec/datastax_rails/cql/update_spec.rb

@@ -6,9 +6,9 @@ describe DatastaxRails::Cql::Update do
   end
   
   it "should generate valid CQL" do
-    cql = DatastaxRails::Cql::Update.new(@model_class, "12345")
+    cql = DatastaxRails::Cql::Update.new(@model_class, 'id' => "12345")
     cql.using(DatastaxRails::Cql::Consistency::QUORUM).columns(:name => 'John', :age => '23')
-    cql.to_cql.should match(/update users SET ("name" = \?, "age" = \?|"age" = \?, "name" = \?) WHERE id IN \(\?\)/)
+    cql.to_cql.should match(/update users SET ("name" = \?, "age" = \?|"age" = \?, "name" = \?) WHERE "id" = \?/)
   end
   
   it_has_behavior "default_consistency"

data/spec/datastax_rails/dynamic_model_spec.rb

@@ -29,6 +29,12 @@ describe DatastaxRails::DynamicModel do
     expect(one.name).to eq('John')
   end
   
+  it "updates an existing attribute" do
+    one.save
+    one.name = 'Jim'
+    expect(one.save).to be_true
+  end
+  
   describe "#solr_field_name" do
     it "maps a attribute name to the underlying storage key" do
       expect(one.solr_field_name(:name)).to eq('s_name')

data/spec/datastax_rails/relation/finder_methods_spec.rb

@@ -6,6 +6,51 @@ describe DatastaxRails::Relation do
     Hobby.commit_solr
   end
   
+  describe "#find" do
+    let(:h) {Hobby.create}
+    let(:i) {Hobby.create}
+    
+    context "with a single id" do
+      context "as a scalar" do
+        it "finds the object and returns it as an object" do
+          expect(Hobby.find(h.id)).to eq(h)
+        end
+        
+        it "raises RecordNotFound for an invalid ID" do
+          expect{Hobby.find("asdf")}.to raise_exception(DatastaxRails::RecordNotFound)
+        end
+        
+        it "raises RecordNotFound for a nil ID" do
+          expect{Hobby.find(nil)}.to raise_exception(DatastaxRails::RecordNotFound)
+        end
+      end
+      
+      context "as an array" do
+        it "finds the object and returns it as a single-element array" do
+          expect(Hobby.find([h.id])).to eq([h])
+        end
+      end
+    end
+    
+    context "with multiple ids" do
+      it "raises RecordNotFound if any portion of the records could not be found" do
+        expect{Hobby.find(h.id, ::Cql::TimeUuid::Generator.new.next)}.to raise_exception(DatastaxRails::RecordNotFound)
+      end
+      
+      context "as an array" do
+        it "finds the objects and returns them as an array" do
+          expect(Hobby.find([h.id, i.id])).to eq([h,i])
+        end
+      end
+      
+      context "as discrete parameters" do
+        it "finds the objects and returns them as an array" do
+          expect(Hobby.find(h.id, i.id)).to eq([h,i])
+        end
+      end
+    end
+  end
+  
   describe "#first" do
     it "should return the first result if records are already loaded" do
       a_record = mock_model(Hobby)

data/spec/dummy/log/test.log

@@ -15601,3 +15601,9 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Error connecting to database
+the scheme http does not accept registry part: :8983 (or bad hostname?)
+Reconnecting and retrying
+Error connecting to database
+the scheme http does not accept registry part: :8983 (or bad hostname?)
+Reconnecting and retrying

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datastax_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.9
 platform: ruby
 authors:
 - Jason M. Kusar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails