cassilds-model 0.1.5 → 0.1.6

data/lib/cassandra-model/persistence.rb

@@ -110,8 +110,8 @@ module CassandraModel
         end
       end
       
-      def where(search_clauses, options = {})
-        find_where(search_clauses, options)
+      def where(search_clauses, select = [], options = {})
+        find_where(search_clauses, select, options)
       end
       
       # key
@@ -209,12 +209,23 @@ module CassandraModel
         return find_every(options).first
       end
       
-      def find_where(search_clauses, options)
+      def find_where(search_clauses, select, options)
         options = options || {}
         nofilter = options.delete(:no_filter)
         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!}
+        elsif select.kind_of?(Array)
+          column_names = select
+        else
+          raise(CassandraModelError, "Invalid columns #{select}")
+        end
+        if column_names.empty?
+          column_names = nil
+        end        
         
         expressions = search_clauses.collect do |expression|
           connection.create_idx_expr(expression[:column_name], expression[:value], expression[:comparison])
@@ -222,7 +233,7 @@ module CassandraModel
         
         records = []
         idx_clause = connection.create_index_clause(expressions, keyrange.first, (options[:limit] || 100))
-        results = connection.get_indexed_slices(column_family, idx_clause, :start => keyrange.first, 
+        results = connection.get_indexed_slices(column_family, idx_clause, column_names, :start => keyrange.first, 
           :finish => keyrange.last, :count => (options[:count] || 100), :key_count => (options[:limit] || 100))
         (results || {}).each { |slice|
           
@@ -287,7 +298,7 @@ module CassandraModel
         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[:limit] || 100))
+            :start => keyrange.first, :finish => keyrange.last, :count => (options[:count] || 100), :key_count => (options[:limit] || 100))
           
           (results || {}).each { |key, columns|
             model = init_model(key, columns)
@@ -349,7 +360,7 @@ module CassandraModel
         end
       end
 
-      VALID_FIND_OPTIONS = [ :select, :keyrange, :conditions, :limit, :offset,
+      VALID_FIND_OPTIONS = [ :select, :keyrange, :conditions, :limit, :count, :offset,
         :order, :readonly ]
 
       def validate_find_options(options) #:nodoc:

data/lib/cassandra-model/types.rb

@@ -73,12 +73,16 @@ module CassandraModel
 
   class BooleanType
     def self.dump(v)
-      v ? '1' : '0'
+      object_to_boolean(v) ? '1' : '0'
     end
 
     def self.load(v)
       v == '1'
     end
+    
+    def self.object_to_boolean value
+      return [true, "true", 1, "1", "T", "t", "Y", "y", "yes"].include?(value.class == String ? value.downcase : value)
+    end
   end
   
   class TimeuuidType

data/lib/cassandra-model/version.rb

@@ -1,3 +1,3 @@
 class CassandraModel
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassilds-model
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-24 00:00:00.000000000Z
+date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &11489860 !ruby/object:Gem::Requirement
+  requirement: &10560600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11489860
+  version_requirements: *10560600
 - !ruby/object:Gem::Dependency
   name: cassilds
-  requirement: &11487960 !ruby/object:Gem::Requirement
+  requirement: &10560080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.1
   type: :runtime
   prerelease: false
-  version_requirements: *11487960
+  version_requirements: *10560080
 - !ruby/object:Gem::Dependency
   name: cassilds-connection-pool
-  requirement: &11465120 !ruby/object:Gem::Requirement
+  requirement: &10559600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *11465120
+  version_requirements: *10559600
 - !ruby/object:Gem::Dependency
   name: simple_uuid
-  requirement: &11435440 !ruby/object:Gem::Requirement
+  requirement: &10559120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11435440
+  version_requirements: *10559120
 description: Cassandra-model allows you to map ColumnFamily/SuperColumnFamily in Cassandra
   to Ruby objects. It was designed to be fast and simple.
 email: