gotime-cassandra_object 4.11.0 → 4.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f263e66af88f25ad58871eacee736b9a13996b65
-  data.tar.gz: a223bf32c8be89d5173bc69bde176e52f512eb81
+  metadata.gz: aa3f176532fdfd5a0c54cc37fae1669de28f3871
+  data.tar.gz: 263463406d38663bf097c49810273859982362e2
 SHA512:
-  metadata.gz: 84e088745991bd331e55baca18e2f63318f0653766fa2c2466c8bfd9a402308d83dd02545c49a8f87f129e1bddb0a4b736acdd4fcf44df0eeb31329e1da9f64c
-  data.tar.gz: cf6b2c6b52aa2693a1b1d2013c4d5bd7cfd102dd67d1ad26002e2fe2b1b0d6ade18a4e397e003d8967d8cb605d6d1c131a37b97734e621ae8a41d2146294abc5
+  metadata.gz: fc7bf9e4be31c169b13caf13cf4c0d458354e6cf3e989250749de3da7aefe61f9868b041fe5c3c269439c662e17896d4b6943ebbcdc37066e86f2ea223385be5
+  data.tar.gz: 2519496ba7ddad57c635f06b361f3068cb50fd19a7ae5b7a9d7c2462724478a2692fca8ec79f3a95dc737dda5b25b6d3e46d204fa2e6fdc6da7ea96a1215cbbc

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/types/array_type.rb

@@ -1,75 +1,19 @@
 module CassandraObject
   module Types
     class ArrayType < BaseType
-      class DirtyArray < Array
-        attr_accessor :record, :name, :options
-        def initialize(record, name, array, options)
-          @record   = record
-          @name     = name.to_s
-          @options  = options
-
-          super(array)
-          setify!
-        end
-
-        def <<(obj)
-          modifying do
-            super
-            setify!
-          end
-        end
-
-        def delete(obj)
-          modifying do
-            super
-          end
-        end
-
-        private
-          def setify!
-            if options[:unique]
-              reject!(&:blank?)
-              uniq!
-              begin sort! rescue ArgumentError end
-            end
-          end
-
-          def modifying
-            unless record.changed_attributes.include?(name)
-              original = dup
-            end
-
-            result = yield
-
-            if !record.changed_attributes.key?(name) && original != self
-              record.changed_attributes[name] = original
-            end
-
-            record.send("#{name}=", self)
-
-            result
-          end
-      end
-
-      # def default
-      #   []
-      # end
-
       def encode(array)
         raise ArgumentError.new("#{array.inspect} is not an Array") unless array.kind_of?(Array)
         array.to_a.to_json
       end
 
       def decode(str)
-        return [] if str.blank?
+        return nil if str.blank?
 
-        ActiveSupport::JSON.decode(str).tap do |array|
-          array.uniq! if options[:unique]
-        end
+        ActiveSupport::JSON.decode(str)
       end
 
       def wrap(record, name, value)
-        DirtyArray.new(record, name, Array(value), options)
+        value
       end
     end
   end

data/test/unit/types/array_type_test.rb

@@ -11,57 +11,7 @@ class CassandraObject::Types::ArrayTypeTest < CassandraObject::Types::TestCase
 
   test 'decode' do
     assert_equal ['1', '2'], coder.decode(['1', '2'].to_json)
-    assert_equal [], coder.decode(nil)
-    assert_equal [], coder.decode('')
-  end
-
-  class TestIssue < CassandraObject::Base
-    self.column_family = 'Issues'
-    array :favorite_colors, unique: true
-  end
-
-  test 'append marks dirty' do
-    issue = TestIssue.create favorite_colors: []
-    assert !issue.changed?
-
-    issue.favorite_colors << 'red'
-    assert issue.changed?
-    assert_equal({'favorite_colors' => [[], ['red']]}, issue.changes)
-  end
-
-  test 'delete marks dirty' do
-    issue = TestIssue.create favorite_colors: ['red']
-    assert !issue.changed?
-
-    issue.favorite_colors.delete('red')
-    assert issue.changed?
-    assert_equal({'favorite_colors' => [['red'], []]}, issue.changes)
-  end
-
-  test 'unique array removes blank' do
-    issue = TestIssue.create favorite_colors: ['blue', 'red', '', nil]
-    assert_equal ['blue', 'red'], issue.favorite_colors
-  end
-
-  test 'unique array uniquifies' do
-    issue = TestIssue.create favorite_colors: ['blue', 'red']
-
-    issue.favorite_colors = ['red', 'red', 'blue']
-    assert !issue.changed?
-
-    issue.favorite_colors = ['red', 'green']
-    assert issue.changed?
-  end
-
-  test 'unique array rescues argument error' do
-    issue = TestIssue.create favorite_colors: [1, 'red']
-
-    assert_equal [1, 'red'], issue.favorite_colors
-  end
-
-  test 'write non array' do
-    issue = TestIssue.create favorite_colors: true
-
-    assert_equal [true], issue.favorite_colors
+    assert_equal nil, coder.decode(nil)
+    assert_equal nil, coder.decode('')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 4.11.1
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel