gotime-cassandra_object 3.0.3 → 3.0.4

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '3.0.3'
+  s.version = '3.0.4'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/lib/cassandra_object/finder_methods.rb

@@ -3,18 +3,16 @@ module CassandraObject
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def find(id)
-        if id.blank?
-          raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{id.inspect}"
-        elsif attributes = connection.get(column_family, id, {:count => 500}).presence
-          instantiate(id, attributes)
+      def find(ids)
+        if ids.is_a?(Array)
+          find_some(ids)
         else
-          raise CassandraObject::RecordNotFound
+          find_one(ids)
         end
       end
 
-      def find_by_id(id)
-        find(id)
+      def find_by_id(ids)
+        find(ids)
       rescue CassandraObject::RecordNotFound
         nil
       end
@@ -34,7 +32,23 @@ module CassandraObject
         all(options.merge(limit: 1)).first
       end
 
-      def find_with_ids(*ids)
+      def count
+        connection.count_range(column_family)
+      end
+
+      private
+      
+      def find_one(id)
+        if id.blank?
+          raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{id.inspect}"
+        elsif attributes = connection.get(column_family, id, {:count => 500}).presence
+          instantiate(id, attributes)
+        else
+          raise CassandraObject::RecordNotFound
+        end
+      end
+
+      def find_some(ids)
         ids = ids.flatten
         return ids if ids.empty?
 
@@ -43,10 +57,6 @@ module CassandraObject
         multi_get(ids).values.compact
       end
 
-      def count
-        connection.count_range(column_family)
-      end
-
       def multi_get(keys, options={})
         attribute_results = ActiveSupport::Notifications.instrument("multi_get.cassandra_object", column_family: column_family, keys: keys) do
           connection.multi_get(column_family, keys.map(&:to_s), consistency: thrift_read_consistency, count: 500)

data/test/unit/finder_methods_test.rb

@@ -18,6 +18,15 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
     end
   end
 
+  test 'find with ids' do
+    first_issue = Issue.create
+    second_issue = Issue.create
+    third_issue = Issue.create
+
+    assert_equal [], Issue.find([])
+    assert_equal [first_issue, second_issue], Issue.find([first_issue.id, second_issue.id])
+  end
+
   test 'find_by_id' do
     Issue.create.tap do |issue|
       assert_equal issue, Issue.find_by_id(issue.id)
@@ -39,14 +48,4 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
 
     assert [first_issue, second_issue].include?(Issue.first)
   end
-
-  test 'find_with_ids' do
-    first_issue = Issue.create
-    second_issue = Issue.create
-    third_issue = Issue.create
-
-    assert_equal [], Issue.find_with_ids([])
-    assert_equal [first_issue, second_issue].to_set, Issue.find_with_ids(first_issue.id, second_issue.id).to_set
-    assert_equal [first_issue, second_issue].to_set, Issue.find_with_ids([first_issue.id, second_issue.id]).to_set
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel