gotime-cassandra_object 2.10.8 → 2.10.9

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attribute_methods/typecasting.rb

@@ -27,8 +27,8 @@ module CassandraObject
         # attribute :ammo, type: Ammo, coder: AmmoCodec
         # 
         def attribute(name, options)
-          type  = options.delete :type
-          coder = options.delete :coder
+          type  = options[:type]
+          coder = options[:coder]
 
           if type.is_a?(Symbol)
             coder = CassandraObject::Type.get_coder(type) || (raise "Unknown type #{type}")

data/lib/cassandra_object/timestamps.rb

@@ -3,8 +3,8 @@ module CassandraObject
     extend ActiveSupport::Concern
 
     included do
-      attribute :created_at, type: :time#_with_zone
-      attribute :updated_at, type: :time#_with_zone
+      attribute :created_at, type: :time
+      attribute :updated_at, type: :time
 
       before_create do
         self.created_at ||= Time.current

data/lib/gotime-cassandra_object.rb

@@ -15,7 +15,6 @@ module CassandraObject
   autoload :Identity
   autoload :Serialization
   autoload :Migrations
-  autoload :Cursor
   autoload :Collection
   autoload :Mocking
   autoload :Batches

data/test/unit/identity_test.rb

@@ -29,7 +29,7 @@ class CassandraObject::IdentityTest < CassandraObject::TestCase
       CassandraObject::Identity::UUIDKeyFactory::UUID,
       Issue.parse_key('bb4cbbbc-b7c7-11e0-9ca2-732604ff41fe')
     )
-    
+
     assert_nil Issue.parse_key('fail')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.10.8
+  version: 2.10.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
+date: 2012-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70165426035180 !ruby/object:Gem::Requirement
+  requirement: &70116309308060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165426035180
+  version_requirements: *70116309308060
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70165426031880 !ruby/object:Gem::Requirement
+  requirement: &70116309307600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165426031880
+  version_requirements: *70116309307600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70165426029720 !ruby/object:Gem::Requirement
+  requirement: &70116309307220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165426029720
+  version_requirements: *70116309307220
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -71,7 +71,6 @@ files:
 - lib/cassandra_object/collection.rb
 - lib/cassandra_object/connection.rb
 - lib/cassandra_object/consistency.rb
-- lib/cassandra_object/cursor.rb
 - lib/cassandra_object/errors.rb
 - lib/cassandra_object/finder_methods.rb
 - lib/cassandra_object/generators/migration_generator.rb

data/lib/cassandra_object/cursor.rb

@@ -1,90 +0,0 @@
-module CassandraObject
-  class Cursor
-    include Consistency
-
-    def initialize(target_class, column_family, key, super_column, options={})
-      @target_class  = target_class
-      @column_family = column_family
-      @key           = key.to_s
-      @super_column  = super_column
-      @options       = options
-      @validators    = []
-    end
-    
-    def find(number_to_find)
-      limit       = number_to_find
-      objects     = CassandraObject::Collection.new
-      out_of_keys = false
-
-      if start_with = @options[:start_after]
-        limit += 1
-      else
-        start_with = nil
-      end
-      
-      while objects.size < number_to_find && !out_of_keys
-        index_results = connection.get(@column_family, @key, @super_column,
-          count: limit,
-          start: start_with,
-          reversed: @options[:reversed],
-          consistency: @target_class.thrift_read_consistency)
-
-        out_of_keys  = index_results.size < limit
-
-        if !start_with.blank?
-          index_results.delete(start_with)
-        end
-
-        keys = index_results.keys
-        values = index_results.values
-        
-        missing_keys = []
-        
-        results = values.empty? ? {} : @target_class.multi_get(values)
-        results.each do |(key, result)|
-          if result.nil?
-            missing_keys << key
-          end
-        end
-    
-        unless missing_keys.empty?
-          @target_class.multi_get(missing_keys, :quorum=>true).each do |(key, result)|
-            index_key = index_results.key(key)
-            if result.nil?
-              remove(index_key)
-              results.delete(key)
-            else
-              results[key] = result
-            end
-          end
-        end
-
-        results.values.each do |o|
-          if @validators.all? {|v| v.call(o) }
-            objects << o
-          else
-            remove(index_results.index(o.key))
-          end
-        end
-        
-        start_with = objects.last_column_name = keys.last
-        limit = (number_to_find - results.size) + 1
-        
-      end
-      
-      return objects
-    end
-    
-    def connection
-      @target_class.connection
-    end
-    
-    def remove(index_key)
-      connection.remove(@column_family, @key, @super_column, index_key, consistency: @target_class.thrift_write_consistency)
-    end
-    
-    def validator(&validator)
-      @validators << validator
-    end
-  end
-end