gotime-cassandra_object 2.1.1 → 2.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gotime-cassandra_object (2.1.0)
+    gotime-cassandra_object (2.1.1)
       cassandra (~> 0.11.3)
       rails (~> 3.0)
 

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '2.1.1'
+  s.version = '2.1.2'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

data/lib/cassandra_object/batches.rb

@@ -8,6 +8,24 @@ module CassandraObject
           yield instantiate(k, v)
         end
       end
+
+      def find_in_batches(options = {})
+        batch_size = options.delete(:batch_size) || 1000
+
+        batch = []
+
+        find_each do |record|
+          batch << record
+          if batch.size == batch_size
+            yield(batch)
+            batch = []
+          end
+        end
+        
+        if batch.size > 0
+          yield batch
+        end
+      end
     end
   end
 end

data/lib/cassandra_object/finder_methods.rb

@@ -2,11 +2,11 @@ module CassandraObject
   module FinderMethods
     extend ActiveSupport::Concern
     module ClassMethods
-      def all(keyrange = ''..'', options = {})
+      def all(options = {})
         options = {:consistency => self.read_consistency, :limit => 100}.merge(options)
         count = options[:limit]
-        results = ActiveSupport::Notifications.instrument("get_range.cassandra_object", column_family: column_family, start_key: keyrange.first, finish_key: keyrange.last, key_count: count) do
-          connection.get_range(column_family, start: keyrange.first, finish: keyrange.last, key_count: count, consistency: consistency_for_thrift(options[:consistency]))
+        results = ActiveSupport::Notifications.instrument("get_range.cassandra_object", column_family: column_family, key_count: count) do
+          connection.get_range(column_family, key_count: count, consistency: consistency_for_thrift(options[:consistency]))
         end
 
         results.map do |k, v|
@@ -14,12 +14,8 @@ module CassandraObject
         end.compact
       end
 
-      # def find()
-        
-      # end
-
-      def first(keyrange = ''..'', options = {})
-        all(keyrange, options.merge(:limit => 1)).first
+      def first(options = {})
+        all(options.merge(:limit => 1)).first
       end
 
       def find_with_ids(*ids)

data/test/batches_test.rb

@@ -12,4 +12,19 @@ class CassandraObject::BatchesTest < CassandraObject::TestCase
 
     assert_equal Issue.all.to_set, issues.to_set
   end
+
+  test 'find_in_batches' do
+    Issue.create 
+    Issue.create
+    Issue.create
+    
+    issue_batches = []
+    Issue.find_in_batches(batch_size: 2) do |issues|
+      issue_batches << issues
+    end
+    
+    assert_equal 2, issue_batches.size
+    assert issue_batches.any? { |issues| issues.size == 2 }
+    assert issue_batches.any? { |issues| issues.size == 1 }
+  end
 end

data/test/test_helper.rb

@@ -14,7 +14,8 @@ module CassandraObject
     setup do
       CassandraObject::Base.establish_connection(
         keyspace: 'place_directory_development',
-        servers: '192.168.0.100:9160'
+        # servers: '192.168.0.100:9160'
+        servers: '127.0.0.1:9160'
       )
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-25 00:00:00.000000000Z
+date: 2011-07-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152615720 !ruby/object:Gem::Requirement
+  requirement: &2153248160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152615720
+  version_requirements: *2153248160
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &2152615260 !ruby/object:Gem::Requirement
+  requirement: &2153247700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.11.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152615260
+  version_requirements: *2153247700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152614800 !ruby/object:Gem::Requirement
+  requirement: &2153247240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152614800
+  version_requirements: *2153247240
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []