gotime-cassandra_object 2.8.3 → 2.8.4

data/Gemfile

@@ -1,2 +1,6 @@
 source "http://rubygems.org"
 gemspec
+
+group :test do
+  gem 'cassandra', git: 'git://github.com/twitter/cassandra.git', require: 'cassandra/1.0'
+end

data/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'bundler/setup'
 require 'rake'
 require 'rake/testtask'

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attribute_methods.rb

@@ -4,51 +4,13 @@ module CassandraObject
     include ActiveModel::AttributeMethods
 
     included do
-      class_attribute :attribute_definitions
-      self.attribute_definitions = {}
+      alias :[] :read_attribute
+      alias :[]= :write_attribute
 
       attribute_method_suffix("", "=")
-
-      %w(array boolean date float integer json string time time_with_zone).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
-        EOV
-      end
     end
 
     module ClassMethods
-      def inherited(child)
-        super
-        child.attribute_definitions = attribute_definitions.dup
-      end
-
-      # 
-      # attribute :name, type: :string
-      # attribute :ammo, type: Ammo, coder: AmmoCodec
-      # 
-      def attribute(name, options)
-        type  = options.delete :type
-        coder = options.delete :coder
-
-        if type.is_a?(Symbol)
-          coder = CassandraObject::Type.get_coder(type) || (raise "Unknown type #{type}")
-        elsif coder.nil?
-          raise "Must supply a :coder for #{name}"
-        end
-
-        attribute_definitions[name.to_sym] = AttributeMethods::Definition.new(name, coder, options)
-      end
-
-      def instantiate_attribute(record, name, 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
         return if attribute_methods_generated?
         super(attribute_definitions.keys)
@@ -61,7 +23,7 @@ module CassandraObject
     end
 
     def write_attribute(name, value)
-      @attributes[name.to_s] = self.class.instantiate_attribute(self, name, value)
+      @attributes[name.to_s] = self.class.typecast_attribute(self, name, value)
     end
 
     def read_attribute(name)

data/lib/cassandra_object/attribute_methods/typecasting.rb

@@ -0,0 +1,52 @@
+module CassandraObject
+  module AttributeMethods
+    module Typecasting
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :attribute_definitions
+        self.attribute_definitions = {}
+
+        %w(array boolean date float integer json string time time_with_zone).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
+          EOV
+        end
+      end
+
+      module ClassMethods
+        def inherited(child)
+          super
+          child.attribute_definitions = attribute_definitions.dup
+        end
+
+        # 
+        # attribute :name, type: :string
+        # attribute :ammo, type: Ammo, coder: AmmoCodec
+        # 
+        def attribute(name, options)
+          type  = options.delete :type
+          coder = options.delete :coder
+
+          if type.is_a?(Symbol)
+            coder = CassandraObject::Type.get_coder(type) || (raise "Unknown type #{type}")
+          elsif coder.nil?
+            raise "Must supply a :coder for #{name}"
+          end
+
+          attribute_definitions[name.to_sym] = AttributeMethods::Definition.new(name, coder, options)
+        end
+
+        def typecast_attribute(record, name, value)
+          if attribute_definition = attribute_definitions[name.to_sym]
+            attribute_definition.instantiate(record, value)
+          else
+            raise NoMethodError, "Unknown attribute #{name.inspect}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cassandra_object/base.rb

@@ -36,6 +36,7 @@ module CassandraObject
     include Batches
     include AttributeMethods
     include AttributeMethods::Dirty
+    include AttributeMethods::Typecasting
     include Callbacks
     include Validations
     include Associations
@@ -56,7 +57,7 @@ module CassandraObject
       self.attributes = attributes
       attribute_definitions.each do |attr, attribute_definition|
         unless attribute_exists?(attr)
-          self.attributes[attr.to_s] = self.class.instantiate_attribute(self, attr, nil)
+          self.attributes[attr.to_s] = self.class.typecast_attribute(self, attr, nil)
         end
       end
 

data/lib/cassandra_object/batches.rb

@@ -4,7 +4,7 @@ module CassandraObject
 
     module ClassMethods
       def find_each
-        connection.each(column_family) do |k, v|
+        connection.each(column_family, {:count => 500}) do |k, v|
           yield instantiate(k, v)
         end
       end

data/lib/cassandra_object/finder_methods.rb

@@ -24,7 +24,7 @@ module CassandraObject
       def all(options = {})
         limit = options[:limit] || 100
         results = ActiveSupport::Notifications.instrument("get_range.cassandra_object", column_family: column_family, key_count: limit) do
-          connection.get_range(column_family, key_count: limit, consistency: thrift_read_consistency)
+          connection.get_range(column_family, key_count: limit, consistency: thrift_read_consistency, count: 500)
         end
 
         results.map do |k, v|

data/lib/cassandra_object/persistence.rb

@@ -22,11 +22,12 @@ module CassandraObject
       end
 
       def write(key, attributes, schema_version)
-        key.tap do |key|
-          attributes = encode_attributes(attributes, schema_version)
-          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)
-          end
+        attributes = encode_attributes(attributes, schema_version)
+        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?
+            # connection.remove(connection, key.to_s, *nil_attributes)
+          # end          
         end
       end
 
@@ -36,7 +37,7 @@ module CassandraObject
           object.instance_variable_set("@key", parse_key(key)) if key
           object.instance_variable_set("@new_record", false)
           object.instance_variable_set("@destroyed", false)
-          object.instance_variable_set("@attributes", instantiate_attributes(object, attributes))
+          object.instance_variable_set("@attributes", typecast_attributes(object, attributes))
         end
       end
 
@@ -51,7 +52,7 @@ module CassandraObject
         encoded
       end
 
-      def instantiate_attributes(object, attributes)
+      def typecast_attributes(object, attributes)
         attributes = attributes.symbolize_keys
         Hash[attribute_definitions.map { |k, attribute_definition| [k.to_s, attribute_definition.instantiate(object, attributes[k])] }]
       end

data/lib/gotime-cassandra_object.rb

@@ -30,6 +30,7 @@ module CassandraObject
     eager_autoload do
       autoload :Definition
       autoload :Dirty
+      autoload :Typecasting
     end
   end
 

data/test/attribute_methods/definition_test.rb

@@ -4,7 +4,7 @@ class CassandraObject::AttributeMethods::DefinitionTest < CassandraObject::TestC
   class TestType < CassandraObject::Types::BaseType
   end
   
-  test 'instantiate' do
+  test 'typecast' do
     definition = CassandraObject::AttributeMethods::Definition.new(:foo, TestType, {a: :b})
 
     assert_equal 'foo', definition.name

data/test/attribute_methods/typecasting_test.rb

@@ -0,0 +1,87 @@
+require 'test_helper'
+
+class CassandraObject::AttributeMethods::TypecastingTest < CassandraObject::TestCase
+  class CustomType
+  end
+  
+  class CustomCoder < CassandraObject::Types::BaseType
+  end
+
+  class TestIssue < CassandraObject::Base
+    key :uuid
+    self.column_family = 'Issues'
+
+    attribute :custom_column, type: CustomType, coder: CustomCoder
+    boolean :enabled
+    float   :rating
+    integer :price
+    json    :orders
+    string  :name
+  end
+
+  class TestChildIssue < TestIssue
+    string :description
+  end
+
+  test 'attributes not shared' do
+    assert_nothing_raised { Issue.new.description }
+    assert_raise(NoMethodError) { TestIssue.new.description }
+    assert_nothing_raised { TestChildIssue.new.description }
+  end
+
+  test 'custom attribute definer' do
+    model_attribute = TestIssue.attribute_definitions[:custom_column]
+
+    assert_kind_of CustomCoder, model_attribute.coder
+    assert_equal 'custom_column', model_attribute.name
+  end
+
+  test 'typecast_attribute' do
+    assert_equal 1, TestIssue.typecast_attribute(TestIssue.new, 'price', 1)
+    assert_equal 1, TestIssue.typecast_attribute(TestIssue.new, :price, 1)
+
+    assert_raise NoMethodError do
+      TestIssue.typecast_attribute(TestIssue.new, 'wtf', 1)
+    end
+  end
+
+  test 'boolean attribute' do
+    issue = TestIssue.create! enabled: '1'
+    assert_equal true, issue.enabled
+
+    issue = TestIssue.find issue.id
+    assert_equal true, issue.enabled
+  end
+
+  test 'float attribute' do
+    issue = TestIssue.create! rating: '4.5'
+    assert_equal 4.5, issue.rating
+
+    issue = TestIssue.find issue.id
+    assert_equal(4.5, issue.rating)
+  end
+
+  test 'integer attribute' do
+    issue = TestIssue.create! price: '101'
+    assert_equal 101, issue.price
+
+    issue = TestIssue.find issue.id
+    assert_equal(101, issue.price)
+  end
+
+  test 'json attribute' do
+    issue = TestIssue.create! orders: {'a' => 'b'}
+    assert_equal({'a' => 'b'}, issue.orders)
+
+    issue = TestIssue.find issue.id
+    assert_equal({'a' => 'b'}, issue.orders)
+  end
+
+  test 'string attribute' do
+    issue = TestIssue.create! name: 'hola'
+    assert_equal('hola', issue.name)
+
+    issue = TestIssue.find issue.id
+    assert_equal('hola', issue.name)
+  end
+end

data/test/attribute_methods_test.rb

@@ -1,54 +1,31 @@
 require 'test_helper'
 
 class CassandraObject::AttributeMethodsTest < CassandraObject::TestCase
