gotime-cassandra_object 2.7.0 → 2.7.1

data/README.rdoc

@@ -6,8 +6,11 @@ Cassandra Object uses ActiveModel to mimic much of the behavior in ActiveRecord.
 
 Add the following to your Gemfile:
 
+  gem 'cassandra', require: '0.8'
   gem 'gotime-cassandra_object'
 
+Change the version of Cassandra accordingly. Recent versions have not been backward compatible.
+
 == Defining Models
 
   class Widget < CassandraObject::Base

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/{attributes.rb → attribute_methods.rb}

@@ -1,31 +1,14 @@
 module CassandraObject
-  class Attribute
-    attr_reader :name, :coder, :expected_type
-    def initialize(name, type_mapping, options)
-      @name           = name.to_s
-      @coder          = type_mapping.coder.new(options)
-      @expected_type  = type_mapping.expected_type
-    end
-
-    def instantiate(record, value)
-      value ||= coder.default
-      return unless value
-        
-      value = value.kind_of?(expected_type) ? value : coder.decode(value)
-      coder.wrap(record, name, value)
-    end
-  end
-
-  module Attributes
+  module AttributeMethods
     extend ActiveSupport::Concern
     include ActiveModel::AttributeMethods
 
     included do
-      class_attribute :model_attributes
-      self.model_attributes = {}
+      class_attribute :attribute_definitions
+      self.attribute_definitions = {}
 
       attribute_method_suffix("", "=")
-      
+
       %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 = {})
@@ -38,7 +21,7 @@ module CassandraObject
     module ClassMethods
       def inherited(child)
         super
-        child.model_attributes = model_attributes.dup
+        child.attribute_definitions = attribute_definitions.dup
       end
 
       # 
@@ -47,7 +30,7 @@ module CassandraObject
       # 
       def attribute(name, options)
         expected_type = options.delete :type
-        coder = options.delete :coder
+        coder         = options.delete :coder
 
         if expected_type.is_a?(Symbol)
           type_mapping = CassandraObject::Type.get_mapping(expected_type) || (raise "Unknown type #{type}")
@@ -57,7 +40,7 @@ module CassandraObject
           type_mapping = CassandraObject::Type::TypeMapping.new(expected_type, coder)
         end
 
-        model_attributes[name.to_sym] = Attribute.new(name, type_mapping, options)
+        attribute_definitions[name.to_sym] = AttributeMethods::Definition.new(name, type_mapping, options)
       end
 
       def json(name, options = {})
@@ -65,15 +48,15 @@ module CassandraObject
       end
 
       def instantiate_attribute(record, name, value)
-        if model_attribute = model_attributes[name.to_sym]
-          model_attribute.instantiate(record, value)
+        if attribute_definition = attribute_definitions[name.to_sym]
+          attribute_definition.instantiate(record, value)
         else
           raise NoMethodError, "Unknown attribute #{name.inspect}"
         end
       end
 
       def define_attribute_methods
-        super(model_attributes.keys)
+        super(attribute_definitions.keys)
       end
     end
 
@@ -107,7 +90,7 @@ module CassandraObject
 
     protected
       def attribute_method?(name)
-        !!model_attributes[name.to_sym]
+        !!attribute_definitions[name.to_sym]
       end
 
     private

data/lib/cassandra_object/attribute_methods/definition.rb

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

data/lib/cassandra_object/attribute_methods/dirty.rb

@@ -0,0 +1,44 @@
+module CassandraObject
+  module AttributeMethods
+    module Dirty
+      extend ActiveSupport::Concern
+      include ActiveModel::Dirty
+
+      # Attempts to +save+ the record and clears changed attributes if successful.
+      def save(*) #:nodoc:
+        if status = super
+          @previously_changed = changes
+          @changed_attributes.clear
+        end
+        status
+      end
+
+      # Attempts to <tt>save!</tt> the record and clears changed attributes if successful.
+      def save!(*) #:nodoc:
+        super.tap do
+          @previously_changed = changes
+          @changed_attributes.clear
+        end
+      end
+
+      # <tt>reload</tt> the record and clears changed attributes.
+      def reload
+        super.tap do
+          @previously_changed.try :clear
+          @changed_attributes.clear
+        end
+      end
+
+      def write_attribute(name, value)
+        name = name.to_s
+        old = read_attribute(name)
+
+        super
+
+        unless attribute_changed?(name) || old == read_attribute(name)
+          changed_attributes[name] = old
+        end
+      end
+    end
+  end
+end

data/lib/cassandra_object/base.rb

@@ -31,14 +31,14 @@ module CassandraObject
     include Connection
     include Consistency
     include Identity
-    include Attributes
+    include FinderMethods
     include Persistence
+    include Batches
+    include AttributeMethods
+    include AttributeMethods::Dirty
     include Callbacks
-    include Dirty
     include Validations
     include Associations
-    include Batches
-    include FinderMethods
     include Timestamps
 
     attr_reader :attributes
@@ -54,9 +54,9 @@ module CassandraObject
       @destroyed = false
       @attributes = {}
       self.attributes = attributes
-      model_attributes.each do |k, model_attribute|
-        unless read_attribute(k)
-          write_attribute(k, model_attribute.instantiate(self, nil))
+      attribute_definitions.each do |attr, attribute_definition|
+        unless read_attribute(attr)
+          write_attribute(attr, attribute_definition.instantiate(self, nil))
         end
       end
 
@@ -69,7 +69,7 @@ module CassandraObject
 
     def hash
       id.hash
-    end    
+    end
 
     def ==(comparison_object)
       comparison_object.equal?(self) ||

data/lib/cassandra_object/persistence.rb

@@ -45,14 +45,14 @@ 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.to_sym].coder.encode(value).force_encoding('ASCII-8BIT')
+          memo[column_name.to_s] = value.nil? ? '' : attribute_definitions[column_name.to_sym].coder.encode(value).force_encoding('ASCII-8BIT')
           memo
         end.merge({"schema_version" => schema_version.to_s})
       end
 
       def instantiate_attributes(object, attributes)
         attributes = attributes.symbolize_keys
-        Hash[model_attributes.map { |k, model_attribute| [k.to_s, model_attribute.instantiate(object, attributes[k])] }]
+        Hash[attribute_definitions.map { |k, attribute_definition| [k.to_s, attribute_definition.instantiate(object, attributes[k])] }]
       end
     end
 

data/lib/cassandra_object/types/array_type.rb

@@ -13,6 +13,13 @@ module CassandraObject
         end
 
         def <<(obj)
+          modifying do
+            super
+            setify!
+          end
+        end
+
+        def delete(obj)
           modifying do
             super
           end
@@ -32,7 +39,6 @@ module CassandraObject
             end
 
             result = yield
-            setify!
 
             if !record.changed_attributes.key?(name) && original != self
               record.changed_attributes[name] = original

data/lib/gotime-cassandra_object.rb

@@ -6,8 +6,7 @@ module CassandraObject
 
   autoload :Base
   autoload :Connection
-  autoload :Attributes
-  autoload :Dirty
+  autoload :AttributeMethods
   autoload :Consistency
   autoload :Persistence
   autoload :Callbacks
@@ -25,6 +24,15 @@ module CassandraObject
   autoload :Type
   autoload :Schema
 
+  module AttributeMethods
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :Definition
+      autoload :Dirty
+    end
+  end
+
   module Tasks
     extend ActiveSupport::Autoload
     autoload :Keyspace

data/test/attribute_methods/dirty_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+class CassandraObject::AttributeMethods::DirtyTest < CassandraObject::TestCase
+  test 'save clears dirty' do
+    record = temp_object do
+      string :name
+    end.new name: 'foo'
+    
+    assert record.changed?
+
+    record.save!
+
+    assert !record.changed?
+  end
+
+  test 'reload clears dirty' do
+    record = temp_object do
+      string :name
+    end.create! name: 'foo'
+
+    record.name = 'bar'
+    assert record.changed?
+
+    record.reload
+
+    assert !record.changed?
+  end
+
+  test 'typecase before dirty check' do
+    record = temp_object do
+      float :price
+    end.create(price: 5.01)
+
+    record.price = '5.01'
+    assert !record.changed?
+
+    record.price = '7.12'
+    assert record.changed?
+  end
+end

data/test/{attributes_test.rb → attribute_methods_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class CassandraObject::AttributesTest < CassandraObject::TestCase
+class CassandraObject::AttributeMethodsTest < CassandraObject::TestCase
   class CustomType
   end
   
@@ -21,7 +21,7 @@ class CassandraObject::AttributesTest < CassandraObject::TestCase
   end
 
   test 'custom attribute definer' do
-    model_attribute = TestIssue.model_attributes[:custom_column]
+    model_attribute = TestIssue.attribute_definition[:custom_column]
 
     assert_kind_of CustomCoder, model_attribute.coder
     assert_equal CustomType, model_attribute.expected_type

data/test/test_helper.rb

@@ -19,10 +19,18 @@ module CassandraObject
     teardown do
       Issue.delete_all
     end
-
+    
     def connection
       CassandraObject::Base.connection
     end
+
+    def temp_object(&block)
+      Class.new(CassandraObject::Base) do
+        key :uuid
+        self.column_family = 'Issues'
+        instance_eval(&block)
+      end
+    end
   end
 
   module Types

data/test/types/array_type_test.rb

@@ -19,16 +19,24 @@ class CassandraObject::Types::ArrayTypeTest < CassandraObject::Types::TestCase
     array :favorite_colors, unique: true
   end
 
-  test 'wrap' do
+  test 'append marks dirty' do
     issue = TestIssue.create favorite_colors: []
     assert !issue.changed?
-    assert_kind_of Array, issue.favorite_colors
 
     issue.favorite_colors << 'red'
     assert issue.changed?
     assert_equal({'favorite_colors' => [[], ['red']]}, issue.changes)
   end
 
+  test 'delete marks dirty' do
+    issue = TestIssue.create favorite_colors: ['red']
+    assert !issue.changed?
+
+    issue.favorite_colors.delete('red')
+    assert issue.changed?
+    assert_equal({'favorite_colors' => [['red'], []]}, issue.changes)
+  end
+
   test 'unique array' do
     issue = TestIssue.create favorite_colors: ['blue', 'red']
 

data/test/types/boolean_type_test.rb

@@ -5,7 +5,7 @@ class CassandraObject::Types::BooleanTypeTest < CassandraObject::Types::TestCase
     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')

data/test/types/float_type_test.rb

@@ -1,5 +1,20 @@
 require 'test_helper'
 
-class CassandraObject::Type::FloatTypeTest < CassandraObject::Types::TestCase
-  
+class CassandraObject::Types::FloatTypeTest < CassandraObject::Types::TestCase
+  test 'encode' do
+    assert_equal '5.01', coder.encode(5.01)
+    
+    assert_raise ArgumentError do
+      coder.encode('x')
+    end
+  end
+
+  test 'decode' do
+    assert_equal 3.14, coder.decode('3.14')
+    assert_equal 5, coder.decode('5')
+
+    assert_raise ArgumentError do
+      coder.decode('xyz')
+    end
+  end
 end

data/test/validations_test.rb

@@ -12,4 +12,16 @@ class CassandraObject::ValidationsTest < CassandraObject::TestCase
       Issue.reset_callbacks(:validate)
     end
   end
+
+  test 'save!' do
+    begin
+      Issue.validates(:description, presence: true)
+
+      Issue.new(description: 'lol').save!
+
+      assert_raise(CassandraObject::RecordInvalid) { Issue.new(description: '').save! }
+    ensure
+      Issue.reset_callbacks(:validate)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-08-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70185349554920 !ruby/object:Gem::Requirement
+  requirement: &70132262094800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70185349554920
+  version_requirements: *70132262094800
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70185349554140 !ruby/object:Gem::Requirement
+  requirement: &70132262094260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70185349554140
+  version_requirements: *70132262094260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70185349553500 !ruby/object:Gem::Requirement
+  requirement: &70132262093740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70185349553500
+  version_requirements: *70132262093740
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -63,7 +63,9 @@ files:
 - lib/cassandra_object/associations.rb
 - lib/cassandra_object/associations/one_to_many.rb
 - lib/cassandra_object/associations/one_to_one.rb
-- lib/cassandra_object/attributes.rb
+- lib/cassandra_object/attribute_methods.rb
+- lib/cassandra_object/attribute_methods/definition.rb
+- lib/cassandra_object/attribute_methods/dirty.rb
 - lib/cassandra_object/base.rb
 - lib/cassandra_object/batches.rb
 - lib/cassandra_object/callbacks.rb
@@ -71,7 +73,6 @@ files:
 - lib/cassandra_object/connection.rb
 - lib/cassandra_object/consistency.rb
 - lib/cassandra_object/cursor.rb
-- lib/cassandra_object/dirty.rb
 - lib/cassandra_object/errors.rb
 - lib/cassandra_object/finder_methods.rb
 - lib/cassandra_object/generators/migration_generator.rb
@@ -113,13 +114,14 @@ files:
 - lib/cassandra_object/validations.rb
 - lib/gotime-cassandra_object.rb
 - test/active_model_test.rb
-- test/attributes_test.rb
+- test/attribute_methods/definition_test.rb
+- test/attribute_methods/dirty_test.rb
+- test/attribute_methods_test.rb
 - test/base_test.rb
 - test/batches_test.rb
 - 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
@@ -162,13 +164,14 @@ specification_version: 3
 summary: Cassandra ActiveModel
 test_files:
 - test/active_model_test.rb
-- test/attributes_test.rb
+- test/attribute_methods/definition_test.rb
+- test/attribute_methods/dirty_test.rb
+- test/attribute_methods_test.rb
 - test/base_test.rb
 - test/batches_test.rb
 - 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

data/lib/cassandra_object/dirty.rb

@@ -1,42 +0,0 @@
-module CassandraObject
-  module Dirty
-    extend ActiveSupport::Concern
-    include ActiveModel::Dirty
-
-    # Attempts to +save+ the record and clears changed attributes if successful.
-    def save(*) #:nodoc:
-      if status = super
-        @previously_changed = changes
-        @changed_attributes.clear
-      end
-      status
-    end
-
-    # Attempts to <tt>save!</tt> the record and clears changed attributes if successful.
-    def save!(*) #:nodoc:
-      super.tap do
-        @previously_changed = changes
-        @changed_attributes.clear
-      end
-    end
-
-    # <tt>reload</tt> the record and clears changed attributes.
-    def reload
-      super.tap do
-        @previously_changed.try :clear
-        @changed_attributes.clear
-      end
-    end
-
-    def write_attribute(name, value)
-      name = name.to_s
-      old = read_attribute(name)
-
-      super
-
-      unless attribute_changed?(name) || old == read_attribute(name)
-        changed_attributes[name] = old
-      end
-    end
-  end
-end

data/test/dirty_test.rb

@@ -1,28 +0,0 @@
-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
-
-  test 'reload clears dirty' do
-    record = TestRecord.create! name: 'foo'
-    record.name = 'bar'
-    assert record.changed?
-
-    record.reload
-
-    assert !record.changed?
-  end
-end