ocean-dynamo 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1d14c8cad14fe20abd48a743d192899d015e88f
-  data.tar.gz: 931402dbece516985faaede7388447e3d656bc9a
+  metadata.gz: 38c9f3db161b07ef4486141afad09f05af00b752
+  data.tar.gz: 92a73810cedf7aceb64e31fde8582afd2e56fe18
 SHA512:
-  metadata.gz: 572e3087a3b6e2ab6767838dd896386c2f8c66c8f6d111da6d4baf4e2d492120da79699c4bd372a961a452adedcfd7bbe81287fd5716440189fe749556e2e2ef
-  data.tar.gz: 80d7a0713f3c6bf3d41b057977936df937c617a577845ae450fa7d38b0913a65cf8ace523fefe00367e578b3858676e209daf9b8d7e41dc00391e8bb34792034
+  metadata.gz: 0116191369abb7f9124034727ea50dc32995cfbebd55a4c030ded15a963c3f5fd7a1ed244ce85971606af4e329cf78f942b84a2d81e270af94bc4eddd135c3b1
+  data.tar.gz: 95861f8c29cd86c2018633549c21ce45b61adf65e8c2742496da04321ef6e2dd40447b8438c7d70ce36c40b35bcc87874bb65a50279ae835ef0f9a4d84b7cd5b

data/lib/ocean-dynamo/attributes.rb

@@ -1,7 +1,7 @@
 module OceanDynamo
   class Base
-    include ActiveModel::DeprecatedMassAssignmentSecurity
-    include ActiveModel::ForbiddenAttributesProtection
+    #include ActiveModel::DeprecatedMassAssignmentSecurity
+    #include ActiveModel::ForbiddenAttributesProtection
 
     attr_reader :attributes
     attr_reader :destroyed
@@ -161,16 +161,6 @@ module OceanDynamo
     end
 
 
-    def deserialized_attributes(consistent_read: false, hash: nil)
-      hash ||= dynamo_item.attributes.to_hash(consistent_read: consistent_read)
-      result = {}
-      fields.each do |attribute, metadata|
-        result[attribute] = deserialize_attribute(hash[attribute], metadata)
-      end
-      result
-    end
-
-
     def deserialize_attribute(value, metadata, type: metadata[:type])
       case type
       when :string

data/lib/ocean-dynamo/class_variables.rb

@@ -34,5 +34,14 @@ module OceanDynamo
     class_attribute :fields, instance_writer: false
     self.fields = nil
 
+    class_attribute :table_connected, instance_writer: false
+    self.table_connected = false
+
+    class_attribute :table_connect_policy, instance_writer: false
+    self.table_connect_policy = :late
+
+    class_attribute :table_create_policy, instance_writer: false
+    self.table_create_policy = false
+
   end
 end

data/lib/ocean-dynamo/exceptions.rb

@@ -2,6 +2,8 @@ module OceanDynamo
 
   class DynamoError < StandardError; end
 
+  class TableNotFound < DynamoError; end
+
   class UnknownPrimaryKey < DynamoError; end
 
   class UnknownTableStatus < DynamoError; end

data/lib/ocean-dynamo/persistence.rb

@@ -148,6 +148,7 @@ module OceanDynamo
 
 
     def delete
+      _connect_late?
       if persisted?
         @dynamo_item.delete
       end
@@ -166,6 +167,7 @@ module OceanDynamo
 
     def touch(name=nil)
       raise DynamoError, "can not touch on a new record object" unless persisted?
+      _connect_late?
       run_callbacks :touch do
         attrs = ['updated_at']
         attrs << name if name
@@ -185,27 +187,55 @@ module OceanDynamo
 
     protected
 
+    def self._connect_late?
+      return false if table_connected
+      return false unless table_connect_policy
+      establish_db_connection
+      true
+    end
+
+
+    def _connect_late?
+      self.class._connect_late?
+    end
+
+
     def perform_validations(options={}) # :nodoc:
       options[:validate] == false || valid?(options[:context])
     end
 
 
     def dynamo_persist # :nodoc:
+      _connect_late?
       @dynamo_item = dynamo_items.put(serialized_attributes)
       @new_record = false
+      true
     end
 
 
-    def post_instantiate(item, consistent) # :nodoc:
+    def dynamo_unpersist(item, consistent) # :nodoc:
+      _connect_late?
       @dynamo_item = item
       @new_record = false
-      assign_attributes(deserialized_attributes(
-        hash: nil,
-        consistent_read: consistent)
-      )
+      assign_attributes(_dynamo_read_attributes(consistent_read: consistent))
       self
     end
 
 
+    def _dynamo_read_attributes(consistent_read: false) # :nodoc:
+      hash = _dynamo_read_raw_attributes(consistent_read)
+      result = {}
+      fields.each do |attribute, metadata|
+        result[attribute] = deserialize_attribute(hash[attribute], metadata)
+      end
+      result
+    end
+
+
+    def _dynamo_read_raw_attributes(consistent) # :nodoc:
+      dynamo_item.attributes.to_hash(consistent_read: consistent)
+    end
+
+
   end
 end

data/lib/ocean-dynamo/queries.rb

@@ -2,13 +2,15 @@ module OceanDynamo
   class Base
 
     def self.find(hash, range=nil, consistent: false)
+      _connect_late?
       item = dynamo_items[hash, range]
       raise RecordNotFound unless item.exists?
-      new.send(:post_instantiate, item, consistent)
+      new.send(:dynamo_unpersist, item, consistent)
     end
 
 
     def self.count
+      _connect_late?
       dynamo_table.item_count || -1    # The || -1 is for fake_dynamo specs.
     end
 

data/lib/ocean-dynamo/schema.rb

@@ -8,12 +8,16 @@ module OceanDynamo
                            table_name_suffix: nil,
                            read_capacity_units: 10,
                            write_capacity_units: 5,
-                           connect: true,
+                           connect: :late,
+                           create: false,
                            &block)
       # Set class vars
       self.dynamo_client = nil
       self.dynamo_table = nil
       self.dynamo_items = nil
+      self.table_connected = false
+      self.table_connect_policy = connect
+      self.table_create_policy = create
       self.table_hash_key = table_hash_key
       self.table_range_key = table_range_key
       self.table_name = table_name
@@ -27,7 +31,7 @@ module OceanDynamo
       DEFAULT_ATTRIBUTES.each { |name, type, **pairs| attribute name, type, **pairs }
       block.call
       # Connect to AWS
-      establish_db_connection if connect
+      establish_db_connection if connect == true
       # Finally return the full table name
       table_full_name
     end

data/lib/ocean-dynamo/tables.rb

@@ -5,7 +5,9 @@ module OceanDynamo
       setup_dynamo  
       if dynamo_table.exists?
         wait_until_table_is_active
+        self.table_connected = true
       else
+        raise(TableNotFound, table_full_name) unless table_create_policy
         create_table
       end
       set_dynamo_table_keys

data/lib/ocean-dynamo/version.rb

@@ -1,3 +1,3 @@
 module OceanDynamo
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

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