gotime-cassandra_object 2.7.3 → 2.7.4

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/migrations.rb

@@ -4,8 +4,10 @@ module CassandraObject
     extend ActiveSupport::Autoload
 
     included do
-      class_inheritable_array :migrations
-      class_inheritable_accessor :current_schema_version
+      class_attribute :migrations
+      self.migrations = []
+
+      class_attribute :current_schema_version
       self.current_schema_version = 0
     end
 
@@ -25,7 +27,7 @@ module CassandraObject
     
     module ClassMethods
       def migrate(version, &blk)
-        write_inheritable_array(:migrations, [Migration.new(version, blk)])
+        migrations << Migration.new(version, blk)
         
         if version > self.current_schema_version 
           self.current_schema_version = version

data/lib/cassandra_object/types/array_type.rb

@@ -28,6 +28,7 @@ module CassandraObject
         private
           def setify!
             if options[:unique]
+              compact!
               uniq!
               sort!
             end
@@ -60,9 +61,11 @@ module CassandraObject
       end
 
       def decode(str)
-        array = ActiveSupport::JSON.decode(str)
-        array.uniq! if options[:unique]
-        array
+        return [] if str.nil?
+
+        ActiveSupport::JSON.decode(str).tap do |array|
+          array.uniq! if options[:unique]
+        end
       end
 
       def wrap(record, name, value)

data/test/types/array_type_test.rb

@@ -11,6 +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)
   end
 
   class TestIssue < CassandraObject::Base
@@ -38,7 +39,8 @@ class CassandraObject::Types::ArrayTypeTest < CassandraObject::Types::TestCase
   end
 
   test 'unique array' do
-    issue = TestIssue.create favorite_colors: ['blue', 'red']
+    issue = TestIssue.create favorite_colors: ['blue', 'red', nil]
+    assert_equal ['blue', 'red'], issue.favorite_colors
 
     issue.favorite_colors = ['red', 'red', 'blue']
     assert !issue.changed?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-01 00:00:00.000000000Z
+date: 2011-09-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70131057655200 !ruby/object:Gem::Requirement
+  requirement: &70284159657700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131057655200
+  version_requirements: *70284159657700
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70131057654400 !ruby/object:Gem::Requirement
+  requirement: &70284159657200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70131057654400
+  version_requirements: *70284159657200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70131057653480 !ruby/object:Gem::Requirement
+  requirement: &70284159656660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70131057653480
+  version_requirements: *70284159656660
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []