ocean-dynamo 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a28d5f280ebcb046fad6b812a8a4394ca2b64dfc
-  data.tar.gz: fc0f313738efd5370163056bf2915b83645f53b7
+  metadata.gz: e62e3f71a4c942cf37151bdaa588ce917c4fd269
+  data.tar.gz: ec345bbecb5a322e74d196f5586e75997e717e24
 SHA512:
-  metadata.gz: 0259caaebfa02274f8103695c741670d6190be669ecd1c0d92d8165ea1a058f628ae96072c946fc77fc6561a0d7bb1ba075c0773201e6d3f641a69bdfec1b70b
-  data.tar.gz: 2b0108bbef441a611ebdaed44b76512b7ae62d75491fe0788d30f2d0ea1d5f0e80fa08a3c6a10547197d2f2640db9f7970f15e3e9e126c10ffbf778e4692b2ea
+  metadata.gz: 3ab10073d477aee182164feb1042cd5ea82dbe0aaac3db4ec5204f4d832b2a968d1799783ab662528be9472c12d382097f0cc3e915d5a3209a6eca4df8b96096
+  data.tar.gz: 4b75d7ac49d8647f4183825b21c8f20177fc8a8eb3603f7c06637b19ff295099be0ef0c65ae54c579a745027a64cf95044dc28cf45750bd3a335b2c23b888133

data/README.rdoc

@@ -162,12 +162,10 @@ controllers. OceanDynamo implements much of the infrastructure of ActiveRecord;
 for instance, +read_attribute+, +write_attribute+, and much of the control logic and
 internal organisation.
 
-* +belongs_to+ now handles setting and retrieving the parent association correctly in
-  all cases, including direct and mass assignment (+:master+, +:master_id+, etc). 
-* +has_many=+ now destroys rather than deletes.
-* Got rid of the +fake_dynamo+ purge message.
-* Relations now take an optional reload arg, as in <tt>parent.children(true)</tt>.
-
+* +has_many+ now destroys all children before destroying itself. It thus behaves like
+  <tt>dependent: :destroy</tt> was declared in ActiveRecord. Soon, +has_many+ will take
+  a <tt>dependent:</tt> value of <tt>:destroy</tt>, <tt>:delete</tt>, or <tt>:nullify</tt>,
+  for full compatibility.
 
 === Future milestones
 
@@ -247,9 +245,8 @@ NB: +aws.yml+ is excluded from source control. This allows you to enter your AWS
 safely. Note that +aws.yml.example+ is under source control: don't edit it.
 
 Make sure your have version 0.1.3 of the +fake_dynamo+ gem. It implements the +2011-12-05+ version
-of the DynamoDB API. We're not yet using the +2012-08-10+ version, as the +aws-sdk+ ruby gem
-doesn't fully support it. We'll make the change as soon as +aws-sdk+ is updated. Reportedly,
-it's in the works.
+of the DynamoDB API. We're not using the +2012-08-10+ version, as the +aws-sdk+ ruby gem
+doesn't fully support it.
 
 Next, start +fake_dynamo+:
 

data/lib/ocean-dynamo/associations/belongs_to.rb

@@ -15,7 +15,7 @@ module OceanDynamo
     module ClassMethods
       
       #
-      # 
+      # Class macro to define the +belongs_to+ relation.
       #
       def belongs_to(target)                             # :master, "master", Master
         target_attr = target.to_s.underscore             # "master"
@@ -55,29 +55,15 @@ module OceanDynamo
                          end"
 
         self.class_eval "def #{target_attr}=(value) 
