gotime-cassandra_object 2.10.3 → 2.10.4

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/base.rb

@@ -40,7 +40,6 @@ module CassandraObject
     include BelongsTo
     include Callbacks
     include Validations
-    include Associations
     include Timestamps
 
     attr_reader :attributes

data/lib/gotime-cassandra_object.rb

@@ -14,7 +14,6 @@ module CassandraObject
   autoload :Validations
   autoload :Identity
   autoload :Serialization
-  autoload :Associations
   autoload :Migrations
   autoload :Cursor
   autoload :Collection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.10.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70254537627400 !ruby/object:Gem::Requirement
+  requirement: &70334275426700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254537627400
+  version_requirements: *70334275426700
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70254537638320 !ruby/object:Gem::Requirement
+  requirement: &70334275424680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70254537638320
+  version_requirements: *70334275424680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70254537637500 !ruby/object:Gem::Requirement
+  requirement: &70334275423800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254537637500
+  version_requirements: *70334275423800
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -60,9 +60,6 @@ files:
 - README.rdoc
 - Rakefile
 - gotime-cassandra_object.gemspec
-- lib/cassandra_object/associations.rb
-- lib/cassandra_object/associations/one_to_many.rb
-- lib/cassandra_object/associations/one_to_one.rb
 - lib/cassandra_object/attribute_methods.rb
 - lib/cassandra_object/attribute_methods/definition.rb
 - lib/cassandra_object/attribute_methods/dirty.rb

data/lib/cassandra_object/associations.rb

@@ -1,46 +0,0 @@
-module CassandraObject
-  module Associations
-    extend ActiveSupport::Concern
-    extend ActiveSupport::Autoload
-
-    autoload :OneToMany
-    autoload :OneToOne
-    
-    included do
-      class_inheritable_hash :associations
-    end
-
-    module ClassMethods
-      def relationships_column_family=(column_family)
-        @relationships_column_family = column_family
-      end
-
-      def relationships_column_family
-        @relationships_column_family || "#{name}Relationships"
-      end
-
-      def column_family_configuration
-        super << {:Name=>relationships_column_family, :CompareWith=>"UTF8Type", :CompareSubcolumnsWith=>"TimeUUIDType", :ColumnType=>"Super"}
-      end
-
-      def association(association_name, options= {})
-        if options[:unique]
-          write_inheritable_hash(:associations, {association_name => OneToOne.new(association_name, self, options)})
-        else
-          write_inheritable_hash(:associations, {association_name => OneToMany.new(association_name, self, options)})
-        end
-      end
-      
-      def remove(key)
-        begin
-          ActiveSupport::Notifications.instrument("remove.cassandra_object", column_family: relationships_column_family, key: key) do
-            connection.remove(relationships_column_family, key.to_s, consistency: thrift_write_consistency)
-          end
-        rescue Cassandra::AccessError => e
-          raise e unless e.message =~ /Invalid column family/
-        end
-        super
-      end
-    end
-  end
-end

data/lib/cassandra_object/associations/one_to_many.rb

@@ -1,146 +0,0 @@
-module CassandraObject
-  module Associations
-    class OneToMany
-      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
-
-        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.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", :column_family => column_family, :key => key, :attributes => attributes) do
-          connection.insert(column_family, key.to_s, attributes, :consistency => @owner_class.thrift_write_consistency)
-        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.relationships_column_family
-      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 #{@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
-        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
-
-      def target
-        @target ||= begin
-                      @loaded = true
-                      @association.find(@owner)
-                    end
-      end
-
-      alias to_a target
-
-      def loaded?
-        defined?(@loaded) && @loaded
-      end
-    end
-  end
-end

data/lib/cassandra_object/associations/one_to_one.rb

@@ -1,85 +0,0 @@
-module CassandraObject
-  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
-        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)
-        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)
-        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)
-        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 => @owner_class.thrift_write_consistency)
-        end
-        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.relationships_column_family
-      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