ocean-dynamo 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b38443e8d58e7a350ed2964a808772e77ab0984e
-  data.tar.gz: 313186c1360ace3013305d4cb1917a0ccc384ac0
+  metadata.gz: ff368d52609524104e5a4ebc1d1f3ee662aff305
+  data.tar.gz: b5cee188f14a56e495210b5201c7019137bd8d8a
 SHA512:
-  metadata.gz: 1a4ecd0023e00b2f72b6bd369b59e97d3b63879ecfb81d89e03ed66b86d27602cdbb39e876802e355ff1ec04f2ca3ddc2aba3a1ecbb02803a047c2e035e272ee
-  data.tar.gz: 0ffa4e4ed49eb0f34f9986a8b0592979756653b5e82f4c5339d33ecc5cce37ede389f77abc370b87ca15b5ffede88a4d96408ab899f1c00055acc2840e75ce74
+  metadata.gz: 9b10779bbb989318384e5f7bf1d4fca2ee20da72eecdf441175b8473f22d70a71f9185dd458b2ccc58e073118fbdf5787e8c91dcb3353a7325793a62dec84548
+  data.tar.gz: 10851e376bbcfd6330f7e4414e573e6bc3fe704fdd74afa6a5eff50ff3980c2ca6a49b7dfc962330ff33a4b87862546a275d55e83446acf41c85baac44bf0cd1

data/lib/ocean-dynamo/dynamo.rb

@@ -71,11 +71,13 @@ module OceanDynamo
       true
     end
 
+
     def self.set_table_name_prefix(prefix)
       self.table_name_prefix = prefix
       true
     end
 
+
     def self.set_table_name_suffix(suffix)
       self.table_name_suffix = suffix
       true
@@ -105,7 +107,7 @@ module OceanDynamo
       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 }
+      DEFAULT_FIELDS.each { |k, name, **pairs| attribute k, name, **pairs }
       nil
     end
 
@@ -120,7 +122,7 @@ module OceanDynamo
     end
 
 
-    def self.field(name, type=:string, **pairs)
+    def self.attribute(name, type=:string, **pairs)
       attr_accessor name
       fields[name] = {type:    type, 
                       default: pairs[:default]}
@@ -141,9 +143,6 @@ 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
@@ -189,6 +188,7 @@ module OceanDynamo
       true
     end
 
+
     def self.delete_table
       return false unless dynamo_table.exists? && dynamo_table.status == :active
       dynamo_table.delete
@@ -313,7 +313,8 @@ module OceanDynamo
     def to_key
       return nil unless persisted?
       key = respond_to?(:id) && id
-      key ? [key] : nil
+      return nil unless key
+      table_range_key ? [key, read_attribute(table_range_key)] : [key]
     end
 
 
@@ -372,9 +373,6 @@ module OceanDynamo
     def deserialize_attribute(value, metadata, 
                               type: metadata[:type], 
                               default: metadata[:default])
-      # if value == nil && type != :string
-      #   return evaluate_default(default, type)
-      # end
       case type
       when :string
         return "" if value == nil
@@ -431,7 +429,7 @@ module OceanDynamo
     def save
       begin
         create_or_update
-      rescue RecordInvalid
+      rescue RecordInvalid, RecordNotSaved
         false
       end
     end

data/lib/ocean-dynamo/version.rb

@@ -1,3 +1,3 @@
 module OceanDynamo
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

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