gotime-cassandra_object 2.6.4 → 2.7.0

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attributes.rb

@@ -8,8 +8,9 @@ module CassandraObject
     end
 
     def instantiate(record, value)
-      return if value.nil? && coder.ignore_nil?
-
+      value ||= coder.default
+      return unless value
+        
       value = value.kind_of?(expected_type) ? value : coder.decode(value)
       coder.wrap(record, name, value)
     end
@@ -21,7 +22,7 @@ module CassandraObject
 
     included do
       class_attribute :model_attributes
-      self.model_attributes = {}.with_indifferent_access
+      self.model_attributes = {}
 
       attribute_method_suffix("", "=")
       
@@ -56,15 +57,15 @@ module CassandraObject
           type_mapping = CassandraObject::Type::TypeMapping.new(expected_type, coder)
         end
 
-        model_attributes[name] = Attribute.new(name, type_mapping, options)
+        model_attributes[name.to_sym] = Attribute.new(name, type_mapping, options)
       end
 
-      def json(name)
-        attribute(name, type: :hash)
+      def json(name, options = {})
+        attribute(name, options.update(type: :hash))
       end
 
       def instantiate_attribute(record, name, value)
-        if model_attribute = model_attributes[name]
+        if model_attribute = model_attributes[name.to_sym]
           model_attribute.instantiate(record, value)
         else
           raise NoMethodError, "Unknown attribute #{name.inspect}"

data/lib/cassandra_object/base.rb

@@ -52,8 +52,14 @@ module CassandraObject
       @key = attributes.delete(:key)
       @new_record = true
       @destroyed = false
-      @attributes = {}.with_indifferent_access
+      @attributes = {}
       self.attributes = attributes
+      model_attributes.each do |k, model_attribute|
+        unless read_attribute(k)
+          write_attribute(k, model_attribute.instantiate(self, nil))
+        end
+      end
+
       @schema_version = self.class.current_schema_version
     end
 

data/lib/cassandra_object/persistence.rb

@@ -23,7 +23,7 @@ module CassandraObject
 
       def write(key, attributes, schema_version)
         key.tap do |key|
-          attributes = encode_columns_hash(attributes, schema_version)
+          attributes = encode_attributes(attributes, schema_version)
           ActiveSupport::Notifications.instrument("insert.cassandra_object", column_family: column_family, key: key, attributes: attributes) do
             connection.insert(column_family, key.to_s, attributes, consistency: thrift_write_consistency)
           end
@@ -31,31 +31,28 @@ module CassandraObject
       end
 
       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.delete_if { |k,_| model_attributes[k].nil? }
-
         allocate.tap do |object|
           object.instance_variable_set("@schema_version", attributes.delete('schema_version'))
-          object.instance_variable_set("@key", parse_key(key))
+          object.instance_variable_set("@key", parse_key(key)) if key
           object.instance_variable_set("@new_record", false)
           object.instance_variable_set("@destroyed", false)
-          object.instance_variable_set("@attributes", decode_columns_hash(object, attributes))
+          object.instance_variable_set("@attributes", instantiate_attributes(object, attributes))
         end
       end
 
-      def encode_columns_hash(attributes, schema_version)
+      def encode_attributes(attributes, schema_version)
         attributes.inject({}) do |memo, (column_name, value)|
           # cassandra stores bytes, not strings, so it has no concept of encodings. The ruby thrift gem 
           # expects all strings to be encoded as ascii-8bit.
           # don't attempt to encode columns that are nil
-          memo[column_name.to_s] = value.nil? ? '' : model_attributes[column_name].coder.encode(value).force_encoding('ASCII-8BIT')
+          memo[column_name.to_s] = value.nil? ? '' : model_attributes[column_name.to_sym].coder.encode(value).force_encoding('ASCII-8BIT')
           memo
         end.merge({"schema_version" => schema_version.to_s})
       end
 
-      def decode_columns_hash(object, attributes)
-        Hash[attributes.map { |k, v| [k.to_s, instantiate_attribute(object, k, v)] }]
+      def instantiate_attributes(object, attributes)
+        attributes = attributes.symbolize_keys
+        Hash[model_attributes.map { |k, model_attribute| [k.to_s, model_attribute.instantiate(object, attributes[k])] }]
       end
     end
 

data/lib/cassandra_object/types/array_type.rb

@@ -44,8 +44,8 @@ module CassandraObject
           end
       end
 
-      def ignore_nil?
-        false
+      def default
+        []
       end
 
       def encode(array)

data/lib/cassandra_object/types/base_type.rb

@@ -6,8 +6,8 @@ module CassandraObject
         @options = options
       end
 
-      def ignore_nil?
-        true
+      def default
+        options[:default].dup if options[:default]
       end
 
       def encode(value)

data/lib/cassandra_object/types/date_type.rb

@@ -10,7 +10,6 @@ module CassandraObject
       end
 
       def decode(str)
-        return nil if str.empty?
         Date.parse(str)
       end
     end

data/test/base_test.rb

@@ -6,7 +6,7 @@ class CassandraObject::BaseTest < CassandraObject::TestCase
 
   class Grandson < Son
   end
-  
+
   test 'base_class' do
     assert_equal Son, Son.base_class
     assert_equal Son, Grandson.base_class
@@ -16,6 +16,13 @@ class CassandraObject::BaseTest < CassandraObject::TestCase
     assert_equal 'CassandraObject::BaseTest::Sons', Son.column_family
   end
 
+  test 'initialiaze' do
+    issue = Issue.new
+    
+    assert issue.new_record?
+    assert !issue.destroyed?
+  end
+
   test 'to_param' do
     issue = Issue.create
     assert_equal issue.id, issue.to_param

data/test/dirty_test.rb

@@ -8,10 +8,20 @@ class CassandraObject::DirtyTest < CassandraObject::TestCase
   end
 
   test 'save clears dirty' do
-    record = TestRecord.new(name: 'foo')
+    record = TestRecord.new name: 'foo'
     assert record.changed?
 
-    record.save
+    record.save!
+
+    assert !record.changed?
+  end
+
+  test 'reload clears dirty' do
+    record = TestRecord.create! name: 'foo'
+    record.name = 'bar'
+    assert record.changed?
+
+    record.reload
 
     assert !record.changed?
   end

data/test/types/array_type_test.rb

@@ -1,10 +1,6 @@
 require 'test_helper'
 
 class CassandraObject::Types::ArrayTypeTest < CassandraObject::Types::TestCase
-  test 'ignore_nil' do
-    assert_equal false, coder.ignore_nil?
-  end
-  
   test 'encode' do
     assert_equal ['1', '2'].to_json, coder.encode(['1', '2'])
     

data/test/types/base_type_test.rb

@@ -1,8 +1,9 @@
 require 'test_helper'
 
 class CassandraObject::Types::BaseTypeTest < CassandraObject::Types::TestCase
-  test 'ignore_nil' do
-    assert_equal true, coder.ignore_nil?
+  test 'default' do
+    assert_equal nil, coder.default
+    assert_equal '5', CassandraObject::Types::BaseType.new(default: '5').default
   end
 
   test 'encode' do

metadata

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