gotime-cassandra_object 2.0.0 → 2.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gotime-cassandra_object (0.9.1)
+    gotime-cassandra_object (2.0.0)
       cassandra (~> 0.11.3)
       rails (~> 3.0)
 

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attributes.rb

@@ -1,12 +1,10 @@
 module CassandraObject
   class Attribute
     attr_reader :name, :converter, :expected_type
-    def initialize(name, owner_class, converter, expected_type, options)
+    def initialize(name, converter, expected_type)
       @name          = name.to_s
-      @owner_class   = owner_class
       @converter     = converter
       @expected_type = expected_type
-      @options       = options
     end
 
     def check_value!(value)
@@ -25,33 +23,29 @@ module CassandraObject
           self.model_attributes = {}.with_indifferent_access
         end
 
-        unless type_mapping = attribute_types[options[:type]]
-          type_mapping = {
-            expected_type: options[:type], 
-            converter: options[:converter]
-          }.with_indifferent_access
+        if type_mapping = CassandraObject::Type.get_mapping(options[:type])
+          converter = type_mapping.converter
+          expected_type = type_mapping.expected_type
+        elsif options[:converter]
+          converter = options[:converter]
+          expected_type = options[:type]
+        else
+          raise "Unknown type #{options[:type]}"
         end
 
-        model_attributes[name] = Attribute.new(name, self, type_mapping[:converter], type_mapping[:expected_type], options)
+        model_attributes[name] = Attribute.new(name, converter, expected_type)
       end
 
       def define_attribute_methods
         super(model_attributes.keys)
       end
-
-      def register_attribute_type(name, expected_type, converter)
-        attribute_types[name] = { expected_type: expected_type, converter: converter }.with_indifferent_access
-      end
     end
 
     included do
       class_attribute :model_attributes
       self.model_attributes = {}.with_indifferent_access
 
-      attribute_method_suffix("", "=")
-      
-      cattr_accessor :attribute_types
-      self.attribute_types = {}.with_indifferent_access
+      attribute_method_suffix("", "=")      
     end
 
     def write_attribute(name, value)

data/lib/cassandra_object/base.rb

@@ -2,10 +2,11 @@ require 'cassandra/0.8'
 require 'set'
 
 require 'cassandra_object/log_subscriber'
+require 'cassandra_object/types'
 
 module CassandraObject
   class Base
-    module Naming
+    class << self
       def column_family=(column_family)
         @column_family = column_family
       end
@@ -13,10 +14,7 @@ module CassandraObject
       def column_family
         @column_family || name.pluralize
       end
-    end
-    extend Naming
 
-    class << self
       def base_class
         klass = self
         while klass.superclass != Base
@@ -40,6 +38,7 @@ module CassandraObject
     include Associations
     include Batches
     include FinderMethods
+    include Timestamps
 
     attr_reader :attributes
     attr_accessor :key
@@ -62,5 +61,3 @@ module CassandraObject
     end
   end
 end
-
-require 'cassandra_object/type_registration'

data/lib/cassandra_object/connection.rb

@@ -12,4 +12,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/finder_methods.rb

@@ -14,6 +14,10 @@ module CassandraObject
         end.compact
       end
 
+      # def find()
+        
+      # end
+
       def first(keyrange = ''..'', options = {})
         all(keyrange, options.merge(:limit => 1)).first
       end

data/lib/cassandra_object/persistence.rb

@@ -59,9 +59,6 @@ module CassandraObject
         # remove any attributes we don't know about. we would do this earlier, but we want to make such
         #  attributes available to migrations
         attributes.delete_if{|k,_| !model_attributes.keys.include?(k)}
-        p "attributes = #{attributes.inspect}"
-
-        p "attributes.slice = #{attributes.dup.slice!(*model_attributes.keys).inspect}"
 
         allocate.tap do |object|
           object.instance_variable_set("@schema_version", attributes.delete('schema_version'))
@@ -73,7 +70,7 @@ module CassandraObject
       end
 
       def encode_columns_hash(attributes, schema_version)
