gotime-cassandra_object 2.8.0 → 2.8.1

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attribute_methods.rb

@@ -9,7 +9,7 @@ module CassandraObject
 
       attribute_method_suffix("", "=")
 
-      %w(array boolean date float integer time time_with_zone string).each do |type|
+      %w(array boolean date float integer json string time time_with_zone).each do |type|
         instance_eval <<-EOV, __FILE__, __LINE__ + 1
           def #{type}(name, options = {})                                 # def string(name, options = {})
             attribute(name, options.update(type: :#{type}))               #   attribute(name, options.update(type: :string))
@@ -41,10 +41,6 @@ module CassandraObject
         attribute_definitions[name.to_sym] = AttributeMethods::Definition.new(name, coder, options)
       end
 
-      def json(name, options = {})
-        attribute(name, options.update(type: :hash))
-      end
-
       def instantiate_attribute(record, name, value)
         if attribute_definition = attribute_definitions[name.to_sym]
           attribute_definition.instantiate(record, value)

data/lib/cassandra_object/base.rb

@@ -56,7 +56,7 @@ module CassandraObject
       self.attributes = attributes
       attribute_definitions.each do |attr, attribute_definition|
         unless attribute_exists?(attr)
-          write_attribute(attr, attribute_definition.instantiate(self, nil))
+          self.attributes[attr] = self.class.instantiate_attribute(self, attr, nil)
         end
       end
 

data/lib/cassandra_object/types.rb

@@ -2,8 +2,8 @@ CassandraObject::Type.register(:array,          CassandraObject::Types::ArrayTyp
 CassandraObject::Type.register(:boolean,        CassandraObject::Types::BooleanType)
 CassandraObject::Type.register(:date,           CassandraObject::Types::DateType)
 CassandraObject::Type.register(:float,          CassandraObject::Types::FloatType)
-CassandraObject::Type.register(:hash,           CassandraObject::Types::HashType)
 CassandraObject::Type.register(:integer,        CassandraObject::Types::IntegerType)
+CassandraObject::Type.register(:json,           CassandraObject::Types::JsonType)
 CassandraObject::Type.register(:time,           CassandraObject::Types::TimeType)
 CassandraObject::Type.register(:time_with_zone, CassandraObject::Types::TimeWithZoneType)
 CassandraObject::Type.register(:string,         CassandraObject::Types::StringType)

data/lib/cassandra_object/types/{hash_type.rb → json_type.rb}

@@ -1,8 +1,7 @@
 module CassandraObject
   module Types
-    class HashType < BaseType
+    class JsonType < BaseType
       def encode(hash)
-        raise ArgumentError.new("#{self} requires a Hash") unless hash.kind_of?(Hash)
         ActiveSupport::JSON.encode(hash)
       end
 

data/lib/gotime-cassandra_object.rb

@@ -47,8 +47,8 @@ module CassandraObject
     autoload :BooleanType
     autoload :DateType
     autoload :FloatType
-    autoload :HashType
     autoload :IntegerType
+    autoload :JsonType
     autoload :StringType
     autoload :TimeType
     autoload :TimeWithZoneType

data/test/types/json_type_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+class CassandraObject::Types::JsonTypeTest < CassandraObject::Types::TestCase
+  test 'encode' do
+    assert_equal({a: 'b'}.to_json, coder.encode(a: 'b'))
+    assert_equal '-3', coder.encode(-3)
+  end
+
+  test 'decode' do
+    assert_equal({'a' => 'b'}, coder.decode({'a' => 'b'}.to_json))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
+date: 2011-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70327481619240 !ruby/object:Gem::Requirement
+  requirement: &70248930981540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70327481619240
+  version_requirements: *70248930981540
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70327481618340 !ruby/object:Gem::Requirement
+  requirement: &70248930981000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70327481618340
+  version_requirements: *70248930981000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70327481617260 !ruby/object:Gem::Requirement
+  requirement: &70248930980520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70327481617260
+  version_requirements: *70248930980520
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -105,8 +105,8 @@ files:
 - lib/cassandra_object/types/boolean_type.rb
 - lib/cassandra_object/types/date_type.rb
 - lib/cassandra_object/types/float_type.rb
-- lib/cassandra_object/types/hash_type.rb
 - lib/cassandra_object/types/integer_type.rb
+- lib/cassandra_object/types/json_type.rb
 - lib/cassandra_object/types/string_type.rb
 - lib/cassandra_object/types/time_type.rb
 - lib/cassandra_object/types/time_with_zone_type.rb
@@ -132,8 +132,8 @@ files:
 - test/types/boolean_type_test.rb
 - test/types/date_type_test.rb
 - test/types/float_type_test.rb
-- test/types/hash_type_test.rb
 - test/types/integer_type_test.rb
+- test/types/json_type_test.rb
 - test/types/string_type_test.rb
 - test/types/time_type_test.rb
 - test/types/time_with_zone_type_test.rb

data/test/types/hash_type_test.rb

@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class CassandraObject::Type::BooleanTypeTest < CassandraObject::Types::TestCase
-end