ocean-dynamo 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bb66981fe7a08584a0a51f81e8cc458a354cac7
-  data.tar.gz: d3ee6d39bfac9fe8622b91e7e485dbcbca16c8d3
+  metadata.gz: d38051cf48cd11c7a0dac98fcf9b9428e41d3d13
+  data.tar.gz: bb3df7327933a280a85f5c01214844e65c521c8b
 SHA512:
-  metadata.gz: 4408c7038ebb322f96fd12d65b399f2dc7fdd59708a7f8d13659bba56b4996bb4987e9d052004e7cc0fa35c41e16548364ae87e7df9823adb5d2c03c0dc1ed29
-  data.tar.gz: 29d4cdabc73cd9f84895cd9000c10099f001d56d5bffdfc92d0aab2dee4a4e1b66316e405945f38228814d40224e8ae91aabdcfbc9342da5ab57d51f297d13f5
+  metadata.gz: 1722be5b26ed320e782858b4842eb69aa24e29add54f019575e46fff97ff1a556c922de52390df2a5d6b859db2d6077d833742b852fedbaf938c5c15cfab3899
+  data.tar.gz: 9657f0d36b07e2b2d7ec4a036984dc3305f6121ee57648ac970da2b801e3ff37ffa7c5c98078fa937053619fdc81a96a71ad020090050bd4e7f9c2d09b038b38

data/lib/ocean-dynamo/dynamo.rb

@@ -7,7 +7,7 @@ module OceanDynamo
     [:created_at,   :datetime], 
     [:updated_at,   :datetime],
     [:lock_version, :integer, default: 0]
-  ]
+  ].freeze
 
   class DynamoError < StandardError; end
 
@@ -33,20 +33,37 @@ module OceanDynamo
     # ---------------------------------------------------------
 
     class_attribute :dynamo_client, instance_writer: false
+    self.dynamo_client = nil
+
     class_attribute :dynamo_table, instance_writer: false
+    self.dynamo_table = nil
+
     class_attribute :dynamo_items, instance_writer: false
+    self.dynamo_items = nil
 
     class_attribute :table_name, instance_writer: false
+    self.table_name = nil
+
     class_attribute :table_name_prefix, instance_writer: false
+    self.table_name_prefix = nil
+
     class_attribute :table_name_suffix, instance_writer: false
+    self.table_name_suffix = nil
 
     class_attribute :table_hash_key, instance_writer: false
+    self.table_hash_key = nil
+
     class_attribute :table_range_key, instance_writer: false
+    self.table_range_key = nil
 
     class_attribute :table_read_capacity_units, instance_writer: false
+    self.table_read_capacity_units = 10
+
     class_attribute :table_write_capacity_units, instance_writer: false
+    self.table_write_capacity_units = 5
 
     class_attribute :fields, instance_writer: false
+    self.fields = nil
 
 
     def self.set_table_name(name)
@@ -72,9 +89,20 @@ module OceanDynamo
     end
 
 
+    #
+    # This is where the class is initialized
+    #
     def self.primary_key(hash_key, range_key=nil)
+      self.dynamo_client = nil
+      self.dynamo_table = nil
+      self.dynamo_items = nil
+      self.table_name = nil
+      self.table_name_prefix = nil
+      self.table_name_suffix = nil
+      self.fields = HashWithIndifferentAccess.new
       self.table_hash_key = hash_key
       self.table_range_key = range_key
+      DEFAULT_FIELDS.each { |k, name, **pairs| field k, name, **pairs }
       # Find a better place to do the following initialisation:
       set_table_name compute_table_name unless self.table_name
       nil
@@ -99,7 +127,7 @@ module OceanDynamo
 
 
     def self.establish_db_connection
-      setup_dynamo      
+      setup_dynamo  
       if dynamo_table.exists?
         wait_until_table_is_active
       else
@@ -112,6 +140,9 @@ module OceanDynamo
     def self.setup_dynamo
       #self.dynamo_client = AWS::DynamoDB::Client.new(:api_version => '2012-08-10') 
       self.dynamo_client ||= AWS::DynamoDB.new
+
+      # TODO Create a non-inherited class accessor (SOLVE THAT PROBLEM!) called dynamo_tables
+
       self.dynamo_table = dynamo_client.tables[table_full_name]
       self.dynamo_items = dynamo_table.items
     end
@@ -215,19 +246,6 @@ module OceanDynamo
     define_model_callbacks :touch
 
 
-    # ---------------------------------------------------------
-    #
-    #  Class initialisation, done once at load time
-    #
-    # ---------------------------------------------------------
-
-    self.table_read_capacity_units = 10
-    self.table_write_capacity_units = 5
-
-    self.fields = HashWithIndifferentAccess.new
-    DEFAULT_FIELDS.each { |k, name, **pairs| Base.field k, name, **pairs }
-
-
     # ---------------------------------------------------------
     #
     #  Instance variables and methods
@@ -251,15 +269,17 @@ module OceanDynamo
             self.class.class_eval "def #{name}?; read_attribute('#{name}'); end"
           end
         end
-        if attrs
-          attrs.delete_if { |k, v| !fields.has_key?(k) }
-        end
-        super(attrs)
+
         @dynamo_item = nil
         @destroyed = false
         @new_record = true
         raise NoPrimaryKeyDeclared unless table_hash_key
       end
+
+      if attrs
+          attrs.delete_if { |k, v| !fields.has_key?(k) }
+      end
+      super(attrs)
     end
 
 

data/lib/ocean-dynamo/version.rb

@@ -1,3 +1,3 @@
 module OceanDynamo
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

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