gotime-cassandra_object 2.6.0 → 2.6.1

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attributes.rb

@@ -59,6 +59,10 @@ module CassandraObject
         model_attributes[name] = Attribute.new(name, type_mapping, options)
       end
 
+      def json(name)
+        attribute(name, type: :hash)
+      end
+
       def instantiate_attribute(record, name, value)
         if model_attribute = model_attributes[name]
           model_attribute.instantiate(record, value)

data/lib/cassandra_object/migrations.rb

@@ -31,36 +31,6 @@ module CassandraObject
           self.current_schema_version = version
         end
       end
-      
-      def instantiate(key, attributes)
-        version = attributes.delete('schema_version')
-        original_attributes = attributes.dup
-        if version == current_schema_version
-          return super(key, attributes)
-        end
-        
-        versions_to_migrate = ((version.to_i + 1)..current_schema_version)
-        
-        migrations_to_run = versions_to_migrate.map do |v|
-          migrations.find {|m| m.version == v}
-        end
-        
-        if migrations_to_run.any?(&:nil?)
-          raise MigrationNotFoundError.new(version, migrations)
-        end
-        
-        migrations_to_run.inject(attributes) do |attrs, migration|
-          migration.run(attrs)
-          @schema_version = migration.version.to_s
-          attrs
-        end
-        
-        super(key, attributes).tap do |record|
-          original_attributes.diff(attributes).keys.each do |attribute|
-            record.send :attribute_will_change!, attribute
-          end
-        end
-      end
     end
   end
 end

data/lib/cassandra_object/persistence.rb

@@ -32,7 +32,7 @@ module CassandraObject
 
       def instantiate(key, attributes)
         # remove any attributes we don't know about. we would do this earlier, but we want to make such
-        #  attributes available to migrations
+        # attributes available to migrations
         attributes.delete_if { |k,_| model_attributes[k].nil? }
 
         allocate.tap do |object|
@@ -57,10 +57,6 @@ module CassandraObject
       def decode_columns_hash(object, attributes)
         Hash[attributes.map { |k, v| [k.to_s, instantiate_attribute(object, k, v)] }]
       end
-      
-      def column_family_configuration
-        [{:Name => column_family, :CompareWith => "UTF8Type"}]
-      end
     end
 
     def new_record?

data/test/attributes_test.rb

@@ -8,9 +8,12 @@ class CassandraObject::AttributesTest < CassandraObject::TestCase
   end
 
   class TestIssue < CassandraObject::Base
-    self.column_family = 'Issue'
+    key :uuid
+    self.column_family = 'Issues'
+
     attribute :custom_column, type: CustomType, coder: CustomCoder
     integer :price
+    json :orders
   end
 
   class TestChildIssue < TestIssue
@@ -24,6 +27,14 @@ class CassandraObject::AttributesTest < CassandraObject::TestCase
     assert_equal CustomType, model_attribute.expected_type
   end
 
+  test 'json attribute' do
+    issue = TestIssue.create! orders: {'a' => 'b'}
+
+    issue = TestIssue.find issue.id
+
+    assert_equal({'a' => 'b'}, issue.orders)
+  end
+
   test 'instantiate_attribute' do
     assert_equal 1, TestIssue.instantiate_attribute(TestIssue.new, 'price', 1)
     assert_equal 1, TestIssue.instantiate_attribute(TestIssue.new, :price, 1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70153564769440 !ruby/object:Gem::Requirement
+  requirement: &70147973264920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70153564769440
+  version_requirements: *70147973264920
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70153564768800 !ruby/object:Gem::Requirement
+  requirement: &70147973264260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70153564768800
+  version_requirements: *70147973264260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70153564768060 !ruby/object:Gem::Requirement
+  requirement: &70147973263640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70153564768060
+  version_requirements: *70147973263640
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []