gotime-cassandra_object 2.2.4 → 2.3.0

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attributes.rb

@@ -1,15 +1,15 @@
 module CassandraObject
   class Attribute
-    attr_reader :name, :converter, :expected_type
-    def initialize(name, converter, expected_type)
+    attr_reader :name, :coder, :expected_type
+    def initialize(name, coder, expected_type)
       @name          = name.to_s
-      @converter     = converter
+      @coder     = coder
       @expected_type = expected_type
     end
 
     def check_value!(value)
       return value if value.nil?
-      value.kind_of?(expected_type) ? value : converter.decode(value)
+      value.kind_of?(expected_type) ? value : coder.decode(value)
     end
   end
 
@@ -24,16 +24,16 @@ module CassandraObject
         end
 
         if type_mapping = CassandraObject::Type.get_mapping(options[:type])
-          converter = type_mapping.converter
+          coder = type_mapping.coder
           expected_type = type_mapping.expected_type
-        elsif options[:converter]
-          converter = options[:converter]
+        elsif options[:coder]
+          coder = options[:coder]
           expected_type = options[:type]
         else
           raise "Unknown type #{options[:type]}"
         end
 
-        model_attributes[name] = Attribute.new(name, converter, expected_type)
+        model_attributes[name] = Attribute.new(name, coder, expected_type)
       end
 
       def define_attribute_methods

data/lib/cassandra_object/persistence.rb

@@ -49,13 +49,13 @@ module CassandraObject
           # 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].converter.encode(value).force_encoding('ASCII-8BIT')
+          memo[column_name.to_s] = value.nil? ? '' : model_attributes[column_name].coder.encode(value).force_encoding('ASCII-8BIT')
           memo
         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].converter.decode(v)] }]
+        Hash[attributes.map { |k, v| [k.to_s, model_attributes[k].coder.decode(v)] }]
       end
       
       def column_family_configuration

data/lib/cassandra_object/type.rb

@@ -1,14 +1,14 @@
 module CassandraObject
   class Type
-    class TypeMapping < Struct.new(:expected_type, :converter)
+    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, converter)
-        attribute_types[name] = TypeMapping.new(expected_type, converter)
+      def register(name, expected_type, coder)
+        attribute_types[name] = TypeMapping.new(expected_type, coder.new)
       end
 
       def get_mapping(name)

data/lib/cassandra_object/types/array_type.rb

@@ -1,16 +1,14 @@
 module CassandraObject
   module Types
-    module ArrayType
+    class ArrayType
       def encode(array)
         raise ArgumentError.new("#{self} requires an Array") unless array.kind_of?(Array)
         array.to_json
       end
-      module_function :encode
 
       def decode(str)
         ActiveSupport::JSON.decode(str)
       end
-      module_function :decode
     end
   end
 end

data/lib/cassandra_object/types/boolean_type.rb

@@ -1,6 +1,6 @@
 module CassandraObject
   module Types
-    module BooleanType
+    class BooleanType
       TRUE_VALS = [true, 'true', '1']
       FALSE_VALS = [false, 'false', '0', '', nil]
       VALID_VALS = TRUE_VALS + FALSE_VALS
@@ -11,13 +11,11 @@ module CassandraObject
         end
         TRUE_VALS.include?(bool) ? '1' : '0'
       end
-      module_function :encode
 
       def decode(str)
         raise ArgumentError.new("Cannot convert #{str} into a boolean") unless VALID_VALS.include?(str)
         TRUE_VALS.include?(str)
       end
-      module_function :decode
     end
   end
 end

data/lib/cassandra_object/types/date_type.rb

@@ -1,20 +1,18 @@
 module CassandraObject
   module Types
-    module DateType
+    class DateType
       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)
       end
-      module_function :encode
 
       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)
       end
-      module_function :decode
     end
   end
 end

data/lib/cassandra_object/types/float_type.rb

@@ -1,19 +1,17 @@
 module CassandraObject
   module Types
-    module FloatType
+    class FloatType
       REGEX = /\A[-+]?\d+(\.\d+)?\Z/
       def encode(float)
         raise ArgumentError.new("#{self} requires a Float") unless float.kind_of?(Float)
         float.to_s
       end
-      module_function :encode
 
       def decode(str)
         return nil if str.empty?
         raise ArgumentError.new("Cannot convert #{str} into a Float") unless str.kind_of?(String) && str.match(REGEX)
         str.to_f
       end
-      module_function :decode
     end
   end
 end

