gotime-cassandra_object 0.8.2 → 0.8.3

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '0.8.2'
+  s.version = '0.8.3'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.required_rubygems_version = '>= 1.3.5'

data/lib/cassandra_object/associations.rb

@@ -1,9 +1,10 @@
-require 'cassandra_object/associations/one_to_many'
-require 'cassandra_object/associations/one_to_one'
-
 module CassandraObject
   module Associations
     extend ActiveSupport::Concern
+    extend ActiveSupport::Autoload
+
+    autoload :OneToMany
+    autoload :OneToOne
     
     included do
       class_inheritable_hash :associations
@@ -16,9 +17,9 @@ module CassandraObject
       
       def association(association_name, options= {})
         if options[:unique]
-          write_inheritable_hash(:associations, {association_name => OneToOneAssociation.new(association_name, self, options)})
+          write_inheritable_hash(:associations, {association_name => OneToOne.new(association_name, self, options)})
         else
-          write_inheritable_hash(:associations, {association_name => OneToManyAssociation.new(association_name, self, options)})
+          write_inheritable_hash(:associations, {association_name => OneToMany.new(association_name, self, options)})
         end
       end
       

data/lib/cassandra_object/associations/one_to_many.rb

@@ -1,152 +1,154 @@
 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, :consistency => read_consistency)
-      cursor.find(options[:limit] || 100)
-    end
-    
-    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
-        connection.insert(column_family, key.to_s, attributes, :consistency => write_consistency_for_thrift)
+  module Associations
+    class OneToMany
+      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
-      if has_inverse? && set_inverse
-        inverse.set_inverse(record, owner)
+
+      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, :consistency => read_consistency)
+        cursor.find(options[:limit] || 100)
+      end
+
+      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
+          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
+      end
+
+      def new_key
+        SimpleUUID::UUID.new
+      end
+
+      def column_family
+        @owner_class.to_s + "Relationships"
+      end
+
+      def connection
+        @owner_class.connection
+      end
+
+      def target_class
+        @target_class ||= @target_class_name.constantize
+      end
+
+      def new_proxy(owner)
+        OneToManyAssociationProxy.new(self, owner)
+      end
+
+      def has_inverse?
+        @options[:inverse_of]
       end
-    end
-    
-    def new_key
-      SimpleUUID::UUID.new
-    end
-    
-    def column_family
-      @owner_class.to_s + "Relationships"
-    end
-    
-    def connection
-      @owner_class.connection
-    end
-    
-    def target_class
-      @target_class ||= @target_class_name.constantize
-    end
-    
-    def new_proxy(owner)
-      OneToManyAssociationProxy.new(self, owner)
-    end
-    
-    def has_inverse?
-      @options[:inverse_of]
-    end
-    
-    def inverse
-      has_inverse? && target_class.associations[@options[:inverse_of]]
-    end
-    
-    def set_inverse(owner, record)
-      add(owner, record, false)
-    end
-    
-    def reversed?
-      @options[:reversed] == true
-    end
 
-    def define_methods!
-      @owner_class.class_eval <<-eos
+      def inverse
+        has_inverse? && target_class.associations[@options[:inverse_of]]
+      end
+
+      def set_inverse(owner, record)
+        add(owner, record, false)
+      end
+
+      def reversed?
+        @options[:reversed] == true
+      end
+
+      def define_methods!
+        @owner_class.class_eval <<-eos
         def #{@association_name}
           @_#{@association_name} ||= self.class.associations[:#{@association_name}].new_proxy(self)
         end
-      eos
-    end
-  end
-  
-  class OneToManyAssociationProxy
-    def initialize(association, owner)
-      @association = association
-      @owner       = owner
-    end
-    
-    include Enumerable
-    def each
-      target.each do |i|
-        yield i
+        eos
       end
     end
 
-    def [](index)
-      to_a[index]
-    end
-    
-    def <<(record)
-      @association.add(@owner, record)
-      if loaded?
-        @target << record
+    class OneToManyAssociationProxy
+      def initialize(association, owner)
+        @association = association
+        @owner       = owner
       end
-    end
-    
-    # Get the targets of this association proxy
-    #
-    # @param  [Hash] options the options with which to modify this query
-    # @option options [String]  :start_after the key after which to start returning results
-    # @option options [Boolean] :reversed (false or association default) return the results in reverse order
-    # @option options [Integer] :limit the max number of results to return
-    # @return [Array<CassandraObject::Base>] an array of objects of type self#target_class
-    #
-    def all(options = {})
-      @association.find(@owner, options)
-    end
-    
-    # Create a record of the associated type with 
-    # the supplied attributes and add it to this 
-    # association
-    #
-    # @param  [Hash] attributes the attributes with which to create the object
-    # @return [CassandraObject::Base] the newly created object
-    #
-    def create(attributes)
-      @association.target_class.create(attributes).tap do |record|
-        if record.valid?
+
+      include Enumerable
+      def each
+        target.each do |i|
+          yield i
+        end
+      end
+
+      def [](index)
+        to_a[index]
+      end
+
+      def <<(record)
+        @association.add(@owner, record)
+        if loaded?
+          @target << record
+        end
+      end
+
+      # Get the targets of this association proxy
+      #
+      # @param  [Hash] options the options with which to modify this query
+      # @option options [String]  :start_after the key after which to start returning results
+      # @option options [Boolean] :reversed (false or association default) return the results in reverse order
+      # @option options [Integer] :limit the max number of results to return
+      # @return [Array<CassandraObject::Base>] an array of objects of type self#target_class
+      #
+      def all(options = {})
+        @association.find(@owner, options)
+      end
+
+      # Create a record of the associated type with 
+      # the supplied attributes and add it to this 
+      # association
+      #
+      # @param  [Hash] attributes the attributes with which to create the object
+      # @return [CassandraObject::Base] the newly created object
+      #
+      def create(attributes)
+        @association.target_class.create(attributes).tap do |record|
+          if record.valid?
+            self << record
+          end
+        end
+      end
+
+      def create!(attributes)
+        @association.target_class.create!(attributes).tap do |record|
           self << record
         end
       end
-    end
-    
-    def create!(attributes)
-      @association.target_class.create!(attributes).tap do |record|
-        self << record
+
+      def target
+        @target ||= begin
+                      @loaded = true
+                      @association.find(@owner)
+                    end
       end
-    end
-    
-    def target
-      @target ||= begin
-        @loaded = true
-        @association.find(@owner)
+
+      alias to_a target
+
+      def loaded?
+        defined?(@loaded) && @loaded
       end
     end
-    
-    alias to_a target
-    
-    def loaded?
-      defined?(@loaded) && @loaded
-    end
   end
 end

data/lib/cassandra_object/associations/one_to_one.rb

@@ -1,77 +1,79 @@
 module CassandraObject
-  class OneToOneAssociation
-    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.camelize 
-      @options           = options
+  module Associations
+    class OneToOne
+      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.camelize 
+        @options           = options
 
-      define_methods!
-    end
-    
-    def define_methods!
-      @owner_class.class_eval <<-eos
+        define_methods!
+      end
+
+      def define_methods!
+        @owner_class.class_eval <<-eos
         def #{@association_name}
           @_#{@association_name} ||= self.class.associations[:#{@association_name}].find(self)
         end
-        
+
         def #{@association_name}=(record)
           @_#{@association_name} = record
           self.class.associations[:#{@association_name}].set(self, record)
         end
-      eos
-    end
-    
-    def clear(owner)
-      connection.remove(column_family, owner.key.to_s, @association_name)
-    end
-    
-    def find(owner)
-      if key = connection.get(column_family, owner.key.to_s, @association_name.to_s, :count=>1).values.first
-        target_class.get(key)
-      else
-        nil
+        eos
       end
-    end  
-    
-    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}})
-      if has_inverse? && set_inverse
-        inverse.set_inverse(record, owner)
+
+      def clear(owner)
+        connection.remove(column_family, owner.key.to_s, @association_name)
       end
-    end
-    
-    def new_key
-      SimpleUUID::UUID.new
-    end
-    
-    def set_inverse(owner, record)
-      set(owner, record, false)
-    end
-    
-    def has_inverse?
-      @options[:inverse_of]
-    end
-    
-    def inverse
-      has_inverse? && target_class.associations[@options[:inverse_of]]
-    end
 
-    def column_family
-      @owner_class.to_s + "Relationships"
-    end
-    
-    def connection
-      @owner_class.connection
-    end
-    
-    def target_class
-      @target_class ||= @target_class_name.constantize
-    end
-    
-    def new_proxy(owner)
-      # OneToManyAssociationProxy.new(self, owner)
+      def find(owner)
+        if key = connection.get(column_family, owner.key.to_s, @association_name.to_s, :count=>1).values.first
+          target_class.get(key)
+        else
+          nil
+        end
+      end  
+
+      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}})
+        if has_inverse? && set_inverse
+          inverse.set_inverse(record, owner)
+        end
+      end
+
+      def new_key
+        SimpleUUID::UUID.new
+      end
+
+      def set_inverse(owner, record)
+        set(owner, record, false)
+      end
+
+      def has_inverse?
+        @options[:inverse_of]
+      end
+
+      def inverse
+        has_inverse? && target_class.associations[@options[:inverse_of]]
+      end
+
+      def column_family
+        @owner_class.to_s + "Relationships"
+      end
+
+      def connection
+        @owner_class.connection
+      end
+
+      def target_class
+        @target_class ||= @target_class_name.constantize
+      end
+
+      def new_proxy(owner)
+        # OneToManyAssociationProxy.new(self, owner)
+      end
     end
   end
-end
+end

data/lib/cassandra_object/identity.rb

@@ -1,13 +1,16 @@
-require 'cassandra_object/identity/abstract_key_factory'
-require 'cassandra_object/identity/key'
-require 'cassandra_object/identity/uuid_key_factory'
-require 'cassandra_object/identity/natural_key_factory'
-
 module CassandraObject
   # Some docs will be needed here but the gist of this is simple.  Instead of returning a string, Base#key  now returns a key object.
   # There are corresponding key factories which generate them
   module Identity
     extend ActiveSupport::Concern
+    extend ActiveSupport::Autoload
+
+    autoload :Key
+    autoload :AbstractKeyFactory
+    autoload :UUIDKeyFactory
+    autoload :NaturalKeyFactory
+    autoload :HashedNaturalKeyFactory
+
     module ClassMethods
       # Indicate what kind of key the model will have: uuid or natural
       #

data/lib/cassandra_object/identity/hashed_natural_key_factory.rb

@@ -0,0 +1,10 @@
+require 'digest/sha1'
+module CassandraObject
+  module Identity
+    class HashedNaturalKeyFactory < NaturalKeyFactory
+      def next_key(object)
+        NaturalKey.new(Digest::SHA1.hexdigest(attributes.map { |a| object.attributes[a.to_s] }.join(separator)))
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &22774160 !ruby/object:Gem::Requirement
+  requirement: &11677480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *22774160
+  version_requirements: *11677480
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &22773480 !ruby/object:Gem::Requirement
+  requirement: &11676780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *22773480
+  version_requirements: *11676780
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &22772900 !ruby/object:Gem::Requirement
+  requirement: &11676220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22772900
+  version_requirements: *11676220
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &22772220 !ruby/object:Gem::Requirement
+  requirement: &11675520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22772220
+  version_requirements: *11675520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &22771460 !ruby/object:Gem::Requirement
+  requirement: &11674780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *22771460
+  version_requirements: *11674780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &22770720 !ruby/object:Gem::Requirement
+  requirement: &11674020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *22770720
+  version_requirements: *11674020
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &22770140 !ruby/object:Gem::Requirement
+  requirement: &11673460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22770140
+  version_requirements: *11673460
 description: Cassandra ActiveModel
 email: grantr@gmail.com
 executables: []
@@ -124,6 +124,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/hashed_natural_key_factory.rb
 - lib/cassandra_object/identity/key.rb
 - lib/cassandra_object/identity/natural_key_factory.rb
 - lib/cassandra_object/identity/uuid_key_factory.rb