cassilds-model 0.1.7 → 0.1.8

data/lib/cassandra-model/persistence.rb

@@ -135,18 +135,18 @@ module CassandraModel
         res = {}
         attrs.each do |key, item|
           res[key] = case item
-            when Hash
-              ::JSON.dump(item)
-            when ::Integer
-              Cassandra::Long.new(item).bytes
-            when ::Time
-              Cassandra::Long.new(item.utc.to_i).bytes
-            when ::DateTime
-              Cassandra::Long.new(item.to_time.utc.to_i).bytes
-            else
-              # String, Cassandra::Long, Float, Boolean, TimeuuidType
-              item.to_s
-            end
+          when Hash
+            ::JSON.dump(item)
+          when ::Integer
+            Cassandra::Long.new(item).bytes
+          when ::Time
+            Cassandra::Long.new(item.utc.to_i).bytes
+          when ::DateTime
+            Cassandra::Long.new(item.to_time.utc.to_i).bytes
+          else
+            # String, Cassandra::Long, Float, Boolean, TimeuuidType
+            item.to_s
+          end
         end
         return res
       end
@@ -180,13 +180,14 @@ module CassandraModel
         raise RecordNotFound, "Couldn't find #{name} without an ID" if key.blank?
         options = options || {}
         readonly = options.delete(:readonly)
+        column_names  = options.delete(:select) || columns.stringify_keys.keys
 
         model = nil
         benchmark("CassandraModel[#{self.name}].find_one, key: #{key.to_s}") do
-          ret = connection.get_columns(column_family, key, columns.stringify_keys.keys, options)
+          ret = connection.get_columns(column_family, key, column_names, options)
           unless ret.empty?
             attrs = {}
-            columns.stringify_keys.keys.each_with_index do |key, idx|
+            column_names.each_with_index do |key, idx|
               attrs[key] = ret[idx]
             end
             model = init_model(key, attrs)
@@ -215,6 +216,7 @@ module CassandraModel
         readonly = options.delete(:readonly)
         keyrange = options[:keyrange]
         keyrange = ''..'' if keyrange.blank?
+
         column_names = []
         if select.kind_of?(String)
           column_names = select.split(',').collect! {|n| n.strip!}
@@ -263,6 +265,7 @@ module CassandraModel
         raise(CassandraModelError, "Columns param cannot be nil") if columns.nil?
         options = options || {}
         readonly = options.delete(:readonly)
+
         column_names = []
         if columns.kind_of?(String)
           column_names = columns.split(',').collect! {|n| n.strip!}
@@ -277,7 +280,7 @@ module CassandraModel
           ret = connection.get_columns(column_family, key, column_names, options)
           unless ret.empty?
             attrs = {}
-            columns.each_with_index do |key, idx|
+            column_names.each_with_index do |key, idx|
               attrs[key] = ret[idx]
             end
             model = init_model(key, attrs)
@@ -291,14 +294,15 @@ module CassandraModel
         options = options || {}
         nofilter = options.delete(:no_filter)
         readonly = options.delete(:readonly)
+        columns_names = options.delete(:select) || columns.stringify_keys.keys
         keyrange = options[:keyrange]
         keyrange = ''..'' if keyrange.blank?
 
         records = []
         benchmark("CassandraModel[#{self.name}].find_every, keyrange: #{keyrange.to_s}") do
-          results = connection.get_range(column_family, 
-            :columns => columns.stringify_keys.keys,
-            :start => keyrange.first, :finish => keyrange.last, :count => (options[:count] || 100), :key_count => (options[:limit] || 100))
+          results = connection.get_range(column_family, :columns => columns_names,
+            :start   => keyrange.first, :finish => keyrange.last, 
+            :count => (options[:count] || 100), :key_count => (options[:limit] || 100))
           
           (results || {}).each { |key, columns|
             model = init_model(key, columns)
@@ -337,27 +341,24 @@ module CassandraModel
       end
 
       def find_some(ids, options)
+        ids = ids.map {|i| validate_key_type(i)}
+        
         options = options || {}
-        result = find_every(options)
-
-        # Determine expected size from limit and offset, not just ids.size.
-        expected_size =
-          if options[:limit] && ids.size > options[:limit]
-          options[:limit]
-        else
-          ids.size
-        end
+        nofilter = options.delete(:no_filter)
+        readonly = options.delete(:readonly)
+        column_names = options.delete(:select) || columns.stringify_keys.keys
 
-        # 11 ids with limit 3, offset 9 should give 2 results.
-        if options[:offset] && (ids.size - options[:offset] < expected_size)
-          expected_size = ids.size - options[:offset]
+        result = []
+        benchmark("CassandraModel[#{self.name}].find_some, keys: #{ids.to_s}") do
+          ret = connection.multi_get_columns(column_family, ids, column_names, options)
+          (ret || {}).each do |key, value|
+            model = init_model(key, value)
+            model.readonly! if readonly
+            result << model unless nofilter && model.deleted?
+          end
         end
 
-        if result.size == expected_size
-          result
-        else
-          raise RecordNotFound, "Couldn't find all #{name.pluralize} with IDs (#{ids.inspect}) (found #{result.size} results, but was looking for #{expected_size})"
-        end
+        result
       end
 
       VALID_FIND_OPTIONS = [ :select, :keyrange, :conditions, :limit, :count, :offset,

data/lib/cassandra-model/version.rb

@@ -1,3 +1,3 @@
 class CassandraModel
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassilds-model
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-26 00:00:00.000000000Z
+date: 2011-10-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &22412180 !ruby/object:Gem::Requirement
+  requirement: &22780920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22412180
+  version_requirements: *22780920
 - !ruby/object:Gem::Dependency
   name: cassilds
-  requirement: &22410620 !ruby/object:Gem::Requirement
+  requirement: &22780400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.1
   type: :runtime
   prerelease: false
-  version_requirements: *22410620
+  version_requirements: *22780400
 - !ruby/object:Gem::Dependency
   name: cassilds-connection-pool
-  requirement: &22407200 !ruby/object:Gem::Requirement
+  requirement: &22779920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *22407200
+  version_requirements: *22779920
 - !ruby/object:Gem::Dependency
   name: simple_uuid
-  requirement: &22406500 !ruby/object:Gem::Requirement
+  requirement: &22779440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22406500
+  version_requirements: *22779440
 description: Cassandra-model allows you to map ColumnFamily/SuperColumnFamily in Cassandra
   to Ruby objects. It was designed to be fast and simple.
 email: