gotime-cassandra_object 0.7.2 → 0.7.3

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/gotime-cassandra_object.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gotime-cassandra_object}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Koziarski", "grantr"]
-  s.date = %q{2011-02-03}
+  s.date = %q{2011-02-04}
   s.description = %q{Cassandra ActiveModel}
   s.email = %q{grantr@gmail.com}
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/cassandra_object/base.rb",
     "lib/cassandra_object/callbacks.rb",
     "lib/cassandra_object/collection.rb",
+    "lib/cassandra_object/consistency.rb",
     "lib/cassandra_object/cursor.rb",
     "lib/cassandra_object/dirty.rb",
     "lib/cassandra_object/generators/migration_generator.rb",

data/lib/cassandra_object.rb

@@ -5,7 +5,7 @@ require 'active_model'
 
 
 module CassandraObject
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
   extend ActiveSupport::Autoload
 
   autoload :Base

data/lib/cassandra_object/associations.rb

@@ -25,7 +25,7 @@ module CassandraObject
       def remove(key)
         begin
           ActiveSupport::Notifications.instrument("remove.cassandra_object", :key => key) do
-            connection.remove("#{name}Relationships", key.to_s)
+            connection.remove("#{name}Relationships", 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

@@ -1,22 +1,34 @@
 module CassandraObject
   class OneToManyAssociation
+    include Consistency
+
+    attr_accessor :write_consistency
+    attr_accessor :read_consistency
+
     def initialize(association_name, owner_class, options)
       @association_name  = association_name.to_s
       @owner_class       = owner_class
       @target_class_name = options[:class_name] || association_name.to_s.singularize.camelize
       @options           = options
+
+      @write_consistency = owner_class.write_consistency
+      @read_consistency = owner_class.write_consistency
       
       define_methods!
     end
     
     def find(owner, options = {})
       reversed = options.has_key?(:reversed) ? options[:reversed] : reversed?
-      cursor   = CassandraObject::Cursor.new(target_class, column_family, owner.key.to_s, @association_name, :start_after => options[:start_after], :reversed => reversed)
+      cursor   = CassandraObject::Cursor.new(target_class, column_family, owner.key.to_s, @association_name, :start_after => options[:start_after], :reversed => reversed, :consistency => read_consistency)
       cursor.find(options[:limit] || 100)
     end
     
     def add(owner, record, set_inverse = true)
-      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", :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

data/lib/cassandra_object/base.rb

@@ -2,6 +2,7 @@ require 'cassandra/0.7'
 require 'set'
 require 'cassandra_object/attributes'
 require 'cassandra_object/dirty'
+require 'cassandra_object/consistency'
 require 'cassandra_object/persistence'
 
 require 'cassandra_object/callbacks'
@@ -11,7 +12,6 @@ require 'cassandra_object/identity'
 require 'cassandra_object/indexes'
 require 'cassandra_object/serialization'
 require 'cassandra_object/associations'
-#require 'cassandra_object/sets'
 require 'cassandra_object/migrations'
 require 'cassandra_object/cursor'
 require 'cassandra_object/collection'

data/lib/cassandra_object/consistency.rb

@@ -0,0 +1,30 @@
+module CassandraObject
+  module Consistency
+    VALID_READ_CONSISTENCY_LEVELS = [:one, :quorum, :all]
+    VALID_WRITE_CONSISTENCY_LEVELS = VALID_READ_CONSISTENCY_LEVELS
+
+    def valid_read_consistency_level?(level)
+      !!VALID_READ_CONSISTENCY_LEVELS.include?(level)
+    end
+
+    def valid_write_consistency_level?(level)
+      !!VALID_WRITE_CONSISTENCY_LEVELS.include?(level)
+    end
+
+    def write_consistency_for_thrift
+      consistency_for_thrift(write_consistency)
+    end
+
+    def read_consistency_for_thrift
+      consistency_for_thrift(read_consistency)
+    end
+
+    def consistency_for_thrift(consistency)
+      {
+        :one    => Cassandra::Consistency::ONE, 
+        :quorum => Cassandra::Consistency::QUORUM,
+        :all    => Cassandra::Consistency::ALL
+      }[consistency]
+    end
+  end
+end

data/lib/cassandra_object/cursor.rb

@@ -1,11 +1,15 @@
 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
+      @read_consistency = options[:read_consistency] || options[:consistency] || :quorum
+      @write_consitency = options[:write_consistency] || options[:consistency] || :quorum
       @validators    = []
     end
     
@@ -23,7 +27,8 @@ module CassandraObject
       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])
