gotime-cassandra_object 2.6.3 → 2.6.4

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/dirty.rb

@@ -30,11 +30,13 @@ module CassandraObject
 
     def write_attribute(name, value)
       name = name.to_s
-      unless attribute_changed?(name)
-        old = read_attribute(name)
-        changed_attributes[name] = old if old != value
-      end
+      old = read_attribute(name)
+
       super
+
+      unless attribute_changed?(name) || old == read_attribute(name)
+        changed_attributes[name] = old
+      end
     end
   end
 end

data/lib/cassandra_object/types/array_type.rb

@@ -7,29 +7,40 @@ module CassandraObject
           @record   = record
           @name     = name.to_s
           @options  = options
-          super(array.presence || [])
+
+          super(array)
+          setify!
         end
 
         def <<(obj)
           modifying do
             super
-            uniq! if options[:unique]
           end
         end
 
         private
+          def setify!
+            if options[:unique]
+              uniq!
+              sort!
+            end
+          end
+
           def modifying
             unless record.changed_attributes.include?(name)
               original = dup
             end
 
-            yield
+            result = yield
+            setify!
 
-            if !record.changed_attributes.key?(name) && original.sort != sort
+            if !record.changed_attributes.key?(name) && original != self
               record.changed_attributes[name] = original
             end
 
             record.send("#{name}=", self)
+
+            result
           end
       end
 

data/test/test_helper.rb

@@ -4,6 +4,11 @@ require 'test/unit'
 require 'cassandra/0.8'
 require 'gotime-cassandra_object'
 
+CassandraObject::Base.establish_connection(
+  keyspace: 'place_directory_development',
+  servers: '127.0.0.1:9160'
+)
+
 class Issue < CassandraObject::Base
   key :uuid
   string :description
@@ -11,14 +16,6 @@ end
 
 module CassandraObject
   class TestCase < ActiveSupport::TestCase
-    setup do
-      CassandraObject::Base.establish_connection(
-        keyspace: 'place_directory_development',
-        # servers: '192.168.0.100:9160'
-        servers: '127.0.0.1:9160'
-      )
-    end
-
     teardown do
       Issue.delete_all
     end
@@ -29,7 +26,7 @@ module CassandraObject
   end
 
   module Types
-    class TestCase < ActiveSupport::TestCase
+    class TestCase < CassandraObject::TestCase
       attr_accessor :coder
       setup do
         @coder = self.class.name.sub(/Test$/, '').constantize.new

data/test/types/array_type_test.rb

@@ -18,19 +18,28 @@ class CassandraObject::Types::ArrayTypeTest < CassandraObject::Types::TestCase
   end
 
   class TestIssue < CassandraObject::Base
-    self.column_family = 'Issue'
-    array :favorite_colors
+    key :uuid
+    self.column_family = 'Issues'
+    array :favorite_colors, unique: true
   end
 
   test 'wrap' do
-    issue = TestIssue.new
-    colors = []
-    wrapper = coder.wrap(issue, 'favorite_colors', colors)
+    issue = TestIssue.create favorite_colors: []
+    assert !issue.changed?
+    assert_kind_of Array, issue.favorite_colors
 
-    assert_kind_of Array, wrapper
-    
+    issue.favorite_colors << 'red'
+    assert issue.changed?
+    assert_equal({'favorite_colors' => [[], ['red']]}, issue.changes)
+  end
+
+  test 'unique array' do
+    issue = TestIssue.create favorite_colors: ['blue', 'red']
+
+    issue.favorite_colors = ['red', 'red', 'blue']
     assert !issue.changed?
-    wrapper << 'red'
+
+    issue.favorite_colors = ['red', 'green']
     assert issue.changed?
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-29 00:00:00.000000000Z
+date: 2011-08-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70252009263440 !ruby/object:Gem::Requirement
+  requirement: &70125957503400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70252009263440
+  version_requirements: *70125957503400
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70252009262920 !ruby/object:Gem::Requirement
+  requirement: &70125957502800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70252009262920
+  version_requirements: *70125957502800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70252009262340 !ruby/object:Gem::Requirement
+  requirement: &70125957502140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70252009262340
+  version_requirements: *70125957502140
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []