gotime-cassandra_object 2.6.2 → 2.6.3

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/base.rb

@@ -52,7 +52,7 @@ module CassandraObject
       @key = attributes.delete(:key)
       @new_record = true
       @destroyed = false
-      @attributes = {}
+      @attributes = {}.with_indifferent_access
       self.attributes = attributes
       @schema_version = self.class.current_schema_version
     end

data/lib/cassandra_object/types/array_type.rb

@@ -1,41 +1,35 @@
 module CassandraObject
   module Types
     class ArrayType < BaseType
-      class Proxy < BasicObject
-        instance_methods.each { |m| undef_method m }
-        
-        attr_accessor :record, :name, :array, :options
+      class DirtyArray < Array
+        attr_accessor :record, :name, :options
         def initialize(record, name, array, options)
           @record   = record
           @name     = name.to_s
-          @array    = array.presence || []
           @options  = options
+          super(array.presence || [])
         end
 
         def <<(obj)
           modifying do
-            array << obj
-            array.uniq! if options[:unique]
+            super
+            uniq! if options[:unique]
           end
         end
 
         private
-          def method_missing(method, *args, &block)
-            array.send(method, *args, &block)
-          end
-
           def modifying
             unless record.changed_attributes.include?(name)
-              original = array.dup
+              original = dup
             end
 
             yield
 
-            if !record.changed_attributes.key?(name) && original.sort != array.sort
+            if !record.changed_attributes.key?(name) && original.sort != sort
               record.changed_attributes[name] = original
             end
 
-            record.send("#{name}=", array)
+            record.send("#{name}=", self)
           end
       end
 
@@ -55,7 +49,7 @@ module CassandraObject
       end
 
       def wrap(record, name, value)
-        Proxy.new(record, name, value, options)
+        DirtyArray.new(record, name, value, options)
       end
     end
   end

data/test/dirty_test.rb

@@ -15,16 +15,4 @@ class CassandraObject::DirtyTest < CassandraObject::TestCase
 
     assert !record.changed?
   end
-
-  test 'reload clears dirty' do
-    record = TestRecord.create!(name: 'foo')
-    record = TestRecord.find(record.id)
-
-    record.name = 'bar'
-    assert record.changed?
-
-    record.reload
-
-    assert !record.changed?
-  end
 end

data/test/test_helper.rb

@@ -4,11 +4,6 @@ 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
@@ -17,6 +12,11 @@ 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
@@ -29,7 +29,7 @@ module CassandraObject
   end
 
   module Types
-    class TestCase < CassandraObject::TestCase
+    class TestCase < ActiveSupport::TestCase
       attr_accessor :coder
       setup do
         @coder = self.class.name.sub(/Test$/, '').constantize.new

data/test/types/array_type_test.rb

@@ -18,30 +18,19 @@ class CassandraObject::Types::ArrayTypeTest < CassandraObject::Types::TestCase
   end
 
   class TestIssue < CassandraObject::Base
-    key :uuid
-    self.column_family = 'Issues'
-    array :favorite_colors, unique: true
+    self.column_family = 'Issue'
+    array :favorite_colors
   end
 
-  test 'array attribute' do
-    issue = TestIssue.new favorite_colors: []
-    
-    assert_kind_of Array, issue.favorite_colors
-    issue.favorite_colors << 'red'
-
-    assert issue.changed?
-    assert_equal({'favorite_colors' => [nil, ['red']]}, issue.changes)
-  end
+  test 'wrap' do
+    issue = TestIssue.new
+    colors = []
+    wrapper = coder.wrap(issue, 'favorite_colors', colors)
 
-  test 'array uniques' do
-    issue = TestIssue.create! favorite_colors: ['red', 'blue']
-
-    issue.favorite_colors << 'red'
-    assert_equal ['red', 'blue'], issue.favorite_colors
+    assert_kind_of Array, wrapper
+    
     assert !issue.changed?
-
-    issue.favorite_colors << 'yellow'
-    assert_equal ['red', 'blue', 'yellow'], issue.favorite_colors
-    assert_equal({'favorite_colors' => [['red', 'blue'], ['red', 'blue', 'yellow']]}, issue.changes)
+    wrapper << 'red'
+    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.2
+  version: 2.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70186041043380 !ruby/object:Gem::Requirement
+  requirement: &70252009263440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186041043380
+  version_requirements: *70252009263440
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70186041042820 !ruby/object:Gem::Requirement
+  requirement: &70252009262920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70186041042820
+  version_requirements: *70252009262920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70186041042140 !ruby/object:Gem::Requirement
+  requirement: &70252009262340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70186041042140
+  version_requirements: *70252009262340
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []