gotime-cassandra_object 2.3.3 → 2.3.4

data/README.rdoc

@@ -0,0 +1,2 @@
+== Cassandra Object
+

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '2.3.3'
+  s.version = '2.3.4'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email = 'gems@gotime.com'
   s.homepage = 'http://github.com/gotime/cassandra_object'
 
-  s.extra_rdoc_files = ["README.markdown"]
+  s.extra_rdoc_files = ["README.rdoc"]
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']

data/lib/cassandra_object/finder_methods.rb

@@ -3,7 +3,9 @@ module CassandraObject
     extend ActiveSupport::Concern
     module ClassMethods
       def find(key)
-        if parse_key(key) && attributes = connection.get(column_family, key)
+        if !parse_key(key)
+          raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{key.inspect}"
+        elsif attributes = connection.get(column_family, key)
           instantiate(key, attributes)
         else
           raise CassandraObject::RecordNotFound
@@ -28,20 +30,14 @@ module CassandraObject
       end
 
       def first(options = {})
-        all(options.merge(:limit => 1)).first
+        all(options.merge(limit: 1)).first
       end
 
       def find_with_ids(*ids)
-        expects_array = ids.first.kind_of?(Array)
-        return ids.first if expects_array && ids.first.empty?
+        ids = ids.flatten
+        return ids if ids.empty?
 
-        ids = ids.dup
-        ids.flatten!
-        ids.compact!
-        ids.collect!(&:to_s)
-        ids.uniq!
-
-        #raise RecordNotFound, "Couldn't find #{record_klass.name} without an ID" if ids.empty?
+        ids = ids.compact.map(&:to_s).uniq
 
         results = multi_get(ids).values.compact
 

data/lib/cassandra_object/identity/uuid_key_factory.rb

@@ -24,7 +24,7 @@ module CassandraObject
       
       # Parse should create a new key object from the 'to_param' format
       def parse(string)
-        UUID.new(string)
+        UUID.new(string) if string
       rescue
         nil
       end

data/test/finder_methods_test.rb

@@ -6,6 +6,13 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
       assert_equal issue, Issue.find(issue.id)
     end
 
+    begin
+      Issue.find(nil)
+      assert false
+    rescue => e
+      assert_equal "Couldn't find Issue with key nil", e.message
+    end
+
     assert_raise CassandraObject::RecordNotFound do
       Issue.find('what')
     end
@@ -39,16 +46,7 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
     third_issue = Issue.create
 
     assert_equal [], Issue.find_with_ids([])
-    assert_equal first_issue, Issue.find_with_ids(first_issue.key)
     assert_equal [first_issue, second_issue].to_set, Issue.find_with_ids(first_issue.key, second_issue.key).to_set
     assert_equal [first_issue, second_issue].to_set, Issue.find_with_ids([first_issue.key, second_issue.key]).to_set
   end
-
-  # test 'find single id' do
-  #   created_issue = Issue.create
-  # 
-  #   found_issue = Issue.find(created_issue.id)
-  # 
-  #   assert_equal created_issue, found_issue
-  # end
 end

data/test/identity/uuid_key_factory_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class CassandraObject::Identity::UuidKeyFactoryTest < CassandraObject::TestCase
+  test 'parse' do
+    assert_not_nil key_factory.parse('95b2cf70-c318-11e0-962b-0800200c9a66')
+    assert_nil key_factory.parse('xyz')
+    assert_nil key_factory.parse(nil)
+  end
+
+  private
+    def key_factory
+      @key_factory ||= CassandraObject::Identity::UUIDKeyFactory.new
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-08-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152892860 !ruby/object:Gem::Requirement
+  requirement: &2165457380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152892860
+  version_requirements: *2165457380
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &2152892280 !ruby/object:Gem::Requirement
+  requirement: &2165456920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.11.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152892280
+  version_requirements: *2165456920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152891440 !ruby/object:Gem::Requirement
+  requirement: &2165456060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,20 +44,20 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152891440
+  version_requirements: *2165456060
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.markdown
+- README.rdoc
 files:
 - .gitignore
 - CHANGELOG
 - Gemfile
 - LICENSE
 - MIT-LICENSE
-- README.markdown
+- README.rdoc
 - Rakefile
 - gotime-cassandra_object.gemspec
 - lib/cassandra_object.rb
@@ -120,6 +120,7 @@ files:
 - test/connection_test.rb
 - test/consistency_test.rb
 - test/finder_methods_test.rb
+- test/identity/uuid_key_factory_test.rb
 - test/identity_test.rb
 - test/persistence_test.rb
 - test/test_helper.rb
@@ -167,6 +168,7 @@ test_files:
 - test/connection_test.rb
 - test/consistency_test.rb
 - test/finder_methods_test.rb
+- test/identity/uuid_key_factory_test.rb
 - test/identity_test.rb
 - test/persistence_test.rb
 - test/test_helper.rb

data/README.markdown

@@ -1,12 +0,0 @@
-# Cassandra Object
-
-Cassandra Object provides a API for working with [Cassandra](http://incubator.apache.org/cassandra/) in Rails projects.
-
-Installation:
-
-        gem 'gotime-cassandra_object',  require: 'cassandra_object'
-
-Example:
-
-        class Customer < CassandraObject::Base
-        end