dynamoid 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a8130b39add7870e0217be2f31fc55808f02be5
-  data.tar.gz: 73f7caa9ae29e070fcae4deb87461f7a004d0470
+  metadata.gz: d03723c3178362472031077f90ef4d732c9f6a59
+  data.tar.gz: d5255b0e842355e872056f10c2619f9c9609e96a
 SHA512:
-  metadata.gz: 1e73c399b586b8c264f1b19dcb99e121705a82aaea2efcf68b4b250d1b35d30065ddd3c2fa213c6226260063dd8afd3beb6cd78a6ff7c1130fe92486544392ec
-  data.tar.gz: 89d9baede7e7b40c1e15ffa358b84199c8b5cdc9ea8fb855083da2b63651b1f8304b4afe845c0f7b9b1771a9957e0e0a57881663ad40d67542a0aaa9175605d7
+  metadata.gz: de28cab30c3bd935e588f481986fddc5ad25e46a40a0e5a9675524e71e112f67333f2a663b8951253742b33e655ec556381834acf122c9cb484829c68beb48dc
+  data.tar.gz: 2514d74830f6f8fa4f427eb0ddbed13eec808aaa437a7cac7dc1772a8eb4592dbb1d35551b426cad71ed0e693e6c9d2d532f7d2d1949f72c59c6712136582615

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+# 1.1.0
+
+* Added support for optimistic locking on delete (PR #29, sumocoder)
+* upgrade concurrent-ruby requirement to 1.0 (PR #31, keithmgould)
+
+# 1.0.0
+
+* Add support for AWS SDK v2.
+* Add support for custom class type for fields.
+* Remove partitioning support.
+* Remove support for Dynamoid's (pseudo)indexes, now that DynamoDB offers
+  local and global indexes.
+* Rename :float field type to :number.
+* Rename Chain#limit to Chain#eval_limit.
+
+Housekeeping:
+
+* Switch from `fake_dynamo` for unit tests to DynamoDBLocal. This is the new authoritative
+  implementation of DynamoDB for testing, and it supports AWS SDK v2.
+* Use Travis CI to auto-run unit tests on multiple Rubies.
+* Randomize spec order.

data/README.markdown

@@ -364,6 +364,7 @@ Also, without contributors the project wouldn't be nearly as awesome. So many th
 Running the tests is fairly simple. In one window, run `bin/start_dynamodblocal`, and in the other, use `rake`.
 
 [![Build Status](https://travis-ci.org/Dynamoid/Dynamoid.svg)](https://travis-ci.org/Dynamoid/Dynamoid)
+[![Coverage Status](https://coveralls.io/repos/Dynamoid/Dynamoid/badge.svg?branch=master&service=github)](https://coveralls.io/github/Dynamoid/Dynamoid?branch=master)
 
 ## Copyright
 

data/dynamoid.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = "dynamoid"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   # Keep in sync with README
-  s.authors = %w(
-    Josh Symonds
-    Logan Bowers
-    Craig Heneveld
-    Anatha Kumaran
-    Jason Dew
-    Luis Arias
-    Stefan Neculai
-    Philip White
-    Peeyush Kumar
-  )
+  s.authors = [
+    'Josh Symonds',
+    'Logan Bowers',
+    'Craig Heneveld',
+    'Anatha Kumaran',
+    'Jason Dew',
+    'Luis Arias',
+    'Stefan Neculai',
+    'Philip White',
+    'Peeyush Kumar',
+  ]
   s.description = "Dynamoid is an ORM for Amazon's DynamoDB that supports offline development, associations, querying, and everything else you'd expect from an ActiveRecord-style replacement."
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   ]
   # file list is generated with `git ls-files | grep -v -E -e '^spec/' -e '^\.' -e 'bin/'`
   s.files = %w(
+    CHANGELOG.md
     Gemfile
     LICENSE.txt
     README.markdown
@@ -62,12 +63,13 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency(%q<activemodel>, ["~> 4"])
   s.add_runtime_dependency(%q<aws-sdk-resources>, ["~> 2"])
-  s.add_runtime_dependency(%q<concurrent-ruby>, ["~> 0.9"])
+  s.add_runtime_dependency(%q<concurrent-ruby>, [">= 1.0"])
   s.add_development_dependency(%q<rake>, [">= 0"])
   s.add_development_dependency(%q<rspec>, ["~> 3"])
   s.add_development_dependency(%q<bundler>, [">= 0"])
   s.add_development_dependency(%q<yard>, [">= 0"])
   s.add_development_dependency(%q<github-markup>, [">= 0"])
   s.add_development_dependency(%q<pry>, [">= 0"])
+  s.add_development_dependency(%q<coveralls>, [">= 0"])
 end
 

data/lib/dynamoid/adapter_plugin/aws_sdk_v2.rb

@@ -65,7 +65,7 @@ module Dynamoid
         results = client.batch_get_item(
           request_items: request_items
         )
-        
+
         ret = Hash.new([].freeze) # Default for tables where no rows are returned
         results.data[:responses].each do |table, rows|
           ret[table] = rows.collect { |r| result_item_to_hash(r) }
@@ -107,14 +107,14 @@ module Dynamoid
         read_capacity = options[:read_capacity] || Dynamoid::Config.read_capacity
         write_capacity = options[:write_capacity] || Dynamoid::Config.write_capacity
         range_key = options[:range_key]
-        
+
         key_schema = [
           { attribute_name: key.to_s, key_type: HASH_KEY }
         ]
-        key_schema << { 
+        key_schema << {
           attribute_name: range_key.keys.first.to_s, key_type: RANGE_KEY
         } if(range_key)
-        
+
         #TODO: Provide support for number and binary hash key
         attribute_definitions = [
           { attribute_name: key.to_s, attribute_type: 'S' }
@@ -122,10 +122,10 @@ module Dynamoid
         attribute_definitions << {
           attribute_name: range_key.keys.first.to_s, attribute_type: api_type(range_key.values.first)
         } if(range_key)
-        
+
         client.create_table(table_name: table_name,
           provisioned_throughput: {
-            read_capacity_units: read_capacity, 
+            read_capacity_units: read_capacity,
             write_capacity_units: write_capacity
           },
           key_schema: key_schema,
@@ -144,9 +144,17 @@ module Dynamoid
       # @since 1.0.0
       #
       # @todo: Provide support for various options http://docs.aws.amazon.com/sdkforruby/api/Aws/DynamoDB/Client.html#delete_item-instance_method
-      def delete_item(table_name, key, options = nil)
+      def delete_item(table_name, key, options = {})
+        range_key = options[:range_key]
+        conditions = options[:conditions]
         table = describe_table(table_name)
-        client.delete_item(table_name: table_name, key: key_stanza(table, key, options && options[:range_key]))
+        client.delete_item(
+          table_name: table_name,
+          key: key_stanza(table, key, range_key),
+          expected: expected_stanza(conditions)
+        )
+      rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException => e
+        raise Dynamoid::Errors::ConditionalCheckFailedException, e
       end
 
       # Deletes an entire table from DynamoDB.
@@ -231,7 +239,7 @@ module Dynamoid
       # @todo: Provide support for various options http://docs.aws.amazon.com/sdkforruby/api/Aws/DynamoDB/Client.html#put_item-instance_method
       def put_item(table_name, object, options = nil)
         item = {}
-        
+
         object.each do |k, v|
           next if v.nil? || (v.respond_to?(:empty?) && v.empty?)
           item[k.to_s] = v
@@ -342,10 +350,10 @@ module Dynamoid
       def scan(table_name, scan_hash, select_opts = {})
         limit = select_opts.delete(:limit)
         batch = select_opts.delete(:batch_size)
-        
+
         request = { table_name: table_name }
         request[:limit] = batch || limit if batch || limit
-        request[:scan_filter] = scan_hash.reduce({}) do |memo, kvp| 
+        request[:scan_filter] = scan_hash.reduce({}) do |memo, kvp|
           memo[kvp[0].to_s] = {
             attribute_value_list: [kvp[1]],
             # TODO: Provide support for all comparison operators
@@ -369,7 +377,7 @@ module Dynamoid
           end
         end
       end
-      
+
 
       #
       # Truncates all records in the given table
@@ -381,7 +389,7 @@ module Dynamoid
         table = describe_table(table_name)
         hk    = table.hash_key
         rk    = table.range_key
-        
+
         scan(table_name, {}, {}).each do |attributes|
           opts = {range_key: attributes[rk.to_sym] } if rk
           delete_item(table_name, attributes[hk], opts)
@@ -393,7 +401,7 @@ module Dynamoid
       end
 
       protected
-      
+
       STRING_TYPE  = "S".freeze
       NUM_TYPE     = "N".freeze
       BOOLEAN_TYPE = "B".freeze
@@ -418,7 +426,7 @@ module Dynamoid
         key[table.range_key.to_s] = range_key if range_key
         key
       end
-      
+
       #
       # @param [Hash] conditions Conditions to enforce on operation (e.g. { :if => { :count => 5 }, :unless_exists => ['id']})
       # @return an Expected stanza for the given conditions hash
@@ -426,20 +434,20 @@ module Dynamoid
       def expected_stanza(conditions = nil)
         expected = Hash.new { |h,k| h[k] = {} }
         return expected unless conditions
-        
+
         conditions[:unless_exists].try(:each) do |col|
           expected[col.to_s][:exists] = false
         end
         conditions[:if].try(:each) do |col,val|
           expected[col.to_s][:value] = val
         end
-        
+
         expected
       end
-      
+
       HASH_KEY  = "HASH".freeze
       RANGE_KEY = "RANGE".freeze
-      
+
       #
       # New, semi-arbitrary API to get data on the table
       #
@@ -448,7 +456,7 @@ module Dynamoid
           table_cache[table_name] = Table.new(client.describe_table(table_name: table_name).data)
         end
       end
-      
+
       #
       # Converts a hash returned by get_item, scan, etc. into a key-value hash
       #
@@ -457,35 +465,35 @@ module Dynamoid
           item.each { |k,v| r[k.to_sym] = v }
         end
       end
-      
+
       #
       # Represents a table. Exposes data from the "DescribeTable" API call, and also
       # provides methods for coercing values to the proper types based on the table's schema data
       #
       class Table
         attr_reader :schema
-        
+
         #
         # @param [Hash] schema Data returns from a "DescribeTable" call
         #
         def initialize(schema)
           @schema = schema[:table]
         end
-        
+
         def range_key
           @range_key ||= schema[:key_schema].find { |d| d[:key_type] == RANGE_KEY }.try(:attribute_name)
         end
-        
+
         def range_type
-          range_type ||= schema[:attribute_definitions].find { |d| 
+          range_type ||= schema[:attribute_definitions].find { |d|
             d[:attribute_name] == range_key
           }.try(:fetch,:attribute_type, nil)
         end
-        
+
         def hash_key
           @hash_key ||= schema[:key_schema].find { |d| d[:key_type] == HASH_KEY  }.try(:attribute_name).to_sym
         end
-        
+
         #
         # Returns the API type (e.g. "N", "S") for the given column, if the schema defines it,
         # nil otherwise
@@ -500,31 +508,31 @@ module Dynamoid
           schema[:item_count]
         end
       end
-      
+
       #
-      # Mimics behavior of the yielded object on DynamoDB's update_item API (high level). 
+      # Mimics behavior of the yielded object on DynamoDB's update_item API (high level).
       #
       class ItemUpdater
         attr_reader :table, :key, :range_key
-        
+
         def initialize(table, key, range_key = nil)
           @table = table; @key = key, @range_key = range_key
           @additions = {}
           @deletions = {}
           @updates   = {}
         end
-        
+
         #
-        # Adds the given values to the values already stored in the corresponding columns. 
-        # The column must contain a Set or a number. 
+        # Adds the given values to the values already stored in the corresponding columns.
+        # The column must contain a Set or a number.
         #
-        # @param [Hash] vals keys of the hash are the columns to update, vals are the values to 
+        # @param [Hash] vals keys of the hash are the columns to update, vals are the values to
         #               add. values must be a Set, Array, or Numeric
         #
         def add(values)
           @additions.merge!(values)
         end
-        
+
         #
         # Removes values from the sets of the given columns
         #
@@ -538,19 +546,19 @@ module Dynamoid
         #
         # Replaces the values of one or more attributes
         #
-        def set(values) 
+        def set(values)
           @updates.merge!(values)
         end
-        
+
         #
         # Returns an AttributeUpdates hash suitable for passing to the V2 Client API
         #
         def to_h
           ret = {}
-          
+
           @additions.each do |k,v|
-            ret[k.to_s] = { 
-              action: ADD, 
+            ret[k.to_s] = {
+              action: ADD,
               value: v
             }
           end
@@ -569,7 +577,7 @@ module Dynamoid
 
           ret
         end
-        
+
         ADD    = "ADD".freeze
         DELETE = "DELETE".freeze
         PUT    = "PUT".freeze

data/lib/dynamoid/persistence.rb

@@ -171,8 +171,8 @@ module Dynamoid
     end
 
     #
-    # update!() will increment the lock_version if the table has the column, but will not check it. Thus, a concurrent save will 
-    # never cause an update! to fail, but an update! may cause a concurrent save to fail. 
+    # update!() will increment the lock_version if the table has the column, but will not check it. Thus, a concurrent save will
+    # never cause an update! to fail, but an update! may cause a concurrent save to fail.
     #
     #
     def update!(conditions = {}, &block)
@@ -216,7 +216,21 @@ module Dynamoid
     # @since 0.2.0
     def delete
       options = range_key ? {:range_key => dump_field(self.read_attribute(range_key), self.class.attributes[range_key])} : {}
+
+      # Add an optimistic locking check if the lock_version column exists
+      if(self.class.attributes[:lock_version])
+        conditions = {:if => {}}
+        conditions[:if][:lock_version] =
+          if changes[:lock_version].nil?
+            self.lock_version
+          else
+            changes[:lock_version][0]
+          end
+        options[:conditions] = conditions
+      end
       Dynamoid.adapter.delete(self.class.table_name, self.hash_key, options)
+    rescue Dynamoid::Errors::ConditionalCheckFailedException
+      raise Dynamoid::Errors::StaleObjectError.new(self, 'delete')
     end
 
     # Dump this object's attributes into hash form, fit to be persisted into the datastore.
@@ -268,14 +282,14 @@ module Dynamoid
         end
       end
     end
-    
+
     # Persist the object into the datastore. Assign it an id first if it doesn't have one.
     #
     # @since 0.2.0
     def persist(conditions = nil)
       run_callbacks(:save) do
         self.hash_key = SecureRandom.uuid if self.hash_key.nil? || self.hash_key.blank?
-        
+
         # Add an exists check to prevent overwriting existing records with new ones
         if(new_record?)
           conditions ||= {}

metadata

@@ -1,31 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
-- Josh
-- Symonds
-- Logan
-- Bowers
-- Craig
-- Heneveld
-- Anatha
-- Kumaran
-- Jason
-- Dew
-- Luis
-- Arias
-- Stefan
-- Neculai
-- Philip
-- White
-- Peeyush
-- Kumar
+- Josh Symonds
+- Logan Bowers
+- Craig Heneveld
+- Anatha Kumaran
+- Jason Dew
+- Luis Arias
+- Stefan Neculai
+- Philip White
+- Peeyush Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -59,16 +50,16 @@ dependencies:
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +144,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Dynamoid is an ORM for Amazon's DynamoDB that supports offline development,
   associations, querying, and everything else you'd expect from an ActiveRecord-style
   replacement.
@@ -163,6 +168,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
 files:
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -213,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Dynamoid is an ORM for Amazon's DynamoDB