dynamoid 1.3.4 → 2.0.0

data/lib/dynamoid/associations.rb

@@ -16,16 +16,16 @@ module Dynamoid
   #   * has_one
   module Associations
     extend ActiveSupport::Concern
-    
+
     # Create the association tracking attribute and initialize it to an empty hash.
     included do
       class_attribute :associations, instance_accessor: false
-      
+
       self.associations = {}
     end
 
     module ClassMethods
-      
+
       # create a has_many association for this document.
       #
       # @param [Symbol] name the name of the association
@@ -38,7 +38,7 @@ module Dynamoid
       def has_many(name, options = {})
         association(:has_many, name, options)
       end
-      
+
       # create a has_one association for this document.
       #
       # @param [Symbol] name the name of the association
@@ -51,7 +51,7 @@ module Dynamoid
       def has_one(name, options = {})
         association(:has_one, name, options)
       end
-      
+
       # create a belongs_to association for this document.
       #
       # @param [Symbol] name the name of the association
@@ -64,7 +64,7 @@ module Dynamoid
       def belongs_to(name, options = {})
         association(:belongs_to, name, options)
       end
-      
+
       # create a has_and_belongs_to_many association for this document.
       #
       # @param [Symbol] name the name of the association
@@ -77,7 +77,7 @@ module Dynamoid
       def has_and_belongs_to_many(name, options = {})
         association(:has_and_belongs_to_many, name, options)
       end
-      
+
       private
 
       # create getters and setters for an association.
@@ -86,13 +86,23 @@ module Dynamoid
       # @param [Symbol] name the name of the association
       # @param [Hash] options options to pass to the association constructor; see above for all valid options
       #
-      # @since 0.2.0      
+      # @since 0.2.0
       def association(type, name, options = {})
-        field "#{name}_ids".to_sym, :set
-        self.associations[name] = options.merge(:type => type)
+        # Declare document field.
+        # In simple case it's equivalent to
+        # field "#{name}_ids".to_sym, :set
+        assoc = Dynamoid::Associations.const_get(type.to_s.camelcase).new(nil, name, options)
+        field_name = assoc.declaration_field_name
+        field_type = assoc.declaration_field_type
+
+        field field_name.to_sym, field_type
+
+        self.associations[name] = options.merge(type: type)
+
         define_method(name) do
           @associations[:"#{name}_ids"] ||= Dynamoid::Associations.const_get(type.to_s.camelcase).new(self, name, options)
         end
+
         define_method("#{name}=".to_sym) do |objects|
           @associations[:"#{name}_ids"] ||= Dynamoid::Associations.const_get(type.to_s.camelcase).new(self, name, options)
           @associations[:"#{name}_ids"].setter(objects)
@@ -100,7 +110,6 @@ module Dynamoid
       end
     end
 
-
   end
-  
+
 end

data/lib/dynamoid/associations/association.rb

@@ -16,6 +16,7 @@ module Dynamoid #:nodoc:
       # @option options [Class] :class the target class of the association; that is, the class to which the association objects belong
       # @option options [Symbol] :class_name the name of the target class of the association; only this or Class is necessary
       # @option options [Symbol] :inverse_of the name of the association on the target class
+      # @option options [Symbol] :foreign_key the name of the field for belongs_to association
       #
       # @return [Dynamoid::Association] the actual association instance itself
       #
@@ -48,6 +49,14 @@ module Dynamoid #:nodoc:
         @loaded = false
       end
 
+      def declaration_field_name
+        "#{name}_ids"
+      end
+
+      def declaration_field_type
+        :set
+      end
+
       private
 
       # The target class name, either inferred through the association's name or specified in options.
@@ -68,7 +77,13 @@ module Dynamoid #:nodoc:
       #
       # @since 0.2.0
       def target_attribute
-        "#{target_association}_ids".to_sym if target_association
+        # In simple case it's equivalent to
+        # "#{target_association}_ids".to_sym if target_association
+        if target_association
+          target_options = target_class.associations[target_association]
+          assoc = Dynamoid::Associations.const_get(target_options[:type].to_s.camelcase).new(nil, target_association, target_options)
+          assoc.send(:source_attribute)
+        end
       end
 
       # The ids in the target association.
@@ -89,14 +104,15 @@ module Dynamoid #:nodoc:
       #
       # @since 0.2.0
       def source_attribute
-        "#{name}_ids".to_sym
+        declaration_field_name.to_sym
       end
 
       # The ids in the source association.
       #
       # @since 0.2.0
       def source_ids
-        source.send(source_attribute) || Set.new
+        # handle case when we store scalar value instead of collection (when foreign_key option is specified)
+        Array(source.send(source_attribute)).compact.to_set || Set.new
       end
 
       # Create a new instance of the target class without trying to add it to the association. This creates a base, that caller can update before setting or adding it.

data/lib/dynamoid/associations/belongs_to.rb

@@ -1,12 +1,36 @@
 # encoding: utf-8
 module Dynamoid #:nodoc:
 
-  # The belongs_to association. For belongs_to, we reference only a single target instead of multiple records; that target is the 
+  # The belongs_to association. For belongs_to, we reference only a single target instead of multiple records; that target is the
   # object to which the association object is associated.
   module Associations
     class BelongsTo
       include SingleAssociation
 
+      def declaration_field_name
+        options[:foreign_key] || "#{name}_ids"
+      end
+
+      def declaration_field_type
+        if options[:foreign_key]
+          target_class.attributes[target_class.hash_key][:type]
+        else
+          :set
+        end
+      end
+
+      # Override default implementation
+      # to handle case when we store id as scalar value, not as collection
+      def associate(hash_key)
+        target.send(target_association).disassociate(source.hash_key) if target && target_association
+
+        if options[:foreign_key]
+          source.update_attribute(source_attribute, hash_key)
+        else
+          source.update_attribute(source_attribute, Set[hash_key])
+        end
+      end
+
       private
 
       # Find the target association, either has_many or has_one. Uses either options[:inverse_of] or the source class name and default parsing to
@@ -24,21 +48,7 @@ module Dynamoid #:nodoc:
           return has_one_key_name if target_class.associations[has_one_key_name][:type] == :has_one
         end
       end
-      
-      # Associate a source object to this association.
-      #
-      # @since 0.2.0
-      def associate_target(object)
-        object.update_attribute(target_attribute, target_ids.merge(Array(source.hash_key)))
-      end
-
-      # Disassociate a source object from this association.
-      #
-      # @since 0.2.0      
-      def disassociate_target(object)
-        source.update_attribute(source_attribute, target_ids - Array(source.hash_key))
-      end
     end
   end
-  
+
 end

data/lib/dynamoid/associations/has_and_belongs_to_many.rb

@@ -18,22 +18,6 @@ module Dynamoid #:nodoc:
         return nil if guess.nil? || guess[:type] != :has_and_belongs_to_many
         key_name
       end
-
-      # Associate a source object to this association.
-      #
-      # @since 0.2.0
-      def associate_target(object)
-        ids = object.send(target_attribute) || Set.new
-        object.update_attribute(target_attribute, ids.merge(Array(source.hash_key)))
-      end
-
-      # Disassociate a source object from this association.
-      #
-      # @since 0.2.0
-      def disassociate_target(object)
-        ids = object.send(target_attribute) || Set.new
-        object.update_attribute(target_attribute, ids - Array(source.hash_key))
-      end
     end
   end
 

data/lib/dynamoid/associations/has_many.rb

@@ -8,7 +8,7 @@ module Dynamoid #:nodoc:
 
       private
 
-      # Find the target association, always a :belongs_to association. Uses either options[:inverse_of] or the source class name 
+      # Find the target association, always a :belongs_to association. Uses either options[:inverse_of] or the source class name
       # and default parsing to return the most likely name for the target association.
       #
       # @since 0.2.0
@@ -18,22 +18,7 @@ module Dynamoid #:nodoc:
         return nil if guess.nil? || guess[:type] != :belongs_to
         key_name
       end
-
-      # Associate a source object to this association.
-      #
-      # @since 0.2.0                  
-      def associate_target(object)
-        object.update_attribute(target_attribute, Set[source.hash_key])
-      end
-      
-      # Disassociate a source object from this association.
-      #
-      # @since 0.2.0      
-      def disassociate_target(object)
-        object.update_attribute(target_attribute, nil)
-      end
-      
     end
   end
-  
+
 end

data/lib/dynamoid/associations/has_one.rb

@@ -19,20 +19,6 @@ module Dynamoid #:nodoc:
         return nil if guess.nil? || guess[:type] != :belongs_to
         key_name
       end
-
-      # Associate a source object to this association.
-      #
-      # @since 0.2.0
-      def associate_target(object)
-        object.update_attribute(target_attribute, Set[source.hash_key])
-      end
-
-      # Disassociate a source object from this association.
-      #
-      # @since 0.2.0
-      def disassociate_target(object)
-        source.update_attribute(source_attribute, nil)
-      end
     end
   end
 

data/lib/dynamoid/associations/many_association.rb

@@ -14,7 +14,7 @@ module Dynamoid #:nodoc:
 
       include Enumerable
       # Delegate methods to the records the association represents.
-      delegate :first, :last, :empty?, :size, :class, :to => :records
+      delegate :first, :last, :empty?, :size, :class, to: :records
 
       # The records associated to the source.
       #
@@ -52,12 +52,13 @@ module Dynamoid #:nodoc:
       #
       # @since 0.2.0
       def delete(object)
-        source.update_attribute(source_attribute, source_ids - Array(object).collect(&:hash_key))
-        Array(object).each {|o| self.send(:disassociate_target, o)} if target_association
+        disassociate(Array(object).collect(&:hash_key))
+        if target_association
+          Array(object).each { |obj| obj.send(target_association).disassociate(source.hash_key) }
+        end
         object
       end
 
-
       # Add an object or array of objects to an association. This preserves the current records in the association (if any)
       # and adds the object to the target association if it is detected to exist.
       #
@@ -67,8 +68,12 @@ module Dynamoid #:nodoc:
       #
       # @since 0.2.0
       def <<(object)
-        source.update_attribute(source_attribute, source_ids.merge(Array(object).collect(&:hash_key)))
-        Array(object).each {|o| self.send(:associate_target, o)} if target_association
+        associate(Array(object).collect(&:hash_key))
+
+        if target_association
+          Array(object).each { |obj| obj.send(target_association).associate(source.hash_key) }
+        end
+
         object
       end
 
@@ -171,6 +176,14 @@ module Dynamoid #:nodoc:
         end
       end
 
+      def associate(hash_key)
+        source.update_attribute(source_attribute, source_ids.merge(Array(hash_key)))
+      end
+
+      def disassociate(hash_key)
+        source.update_attribute(source_attribute, source_ids - Array(hash_key))
+      end
+
       private
 
       # If a query exists, filter all existing results based on that query.

data/lib/dynamoid/associations/single_association.rb

@@ -5,18 +5,23 @@ module Dynamoid #:nodoc:
     module SingleAssociation
       include Association
 
-      delegate :class, :to => :target
+      delegate :class, to: :target
 
       def setter(object)
-        delete
-        source.update_attribute(source_attribute, Set[object.hash_key])
-        self.send(:associate_target, object) if target_association
+        if object.nil?
+          delete
+          return
+        end
+
+        associate(object.hash_key)
+        self.target = object
+        object.send(target_association).associate(source.hash_key) if target_association
         object
       end
 
       def delete
-        source.update_attribute(source_attribute, nil)
-        self.send(:disassociate_target, target) if target && target_association
+        target.send(target_association).disassociate(source.hash_key) if target && target_association
+        disassociate
         target
       end
 
@@ -28,7 +33,6 @@ module Dynamoid #:nodoc:
         setter(target_class.create(attributes))
       end
 
-
       # Is this object equal to the association's target?
       #
       # @return [Boolean] true/false
@@ -59,6 +63,15 @@ module Dynamoid #:nodoc:
         target.nil?
       end
 
+      def associate(hash_key)
+        target.send(target_association).disassociate(source.hash_key) if target && target_association
+        source.update_attribute(source_attribute, Set[hash_key])
+      end
+
+      def disassociate(hash_key=nil)
+        source.update_attribute(source_attribute, nil)
+      end
+
       private
 
       # Find the target of the has_one association.
@@ -70,6 +83,11 @@ module Dynamoid #:nodoc:
         return if source_ids.empty?
         target_class.find(source_ids.first)
       end
+
+      def target=(object)
+        @target = object
+        @loaded = true
+      end
     end
   end
 end

data/lib/dynamoid/config.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-require "uri"
-require "dynamoid/config/options"
+require 'uri'
+require 'dynamoid/config/options'
 
 module Dynamoid
 
@@ -11,22 +11,22 @@ module Dynamoid
     include ActiveModel::Observing if defined?(ActiveModel::Observing)
 
     # All the default options.
-    option :adapter, :default => 'aws_sdk_v2'
-    option :namespace, :default => defined?(Rails) ? "dynamoid_#{Rails.application.class.parent_name}_#{Rails.env}" : "dynamoid"
-    option :access_key, :default => nil
-    option :secret_key, :default => nil
-    option :region, :default => nil
-    option :batch_size, :default => 100
-    option :read_capacity, :default => 100
-    option :write_capacity, :default => 20
-    option :warn_on_scan, :default => true
-    option :endpoint, :default => nil
-    option :identity_map, :default => false
-    option :timestamps, :default => true
-    option :sync_retry_max_times, :default => 60 # a bit over 2 minutes
-    option :sync_retry_wait_seconds, :default => 2
-    option :convert_big_decimal, :default => false
-    option :models_dir, :default => "app/models" # perhaps you keep your dynamoid models in a different directory?
+    option :adapter, default: 'aws_sdk_v2'
+    option :namespace, default: defined?(Rails) ? "dynamoid_#{Rails.application.class.parent_name}_#{Rails.env}" : 'dynamoid'
+    option :access_key, default: nil
+    option :secret_key, default: nil
+    option :region, default: nil
+    option :batch_size, default: 100
+    option :read_capacity, default: 100
+    option :write_capacity, default: 20
+    option :warn_on_scan, default: true
+    option :endpoint, default: nil
+    option :identity_map, default: false
+    option :timestamps, default: true
+    option :sync_retry_max_times, default: 60 # a bit over 2 minutes
+    option :sync_retry_wait_seconds, default: 2
+    option :convert_big_decimal, default: false
+    option :models_dir, default: 'app/models' # perhaps you keep your dynamoid models in a different directory?
     option :application_timezone, default: :local # available values - :utc, :local, time zone names
 
     # The default logger for Dynamoid: either the Rails logger or just stdout.