-  class CustomType
-  end
-  
-  class CustomCoder < CassandraObject::Types::BaseType
-  end
-
-  class TestIssue < CassandraObject::Base
-    key :uuid
-    self.column_family = 'Issues'
-
-    attribute :custom_column, type: CustomType, coder: CustomCoder
-    integer :price
-    json :orders
-  end
-
-  class TestChildIssue < TestIssue
-    string :description
-  end
+  test 'read and write attributes' do
+    issue = Issue.new
+    assert_nil issue.read_attribute(:description)
 
-  test 'custom attribute definer' do
-    model_attribute = TestIssue.attribute_definitions[:custom_column]
+    issue.write_attribute(:description, nil)
+    assert_nil issue.read_attribute(:description)
 
-    assert_kind_of CustomCoder, model_attribute.coder
-    assert_equal 'custom_column', model_attribute.name
+    issue.write_attribute(:description, 'foo')
+    assert_equal 'foo', issue.read_attribute(:description)
   end
 
-  test 'json attribute' do
-    issue = TestIssue.create! orders: {'a' => 'b'}
-
-    issue = TestIssue.find issue.id
-
-    assert_equal({'a' => 'b'}, issue.orders)
-  end
+  test 'hash accessor aliases' do
+    issue = Issue.new
 
-  test 'instantiate_attribute' do
-    assert_equal 1, TestIssue.instantiate_attribute(TestIssue.new, 'price', 1)
-    assert_equal 1, TestIssue.instantiate_attribute(TestIssue.new, :price, 1)
+    issue[:description] = 'bar'
 
-    assert_raise NoMethodError do
-      TestIssue.instantiate_attribute(TestIssue.new, 'wtf', 1)
-    end
+    assert_equal 'bar', issue[:description]
   end
 
-  test 'attributes not shared' do
-    assert_nothing_raised { Issue.new.description }
-    assert_raise(NoMethodError) { TestIssue.new.description }
-    assert_nothing_raised { TestChildIssue.new.description }
-  end
+  # test 'attribute_exists' do
+  #   assert !Issue.new.attribute_exists?(:description)
+  #   assert Issue.new(description: nil).attribute_exists?(:description)
+  #   assert Issue.new(description: false).attribute_exists?(:description)
+  #   assert Issue.new(description: 'hey').attribute_exists?(:description)
+  # end
 
   test 'attributes setter' do
     issue = Issue.new
@@ -59,15 +36,4 @@ class CassandraObject::AttributeMethodsTest < CassandraObject::TestCase
 
     assert_equal 'foo', issue.description
   end
-
-  test 'read and write attributes' do
-    issue = Issue.new
-    assert_nil issue.read_attribute(:description)
-
-    issue.write_attribute(:description, nil)
-    assert_nil issue.read_attribute(:description)
-
-    issue.write_attribute(:description, 'foo')
-    assert_equal 'foo', issue.read_attribute(:description)
-  end
 end

data/test/batches_test.rb

@@ -17,12 +17,12 @@ class CassandraObject::BatchesTest < CassandraObject::TestCase
     Issue.create 
     Issue.create
     Issue.create
-    
+
     issue_batches = []
     Issue.find_in_batches(batch_size: 2) do |issues|
       issue_batches << issues
     end
-    
+
     assert_equal 2, issue_batches.size
     assert issue_batches.any? { |issues| issues.size == 2 }
     assert issue_batches.any? { |issues| issues.size == 1 }

data/test/test_helper.rb

@@ -1,8 +1,6 @@
-require 'rubygems'
 require 'bundler/setup'
-require 'test/unit'
-require 'cassandra/0.8'
-require 'gotime-cassandra_object'
+require 'minitest/autorun'
+Bundler.require(:default, :test)
 
 CassandraObject::Base.establish_connection(
   keyspace: 'place_directory_development',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000 Z
+date: 2011-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70160065372480 !ruby/object:Gem::Requirement
+  requirement: &70143745006900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160065372480
+  version_requirements: *70143745006900
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70160065388140 !ruby/object:Gem::Requirement
+  requirement: &70143745002740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70160065388140
+  version_requirements: *70143745002740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70160065387380 !ruby/object:Gem::Requirement
+  requirement: &70143744999540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70160065387380
+  version_requirements: *70143744999540
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -66,6 +66,7 @@ files:
 - lib/cassandra_object/attribute_methods.rb
 - lib/cassandra_object/attribute_methods/definition.rb
 - lib/cassandra_object/attribute_methods/dirty.rb
+- lib/cassandra_object/attribute_methods/typecasting.rb
 - lib/cassandra_object/base.rb
 - lib/cassandra_object/batches.rb
 - lib/cassandra_object/callbacks.rb
@@ -115,6 +116,7 @@ files:
 - test/active_model_test.rb
 - test/attribute_methods/definition_test.rb
 - test/attribute_methods/dirty_test.rb
+- test/attribute_methods/typecasting_test.rb
 - test/attribute_methods_test.rb
 - test/base_test.rb
 - test/batches_test.rb