-                           if !value
-                             target_id = nil
-                             target = nil
-                           elsif !value.kind_of?(#{target_class})
-                             raise AssociationTypeMismatch, \"can't save a #\{value.class\} in a #{target_class} foreign key\"
-                           else
-                             target_id = value.hash_key
-                             target = value
-                           end
+                           target, target_id = type_check_target(#{target_class}, value)
                            write_attribute('#{target_attr_id}', target_id) 
                            @#{target_attr} = target
                            value
                          end"
 
         self.class_eval "def #{target_attr_id}=(value)
-                           if !value
-                             target_id = nil
-                           elsif value.is_a?(String)
-                             target_id = value
-                           else
-                             raise AssociationTypeMismatch, 'Foreign key #{target_attr_id} must be nil or a string'
-                           end
-                           write_attribute('#{target_attr_id}', target_id) 
+                           type_check_foreign_key('#{target_attr_id}', value)
+                           write_attribute('#{target_attr_id}', value) 
                            @#{target_attr} = nil
                            value
                          end"
@@ -132,16 +118,17 @@ module OceanDynamo
     #  Instance variables and methods
     #
     # ---------------------------------------------------------
+    # def initialize(attrs={})
+    #   super
+    # end
 
-    def initialize(attrs={})
-      super
-    end
 
 
     #
     # This is run by #initialize and by #assign_attributes to set the
     # association instance variables (@master, for instance) and their associated 
-    # attributes (such as master_id) from a given value.
+    # attributes (such as master_id) from one single given value such as :master 
+    # and :master_id.
     #
     def set_belongs_to_association(attrs)  # :nodoc:
       parent_class = self.class.belongs_to_class
@@ -157,5 +144,19 @@ module OceanDynamo
       fields[name][:target_class].find(v, consistent: true)
     end
 
+
+    def type_check_foreign_key(name, value)
+      return unless value
+      return if value.is_a?(String)
+      raise AssociationTypeMismatch, "Foreign key #{name} must be nil or a string"
+    end
+
+
+    def type_check_target(target_class, value)
+      return nil unless value
+      return [value, value.hash_key] if value.kind_of?(target_class)
+      raise AssociationTypeMismatch, "can't save a #{value.class} in a #{target_class} foreign key"
+    end
+
   end
 end

data/lib/ocean-dynamo/associations/has_many.rb

@@ -22,8 +22,14 @@ module OceanDynamo
         children_attr = children.to_s.underscore                     # "children"
         child_class = children_attr.singularize.camelize.constantize # Child
         register_relation(child_class, :has_many)
-        attr_accessor children_attr
+
+        before_destroy do |p|
+          map_children(child_class, &:destroy)
+          true
+        end
+
         # Define accessors for instances
+        attr_accessor children_attr
         self.class_eval "def #{children_attr}(force_reload=false) 
                            @#{children_attr} = false if force_reload
                            @#{children_attr} ||= read_children(#{child_class})
@@ -47,37 +53,6 @@ module OceanDynamo
     # ---------------------------------------------------------
 
 
-    #
-    # Reads all children of a has_many relation.
-    #
-    def read_children(child_class)
-      if new_record? 
-        nil
-      else
-        result = Array.new
-        _late_connect?
-        child_items = child_class.dynamo_items
-        child_items.query(hash_value: id, range_gte: "0") do |item_data|
-          result << child_class.new._setup_from_dynamo(item_data)
-        end
-        result
-      end
-    end
-
-
-    #
-    # Write all children in the arg, which should be nil or an array.
-    #
-    def write_children(child_class, arg)
-      return nil if arg.blank?
-      raise AssociationTypeMismatch, "not an array or nil" if !arg.is_a?(Array)
-      raise AssociationTypeMismatch, "an array element is not a #{child_class}" unless arg.all? { |m| m.is_a?(child_class) }
-      # We now know that arg is an array containing only members of the child_class
-      arg.each(&:save!)
-      arg
-    end
-
-
     #
     # Sets all has_many relations to nil.
     #
@@ -98,7 +73,7 @@ module OceanDynamo
     #
     # This version also writes back any relations. TODO: only
     # dirty relations should be persisted. Introduce a dirty flag.
-    # Easiest done via an association proxy object.
+    # Easiest done via an collection proxy object.
     #
     def dynamo_persist(*)  # :nodoc:
       result = super
@@ -119,5 +94,48 @@ module OceanDynamo
       result
     end
 
+
+    #
+    # Reads all children of a has_many relation.
+    #
+    def read_children(child_class)  # :nodoc:
+      if new_record? 
+        nil
+      else
+        result = Array.new
+        _late_connect?
+        child_items = child_class.dynamo_items
+        child_items.query(hash_value: id, range_gte: "0") do |item_data|
+          result << child_class.new._setup_from_dynamo(item_data)
+        end
+        result
+      end
+    end
+
+
+    #
+    # Write all children in the arg, which should be nil or an array.
+    #
+    def write_children(child_class, arg)  # :nodoc:
+      return nil if arg.blank?
+      raise AssociationTypeMismatch, "not an array or nil" if !arg.is_a?(Array)
+      raise AssociationTypeMismatch, "an array element is not a #{child_class}" unless arg.all? { |m| m.is_a?(child_class) }
+      # We now know that arg is an array containing only members of the child_class
+      arg.each(&:save!)
+      arg
+    end
+
+
+    #
+    # Takes a block and yields each child to it. Batched for scalability.
+    #
+    def map_children(child_class)
+      return if new_record?
+      child_items = child_class.dynamo_items
+      child_items.query(hash_value: id, range_gte: "0", batch_size: 1000) do |item_data|
+        yield child_class.new._setup_from_dynamo(item_data)
+      end
+    end
+
   end
 end

data/lib/ocean-dynamo/persistence.rb

@@ -77,9 +77,9 @@ module OceanDynamo
     end
 
 
-    def dynamo_schema(*)
-      super
-    end
+    # def dynamo_schema(*)
+    #   super
+    # end
 
 
     def destroyed?
@@ -319,17 +319,11 @@ module OceanDynamo
 
     def serialize_attribute(attribute, value, metadata=fields[attribute],
                             target_class: metadata[:target_class],
-                            type: metadata[:type]
-                            )
+                            type: metadata[:type])
       return nil if value == nil
-      #value = value.id if value.kind_of?(target_class)
       case type
       when :reference
-        raise DynamoError, ":reference must always have a :target_class" unless target_class
-        return value if value.is_a?(String)
-        # The next two lines should be superfluous now
-        return value.id if value.kind_of?(target_class)
-        raise AssociationTypeMismatch, "can't save a #{value.class} in a #{target_class} :reference"
+        value
       when :string
         return nil if ["", []].include?(value)
         value

data/lib/ocean-dynamo/queries.rb

@@ -24,11 +24,12 @@ module OceanDynamo
     rescue RecordNotFound
       nil
     end
+    alias find_by_id find_by_key
 
 
-    def find_by_id(*args)
-      find_by_key(*args)
-    end
+    # def find_by_id(*args)
+    #   find_by_key(*args)
+    # end
 
 
     #

data/lib/ocean-dynamo/version.rb

@@ -1,3 +1,3 @@
 module OceanDynamo
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk