gotime-cassandra_object 2.12.5 → 2.13.0

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '2.12.5'
+  s.version = '2.13.0'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/lib/cassandra_object/belongs_to.rb

@@ -2,6 +2,11 @@ module CassandraObject
   module BelongsTo
     extend ActiveSupport::Concern
 
+    included do
+      class_attribute :belongs_to_reflections
+      self.belongs_to_reflections = {}
+    end
+
     module ClassMethods
       # === Options
       # [:class_name]
@@ -14,29 +19,41 @@ module CassandraObject
       #   class Truck < CassandraObject::Base
       #   end
       def belongs_to(name, options = {})
-        instance_variable_name = "@#{name}"
-
-        define_method("#{name}=") do |record|
-          instance_variable_set(instance_variable_name, record)
-          send("#{name}_id=", record.try(:id))
-          if options[:polymorphic]
-            send("#{name}_type=", record.class.name)
-          end
-        end
+        CassandraObject::BelongsTo::Builder.build(self, name, options)
+      end
 
-        define_method(name) do
-          unless instance_variable_defined?(instance_variable_name)
-            if record_id = send("#{name}_id").presence
-              model_name = options[:polymorphic] ? send("#{name}_type") : (options[:class_name] || name.to_s.classify)
-              instance_variable_set(instance_variable_name, model_name.constantize.find_by_id(record_id))
-            else
-              instance_variable_set(instance_variable_name, nil)
-            end
-          end
-
-          instance_variable_get(instance_variable_name)
+      def generated_belongs_to_methods
+        @generated_belongs_to_methods ||= begin
+          mod = const_set(:GeneratedSearchesManyMethods, Module.new)
+          include mod
+          mod
         end
       end
     end
+
+    # Returns the belongs_to instance for the given name, instantiating it if it doesn't already exist
+    def belongs_to_association(name)
+      association = belongs_to_instance_get(name)
+
+      if association.nil?
+        association = CassandraObject::BelongsTo::Association.new(self, belongs_to_reflections[name])
+        belongs_to_instance_set(name, association)
+      end
+
+      association
+    end
+
+    private
+      def belongs_to_cache
+        @belongs_to_cache ||= {}
+      end
+
+      def belongs_to_instance_get(name)
+        belongs_to_cache[name.to_sym]
+      end
+
+      def belongs_to_instance_set(name, association)
+        belongs_to_cache[name.to_sym] = association
+      end
   end
 end

data/lib/cassandra_object/belongs_to/association.rb

@@ -0,0 +1,53 @@
+module CassandraObject
+  module BelongsTo
+    class Association
+      attr_reader :owner, :reflection
+      delegate :options, to: :reflection
+
+      def initialize(owner, reflection)
+        @owner = owner
+        @reflection = reflection
+      end
+
+      def reader
+        unless loaded?
+          if record_id = owner.send(reflection.foreign_key).presence
+            self.record_variable = association_class.find_by_id(record_id)
+          else
+            self.record_variable = nil
+          end
+        end
+
+        record_variable
+      end
+
+      def writer(record)
+        self.record_variable = record
+        owner.send("#{reflection.foreign_key}=", record.try(:id))
+        if reflection.polymorphic?
+          owner.send("#{reflection.polymorphic_column}=", record.class.name)
+        end
+      end
+
+      def association_class
+        association_class_name.constantize
+      end
+
+      def association_class_name
+        reflection.polymorphic? ? owner.send(reflection.polymorphic_column) : reflection.class_name
+      end
+
+      def record_variable
+        owner.instance_variable_get(reflection.instance_variable_name)
+      end
+
+      def record_variable=(record)
+        owner.instance_variable_set(reflection.instance_variable_name, record)
+      end
+
+      def loaded?
+        owner.instance_variable_defined?(reflection.instance_variable_name)
+      end
+    end
+  end
+end

data/lib/cassandra_object/belongs_to/builder.rb

@@ -0,0 +1,40 @@
+module CassandraObject
+  module BelongsTo
+    class Builder
+      def self.build(model, name, options)
+        new(model, name, options).build
+      end
+
+      attr_reader :model, :name, :options
+      def initialize(model, name, options)
+        @model, @name, @options = model, name, options
+      end
+
+      def build
+        define_writer
+        define_reader
+
+        reflection = CassandraObject::BelongsTo::Reflection.new(model, name, options)
+        model.belongs_to_reflections = model.belongs_to_reflections.merge(name => reflection)
+      end
+
+      def mixin
+        model.generated_belongs_to_methods
+      end
+
+      def define_writer
+        name = self.name
+        mixin.redefine_method("#{name}=") do |records|
+          belongs_to_association(name).writer(records)
+        end
+      end
+
+      def define_reader
+        name = self.name
+        mixin.redefine_method(name) do
+          belongs_to_association(name).reader
+        end
+      end
+    end
+  end
+end

data/lib/cassandra_object/belongs_to/reflection.rb

@@ -0,0 +1,30 @@
+module CassandraObject
+  module BelongsTo
+    class Reflection
+      attr_reader :model, :name, :options
+      def initialize(model, name, options)
+        @model, @name, @options = model, name, options
+      end
+
+      def instance_variable_name
+        "@#{name}"
+      end
+
+      def foreign_key
+        "#{name}_id"
+      end
+
+      def polymorphic_column
+        "#{name}_type"
+      end
+
+      def polymorphic?
+        options[:polymorphic]
+      end
+
+      def class_name
+        options[:class_name] || name.to_s.classify 
+      end
+    end
+  end
+end

data/lib/cassandra_object/persistence.rb

@@ -3,9 +3,9 @@ module CassandraObject
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def remove(key)
-        ActiveSupport::Notifications.instrument("remove.cassandra_object", column_family: column_family, key: key) do
-          connection.remove(column_family, key.to_s, consistency: thrift_write_consistency)
+      def remove(id)
+        ActiveSupport::Notifications.instrument("remove.cassandra_object", column_family: column_family, key: id) do
+          connection.remove(column_family, id, consistency: thrift_write_consistency)
         end
       end
 
@@ -21,19 +21,19 @@ module CassandraObject
         end
       end
 
-      def write(key, attributes)
+      def write(id, attributes)
         attributes = encode_attributes(attributes)
-        ActiveSupport::Notifications.instrument("insert.cassandra_object", column_family: column_family, key: key, attributes: attributes) do
-          connection.insert(column_family, key.to_s, attributes, consistency: thrift_write_consistency)
+        ActiveSupport::Notifications.instrument("insert.cassandra_object", column_family: column_family, key: id, attributes: attributes) do
+          connection.insert(column_family, id, attributes, consistency: thrift_write_consistency)
           # if nil_attributes.any?
             # connection.remove(connection, key.to_s, *nil_attributes)
           # end          
         end
       end
 
-      def instantiate(key, attributes)
+      def instantiate(id, attributes)
         allocate.tap do |object|
-          object.instance_variable_set("@id", key) if key
+          object.instance_variable_set("@id", id) if id
           object.instance_variable_set("@new_record", false)
           object.instance_variable_set("@destroyed", false)
           object.instance_variable_set("@attributes", typecast_attributes(object, attributes))
@@ -124,7 +124,7 @@ module CassandraObject
       end
 
       def write
-        changed_attributes = changed.inject({}) { |h, n| h[n] = read_attribute(n); h }
+        changed_attributes = Hash[changed.map { |attr| [attr, read_attribute(attr)] }]
         self.class.write(id, changed_attributes)
       end
   end

data/lib/gotime-cassandra_object.rb

@@ -24,6 +24,14 @@ module CassandraObject
   autoload :Type
   autoload :Schema
 
+  module BelongsTo
+    extend ActiveSupport::Autoload
+
+    autoload :Association
+    autoload :Builder
+    autoload :Reflection
+  end
+
   module AttributeMethods
     extend ActiveSupport::Autoload
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.12.5
+  version: 2.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70337376492520 !ruby/object:Gem::Requirement
+  requirement: &70153896808960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337376492520
+  version_requirements: *70153896808960
 - !ruby/object:Gem::Dependency
   name: mcmire-cassandra
-  requirement: &70337376492060 !ruby/object:Gem::Requirement
+  requirement: &70153896808500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.3
   type: :runtime
   prerelease: false
-  version_requirements: *70337376492060
+  version_requirements: *70153896808500
 - !ruby/object:Gem::Dependency
   name: thrift_client
-  requirement: &70337376491600 !ruby/object:Gem::Requirement
+  requirement: &70153896808040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70337376491600
+  version_requirements: *70153896808040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70337376491220 !ruby/object:Gem::Requirement
+  requirement: &70153896807660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70337376491220
+  version_requirements: *70153896807660
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -80,6 +80,9 @@ files:
 - lib/cassandra_object/base.rb
 - lib/cassandra_object/batches.rb
 - lib/cassandra_object/belongs_to.rb
+- lib/cassandra_object/belongs_to/association.rb
+- lib/cassandra_object/belongs_to/builder.rb
+- lib/cassandra_object/belongs_to/reflection.rb
 - lib/cassandra_object/callbacks.rb
 - lib/cassandra_object/collection.rb
 - lib/cassandra_object/connection.rb