gotime-cassandra_object 2.7.2 → 2.7.3

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attribute_methods.rb

@@ -29,18 +29,16 @@ module CassandraObject
       # attribute :ammo, type: Ammo, coder: AmmoCodec
       # 
       def attribute(name, options)
-        expected_type = options.delete :type
-        coder         = options.delete :coder
+        type  = options.delete :type
+        coder = options.delete :coder
 
-        if expected_type.is_a?(Symbol)
-          type_mapping = CassandraObject::Type.get_mapping(expected_type) || (raise "Unknown type #{expected_type}")
+        if type.is_a?(Symbol)
+          coder = CassandraObject::Type.get_coder(type) || (raise "Unknown type #{type}")
         elsif coder.nil?
           raise "Must supply a :coder for #{name}"
-        else
-          type_mapping = CassandraObject::Type::TypeMapping.new(expected_type, coder)
         end
 
-        attribute_definitions[name.to_sym] = AttributeMethods::Definition.new(name, type_mapping, options)
+        attribute_definitions[name.to_sym] = AttributeMethods::Definition.new(name, coder, options)
       end
 
       def json(name, options = {})
@@ -56,7 +54,13 @@ module CassandraObject
       end
 
       def define_attribute_methods
+        return if attribute_methods_generated?
         super(attribute_definitions.keys)
+        @attribute_methods_generated = true
+      end
+
+      def attribute_methods_generated?
+        @attribute_methods_generated ||= false
       end
     end
 

data/lib/cassandra_object/attribute_methods/definition.rb

@@ -1,20 +1,19 @@
 module CassandraObject
   module AttributeMethods
     class Definition
-      attr_reader :name, :coder, :expected_type
-      def initialize(name, type_mapping, options)
+      attr_reader :name, :coder
+      def initialize(name, coder, options)
         @name           = name.to_s
-        @coder          = type_mapping.coder.new(options)
-        @expected_type  = type_mapping.expected_type
+        @coder          = coder.new(options)
       end
 
       def instantiate(record, value)
         value ||= coder.default
         return unless value
       
-        value = value.kind_of?(expected_type) ? value : coder.decode(value)
+        value = value.kind_of?(String) ? coder.decode(value) : value
         coder.wrap(record, name, value)
       end
     end
   end
-end
+end

data/lib/cassandra_object/attribute_methods/dirty.rb

@@ -25,7 +25,7 @@ module CassandraObject
       def reload
         super.tap do
           @previously_changed.try :clear
-          @changed_attributes.clear
+          @changed_attributes.try :clear
         end
       end
 

data/lib/cassandra_object/identity/custom_key_factory.rb

@@ -2,8 +2,6 @@ module CassandraObject
   module Identity
     class CustomKeyFactory < AbstractKeyFactory
       class CustomKey
-        include Key
-
         attr_reader :value
 
         def initialize(value)
@@ -14,16 +12,8 @@ module CassandraObject
           value
         end
 
-        def to_param
-          value
-        end
-
         def ==(other)
-          other.is_a?(CustomKey) && other.value == value
-        end
-
-        def eql?(other)
-          other == self
+          other.to_s == value
         end
       end
 
@@ -36,6 +26,10 @@ module CassandraObject
       def next_key(object)
         CustomKey.new(object.send(@method))
       end
+
+      def parse(value)
+        value
+      end
     end
   end
 end

data/lib/cassandra_object/identity/natural_key_factory.rb

@@ -2,8 +2,6 @@ module CassandraObject
   module Identity
     class NaturalKeyFactory < AbstractKeyFactory
       class NaturalKey
-        include Key
-
         attr_reader :value
 
         def initialize(value)
@@ -14,16 +12,8 @@ module CassandraObject
           value
         end
 
-        def to_param
-          value
-        end
-
         def ==(other)
-          other.is_a?(NaturalKey) && other.value == value
-        end
-
-        def eql?(other)
-          other == self
+          other.to_s == to_s
         end
       end
 

data/lib/cassandra_object/identity/uuid_key_factory.rb

@@ -3,26 +3,15 @@ module CassandraObject
     # Key factories need to support 3 operations
     class UUIDKeyFactory < AbstractKeyFactory
       class UUID < SimpleUUID::UUID
-        include Key
-
-        def to_param
-          to_guid
-        end
-        
         def to_s
-          # FIXME - this should probably write the raw bytes 
-          # but it's very hard to debug without this for now.
           to_guid
         end
       end
     
-      # Next key takes an object and returns the key object it should use.
-      # object will be ignored with synthetic keys but could be useful with natural ones
       def next_key(object)
         UUID.new
       end
       
-      # Parse should create a new key object from the 'to_param' format
       def parse(string)
         UUID.new(string) if string
       rescue

data/lib/cassandra_object/type.rb

@@ -1,17 +1,14 @@
 module CassandraObject
   class Type
-    class TypeMapping < Struct.new(:expected_type, :coder)
-    end
-
     cattr_accessor :attribute_types
     self.attribute_types = {}.with_indifferent_access
 
     class << self
-      def register(name, expected_type, coder)
-        attribute_types[name] = TypeMapping.new(expected_type, coder)
+      def register(name, coder)
+        attribute_types[name] = coder
       end
 
-      def get_mapping(name)
+      def get_coder(name)
         attribute_types[name]
       end
     end

data/lib/cassandra_object/types.rb

@@ -1,9 +1,9 @@
-CassandraObject::Type.register(:array, Array, CassandraObject::Types::ArrayType)
-CassandraObject::Type.register(:boolean, Object, CassandraObject::Types::BooleanType)
-CassandraObject::Type.register(:date, Date, CassandraObject::Types::DateType)
-CassandraObject::Type.register(:float, Float, CassandraObject::Types::FloatType)
-CassandraObject::Type.register(:hash, Hash, CassandraObject::Types::HashType)
-CassandraObject::Type.register(:integer, Integer, CassandraObject::Types::IntegerType)
-CassandraObject::Type.register(:time, Time, CassandraObject::Types::TimeType)
-CassandraObject::Type.register(:time_with_zone, ActiveSupport::TimeWithZone, CassandraObject::Types::TimeWithZoneType)
-CassandraObject::Type.register(:string, String, CassandraObject::Types::StringType)
+CassandraObject::Type.register(:array,          CassandraObject::Types::ArrayType)
+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(: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/string_type.rb

@@ -7,7 +7,7 @@ module CassandraObject
       end
 
       def wrap(record, name, value)
-        value.force_encoding('UTF-8')
+        (value.frozen? ? value.dup : value).force_encoding('UTF-8')
       end
     end
   end

data/test/attribute_methods_test.rb

@@ -24,7 +24,7 @@ class CassandraObject::AttributeMethodsTest < CassandraObject::TestCase
     model_attribute = TestIssue.attribute_definitions[:custom_column]
 
     assert_kind_of CustomCoder, model_attribute.coder
-    assert_equal CustomType, model_attribute.expected_type
+    assert_equal 'custom_column', model_attribute.name
   end
 
   test 'json attribute' do

data/test/types/string_type_test.rb

@@ -15,4 +15,11 @@ class CassandraObject::Types::StringTypeTest < CassandraObject::Types::TestCase
       coder.wrap(nil, nil, '123'.force_encoding('ASCII-8BIT')).encoding
     )
   end
+
+  test 'wrap when frozen' do
+    assert_equal(
+      '123'.force_encoding('UTF-8').encoding,
+      coder.wrap(nil, nil, '123'.force_encoding('ASCII-8BIT').freeze).encoding
+    )
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70248322073880 !ruby/object:Gem::Requirement
+  requirement: &70131057655200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70248322073880
+  version_requirements: *70131057655200
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70248322073300 !ruby/object:Gem::Requirement
+  requirement: &70131057654400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70248322073300
+  version_requirements: *70131057654400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70248322072840 !ruby/object:Gem::Requirement
+  requirement: &70131057653480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70248322072840
+  version_requirements: *70131057653480
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -81,7 +81,6 @@ files:
 - lib/cassandra_object/identity/abstract_key_factory.rb
 - lib/cassandra_object/identity/custom_key_factory.rb
 - lib/cassandra_object/identity/hashed_natural_key_factory.rb
-- lib/cassandra_object/identity/key.rb
 - lib/cassandra_object/identity/natural_key_factory.rb
 - lib/cassandra_object/identity/uuid_key_factory.rb
 - lib/cassandra_object/log_subscriber.rb
@@ -158,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Cassandra ActiveModel

data/lib/cassandra_object/identity/key.rb

@@ -1,20 +0,0 @@
-module CassandraObject
-  module Identity
-    # An "interface" that keys need to implement
-    # 
-    # You don't have to include this. But, there's no reason I can think of not to.
-    #
-    module Key
-      # to_param should return a nice-readable representation of the key suitable to chuck into URLs
-      #
-      # @return [String] a nice readable representation of the key suitable for URLs
-      def to_param; end
-        
-      # to_s should return the bytes which will be written to cassandra both as keys and values for associations.
-      #
-      # @return [String] the bytes which will be written to cassandra as keys
-      def to_s; end
-    end
-  end
-end
-