data/lib/cassandra_object/types/hash_type.rb

@@ -1,16 +1,14 @@
 module CassandraObject
   module Types
-    module HashType
+    class HashType
       def encode(hash)
         raise ArgumentError.new("#{self} requires a Hash") unless hash.kind_of?(Hash)
         ActiveSupport::JSON.encode(hash)
       end
-      module_function :encode
 
       def decode(str)
         ActiveSupport::JSON.decode(str)
       end
-      module_function :decode
     end
   end
 end

data/lib/cassandra_object/types/integer_type.rb

@@ -1,19 +1,17 @@
 module CassandraObject
   module Types
-    module IntegerType
+    class IntegerType
       REGEX = /\A[-+]?\d+\Z/
       def encode(int)
         raise ArgumentError.new("#{self} requires an Integer. You passed #{int.inspect}") unless int.kind_of?(Integer)
         int.to_s
       end
-      module_function :encode
 
       def decode(str)
         return nil if str.empty?
         raise ArgumentError.new("Cannot convert #{str} into an Integer") unless str.kind_of?(String) && str.match(REGEX)
         str.to_i
       end
-      module_function :decode
     end
   end
 end

data/lib/cassandra_object/types/set_type.rb

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

data/lib/cassandra_object/types/string_type.rb

@@ -1,16 +1,14 @@
 module CassandraObject
   module Types
-    module StringType
+    class StringType
       def encode(str)
         raise ArgumentError.new("#{self} requires a String") unless str.kind_of?(String)
         str.dup
       end
-      module_function :encode
 
       def decode(str)
         str
       end
-      module_function :decode
     end
   end
 end

data/lib/cassandra_object/types/time_type.rb

@@ -1,6 +1,6 @@
 module CassandraObject
   module Types
-    module TimeType
+    class TimeType
       # lifted from the implementation of Time.xmlschema and simplified
       REGEX = /\A\s*
                 (-?\d+)-(\d\d)-(\d\d)
@@ -14,14 +14,12 @@ module CassandraObject
         raise ArgumentError.new("#{self} requires a Time") unless time.kind_of?(Time)
         time.xmlschema(6)
       end
-      module_function :encode
 
       def decode(str)
         return nil if str.empty?
         raise ArgumentError.new("Cannot convert #{str} into a Time") unless str.kind_of?(String) && str.match(REGEX)
         Time.xmlschema(str)
       end
-      module_function :decode
     end
   end
 end

data/lib/cassandra_object/types/time_with_zone_type.rb

@@ -1,18 +1,16 @@
 module CassandraObject
   module Types
-    module TimeWithZoneType
+    class TimeWithZoneType
       def encode(time)
         raise ArgumentError.new("#{self} requires a Time") unless time.kind_of?(Time)
         time.utc.xmlschema(6)
       end
-      module_function :encode
 
       def decode(str)
         return nil if str.empty?
         raise ArgumentError.new("Cannot convert #{str} into a Time") unless str.kind_of?(String) && str.match(TimeType::REGEX)
         Time.xmlschema(str).in_time_zone
       end
-      module_function :decode
     end
   end
 end

data/lib/cassandra_object/types/utf8_string_type.rb

@@ -1,18 +1,16 @@
 module CassandraObject
   module Types
-    module UTF8StringType
+    class UTF8StringType
       def encode(str)
         # This is technically the most correct, but it is a pain to require utf-8 encoding for all strings. Should revisit.
         #raise ArgumentError.new("#{self} requires a UTF-8 encoded String") unless str.kind_of?(String) && str.encoding == Encoding::UTF_8
         raise ArgumentError.new("#{self} requires a String") unless str.kind_of?(String)
         str.dup
       end
-      module_function :encode
 
       def decode(str)
         str.force_encoding('UTF-8')
       end
-      module_function :decode
     end
   end
 end

data/test/test_helper.rb

@@ -28,4 +28,13 @@ module CassandraObject
       CassandraObject::Base.connection
     end
   end
+
+  module Types
+    class TestCase < ActiveSupport::TestCase
+      attr_accessor :coder
+      setup do
+        @coder = self.class.name.sub(/Test$/, '').constantize.new
+      end
+    end
+  end
 end

data/test/types/array_type_test.rb

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

data/test/types/boolean_type_test.rb

@@ -1,23 +1,23 @@
 require 'test_helper'
 
-class CassandraObject::Types::BooleanTypeTest < CassandraObject::TestCase
+class CassandraObject::Types::BooleanTypeTest < CassandraObject::Types::TestCase
   test 'encode' do
-    assert_equal '1', CassandraObject::Types::BooleanType.encode(true)
-    assert_equal '1', CassandraObject::Types::BooleanType.encode('true')
-    assert_equal '1', CassandraObject::Types::BooleanType.encode('1')
-
-    assert_equal '0', CassandraObject::Types::BooleanType.encode(false)
-    assert_equal '0', CassandraObject::Types::BooleanType.encode('false')
-    assert_equal '0', CassandraObject::Types::BooleanType.encode('0')
-    assert_equal '0', CassandraObject::Types::BooleanType.encode('')
+    assert_equal '1', coder.encode(true)
+    assert_equal '1', coder.encode('true')
+    assert_equal '1', coder.encode('1')
+                      coder
+    assert_equal '0', coder.encode(false)
+    assert_equal '0', coder.encode('false')
+    assert_equal '0', coder.encode('0')
+    assert_equal '0', coder.encode('')
 
     assert_raise ArgumentError do
-      CassandraObject::Types::BooleanType.encode('wtf')
+      coder.encode('wtf')
     end
   end
 
   test 'decode' do
-    assert_equal true, CassandraObject::Types::BooleanType.decode('1')
-    assert_equal false, CassandraObject::Types::BooleanType.decode('0')
+    assert_equal true, coder.decode('1')
+    assert_equal false, coder.decode('0')
   end
 end

data/test/types/date_type_test.rb

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

data/test/types/float_type_test.rb

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

data/test/types/hash_type_test.rb

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

data/test/types/integer_type_test.rb

@@ -1,18 +1,18 @@
 require 'test_helper'
 
-class CassandraObject::Types::IntegerTypeTest < CassandraObject::TestCase
+class CassandraObject::Types::IntegerTypeTest < CassandraObject::Types::TestCase
   test 'encode' do
-    assert_equal '3', CassandraObject::Types::IntegerType.encode(3)
-    assert_equal '-3', CassandraObject::Types::IntegerType.encode(-3)
+    assert_equal '3', coder.encode(3)
+    assert_equal '-3', coder.encode(-3)
 
     assert_raise ArgumentError do
-      CassandraObject::Types::BooleanType.encode('xx')
+      coder.encode('xx')
     end
   end
 
   test 'decode' do
-    assert_nil CassandraObject::Types::IntegerType.decode('')
-    assert_equal 3, CassandraObject::Types::IntegerType.decode('3')
-    assert_equal -3, CassandraObject::Types::IntegerType.decode('-3')
+    assert_nil coder.decode('')
+    assert_equal 3, coder.decode('3')
+    assert_equal -3, coder.decode('-3')
   end
 end

data/test/types/set_type_test.rb

@@ -1,17 +1,17 @@
 require 'test_helper'
 
-class CassandraObject::Types::SetTypeTest < CassandraObject::TestCase
+class CassandraObject::Types::SetTypeTest < CassandraObject::Types::TestCase
   test 'encode' do
-    assert_equal ['1', '2'].to_json, CassandraObject::Types::SetType.encode(['1', '2'].to_set)
-    assert_equal ['1', '2'].to_json, CassandraObject::Types::SetType.encode(['1', '2', '2'])
+    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
-      CassandraObject::Types::SetType.encode('wtf')
+      coder.encode('wtf')
     end
   end
   
   test 'decode' do
-    assert_equal ['1', '2'], CassandraObject::Types::SetType.decode(['1', '2'].to_set)
-    assert_equal ['1', '2'], CassandraObject::Types::SetType.decode(['1', '2'].to_json)
+    assert_equal ['1', '2'], coder.decode(['1', '2'].to_set)
+    assert_equal ['1', '2'], coder.decode(['1', '2'].to_json)
   end
 end

data/test/types/string_type_test.rb

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

data/test/types/time_type_test.rb

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

data/test/types/utf8_string_type_test.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-29 00:00:00.000000000Z
+date: 2011-08-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2158117880 !ruby/object:Gem::Requirement
+  requirement: &2156966760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158117880
+  version_requirements: *2156966760
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &2158117360 !ruby/object:Gem::Requirement
+  requirement: &2156966180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.11.3
   type: :runtime
   prerelease: false
-  version_requirements: *2158117360
+  version_requirements: *2156966180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158116780 !ruby/object:Gem::Requirement
+  requirement: &2156965600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2158116780
+  version_requirements: *2156965600
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []