ocean-dynamo 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e62e3f71a4c942cf37151bdaa588ce917c4fd269
-  data.tar.gz: ec345bbecb5a322e74d196f5586e75997e717e24
+  metadata.gz: 3dc795167d56cef7e557c8f233b0e6e2fe3a205a
+  data.tar.gz: 4979ca24a5937658f00a325981dec200a81f0263
 SHA512:
-  metadata.gz: 3ab10073d477aee182164feb1042cd5ea82dbe0aaac3db4ec5204f4d832b2a968d1799783ab662528be9472c12d382097f0cc3e915d5a3209a6eca4df8b96096
-  data.tar.gz: 4b75d7ac49d8647f4183825b21c8f20177fc8a8eb3603f7c06637b19ff295099be0ef0c65ae54c579a745027a64cf95044dc28cf45750bd3a335b2c23b888133
+  metadata.gz: 4796a5bb3c5b216a96b10c9955ec6815ce676e869c7ec6367bb4534bb8f8f349535f96c77308dcaa18a49a786bdcfff631321787a01079bc356aa9f106a6d911
+  data.tar.gz: 132101d4bb782d609c75e912a658f19ba423f455e2be2b2bad4d4a720ddc7f45aee1c1ded129bb6713026af0ada9703b14f0539804d4a7dede8d9eb4d478ae99

data/README.rdoc

@@ -104,7 +104,7 @@ The following example shows how to set up a +has_many+ / +belongs_to+ relation:
      attribute :that
      attribute :the_other
    end
-   has_many :children
+   has_many :children, dependent: :destroy
  end
  
  
@@ -162,10 +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.
 
-* +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.
+* The +dependent:+ keyword arg may now be +:destroy+, +:delete+ or +:nullify+
+  with the same semantics as in ActiveRecord. With +:nullify+, however,
+  the hash key is set to the string "NULL" rather than binary NULL, as
+  DynamoDB doesn't permit storing empty fields.
 
 === Future milestones
 

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

@@ -18,16 +18,53 @@ module OceanDynamo
       #
       # Defines a has_many relation to a belongs_to class.
       #
-      def has_many(children)                                         # :children
+      # The +dependent:+ keyword arg may be +:destroy+, +:delete+ or +:nullify+
+      # and have the same semantics as in ActiveRecord. With +:nullify+, however,
+      # the hash key is set to the string "NULL" rather than binary NULL, as
+      # DynamoDB doesn't permit storing empty fields.
+      #
+      def has_many(children, dependent: :nullify)                    # :children
         children_attr = children.to_s.underscore                     # "children"
         child_class = children_attr.singularize.camelize.constantize # Child
         register_relation(child_class, :has_many)
 
-        before_destroy do |p|
-          map_children(child_class, &:destroy)
+        # Handle children= after create and update
+        after_save do |p|
+          new_children = instance_variable_get("@#{children_attr}")  
+          if new_children  # TODO: only do this for dirty collections
+            write_children child_class, new_children
+            map_children child_class do |c|
+              next if new_children.include?(c)
+              c.destroy
+            end
+          end 
           true
         end
 
+        if dependent == :destroy
+          before_destroy do |p|
+            map_children(child_class, &:destroy)
+            p.instance_variable_set "@#{children_attr}", nil
+            true
+          end
+
+        elsif dependent == :delete
+          before_destroy do |p|
+            delete_children(child_class)
+            p.instance_variable_set "@#{children_attr}", nil
+         end
+
+        elsif dependent == :nullify
+          before_destroy do |p|
+            nullify_children(child_class)
+            p.instance_variable_set "@#{children_attr}", nil
+            true
+          end
+
+        else
+          raise ArgumentError, ":dependent must be :destroy, :delete, or :nullify"
+        end
+
         # Define accessors for instances
         attr_accessor children_attr
         self.class_eval "def #{children_attr}(force_reload=false) 
@@ -70,31 +107,6 @@ module OceanDynamo
 
     protected
 
-    #
-    # This version also writes back any relations. TODO: only
-    # dirty relations should be persisted. Introduce a dirty flag.
-    # Easiest done via an collection proxy object.
-    #
-    def dynamo_persist(*)  # :nodoc:
-      result = super
-
-      self.class.relations_of_type(:has_many).each do |klass|
-        attr_name = klass.to_s.pluralize.underscore
-        # First create or update the children in the new set
-        new_children = instance_variable_get("@#{attr_name}")
-        next unless new_children
-        write_children klass, new_children
-        # Destroy all children not in the new set (this is not yet scalable)
-        read_children(klass).each do |c|
-          next if new_children.include?(c)
-          c.destroy
-        end
-      end
-
-      result
-    end
-
-
     #
     # Reads all children of a has_many relation.
     #
@@ -105,7 +117,8 @@ module OceanDynamo
         result = Array.new
         _late_connect?
         child_items = child_class.dynamo_items
-        child_items.query(hash_value: id, range_gte: "0") do |item_data|
+        child_items.query(hash_value: id, range_gte: "0",
+                          batch_size: 1000, select: :all) do |item_data|
           result << child_class.new._setup_from_dynamo(item_data)
         end
         result
@@ -132,10 +145,42 @@ module OceanDynamo
     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|
+      child_items.query(hash_value: id, range_gte: "0", 
+                        batch_size: 1000, select: :all) do |item_data|
         yield child_class.new._setup_from_dynamo(item_data)
       end
     end
 
+
+    # 
+    # Delete all children without instantiating them first.
+    # 
+    def delete_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|
+        item.delete
+      end
+    end
+
+
+    #
+    # Set the hash key values of all children to the string "NULL", thereby turning them
+    # into orphans. Note that we're not setting the key to NULL as this isn't possible
+    # in DynamoDB. Instead, we're using the literal string "NULL".
+    #
+    def nullify_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, select: :all) do |item_data|
+        attrs = item_data.attributes
+        item_data.item.delete
+        attrs[child_class.table_hash_key.to_s] = "NULL"
+        child_items.create attrs
+      end
+    end
+
   end
 end

data/lib/ocean-dynamo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Peter Bengtson