+                                                                            :reversed=>@options[:reversed],
+                                                                            :consistency=>consistency_for_thrift(@read_consistency))
 
         out_of_keys  = index_results.size < limit
 
@@ -76,11 +81,11 @@ module CassandraObject
     end
     
     def remove(index_key)
-      connection.remove(@column_family, @key, @super_column, index_key)
+      connection.remove(@column_family, @key, @super_column, index_key, :consistency => consistency_for_thrift(@write_consistency))
     end
     
     def validator(&validator)
       @validators << validator
     end
   end
-end
+end

data/lib/cassandra_object/log_subscriber.rb

@@ -12,6 +12,12 @@ module CassandraObject
       debug "  #{name}  #{event.payload[:key]}"
     end
 
+    def truncate(event)
+      name = 'CassandraObject truncate (%.1fms)' % event.duration
+
+      debug "  #{name}  #{event.payload[:column_family]}"
+    end
+
     def insert(event)
       name = 'CassandraObject insert (%.1fms)' % event.duration
 
@@ -21,7 +27,7 @@ module CassandraObject
     def get_range(event)
       name = 'CassandraObject get_range (%.1fms)' % event.duration
       
-      debug "  #{name}  (#{event.payload[:count]}) #{event.payload[:start]} => #{event.payload[:finish]}"
+      debug "  #{name}  (#{event.payload[:count]}) '#{event.payload[:start]}' => '#{event.payload[:finish]}'"
     end
   end
 end

data/lib/cassandra_object/persistence.rb

@@ -2,38 +2,31 @@ module CassandraObject
   module Persistence
     extend ActiveSupport::Concern
     included do
-      class_inheritable_writer :write_consistency
-      class_inheritable_writer :read_consistency
+      extend Consistency
+
+      class_attribute :write_consistency
+      class_attribute :read_consistency
+      self.write_consistency = self.read_consistency = :quorum
     end
 
-    VALID_READ_CONSISTENCY_LEVELS = [:one, :quorum, :all]
-    VALID_WRITE_CONSISTENCY_LEVELS = VALID_READ_CONSISTENCY_LEVELS
 
     module ClassMethods
       def consistency_levels(levels)
         if levels.has_key?(:write)
           unless valid_write_consistency_level?(levels[:write])
-            raise ArgumentError, "Invalid write consistency level. Valid levels are: #{VALID_WRITE_CONSISTENCY_LEVELS.inspect}. You gave me #{levels[:write].inspect}"
+            raise ArgumentError, "Invalid write consistency level. Valid levels are: #{Consistency::VALID_WRITE_CONSISTENCY_LEVELS.inspect}. You gave me #{levels[:write].inspect}"
           end
           self.write_consistency = levels[:write]
         end
 
         if levels.has_key?(:read)
           unless valid_read_consistency_level?(levels[:read])
-            raise ArgumentError, "Invalid read consistency level. Valid levels are #{VALID_READ_CONSISTENCY_LEVELS.inspect}. You gave me #{levels[:write].inspect}"
+            raise ArgumentError, "Invalid read consistency level. Valid levels are #{Consistency::VALID_READ_CONSISTENCY_LEVELS.inspect}. You gave me #{levels[:write].inspect}"
           end
           self.read_consistency = levels[:read]
         end
       end
 
-      def write_consistency
-        read_inheritable_attribute(:write_consistency) || :quorum
-      end
-
-      def read_consistency
-        read_inheritable_attribute(:read_consistency) || :quorum
-      end
-
       def get(key, options = {})
         multi_get([key], options).values.first
       end
@@ -65,13 +58,16 @@ module CassandraObject
       end
 
       def delete_all
-        connection.truncate!(column_family)
+        ActiveSupport::Notifications.instrument("truncate.cassandra_object", :column_family => column_family) do
+          connection.truncate!(column_family)
+        end
       end
 
       def all(keyrange = ''..'', options = {})
-        count = options[:limit] || 100
+        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)
+          connection.get_range(column_family, :start => keyrange.first, :finish => keyrange.last, :count => count, :consistency=>consistency_for_thrift(options[:consistency]))
         end
 
         results.map do |result|
@@ -137,30 +133,6 @@ module CassandraObject
         [{:Name=>column_family, :CompareWith=>"UTF8Type"}]
       end
 
-      protected
-      def valid_read_consistency_level?(level)
-        !!VALID_READ_CONSISTENCY_LEVELS.include?(level)
-      end
-
-      def valid_write_consistency_level?(level)
-        !!VALID_WRITE_CONSISTENCY_LEVELS.include?(level)
-      end
-
-      def write_consistency_for_thrift
-        consistency_for_thrift(write_consistency)
-      end
-
-      def read_consistency_for_thrift
-        consistency_for_thrift(read_consistency)
-      end
-
-      def consistency_for_thrift(consistency)
-        {
-          :one    => Cassandra::Consistency::ONE, 
-          :quorum => Cassandra::Consistency::QUORUM,
-          :all    => Cassandra::Consistency::ALL
-        }[consistency]
-      end
     end
 
     module InstanceMethods

data/lib/cassandra_object/types.rb

@@ -26,7 +26,7 @@ module CassandraObject
     module_function :encode
 
     def decode(str)
-      return nil if str == ''
+      return nil if str.empty?
       raise ArgumentError.new("#{str} isn't a String that looks like a Float") unless str.kind_of?(String) && str.match(REGEX)
       str.to_f
     end
@@ -37,12 +37,14 @@ module CassandraObject
     FORMAT = '%Y-%m-%d'
     REGEX = /\A\d{4}-\d{2}-\d{2}\Z/
     def encode(date)
+      return '' if date.nil?
       raise ArgumentError.new("#{self} requires a Date") unless date.kind_of?(Date)
       date.strftime(FORMAT)
     end
     module_function :encode
 
     def decode(str)
+      return nil if str.empty?
       raise ArgumentError.new("#{str} isn't a String that looks like a Date") unless str.kind_of?(String) && str.match(REGEX)
       Date.strptime(str, FORMAT)
     end
@@ -60,12 +62,14 @@ module CassandraObject
               \s*\z/ix
 
     def encode(time)
+      return '' if time.nil?
       raise ArgumentError.new("#{self} requires a Time") unless time.kind_of?(Time)
       time.xmlschema(6)
     end
     module_function :encode
 
     def decode(str)
+      return nil if str.empty?
       raise ArgumentError.new("#{str} isn't a String that looks like a Time") unless str.kind_of?(String) && str.match(REGEX)
       Time.xmlschema(str)
     end
@@ -86,6 +90,7 @@ module CassandraObject
 
   module StringType
     def encode(str)
+      return '' if str.nil?
       raise ArgumentError.new("#{self} requires a String") unless str.kind_of?(String)
       str.dup
     end
@@ -99,6 +104,7 @@ module CassandraObject
   
   module UTF8StringType
     def encode(str)
+      return '' if str.nil?
       # This is technically the most correct, but it is a pain to require utf-8 encoding for all strings. Should revisit.
       #raise ArgumentError.new("#{self} requires a UTF-8 encoded String") unless str.kind_of?(String) && str.encoding == Encoding::UTF_8
       raise ArgumentError.new("#{self} requires a String") unless str.kind_of?(String)
@@ -114,12 +120,14 @@ module CassandraObject
 
   module HashType
     def encode(hash)
+      return '' if hash.nil?
       raise ArgumentError.new("#{self} requires a Hash") unless hash.kind_of?(Hash)
       ActiveSupport::JSON.encode(hash)
     end
     module_function :encode
 
     def decode(str)
+      return nil if str.empty?
       ActiveSupport::JSON.decode(str)
     end
     module_function :decode

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Michael Koziarski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -08:00
+date: 2011-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,6 +154,7 @@ files:
 - lib/cassandra_object/base.rb
 - lib/cassandra_object/callbacks.rb
 - lib/cassandra_object/collection.rb
+- lib/cassandra_object/consistency.rb
 - lib/cassandra_object/cursor.rb
 - lib/cassandra_object/dirty.rb
 - lib/cassandra_object/generators/migration_generator.rb
@@ -212,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1322377841718968228
+      hash: -32715678761257107
       segments: 
       - 0
       version: "0"