gotime-cassandra_object 2.8.5 → 2.8.6

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/base.rb

@@ -75,7 +75,7 @@ module CassandraObject
     def ==(comparison_object)
       comparison_object.equal?(self) ||
         (comparison_object.instance_of?(self.class) &&
-          comparison_object.key == key &&
+          comparison_object.id == id &&
           !comparison_object.new_record?)
     end
 

data/test/unit/base_test.rb

@@ -23,6 +23,19 @@ class CassandraObject::BaseTest < CassandraObject::TestCase
     assert !issue.destroyed?
   end
 
+  test 'equality of new records' do
+    assert_not_equal Issue.new, Issue.new
+  end
+
+  test 'equality' do
+    first_issue = Issue.create
+    second_issue = Issue.create
+
+    assert_equal first_issue, first_issue
+    assert_equal first_issue, Issue.find(first_issue.id)
+    assert_not_equal first_issue, second_issue
+  end
+
   test 'to_param' do
     issue = Issue.create
     assert_equal issue.id, issue.to_param

data/test/unit/identity_test.rb

@@ -14,18 +14,6 @@ class CassandraObject::IdentityTest < CassandraObject::TestCase
     assert_equal issue.key.to_s, uuid
   end
 
-  test 'equality of new records' do
-    assert_not_equal Issue.new, Issue.new
-  end
-
-  test 'equality' do
-    first_issue = Issue.create
-    second_issue = Issue.create
-
-    assert_equal first_issue, first_issue
-    assert_not_equal first_issue, second_issue
-  end
-
   test 'parse_key' do
     assert_kind_of(
       CassandraObject::Identity::UUIDKeyFactory::UUID,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000 Z
+date: 2011-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70217821093200 !ruby/object:Gem::Requirement
+  requirement: &70294538924840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70217821093200
+  version_requirements: *70294538924840
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70217821087380 !ruby/object:Gem::Requirement
+  requirement: &70294538924300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70217821087380
+  version_requirements: *70294538924300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70217826220160 !ruby/object:Gem::Requirement
+  requirement: &70294538923840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70217826220160
+  version_requirements: *70294538923840
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []