gotime-cassandra_object 4.10.5 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7065981f0726fd662b2d6a42d8b2c8938e56b974
-  data.tar.gz: cbd7d2ba31303203624b2bce28c5fc3b61737d38
+  metadata.gz: f263e66af88f25ad58871eacee736b9a13996b65
+  data.tar.gz: a223bf32c8be89d5173bc69bde176e52f512eb81
 SHA512:
-  metadata.gz: 32474823df1bbb7ffe2b750896c88174b28310fe1f26212d848fabbb29a267215e41c2367cde0f0706fb748362730a1d806d3ae5d9cb76f227f9aebca1c28b62
-  data.tar.gz: 735e41f64fc8e187f047ab3ceef93fb607a1db4b4e4fd1bccd0bd11e1b2c0db487a1b413f82bbf146a7be1dcc6e63a40c6eb05f3ddf543142c59f43aa43c431f
+  metadata.gz: 84e088745991bd331e55baca18e2f63318f0653766fa2c2466c8bfd9a402308d83dd02545c49a8f87f129e1bddb0a4b736acdd4fcf44df0eeb31329e1da9f64c
+  data.tar.gz: cf6b2c6b52aa2693a1b1d2013c4d5bd7cfd102dd67d1ad26002e2fe2b1b0d6ade18a4e397e003d8967d8cb605d6d1c131a37b97734e621ae8a41d2146294abc5

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attribute_methods.rb

@@ -52,7 +52,11 @@ module CassandraObject
     end
 
     def attributes
-      Hash[@attributes.map { |name, _| [name, read_attribute(name)] }]
+      results = {}
+      @attributes.each_key do |key|
+        results[key] = read_attribute(key)
+      end
+      results
     end
 
     def attributes=(attributes)
@@ -77,7 +81,7 @@ module CassandraObject
 
     protected
       def attribute_method?(name)
-        !!attribute_definitions[name.to_sym]
+        !!attribute_definitions[name.to_s]
       end
 
     private

data/lib/cassandra_object/attribute_methods/definition.rb

@@ -7,6 +7,10 @@ module CassandraObject
         @coder  = coder.new(options)
       end
 
+      def default
+        coder.default
+      end
+
       def instantiate(record, value)
         value = value.nil? ? coder.default : value
         return if value.nil?

data/lib/cassandra_object/attribute_methods/typecasting.rb

@@ -39,11 +39,11 @@ module CassandraObject
             raise "Must supply a :coder for #{name}"
           end
 
-          attribute_definitions[name.to_sym] = AttributeMethods::Definition.new(name, coder, options)
+          attribute_definitions[name.to_s] = AttributeMethods::Definition.new(name, coder, options)
         end
 
         def typecast_attribute(record, name, value)
-          if attribute_definition = attribute_definitions[name.to_sym]
+          if attribute_definition = attribute_definitions[name.to_s]
             attribute_definition.instantiate(record, value)
           else
             raise NoMethodError, "Unknown attribute #{name.inspect}"
@@ -51,7 +51,7 @@ module CassandraObject
         end
 
         def coder_for(attribute)
-          attribute_definitions[attribute.to_sym].coder
+          attribute_definitions[attribute.to_s].coder
         end
       end
     end

data/lib/cassandra_object/core.rb

@@ -7,9 +7,9 @@ module CassandraObject
       @destroyed = false
       @attributes = {}
       self.attributes = attributes || {}
-      attribute_definitions.each_key do |attr|
-        unless attribute_exists?(attr)
-          @attributes[attr.to_s] = self.class.typecast_attribute(self, attr, nil)
+      attribute_definitions.each_value do |definition|
+        unless definition.default.nil? || attribute_exists?(definition.name)
+          @attributes[definition.name] = definition.default
         end
       end
 

data/lib/cassandra_object/persistence.rb

@@ -53,7 +53,7 @@ module CassandraObject
           object.instance_variable_set("@id", id) if id
           object.instance_variable_set("@new_record", false)
           object.instance_variable_set("@destroyed", false)
-          object.instance_variable_set("@attributes", typecast_attributes(object, attributes))
+          object.instance_variable_set("@attributes", typecast_persisted_attributes(object, attributes))
         end
       end
 
@@ -61,7 +61,7 @@ module CassandraObject
         encoded = {}
         attributes.each do |column_name, value|
           unless value.nil?
-            encoded[column_name.to_s] = attribute_definitions[column_name.to_sym].coder.encode(value)
+            encoded[column_name] = attribute_definitions[column_name].coder.encode(value)
           end
         end
         encoded
@@ -91,9 +91,19 @@ module CassandraObject
           end
         end
 
-        def typecast_attributes(object, attributes)
-          attributes = attributes.symbolize_keys
-          Hash[attribute_definitions.map { |k, attribute_definition| [k.to_s, attribute_definition.instantiate(object, attributes[k])] }]
+        def typecast_persisted_attributes(object, attributes)
+          attributes.each do |key, value|
+            next unless definition = attribute_definitions[key]
+            attributes[key] = definition.instantiate(object, value)
+          end
+
+          attribute_definitions.each_value do |definition|
+            unless definition.default.nil? || attributes.has_key?(definition.name)
+              attributes[definition.name] = definition.default
+            end
+          end
+
+          attributes
         end
 
         def write_option_string(ignore_batching = false)
@@ -150,7 +160,7 @@ module CassandraObject
 
     def reload
       clear_belongs_to_cache
-      @attributes.update(self.class.find(id).instance_variable_get('@attributes'))
+      @attributes = self.class.find(id).instance_variable_get('@attributes')
       self
     end
 

data/lib/cassandra_object/types/array_type.rb

@@ -51,9 +51,9 @@ module CassandraObject
           end
       end
 
-      def default
-        []
-      end
+      # def default
+      #   []
+      # end
 
       def encode(array)
         raise ArgumentError.new("#{array.inspect} is not an Array") unless array.kind_of?(Array)

data/lib/cassandra_object/types/date_type.rb

@@ -12,6 +12,10 @@ module CassandraObject
       def decode(str)
         Date.parse(str)
       end
+
+      def wrap(record, name, value)
+        value.to_date
+      end
     end
   end
 end

data/lib/cassandra_object/types/integer_type.rb

@@ -11,6 +11,10 @@ module CassandraObject
         return nil if str.empty?
         str.to_i
       end
+
+      def wrap(record, name, value)
+        value.to_i
+      end
     end
   end
 end

data/test/unit/attribute_methods/typecasting_test.rb

@@ -29,7 +29,7 @@ class CassandraObject::AttributeMethods::TypecastingTest < CassandraObject::Test
   end
 
   test 'custom attribute definer' do
-    model_attribute = TestIssue.attribute_definitions[:custom_column]
+    model_attribute = TestIssue.attribute_definitions['custom_column']
 
     assert_kind_of CustomCoder, model_attribute.coder
     assert_equal 'custom_column', model_attribute.name

data/test/unit/persistence_test.rb

@@ -16,12 +16,12 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
 
     assert_equal(
       {},
-      klass.encode_attributes({description: nil})
+      klass.encode_attributes({'description' => nil})
     )
 
     assert_equal(
       {'description' => 'lol'},
-      klass.encode_attributes({description: 'lol'})
+      klass.encode_attributes({'description' => 'lol'})
     )
   end
 

data/test/unit/types/array_type_test.rb

@@ -20,10 +20,6 @@ class CassandraObject::Types::ArrayTypeTest < CassandraObject::Types::TestCase
     array :favorite_colors, unique: true
   end
 
-  test 'default' do
-    assert_equal [], TestIssue.new.favorite_colors
-  end
-
   test 'append marks dirty' do
     issue = TestIssue.create favorite_colors: []
     assert !issue.changed?

metadata

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