-        attributes.inject(Hash.new) do |memo, (column_name, value)|
+        attributes.inject({}) do |memo, (column_name, value)|
           # 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

data/lib/cassandra_object/timestamps.rb

@@ -3,21 +3,17 @@ module CassandraObject
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :timestamp_override
+      attribute :created_at, type: :time#_with_zone
+      attribute :updated_at, type: :time#_with_zone
 
-      attribute :created_at, :type => :time_with_zone
-      attribute :updated_at, :type => :time_with_zone
+      before_create do #|r|
+        self.created_at ||= Time.current
+        self.updated_at ||= Time.current
+      end
 
-      before_create :set_created_at
-      before_save :set_updated_at
-    end
-
-    def set_created_at
-      self.created_at = Time.current unless timestamp_override
-    end
-
-    def set_updated_at
-      self.updated_at = Time.current unless timestamp_override
+      before_update if: :changed? do #|r|
+        self.updated_at = Time.current
+      end
     end
   end
 end

data/lib/cassandra_object/type.rb

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

data/lib/cassandra_object/types/boolean_type.rb

@@ -0,0 +1,23 @@
+module CassandraObject
+  class Types
+    module BooleanType
+      TRUE_VALS = [true, 'true', '1']
+      FALSE_VALS = [false, 'false', '0', '', nil]
+      VALID_VALS = TRUE_VALS + FALSE_VALS
+      
+      def encode(bool)
+        unless VALID_VALS.include?(bool)
+          raise ArgumentError.new("#{self} requires a boolean")
+        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

@@ -0,0 +1,20 @@
+module CassandraObject
+  class Types
+    module 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

@@ -0,0 +1,19 @@
+module CassandraObject
+  class Types
+    module 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

@@ -0,0 +1,16 @@
+module CassandraObject
+  class Types
+    module 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

@@ -0,0 +1,19 @@
+module CassandraObject
+  class Types
+    module 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/string_type.rb

@@ -0,0 +1,16 @@
+module CassandraObject
+  class Types
+    module 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

@@ -0,0 +1,27 @@
+module CassandraObject
+  class Types
+    module TimeType
+      # lifted from the implementation of Time.xmlschema and simplified
+      REGEX = /\A\s*
+                (-?\d+)-(\d\d)-(\d\d)
+                T
+                (\d\d):(\d\d):(\d\d)
+                (\.\d*)?
+                (Z|[+-]\d\d:\d\d)?
+                \s*\z/ix
+
+      def encode(time)
+        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

@@ -0,0 +1,18 @@
+module CassandraObject
+  class Types
+    module 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

@@ -0,0 +1,18 @@
+module CassandraObject
+  class Types
+    module 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/lib/cassandra_object/types.rb

@@ -1,148 +1,9 @@
-module CassandraObject
-  module 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
-
-  module 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
-  
-  module 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
-
-  module TimeType
-    # lifted from the implementation of Time.xmlschema and simplified
-    REGEX = /\A\s*
-              (-?\d+)-(\d\d)-(\d\d)
-              T
-              (\d\d):(\d\d):(\d\d)
-              (\.\d*)?
-              (Z|[+-]\d\d:\d\d)?
-              \s*\z/ix
-
-    def encode(time)
-      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
-  
-  module 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
-
-  module 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
-  
-  module 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
-
-  module 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
-
-  module BooleanType
-    TRUE_VALS = [true, 'true', '1']
-    FALSE_VALS = [false, 'false', '0', '', nil]
-    def encode(bool)
-      unless TRUE_VALS.any? { |a| bool == a } || FALSE_VALS.any? { |a| bool == a }
-        raise ArgumentError.new("#{self} requires a boolean")
-      end
-      TRUE_VALS.include?(bool) ? '1' : '0'
-    end
-    module_function :encode
-
-    def decode(str)
-      raise ArgumentError.new("Cannot convert #{str} into a boolean") unless TRUE_VALS.any? { |a| str == a } || FALSE_VALS.any? { |a| str == a }
-      TRUE_VALS.include?(str)
-    end
-    module_function :decode
-  end
-end
+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::UTF8StringType) #This could be changed to StringType to support non-utf8 strings
+CassandraObject::Type.register(:utf8, String, CassandraObject::Types::UTF8StringType)

