gotime-cassandra_object 2.5.0 → 2.6.0

data/README.rdoc

@@ -15,6 +15,7 @@ Add the following to your Gemfile:
     string :name
     string :description
     integer :price
+    array :colors, unique: true
 
     validates :name, presence: :true
 

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attributes.rb

@@ -1,15 +1,17 @@
 module CassandraObject
   class Attribute
     attr_reader :name, :coder, :expected_type
-    def initialize(name, coder, expected_type)
+    def initialize(name, type_mapping, options)
       @name           = name.to_s
-      @coder          = coder
-      @expected_type  = expected_type
+      @coder          = type_mapping.coder.new(options)
+      @expected_type  = type_mapping.expected_type
     end
 
-    def check_value!(value)
-      return value if value.nil?
-      value.kind_of?(expected_type) ? value : coder.decode(value)
+    def instantiate(record, value)
+      return if value.nil? && coder.ignore_nil?
+
+      value = value.kind_of?(expected_type) ? value : coder.decode(value)
+      coder.wrap(record, name, value)
     end
   end
 
@@ -23,11 +25,11 @@ module CassandraObject
 
       attribute_method_suffix("", "=")
       
-      %w(array boolean date float integer time time_with_zone set string).each do |type|
+      %w(array boolean date float integer time time_with_zone string).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))
-          end                                                                 # end
+          def #{type}(name, options = {})                                   # def string(name, options = {})
+            attribute(name, options.update(type: :#{type}))                 #   attribute(name, options.update(type: :string))
+          end                                                               # end
         EOV
       end
     end
@@ -38,18 +40,31 @@ module CassandraObject
         child.model_attributes = model_attributes.dup
       end
 
+      # 
+      # attribute :name, type: :string
+      # attribute :ammo, type: Ammo, coder: AmmoCodec
+      # 
       def attribute(name, options)
-        if type_mapping = CassandraObject::Type.get_mapping(options[:type])
-          coder = type_mapping.coder
-          expected_type = type_mapping.expected_type
-        elsif options[:coder]
-          coder = options[:coder]
-          expected_type = options[:type]
+        expected_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 #{type}")
+        elsif coder.nil?
+          raise "Must supply a :coder for #{name}"
         else
-          raise "Unknown type #{options[:type]}"
+          type_mapping = CassandraObject::Type::TypeMapping.new(expected_type, coder)
         end
 
-        model_attributes[name] = Attribute.new(name, coder, expected_type)
+        model_attributes[name] = Attribute.new(name, type_mapping, options)
+      end
+
+      def instantiate_attribute(record, name, value)
+        if model_attribute = model_attributes[name]
+          model_attribute.instantiate(record, value)
+        else
+          raise NoMethodError, "Unknown attribute #{name.inspect}"
+        end
       end
 
       def define_attribute_methods
@@ -58,11 +73,7 @@ module CassandraObject
     end
 
     def write_attribute(name, value)
-      if ma = self.class.model_attributes[name]
-        @attributes[name.to_s] = ma.check_value!(value)
-      else
-        raise NoMethodError, "Unknown attribute #{name.inspect}"
-      end
+      @attributes[name.to_s] = self.class.instantiate_attribute(self, name, value)
     end
 
     def read_attribute(name)

data/lib/cassandra_object/finder_methods.rb

@@ -4,12 +4,12 @@ module CassandraObject
 
     module ClassMethods
       def find(key)
-        key = key.try :to_s
+        key_string = key.try :to_s
 
-        if !parse_key(key)
+        if key_string.blank?
           raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{key.inspect}"
-        elsif attributes = connection.get(column_family, key)
-          instantiate(key, attributes)
+        elsif attributes = connection.get(column_family, key_string).presence
+          instantiate(key_string, attributes)
         else
           raise CassandraObject::RecordNotFound
         end

data/lib/cassandra_object/persistence.rb

@@ -40,7 +40,7 @@ module CassandraObject
           object.instance_variable_set("@key", parse_key(key))
           object.instance_variable_set("@new_record", false)
           object.instance_variable_set("@destroyed", false)
-          object.instance_variable_set("@attributes", decode_columns_hash(attributes))
+          object.instance_variable_set("@attributes", decode_columns_hash(object, attributes))
         end
       end
 
@@ -54,8 +54,8 @@ module CassandraObject
         end.merge({"schema_version" => schema_version.to_s})
       end
 
-      def decode_columns_hash(attributes)
-        Hash[attributes.map { |k, v| [k.to_s, model_attributes[k].coder.decode(v)] }]
+      def decode_columns_hash(object, attributes)
+        Hash[attributes.map { |k, v| [k.to_s, instantiate_attribute(object, k, v)] }]
       end
       
       def column_family_configuration

data/lib/cassandra_object/type.rb

@@ -8,7 +8,7 @@ module CassandraObject
 
     class << self
       def register(name, expected_type, coder)
-        attribute_types[name] = TypeMapping.new(expected_type, coder.new)
+        attribute_types[name] = TypeMapping.new(expected_type, coder)
       end
 
       def get_mapping(name)

data/lib/cassandra_object/types.rb

@@ -4,7 +4,6 @@ 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(:set, Array, CassandraObject::Types::SetType)
 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)

data/lib/cassandra_object/types/array_type.rb

@@ -1,13 +1,44 @@
 module CassandraObject
   module Types
-    class ArrayType
+    class ArrayType < BaseType
+      class Proxy < BasicObject
+        attr_accessor :record, :name, :array, :options
+        def initialize(record, name, array, options)
+          @record   = record
+          @name     = name
+          @array    = array.presence || []
+          @options  = options
+        end
+
+        def <<(obj)
+          array << obj
+          array.sort!
+          array.uniq! if options[:unique]
+          record.send("#{name}=", array)
+        end
+
+        def method_missing(method, *args, &block)
+          array.send(method, *args, &block)
+        end
+      end
+
+      def ignore_nil?
+        false
+      end
+
       def encode(array)
         raise ArgumentError.new("#{self} requires an Array") unless array.kind_of?(Array)
-        array.to_json
+        array.to_a.to_json
       end
 
       def decode(str)
-        ActiveSupport::JSON.decode(str)
+        array = ActiveSupport::JSON.decode(str)
+        array.uniq! if options[:unique]
+        array
+      end
+
+      def wrap(record, name, value)
+        Proxy.new(record, name, value, options)
       end
     end
   end

data/lib/cassandra_object/types/base_type.rb

@@ -0,0 +1,26 @@
+module CassandraObject
+  module Types
+    class BaseType
+      attr_accessor :options
+      def initialize(options = {})
+        @options = options
+      end
+
+      def ignore_nil?
+        true
+      end
+
+      def encode(value)
+        value.to_s
+      end
+
+      def decode(str)
+        str
+      end
+
+      def wrap(record, name, value)
+        value
+      end
+    end
+  end
+end

data/lib/cassandra_object/types/boolean_type.rb

@@ -1,6 +1,6 @@
 module CassandraObject
   module Types
-    class BooleanType
+    class BooleanType < BaseType
       TRUE_VALS = [true, 'true', '1']
       FALSE_VALS = [false, 'false', '0', '', nil]
       VALID_VALS = TRUE_VALS + FALSE_VALS

data/lib/cassandra_object/types/date_type.rb

@@ -1,18 +1,18 @@
 module CassandraObject
   module Types
-    class DateType
+    class DateType < BaseType
       FORMAT = '%Y-%m-%d'
       REGEX = /\A\d{4}-\d{2}-\d{2}\Z/
-      def encode(date)
-        raise ArgumentError.new("#{self} requires a Date") unless date.kind_of?(Date)
-        date.strftime(FORMAT)
+
+      def encode(value)
+        raise ArgumentError.new("#{self} requires a Date") unless value.kind_of?(Date)
+        value.strftime(FORMAT)
       end
 
       def decode(str)
         return nil if str.empty?
-        raise ArgumentError.new("Cannot convert #{str} into a Date") unless str.kind_of?(String) && str.match(REGEX)
-        Date.strptime(str, FORMAT)
+        Date.parse(str)
       end
     end
   end
-end
+end

data/lib/cassandra_object/types/float_type.rb

@@ -1,6 +1,6 @@
 module CassandraObject
   module Types
-    class FloatType
+    class FloatType < BaseType
       REGEX = /\A[-+]?\d+(\.\d+)?\Z/
       def encode(float)
         raise ArgumentError.new("#{self} requires a Float") unless float.kind_of?(Float)

data/lib/cassandra_object/types/hash_type.rb

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

data/lib/cassandra_object/types/integer_type.rb

@@ -1,6 +1,6 @@
 module CassandraObject
   module Types
-    class IntegerType
+    class IntegerType < BaseType
       REGEX = /\A[-+]?\d+\Z/
       def encode(int)
         raise ArgumentError.new("#{self} requires an Integer. You passed #{int.inspect}") unless int.kind_of?(Integer)

data/lib/cassandra_object/types/string_type.rb

@@ -1,6 +1,6 @@
 module CassandraObject
   module Types
-    class StringType
+    class StringType < BaseType
       def encode(str)
         raise ArgumentError.new("#{self} requires a String") unless str.kind_of?(String)
         str.dup

data/lib/cassandra_object/types/time_type.rb

@@ -1,6 +1,6 @@
 module CassandraObject
   module Types
-    class TimeType
+    class TimeType < BaseType
       # lifted from the implementation of Time.xmlschema and simplified
       REGEX = /\A\s*
                 (-?\d+)-(\d\d)-(\d\d)

data/lib/cassandra_object/types/time_with_zone_type.rb

@@ -1,6 +1,6 @@
 module CassandraObject
   module Types
-    class TimeWithZoneType
+    class TimeWithZoneType < BaseType
       def encode(time)
         raise ArgumentError.new("#{self} requires a Time") unless time.kind_of?(Time)
         time.utc.xmlschema(6)

data/lib/gotime-cassandra_object.rb

@@ -34,13 +34,13 @@ module CassandraObject
   module Types
     extend ActiveSupport::Autoload
     
+    autoload :BaseType
     autoload :ArrayType
     autoload :BooleanType
     autoload :DateType
     autoload :FloatType
     autoload :HashType
     autoload :IntegerType
-    autoload :SetType
     autoload :StringType
     autoload :TimeType
     autoload :TimeWithZoneType

data/test/attributes_test.rb

@@ -1,14 +1,38 @@
 require 'test_helper'
 
 class CassandraObject::AttributesTest < CassandraObject::TestCase
+  class CustomType
+  end
+  
+  class CustomCoder < CassandraObject::Types::BaseType
+  end
+
   class TestIssue < CassandraObject::Base
     self.column_family = 'Issue'
+    attribute :custom_column, type: CustomType, coder: CustomCoder
+    integer :price
   end
 
   class TestChildIssue < TestIssue
     string :description
   end
 
+  test 'custom attribute definer' do
+    model_attribute = TestIssue.model_attributes[:custom_column]
+
+    assert_kind_of CustomCoder, model_attribute.coder
+    assert_equal CustomType, model_attribute.expected_type
+  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)
+
+    assert_raise NoMethodError do
+      TestIssue.instantiate_attribute(TestIssue.new, 'wtf', 1)
+    end
+  end
+
   test 'attributes not shared' do
     assert_nothing_raised { Issue.new.description }
     assert_raise(NoMethodError) { TestIssue.new.description }
@@ -24,4 +48,4 @@ class CassandraObject::AttributesTest < CassandraObject::TestCase
 
     assert_equal 'foo', issue.description
   end
-end
+end

data/test/dirty_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class CassandraObject::DirtyTest < CassandraObject::TestCase
+  class TestRecord < CassandraObject::Base
+    key :uuid
+    self.column_family = 'Issues'
+    string :name
+  end
+
+  test 'save clears dirty' do
+    record = TestRecord.new(name: 'foo')
+    assert record.changed?
+
+    record.save
+
+    assert !record.changed?
+  end
+end

data/test/finder_methods_test.rb

@@ -13,7 +13,7 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
     rescue => e
       assert_equal "Couldn't find Issue with key nil", e.message
     end
-
+    
     assert_raise CassandraObject::RecordNotFound do
       Issue.find('what')
     end

data/test/types/array_type_test.rb

@@ -1,6 +1,10 @@
 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'])
     
@@ -12,4 +16,21 @@ class CassandraObject::Types::ArrayTypeTest < CassandraObject::Types::TestCase
   test 'decode' do
     assert_equal ['1', '2'], coder.decode(['1', '2'].to_json)
   end
-end
+
+  class TestIssue < CassandraObject::Base
+    self.column_family = 'Issue'
+    array :favorite_colors
+  end
+
+  test 'wrap' do
+    issue = TestIssue.new
+    colors = []
+    wrapper = coder.wrap(issue, 'favorite_colors', colors)
+
+    assert_kind_of Array, wrapper
+    
+    assert !issue.changed?
+    wrapper << 'red'
+    assert issue.changed?
+  end
+end

data/test/types/base_type_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class CassandraObject::Types::BaseTypeTest < CassandraObject::Types::TestCase
+  test 'ignore_nil' do
+    assert_equal true, coder.ignore_nil?
+  end
+
+  test 'encode' do
+    assert_equal '1', coder.encode(1)
+    assert_equal '', coder.encode(nil)
+    assert_equal '1', coder.encode('1')
+  end
+
+  test 'decode' do
+    assert_equal 'abc', coder.decode('abc')
+  end
+
+  test 'wrap' do
+    object = Object.new
+    assert_equal object, coder.wrap(nil, nil, object)
+  end
+end

data/test/types/date_type_test.rb

@@ -1,4 +1,11 @@
 require 'test_helper'
 
-class CassandraObject::Type::DateTypeTest < CassandraObject::Types::TestCase
-end
+class CassandraObject::Types::DateTypeTest < CassandraObject::Types::TestCase
+  test 'encode' do
+    assert_equal '2004-04-25', coder.encode(Date.new(2004, 4, 25))
+  end
+
+  test 'decode' do
+    assert_equal Date.new(2004, 4, 25), coder.decode('2004-04-25')
+  end
+end

data/test/types/float_type_test.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000Z
+date: 2011-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70322955465140 !ruby/object:Gem::Requirement
+  requirement: &70153564769440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322955465140
+  version_requirements: *70153564769440
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70322955464620 !ruby/object:Gem::Requirement
+  requirement: &70153564768800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70322955464620
+  version_requirements: *70153564768800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70322955464020 !ruby/object:Gem::Requirement
+  requirement: &70153564768060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70322955464020
+  version_requirements: *70153564768060
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -101,12 +101,12 @@ files:
 - lib/cassandra_object/type.rb
 - lib/cassandra_object/types.rb
 - lib/cassandra_object/types/array_type.rb
