ocean-dynamo 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0600d1787ee17e3a8b0c3a3a46f6f5ba612a75e
-  data.tar.gz: 00cf766c26b77d5e8bebdc73d98e02d440ef82d4
+  metadata.gz: 6f942e71fcd88e1e0971e48f931e62a686f1cf28
+  data.tar.gz: bb383ce780b0d04419de134073ea56d0bb6d3af7
 SHA512:
-  metadata.gz: b48818cd86654ba5ad998121a824e046c73e1a4cdd8366d141f79f0f26ff6ba75d11c463bd7ede7dffe70a1463dde375ee2be5b4de33a9b08ffe4dfc93eb765c
-  data.tar.gz: a8d5073f16ef39c346a38317b5ac0a28bdea0331be3f2ce55c45ff5757be7b798faf83959e03733360d7abf5d1e41ed3a49b2873919acee5fab32d6a66740b46
+  metadata.gz: b0f6617f8ed0224199f4b935f8faaa1e4ab54fa70086f6fec6834db564dbf4c61caad45f7de2a9a0a4d79aeb7199c17f30069864fbd383311cd304670210bca8
+  data.tar.gz: 6b6bcc33a0eb6f471f0d0d9654f12199b5255babf20c1a4028ef352b7e2ec32bbfffbf5b7db5d609ff807a693b9c0ff1ad190de47eb8735fe0e0f29255408917

data/README.rdoc

@@ -40,7 +40,7 @@ The following example shows the syntax.
 
   class AsyncJob < OceanDynamo::Base
 
-    dynamo_schema do
+    dynamo_schema(:uuid) do
       attribute :credentials,          :string
       attribute :token
       attribute :steps,                :serialized, default: []
@@ -62,8 +62,8 @@ The following example shows the syntax.
 
 Each attribute has a name, a type (+:string+, +:integer+, +:float+, +:datetime+, +:boolean+, 
 or +:serialized+) where +:string+ is the default. Each attribute also optionally has a default 
-value, which can be a Proc. The hash key attribute is by default +:uuid+ (this can of
-course be specified) and is a +:string+. The keys can also be explicitly declared.
+value, which can be a Proc. The hash key attribute is by default +:id+ (overridden as :uuid in
+the example above) and is a +:string+. The keys can also be explicitly declared.
 
 The +:string+, +:integer+, +:float+ and +:datetime+ types can also store sets of their type.
 Sets are represented as arrays, may not contain duplicates and may not be empty.
@@ -74,7 +74,7 @@ value will return the empty string, <tt>""</tt>.
 Also, dynamo_schema takes args and many options. Here's the full syntax:
 
  dynamo_schema(
-   table_hash_key = :uuid,                 # The name of the hash key attribute
+   table_hash_key = :id,                   # The name of the hash key attribute
    table_range_key = nil,                  # The name of the range key attribute (or nil)
    table_name: compute_table_name,         # The basename of the DynamoDB table
    table_name_prefix: nil,                 # A basename prefix string or nil

data/lib/ocean-dynamo/attributes.rb

@@ -22,7 +22,7 @@ module OceanDynamo
         @new_record = true
         raise UnknownPrimaryKey unless table_hash_key
       end
-      attrs &&  attrs.delete_if { |k, v| !fields.has_key?(k) }
+      attrs && attrs.delete_if { |k, v| !fields.has_key?(k) }
       super(attrs)
     end
 
@@ -38,7 +38,7 @@ module OceanDynamo
 
 
     def id
-      read_attribute(table_hash_key)
+     read_attribute(table_hash_key)
     end
 
 
@@ -46,6 +46,10 @@ module OceanDynamo
       write_attribute(table_hash_key, value)
     end
 
+    def id?
+      read_attribute(table_hash_key).present?
+    end
+
 
     def read_attribute_for_validation(key)
       @attributes[key.to_s]
@@ -54,16 +58,18 @@ module OceanDynamo
 
     def read_attribute(attr_name)
       attr_name = attr_name.to_s
-      if attr_name == 'id' && fields[table_hash_key] != attr_name.to_sym
-        return read_attribute(table_hash_key)
+      attr_name = table_hash_key.to_s if attr_name == 'id'
+      if fields.has_key?(attr_name)
+        @attributes[attr_name]
+      else
+        raise ActiveModel::MissingAttributeError, "can't read unknown attribute `#{attr_ name}"
       end
-      @attributes[attr_name]   # Type cast!
     end
 
 
     def write_attribute(attr_name, value)
       attr_name = attr_name.to_s
-      attr_name = table_hash_key.to_s if attr_name == 'id' && fields[table_hash_key]
+      attr_name = table_hash_key.to_s if attr_name == 'id'
       if fields.has_key?(attr_name)
         @attributes[attr_name] = type_cast_attribute_for_write(attr_name, value)
       else
@@ -80,7 +86,7 @@ module OceanDynamo
     end
 
 
-    def assign_attributes(values)
+    def assign_attributes(values, without_protection: false)
       return if values.blank?
       values = values.stringify_keys
       # if values.respond_to?(:permitted?)

data/lib/ocean-dynamo/persistence.rb

@@ -83,14 +83,14 @@ module OceanDynamo
     end
 
 
-    def update_attributes(attrs={})
-      assign_attributes(attrs)
+    def update_attributes(attrs={}, options={})
+      assign_attributes(attrs, options)
       save
     end
 
 
-    def update_attributes!(attrs={})
-      assign_attributes(attrs)
+    def update_attributes!(attrs={}, options={})
+      assign_attributes(attrs, options)
       save!
     end
 

data/lib/ocean-dynamo/queries.rb

@@ -16,6 +16,11 @@ module OceanDynamo
     end
 
 
+    def self.find_by_id(*args)
+      find_by_key(*args)
+    end
+
+
     def self.count
       _late_connect?
       dynamo_table.item_count || -1    # The || -1 is for fake_dynamo specs.

data/lib/ocean-dynamo/schema.rb

@@ -2,7 +2,7 @@ module OceanDynamo
   class Base
 
 
-    def self.dynamo_schema(table_hash_key=:uuid, 
+    def self.dynamo_schema(table_hash_key=:id, 
                            table_range_key=nil,
                            table_name: compute_table_name,
                            table_name_prefix: nil,
@@ -32,15 +32,17 @@ module OceanDynamo
       self.timestamp_attributes = timestamps
       # Init
       self.fields = HashWithIndifferentAccess.new
-      attribute table_hash_key, :string, default: ''
+      attribute table_hash_key, :string, default: ""
       timestamp_attributes.each { |name| attribute name, :datetime } if timestamp_attributes
-      attribute(lock_attribute, :integer, default: 0) if lock_attribute
+      attribute(lock_attribute, :integer, default: 0) if locking
       block.call
       # Define attribute accessors
       fields.each do |name, md| 
-        self.class_eval "def #{name}; read_attribute('#{name.to_s}'); end"
-        self.class_eval "def #{name}=(value); write_attribute('#{name.to_s}', value); end"
-        self.class_eval "def #{name}?; read_attribute('#{name.to_s}').present?; end"
+        name = name.to_s
+        # We define accessors even if the name is 'id' (for which we already have methods)
+        self.class_eval "def #{name}; read_attribute('#{name}'); end"
+        self.class_eval "def #{name}=(value); write_attribute('#{name}', value); end"
+        self.class_eval "def #{name}?; read_attribute('#{name}').present?; end"
       end
       # Connect to AWS
       establish_db_connection if connect == true

data/lib/ocean-dynamo/version.rb

@@ -1,3 +1,3 @@
 module OceanDynamo
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

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