data/lib/cassandra_object.rb

@@ -18,12 +18,11 @@ module CassandraObject
   autoload :Migrations
   autoload :Cursor
   autoload :Collection
-  autoload :Types
   autoload :Mocking
   autoload :Batches
   autoload :FinderMethods
   autoload :Timestamps
-
+  autoload :Type
   autoload :Schema
 
   module Tasks
@@ -31,6 +30,19 @@ module CassandraObject
     autoload :Keyspace
     autoload :ColumnFamily
   end
+
+  class Types
+    extend ActiveSupport::Autoload
+    
+    autoload :BooleanType
+    autoload :DateType
+    autoload :FloatType
+    autoload :HashType
+    autoload :IntegerType
+    autoload :TimeType
+    autoload :TimeWithZoneType
+    autoload :UTF8StringType
+  end
 end
 
 require 'cassandra_object/railtie'

data/test/base_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class CassandraObject::BaseTest < CassandraObject::TestCase
+  class Son < CassandraObject::Base
+  end
+
+  class Grandson < Son
+  end
+  
+  test 'base_class' do
+    assert_equal Son, Son.base_class
+    assert_equal Son, Grandson.base_class
+  end
+
+  test 'column family' do
+    assert_equal 'CassandraObject::BaseTest::Sons', Son.column_family
+  end
+end

data/test/finder_methods_test.rb

@@ -25,4 +25,12 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
     assert_equal [first_issue, second_issue].to_set, Issue.find_with_ids(first_issue.key, second_issue.key).to_set
     assert_equal [first_issue, second_issue].to_set, Issue.find_with_ids([first_issue.key, second_issue.key]).to_set
   end
+
+  # test 'find single id' do
+  #   created_issue = Issue.create
+  # 
+  #   found_issue = Issue.find(created_issue.id)
+  # 
+  #   assert_equal created_issue, found_issue
+  # end
 end

data/test/identity_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class CassandraObject::IdentiyTest < CassandraObject::TestCase
+class CassandraObject::IdentityTest < CassandraObject::TestCase
   test 'equality of new records' do
     assert_not_equal Issue.new, Issue.new
   end

data/test/test_helper.rb

@@ -1,8 +1,12 @@
+# lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+# $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+# require File.expand_path('../../lib/cassandra_object', __FILE__)
 require 'cassandra_object'
 require 'rails/test_help'
 
 class Issue < CassandraObject::Base
   key :uuid
+  attribute :description, type: :string
 end
 
 module CassandraObject

data/test/timestamps_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+class CassandraObject::TimestampsTest < CassandraObject::TestCase
+  test 'timestamps set on create' do
+    issue = Issue.create
+
+    assert_in_delta Time.now.to_i, issue.created_at.to_i, 3
+    assert_in_delta Time.now.to_i, issue.updated_at.to_i, 3
+  end
+
+  test 'updated_at set on change' do
+    issue = Issue.create
+
+    issue.updated_at = nil
+    issue.description = 'lol'
+    issue.save
+
+    assert_in_delta Time.now.to_i, issue.updated_at.to_i, 3
+  end
+
+  test 'created_at sets only if nil' do
+    time = 5.days.ago
+    issue = Issue.create created_at: time
+
+    assert_equal time, issue.created_at
+  end
+end

data/test/types/boolean_type_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class CassandraObject::Types::BooleanTypeTest < CassandraObject::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_raise ArgumentError do
+      CassandraObject::Types::BooleanType.encode('wtf')
+    end
+  end
+
+  test 'decode' do
+    assert_equal true, CassandraObject::Types::BooleanType.decode('1')
+    assert_equal false, CassandraObject::Types::BooleanType.decode('0')
+  end
+end

data/test/types/date_type_test.rb

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

data/test/types/float_type_test.rb

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

data/test/types/hash_type_test.rb

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

data/test/types/integer_type_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class CassandraObject::Types::IntegerTypeTest < CassandraObject::TestCase
+  test 'encode' do
+    assert_equal '3', CassandraObject::Types::IntegerType.encode(3)
+    assert_equal '-3', CassandraObject::Types::IntegerType.encode(-3)
+
+    assert_raise ArgumentError do
+      CassandraObject::Types::BooleanType.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')
+  end
+end

data/test/types/string_type_test.rb

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

data/test/types/time_type_test.rb

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

data/test/types/utf8_string_type_test.rb

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

data/test-old/types_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TypesTest < CassandraObjectTestCase
+class TypeTest < CassandraObjectTestCase
   context "IntegerType" do
     context "encode" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-22 00:00:00.000000000Z
+date: 2011-07-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153244980 !ruby/object:Gem::Requirement
+  requirement: &2170403800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153244980
+  version_requirements: *2170403800
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &2153244520 !ruby/object:Gem::Requirement
+  requirement: &2152534000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.11.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153244520
+  version_requirements: *2152534000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153244060 !ruby/object:Gem::Requirement
+  requirement: &2152533540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153244060
+  version_requirements: *2152533540
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -101,8 +101,17 @@ files:
 - lib/cassandra_object/tasks/keyspace.rb
 - lib/cassandra_object/tasks/ks.rake
 - lib/cassandra_object/timestamps.rb
-- lib/cassandra_object/type_registration.rb
+- lib/cassandra_object/type.rb
 - lib/cassandra_object/types.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/string_type.rb
+- lib/cassandra_object/types/time_type.rb
+- lib/cassandra_object/types/time_with_zone_type.rb
+- lib/cassandra_object/types/utf8_string_type.rb
 - lib/cassandra_object/validation.rb
 - test-old/active_model_test.rb
 - test-old/base_test.rb
@@ -126,12 +135,22 @@ files:
 - test-old/types_test.rb
 - test-old/validation_test.rb
 - test-old/z_mock_test.rb
+- test/base_test.rb
 - test/batches_test.rb
 - test/connection_test.rb
 - test/finder_methods_test.rb
 - test/identity_test.rb
 - test/persistence_test.rb
 - test/test_helper.rb
+- test/timestamps_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/string_type_test.rb
+- test/types/time_type_test.rb
+- test/types/utf8_string_type_test.rb
 homepage: http://github.com/gotime/cassandra_object
 licenses: []
 post_install_message: 
@@ -157,9 +176,19 @@ signing_key:
 specification_version: 3
 summary: Cassandra ActiveModel
 test_files:
+- test/base_test.rb
 - test/batches_test.rb
 - test/connection_test.rb
 - test/finder_methods_test.rb
 - test/identity_test.rb
 - test/persistence_test.rb
 - test/test_helper.rb
+- test/timestamps_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/string_type_test.rb
+- test/types/time_type_test.rb
+- test/types/utf8_string_type_test.rb

data/lib/cassandra_object/type_registration.rb

@@ -1,11 +0,0 @@
-require 'cassandra_object/types'
-
-CassandraObject::Base.register_attribute_type(:integer, Integer, CassandraObject::IntegerType)
-CassandraObject::Base.register_attribute_type(:float, Float, CassandraObject::FloatType)
-CassandraObject::Base.register_attribute_type(:date, Date, CassandraObject::DateType)
-CassandraObject::Base.register_attribute_type(:time, Time, CassandraObject::TimeType)
-CassandraObject::Base.register_attribute_type(:time_with_zone, ActiveSupport::TimeWithZone, CassandraObject::TimeWithZoneType)
-CassandraObject::Base.register_attribute_type(:string, String, CassandraObject::UTF8StringType) #This could be changed to StringType to support non-utf8 strings
-CassandraObject::Base.register_attribute_type(:utf8, String, CassandraObject::UTF8StringType)
-CassandraObject::Base.register_attribute_type(:hash, Hash, CassandraObject::HashType)
-CassandraObject::Base.register_attribute_type(:boolean, Object, CassandraObject::BooleanType)