+- lib/cassandra_object/types/base_type.rb
 - 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/set_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
@@ -119,6 +119,7 @@ files:
 - test/callbacks_test.rb
 - test/connection_test.rb
 - test/consistency_test.rb
+- test/dirty_test.rb
 - test/finder_methods_test.rb
 - test/identity/uuid_key_factory_test.rb
 - test/identity_test.rb
@@ -126,12 +127,12 @@ files:
 - test/test_helper.rb
 - test/timestamps_test.rb
 - test/types/array_type_test.rb
+- test/types/base_type_test.rb
 - 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/set_type_test.rb
 - test/types/string_type_test.rb
 - test/types/time_type_test.rb
 - test/validations_test.rb
@@ -167,6 +168,7 @@ test_files:
 - test/callbacks_test.rb
 - test/connection_test.rb
 - test/consistency_test.rb
+- test/dirty_test.rb
 - test/finder_methods_test.rb
 - test/identity/uuid_key_factory_test.rb
 - test/identity_test.rb
@@ -174,12 +176,12 @@ test_files:
 - test/test_helper.rb
 - test/timestamps_test.rb
 - test/types/array_type_test.rb
+- test/types/base_type_test.rb
 - 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/set_type_test.rb
 - test/types/string_type_test.rb
 - test/types/time_type_test.rb
 - test/validations_test.rb

data/lib/cassandra_object/types/set_type.rb

@@ -1,20 +0,0 @@
-module CassandraObject
-  module Types
-    class SetType
-      def encode(set)
-        if set.kind_of?(Set)
-          set.to_json
-        elsif set.kind_of?(Array)
-          set.uniq.to_json
-        else
-          raise ArgumentError.new("#{self} requires an Array or Set")
-        end
-      end
-
-      def decode(str)
-        return str.to_a if str.kind_of?(Set)
-        ActiveSupport::JSON.decode(str)
-      end
-    end
-  end
-end

data/test/types/set_type_test.rb

@@ -1,17 +0,0 @@
-require 'test_helper'
-
-class CassandraObject::Types::SetTypeTest < CassandraObject::Types::TestCase
-  test 'encode' do
-    assert_equal ['1', '2'].to_json, coder.encode(['1', '2'].to_set)
-    assert_equal ['1', '2'].to_json, coder.encode(['1', '2', '2'])
-
-    assert_raise ArgumentError do
-      coder.encode('wtf')
-    end
-  end
-  
-  test 'decode' do
-    assert_equal ['1', '2'], coder.decode(['1', '2'].to_set)
-    assert_equal ['1', '2'], coder.decode(['1', '2'].to_json)
-  end
-end