gotime-cassandra_object 2.11.7 → 2.11.8

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attribute_methods/typecasting.rb

@@ -46,6 +46,10 @@ module CassandraObject
             raise NoMethodError, "Unknown attribute #{name.inspect}"
           end
         end
+
+        def coder_for(attribute)
+          attribute_definitions[attribute.to_sym].coder
+        end
       end
     end
   end

data/lib/cassandra_object/base.rb

@@ -59,8 +59,6 @@ module CassandraObject
           @attributes[attr.to_s] = self.class.typecast_attribute(self, attr, nil)
         end
       end
-
-      @schema_version = self.class.current_schema_version
     end
 
     def to_param

data/lib/cassandra_object/migrations.rb

@@ -6,9 +6,6 @@ module CassandraObject
     included do
       class_attribute :migrations
       self.migrations = []
-
-      class_attribute :current_schema_version
-      self.current_schema_version = 0
     end
 
     autoload :Migration
@@ -19,17 +16,9 @@ module CassandraObject
       end
     end
     
-    def schema_version
-      Integer(@schema_version || self.class.current_schema_version)
-    end
-    
     module ClassMethods
       def migrate(version, &blk)
         migrations << Migration.new(version, blk)
-        
-        if version > self.current_schema_version 
-          self.current_schema_version = version
-        end
       end
     end
   end

data/lib/cassandra_object/persistence.rb

@@ -21,8 +21,8 @@ module CassandraObject
         end
       end
 
-      def write(key, attributes, schema_version)
-        attributes = encode_attributes(attributes, schema_version)
+      def write(key, attributes)
+        attributes = encode_attributes(attributes)
         ActiveSupport::Notifications.instrument("insert.cassandra_object", column_family: column_family, key: key, attributes: attributes) do
           connection.insert(column_family, key.to_s, attributes, consistency: thrift_write_consistency)
           # if nil_attributes.any?
@@ -33,7 +33,6 @@ module CassandraObject
 
       def instantiate(key, attributes)
         allocate.tap do |object|
-          object.instance_variable_set("@schema_version", attributes.delete('schema_version'))
           object.instance_variable_set("@key", parse_key(key)) if key
           object.instance_variable_set("@new_record", false)
           object.instance_variable_set("@destroyed", false)
@@ -41,8 +40,8 @@ module CassandraObject
         end
       end
 
-      def encode_attributes(attributes, schema_version)
-        encoded = {"schema_version" => schema_version.to_s}
+      def encode_attributes(attributes)
+        encoded = {}
         attributes.each do |column_name, value|
           # The ruby thrift gem expects all strings to be encoded as ascii-8bit.
           unless value.nil?
@@ -126,7 +125,7 @@ module CassandraObject
 
       def write
         changed_attributes = changed.inject({}) { |h, n| h[n] = read_attribute(n); h }
-        self.class.write(key, changed_attributes, schema_version)
+        self.class.write(key, changed_attributes)
       end
   end
 end

data/lib/cassandra_object/types/array_type.rb

@@ -56,7 +56,7 @@ module CassandraObject
       end
 
       def encode(array)
-        raise ArgumentError.new("#{self} requires an Array") unless array.kind_of?(Array)
+        raise ArgumentError.new("#{array.inspect} is not an Array") unless array.kind_of?(Array)
         array.to_a.to_json
       end
 

data/lib/cassandra_object/types/boolean_type.rb

@@ -7,7 +7,7 @@ module CassandraObject
       
       def encode(bool)
         unless VALID_VALS.include?(bool)
-          raise ArgumentError.new("#{self} requires a boolean")
+          raise ArgumentError.new("#{bool.inspect} is not a Boolean")
         end
         TRUE_VALS.include?(bool) ? '1' : '0'
       end

data/lib/cassandra_object/types/date_type.rb

@@ -5,7 +5,7 @@ module CassandraObject
       REGEX = /\A\d{4}-\d{2}-\d{2}\Z/
 
       def encode(value)
-        raise ArgumentError.new("#{self} requires a Date") unless value.kind_of?(Date)
+        raise ArgumentError.new("#{value.inspect} is not a Date") unless value.kind_of?(Date)
         value.strftime(FORMAT)
       end
 

data/lib/cassandra_object/types/float_type.rb

@@ -3,7 +3,7 @@ module CassandraObject
     class FloatType < BaseType
       REGEX = /\A[-+]?\d+(\.\d+)?\Z/
       def encode(float)
-        raise ArgumentError.new("#{self} requires a Float") unless float.kind_of?(Float)
+        raise ArgumentError.new("#{float.inspect} is not a Float") unless float.kind_of?(Float)
         float.to_s
       end
 

data/lib/cassandra_object/types/integer_type.rb

@@ -3,7 +3,7 @@ module CassandraObject
     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)
+        raise ArgumentError.new("#{int.inspect} is not an Integer.") unless int.kind_of?(Integer)
         int.to_s
       end
 

data/lib/cassandra_object/types/string_type.rb

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

data/lib/cassandra_object/types/time_type.rb

@@ -10,7 +10,7 @@ module CassandraObject
                 \s*\z/ix
 
       def encode(time)
-        raise ArgumentError.new("#{self} requires a Time") unless time.kind_of?(Time)
+        raise ArgumentError.new("#{time.inspect} is not a Time") unless time.kind_of?(Time)
         time.utc.xmlschema(6)
       end
 

data/test/unit/persistence_test.rb

@@ -7,18 +7,18 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     end
     
     assert_equal(
-      {'schema_version' => 'foo'},
-      klass.encode_attributes({}, 'foo')
+      {},
+      klass.encode_attributes({})
     )
 
     assert_equal(
-      {'schema_version' => 'foo'},
-      klass.encode_attributes({description: nil}, 'foo')
+      {},
+      klass.encode_attributes({description: nil})
     )
 
     assert_equal(
-      {'description' => 'lol', 'schema_version' => 'foo'},
-      klass.encode_attributes({description: 'lol'}, 'foo')
+      {'description' => 'lol'},
+      klass.encode_attributes({description: 'lol'})
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.11.7
+  version: 2.11.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel