gotime-cassandra_object 0.8.7 → 0.9.0

data/gotime-cassandra_object.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '0.8.7'
+  s.version = '0.9.0'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.required_rubygems_version = '>= 1.3.5'
-  s.authors = ["Michael Koziarski", "grantr"]
-  s.email = 'grantr@gmail.com'
+  s.authors = ["Michael Koziarski", "gotime"]
+  s.email = 'gems@gotime.com'
   s.homepage = 'http://github.com/gotime/cassandra_object'
   s.extra_rdoc_files = ["README.markdown"]
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency('activesupport', "~> 3")
-  s.add_runtime_dependency('activemodel', "~> 3")
-  s.add_runtime_dependency('cassandra')
+  s.add_runtime_dependency('activesupport', "~> 3.0")
+  s.add_runtime_dependency('activemodel', "~> 3.0")
+  s.add_runtime_dependency('cassandra', "~> 0.11.3")
 
   s.add_development_dependency('shoulda')
   s.add_development_dependency('bundler', "~> 1.0.0")

data/lib/cassandra_object/associations.rb

@@ -11,8 +11,17 @@ module CassandraObject
     end
 
     module ClassMethods
+
+      def relationships_column_family=(column_family)
+        @relationships_column_family = column_family
+      end
+
+      def relationships_column_family
+        @relationships_column_family || "#{column_family}Relationships"
+      end
+
       def column_family_configuration
-        super << {:Name=>"#{name}Relationships", :CompareWith=>"UTF8Type", :CompareSubcolumnsWith=>"TimeUUIDType", :ColumnType=>"Super"}
+        super << {:Name=>relationships_column_family, :CompareWith=>"UTF8Type", :CompareSubcolumnsWith=>"TimeUUIDType", :ColumnType=>"Super"}
       end
       
       def association(association_name, options= {})
@@ -25,8 +34,8 @@ module CassandraObject
       
       def remove(key)
         begin
-          ActiveSupport::Notifications.instrument("remove.cassandra_object", :key => key) do
-            connection.remove("#{name}Relationships", key.to_s, :consistency => write_consistency_for_thrift)
+          ActiveSupport::Notifications.instrument("remove.cassandra_object", :column_family => relationships_column_family, :key => key) do
+            connection.remove(relationships_column_family, key.to_s, :consistency => write_consistency_for_thrift)
           end
         rescue Cassandra::AccessError => e
           raise e unless e.message =~ /Invalid column family/

data/lib/cassandra_object/associations/one_to_many.rb

@@ -27,7 +27,7 @@ module CassandraObject
       def add(owner, record, set_inverse = true)
         key = owner.key
         attributes = {@association_name=>{new_key=>record.key.to_s}}
-        ActiveSupport::Notifications.instrument("insert.cassandra_object", :key => key, :attributes => attributes) do
+        ActiveSupport::Notifications.instrument("insert.cassandra_object", :column_family => column_family, :key => key, :attributes => attributes) do
           connection.insert(column_family, key.to_s, attributes, :consistency => write_consistency_for_thrift)
         end
         if has_inverse? && set_inverse
@@ -40,7 +40,7 @@ module CassandraObject
       end
 
       def column_family
-        @owner_class.to_s + "Relationships"
+        @owner_class.relationships_column_family
       end
 
       def connection

data/lib/cassandra_object/associations/one_to_one.rb

@@ -24,7 +24,9 @@ module CassandraObject
       end
 
       def clear(owner)
-        connection.remove(column_family, owner.key.to_s, @association_name)
+        ActiveSupport::Notifications.instrument("remove.cassandra_object", :column_family => column_family, :key => owner.key, :columns => @association_name) do
+          connection.remove(column_family, owner.key.to_s, @association_name)
+        end
       end
 
       def find(owner)
@@ -37,7 +39,11 @@ module CassandraObject
 
       def set(owner, record, set_inverse = true)
         clear(owner)
-        connection.insert(column_family, owner.key.to_s, {@association_name=>{new_key => record.key.to_s}})
+        key = owner.key
+        attributes = {@association_name=>{new_key=>record.key.to_s}}
+        ActiveSupport::Notifications.instrument("insert.cassandra_object", :column_family => column_family, :key => key, :attributes => attributes) do
+          connection.insert(column_family, key.to_s, attributes, :consistency => write_consistency_for_thrift)
+        end
         if has_inverse? && set_inverse
           inverse.set_inverse(record, owner)
         end
@@ -60,7 +66,7 @@ module CassandraObject
       end
 
       def column_family
-        @owner_class.to_s + "Relationships"
+        @owner_class.relationships_column_family
       end
 
       def connection

data/lib/cassandra_object/identity.rb

@@ -10,6 +10,7 @@ module CassandraObject
     autoload :UUIDKeyFactory
     autoload :NaturalKeyFactory
     autoload :HashedNaturalKeyFactory
+    autoload :CustomKeyFactory
 
     module ClassMethods
       # Indicate what kind of key the model will have: uuid or natural
@@ -23,6 +24,8 @@ module CassandraObject
           UUIDKeyFactory.new
         when :natural
           NaturalKeyFactory.new(*options)
+        when :custom
+          CustomKeyFactory.new(*options)
         else
           name_or_factory
         end

data/lib/cassandra_object/identity/custom_key_factory.rb

@@ -0,0 +1,50 @@
+module CassandraObject
+  module Identity
+    class CustomKeyFactory < AbstractKeyFactory
+      class CustomKey
+        include Key
+
+        attr_reader :value
+
+        def initialize(value)
+          @value = value
+        end
+
+        def to_s
+          value
+        end
+
+        def to_param
+          value
+        end
+
+        def ==(other)
+          other.is_a?(CustomKey) && other.value == value
+        end
+
+        def eql?(other)
+          other == self
+        end
+      end
+
+      attr_reader :method
+
+      def initialize(options)
+        @method = options[:method]
+      end
+
+      def next_key(object)
+        CustomKey.new(object.send(@method))
+      end
+
+      def parse(paramized_key)
+        CustomKey.new(paramized_key)
+      end
+
+      def create(paramized_key)
+        CustomKey.new(paramized_key)
+      end
+    end
+  end
+end
+

data/lib/cassandra_object/log_subscriber.rb

@@ -1,31 +1,34 @@
 module CassandraObject
   class LogSubscriber < ActiveSupport::LogSubscriber
     def multi_get(event)
-      name = 'CassandraObject multi_get (%.1fms)' % event.duration
+      name = '%s multi_get (%.1fms)' % [event.payload[:column_family], event.duration]
 
       debug "  #{name}  (#{event.payload[:keys].size}) #{event.payload[:keys].join(" ")}"
     end
 
     def remove(event)
-      name = 'CassandraObject remove (%.1fms)' % event.duration
+      name = '%s remove (%.1fms)' % [event.payload[:column_family], event.duration]
 
-      debug "  #{name}  #{event.payload[:key]}"
+      message = "  #{name}  #{event.payload[:key]}"
+      message << " #{Array(event.payload[:attributes]).inspect}" if event.payload[:attributes]
+
+      debug message
     end
 
     def truncate(event)
-      name = 'CassandraObject truncate (%.1fms)' % event.duration
+      name = '%s truncate (%.1fms)' % [event.payload[:column_family], event.duration]
 
       debug "  #{name}  #{event.payload[:column_family]}"
     end
 
     def insert(event)
-      name = 'CassandraObject insert (%.1fms)' % event.duration
+      name = '%s insert (%.1fms)' % [event.payload[:column_family], event.duration]
 
       debug "  #{name}  #{event.payload[:key]} #{event.payload[:attributes].inspect}"
     end
 
     def get_range(event)
-      name = 'CassandraObject get_range (%.1fms)' % event.duration
+      name = '%s get_range (%.1fms)' % [event.payload[:column_family], event.duration]
       
       debug "  #{name}  (#{event.payload[:count]}) '#{event.payload[:start]}' => '#{event.payload[:finish]}'"
     end

data/lib/cassandra_object/persistence.rb

@@ -27,18 +27,18 @@ module CassandraObject
         end
       end
 
-      def get(key, options = {})
+      def get(key, options={})
         multi_get([key], options).values.first
       end
 
-      def multi_get(keys, options = {})
-        options = {:consistency => self.read_consistency, :limit => 100}.merge(options)
+      def multi_get(keys, options={})
+        options = {:consistency => self.read_consistency}.merge(options)
         unless valid_read_consistency_level?(options[:consistency])
           raise ArgumentError, "Invalid read consistency level: '#{options[:consistency]}'. Valid options are [:quorum, :one]"
         end
 
-        attribute_results = ActiveSupport::Notifications.instrument("multi_get.cassandra_object", :keys => keys) do
-          connection.multi_get(column_family, keys.map(&:to_s), :count=>options[:limit], :consistency=>consistency_for_thrift(options[:consistency]))
+        attribute_results = ActiveSupport::Notifications.instrument("multi_get.cassandra_object", :column_family => column_family, :keys => keys) do
+          connection.multi_get(column_family, keys.map(&:to_s), :consistency => consistency_for_thrift(options[:consistency]))
         end
 
         attribute_results.inject(ActiveSupport::OrderedHash.new) do |memo, (key, attributes)|
@@ -52,7 +52,7 @@ module CassandraObject
       end
 
       def remove(key)
-        ActiveSupport::Notifications.instrument("remove.cassandra_object", :key => key) do
+        ActiveSupport::Notifications.instrument("remove.cassandra_object", :column_family => column_family, :key => key) do
           connection.remove(column_family, key.to_s, :consistency => write_consistency_for_thrift)
         end
       end
@@ -66,25 +66,22 @@ module CassandraObject
       def all(keyrange = ''..'', options = {})
         options = {:consistency => self.read_consistency, :limit => 100}.merge(options)
         count = options[:limit]
-        results = ActiveSupport::Notifications.instrument("get_range.cassandra_object", :start => keyrange.first, :finish => keyrange.last, :count => count) do
-          connection.get_range(column_family, :start => keyrange.first, :finish => keyrange.last, :count => count, :consistency=>consistency_for_thrift(options[:consistency]))
+        results = ActiveSupport::Notifications.instrument("get_range.cassandra_object", :column_family => column_family, :start => keyrange.first, :finish => keyrange.last, :key_count => count) do
+          connection.get_range(column_family, :start => keyrange.first, :finish => keyrange.last, :key_count => count, :consistency => consistency_for_thrift(options[:consistency]))
         end
 
-        results.map do |result|
-          if result.columns.empty?
+        #get_ranges response changed in cassandra gem 0.11.3 for cassandra 0.8.1, now similar to other method responses like multi_get
+        results.map do |k, v|
+          if v.empty?
             nil
           else
-            attributes = result.columns.inject(ActiveSupport::OrderedHash.new) do |memo, column|
-              memo[column.column.name] = column.column.value
-              memo
-            end
-            instantiate(result.key, attributes)
+            instantiate(k, v)
           end
         end.compact
       end
 
       def first(keyrange = ''..'', options = {})
-        all(keyrange, options.merge(:limit=>1)).first
+        all(keyrange, options.merge(:limit => 1)).first
       end
 
       def create(attributes)
@@ -96,7 +93,7 @@ module CassandraObject
       def write(key, attributes, schema_version)
         key.tap do |key|
           attributes = encode_columns_hash(attributes, schema_version)
-          ActiveSupport::Notifications.instrument("insert.cassandra_object", :key => key, :attributes => attributes) do
+          ActiveSupport::Notifications.instrument("insert.cassandra_object", :column_family => column_family, :key => key, :attributes => attributes) do
             connection.insert(column_family, key.to_s, attributes, :consistency => write_consistency_for_thrift)
           end
         end
@@ -133,7 +130,7 @@ module CassandraObject
       end
       
       def column_family_configuration
-        [{:Name=>column_family, :CompareWith=>"UTF8Type"}]
+        [{:Name => column_family, :CompareWith => "UTF8Type"}]
       end
 
     end

data/lib/cassandra_object/timestamps.rb

@@ -13,11 +13,11 @@ module CassandraObject
     end
 
     def set_created_at
-      self.created_at = Time.current unless self.class.timestamp_override
+      self.created_at = Time.current unless timestamp_override
     end
 
     def set_updated_at
-      self.updated_at = Time.current unless self.class.timestamp_override
+      self.updated_at = Time.current unless timestamp_override
     end
   end
 end

data/lib/cassandra_object/types.rb

@@ -123,7 +123,6 @@ module CassandraObject
     module_function :encode
 
     def decode(str)
-      return nil if str.empty?
       ActiveSupport::JSON.decode(str)
     end
     module_function :decode

metadata

@@ -1,17 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.8.7
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Michael Koziarski
-- grantr
+- gotime
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -07:00
+date: 2011-07-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +26,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "3"
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -33,7 +40,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "3"
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -42,9 +52,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        segments: 
+        - 0
+        - 11
+        - 3
+        version: 0.11.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -55,6 +69,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -66,6 +82,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id005
@@ -77,6 +97,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
   type: :development
   version_requirements: *id006
@@ -88,11 +112,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id007
 description: Cassandra ActiveModel
-email: grantr@gmail.com
+email: gems@gotime.com
 executables: []
 
 extensions: []
@@ -127,6 +153,7 @@ files:
 - lib/cassandra_object/generators/templates/migration.rb.erb
 - lib/cassandra_object/identity.rb
 - lib/cassandra_object/identity/abstract_key_factory.rb
+- lib/cassandra_object/identity/custom_key_factory.rb
 - lib/cassandra_object/identity/hashed_natural_key_factory.rb
 - lib/cassandra_object/identity/key.rb
 - lib/cassandra_object/identity/natural_key_factory.rb
@@ -184,17 +211,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 5
       version: 1.3.5
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Cassandra ActiveModel