dynamoid 0.4.1 → 0.5.0

data/Dynamoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dynamoid"
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Symonds"]
-  s.date = "2012-05-04"
+  s.date = "2012-08-22"
   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.email = "josh@joshsymonds.com"
   s.extra_rdoc_files = [
@@ -81,7 +81,6 @@ Gem::Specification.new do |s|
     "lib/dynamoid.rb",
     "lib/dynamoid/adapter.rb",
     "lib/dynamoid/adapter/aws_sdk.rb",
-    "lib/dynamoid/adapter/local.rb",
     "lib/dynamoid/associations.rb",
     "lib/dynamoid/associations/association.rb",
     "lib/dynamoid/associations/belongs_to.rb",
@@ -95,23 +94,26 @@ Gem::Specification.new do |s|
     "lib/dynamoid/config/options.rb",
     "lib/dynamoid/criteria.rb",
     "lib/dynamoid/criteria/chain.rb",
+    "lib/dynamoid/dirty.rb",
     "lib/dynamoid/document.rb",
     "lib/dynamoid/errors.rb",
     "lib/dynamoid/fields.rb",
     "lib/dynamoid/finders.rb",
+    "lib/dynamoid/identity_map.rb",
     "lib/dynamoid/indexes.rb",
     "lib/dynamoid/indexes/index.rb",
+    "lib/dynamoid/middleware/identity_map.rb",
     "lib/dynamoid/persistence.rb",
     "lib/dynamoid/validations.rb",
     "spec/app/models/address.rb",
     "spec/app/models/camel_case.rb",
     "spec/app/models/magazine.rb",
+    "spec/app/models/message.rb",
     "spec/app/models/sponsor.rb",
     "spec/app/models/subscription.rb",
     "spec/app/models/tweet.rb",
     "spec/app/models/user.rb",
     "spec/dynamoid/adapter/aws_sdk_spec.rb",
-    "spec/dynamoid/adapter/local_spec.rb",
     "spec/dynamoid/adapter_spec.rb",
     "spec/dynamoid/associations/association_spec.rb",
     "spec/dynamoid/associations/belongs_to_spec.rb",
@@ -122,9 +124,11 @@ Gem::Specification.new do |s|
     "spec/dynamoid/config_spec.rb",
     "spec/dynamoid/criteria/chain_spec.rb",
     "spec/dynamoid/criteria_spec.rb",
+    "spec/dynamoid/dirty_spec.rb",
     "spec/dynamoid/document_spec.rb",
     "spec/dynamoid/fields_spec.rb",
     "spec/dynamoid/finders_spec.rb",
+    "spec/dynamoid/identity_map_spec.rb",
     "spec/dynamoid/indexes/index_spec.rb",
     "spec/dynamoid/indexes_spec.rb",
     "spec/dynamoid/persistence_spec.rb",
@@ -135,7 +139,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/Veraticus/Dynamoid"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "Dynamoid is an ORM for Amazon's DynamoDB"
 
   if s.respond_to? :specification_version then
@@ -145,7 +149,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activemodel>, [">= 0"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
       s.add_runtime_dependency(%q<aws-sdk>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -153,11 +156,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<redcarpet>, ["= 1.17.2"])
       s.add_development_dependency(%q<github-markup>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
+      s.add_development_dependency(%q<fake_dynamo>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, ["= 0.10.0"])
     else
       s.add_dependency(%q<activemodel>, [">= 0"])
       s.add_dependency(%q<tzinfo>, [">= 0"])
       s.add_dependency(%q<aws-sdk>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -165,12 +170,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<redcarpet>, ["= 1.17.2"])
       s.add_dependency(%q<github-markup>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<fake_dynamo>, [">= 0"])
+      s.add_dependency(%q<mocha>, ["= 0.10.0"])
     end
   else
     s.add_dependency(%q<activemodel>, [">= 0"])
     s.add_dependency(%q<tzinfo>, [">= 0"])
     s.add_dependency(%q<aws-sdk>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
@@ -178,6 +185,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<redcarpet>, ["= 1.17.2"])
     s.add_dependency(%q<github-markup>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<fake_dynamo>, [">= 0"])
+    s.add_dependency(%q<mocha>, ["= 0.10.0"])
   end
 end
 

data/Gemfile

@@ -10,7 +10,6 @@ gem 'aws-sdk'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "mocha"
   gem "rake"
   gem "rspec"
   gem "bundler"
@@ -18,4 +17,7 @@ group :development do
   gem "yard"
   gem "redcarpet", '1.17.2'
   gem 'github-markup'
+  gem 'pry'
+  gem 'fake_dynamo'
+  gem "mocha", '0.10.0'
 end

data/Gemfile.lock

@@ -1,49 +1,71 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
+    activesupport (3.2.8)
       i18n (~> 0.6)
-    activesupport (3.1.3)
       multi_json (~> 1.0)
-    aws-sdk (1.3.5)
+    aws-sdk (1.6.4)
       httparty (~> 0.7)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     builder (3.0.0)
+    coderay (1.0.7)
     diff-lcs (1.1.3)
+    fake_dynamo (0.0.9)
+      activesupport
+      json
+      sinatra
     git (1.2.5)
-    github-markup (0.7.1)
-    httparty (0.8.1)
-      multi_json
+    github-markup (0.7.4)
+    httparty (0.8.3)
+      multi_json (~> 1.0)
       multi_xml
     i18n (0.6.0)
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.5)
+      rdoc
+    json (1.7.5)
     metaclass (0.0.1)
+    method_source (0.8)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
-    multi_json (1.0.4)
-    multi_xml (0.4.1)
-    nokogiri (1.5.0)
+    multi_json (1.3.6)
+    multi_xml (0.5.1)
+    nokogiri (1.5.5)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
     rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
     redcarpet (1.17.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    tzinfo (0.3.31)
-    uuidtools (2.1.2)
-    yard (0.7.5)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    slop (3.3.2)
+    tilt (1.3.3)
+    tzinfo (0.3.33)
+    uuidtools (2.1.3)
+    yard (0.8.2.1)
 
 PLATFORMS
   ruby
@@ -52,9 +74,11 @@ DEPENDENCIES
   activemodel
   aws-sdk
   bundler
+  fake_dynamo
   github-markup
   jeweler
-  mocha
+  mocha (= 0.10.0)
+  pry
   rake
   redcarpet (= 1.17.2)
   rspec

data/README.markdown

@@ -1,6 +1,10 @@
 # Dynamoid
 
-Dynamoid is an ORM for Amazon's DynamoDB for Ruby applications. It provides similar functionality to ActiveRecord and improves on Amazon's existing [HashModel](http://docs.amazonwebservices.com/AWSRubySDK/latest/AWS/Record/HashModel.html) by providing better searching tools, native association support, and a local adapter for offline development.
+Dynamoid is an ORM for Amazon's DynamoDB for Ruby applications. It
+provides similar functionality to ActiveRecord and improves on
+Amazon's existing
+[HashModel](http://docs.amazonwebservices.com/AWSRubySDK/latest/AWS/Record/HashModel.html)
+by providing better searching tools and native association support.
 
 DynamoDB is not like other document-based databases you might know, and is very different indeed from relational databases. It sacrifices anything beyond the simplest relational queries and transactional support to provide a fast, cost-efficient, and highly durable storage solution. If your database requires complicated relational queries and transaction support, then this modest Gem cannot provide them for you, and neither can DynamoDB. In those cases you would do better to look elsewhere for your database needs.
 
@@ -18,7 +22,6 @@ Then you need to initialize it to get it going. Put code similar to this somewhe
 
 ```ruby
   Dynamoid.configure do |config|
-    config.adapter = 'local' # This adapter allows offline development without connecting to the DynamoDB servers. Data is *NOT* persisted.
     # config.adapter = 'aws_sdk' # This adapter establishes a connection to the DynamoDB servers using Amazon's own AWS gem.
     # config.access_key = 'access_key' # If connecting to DynamoDB, your access key is required.
     # config.secret_key = 'secret_key' # So is your secret key.
@@ -254,7 +257,7 @@ Also, without contributors the project wouldn't be nearly as awesome. So many th
 
 ## Running the tests
 
-The tests can be run in the simple predictable way with ```rake```. However, if you provide environment variables for ACCESS_KEY and SECRET_KEY, the tests will use the aws_sdk adapter rather than the local adapter: ```ACCESS_KEY=<accesskey> SECRET_KEY=<secretkey> rake```. Keep in mind this takes much, much longer than the local tests.
+Running the tests is fairly simple. In one window, run `fake_dynamo`, and in the other, use `rake`.
 
 ## Copyright
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/lib/dynamoid.rb

@@ -13,14 +13,18 @@ require 'dynamoid/fields'
 require 'dynamoid/indexes'
 require 'dynamoid/associations'
 require 'dynamoid/persistence'
+require 'dynamoid/dirty'
 require 'dynamoid/validations'
 require 'dynamoid/criteria'
 require 'dynamoid/finders'
+require 'dynamoid/identity_map'
 require 'dynamoid/config'
 require 'dynamoid/components'
 require 'dynamoid/document'
 require 'dynamoid/adapter'
 
+require 'dynamoid/middleware/identity_map'
+
 module Dynamoid
   extend self
 

data/lib/dynamoid/adapter.rb

@@ -7,7 +7,7 @@ module Dynamoid
     extend self
     attr_accessor :tables
 
-    # The actual adapter currently in use: presently, either AwsSdk or Local.
+    # The actual adapter currently in use: presently AwsSdk.
     #
     # @since 0.2.0
     def adapter
@@ -164,8 +164,8 @@ module Dynamoid
     # Delegate all methods that aren't defind here to the underlying adapter.
     #
     # @since 0.2.0
-    def method_missing(method, *args)
-      return benchmark(method, *args) {adapter.send(method, *args)} if @adapter.respond_to?(method)
+    def method_missing(method, *args, &block)
+      return benchmark(method, *args) {adapter.send(method, *args, &block)} if @adapter.respond_to?(method)
       super
     end
 

data/lib/dynamoid/adapter/aws_sdk.rb

@@ -18,7 +18,7 @@ module Dynamoid
       #
       # @since 0.2.0
       def connect!
-        @@connection = AWS::DynamoDB.new(:access_key_id => Dynamoid::Config.access_key, :secret_access_key => Dynamoid::Config.secret_key, :dynamo_db_endpoint => Dynamoid::Config.endpoint)
+        @@connection = AWS::DynamoDB.new(:access_key_id => Dynamoid::Config.access_key, :secret_access_key => Dynamoid::Config.secret_key, :dynamo_db_endpoint => Dynamoid::Config.endpoint, :use_ssl => Dynamoid::Config.use_ssl, :dynamo_db_port => Dynamoid::Config.port)
       end
 
       # Return the established connection.
@@ -63,7 +63,7 @@ module Dynamoid
       #
       # @since 0.2.0
       def create_table(table_name, key = :id, options = {})
-        Dynamite.logger.info "Creating #{table_name} table. This could take a while."
+        Dynamoid.logger.info "Creating #{table_name} table. This could take a while."
         options[:hash_key] ||= {key.to_sym => :string}
         read_capacity = options[:read_capacity] || Dynamoid::Config.read_capacity
         write_capacity = options[:write_capacity] || Dynamoid::Config.write_capacity
@@ -82,11 +82,7 @@ module Dynamoid
       def delete_item(table_name, key, options = {})
         range_key = options.delete(:range_key)
         table = get_table(table_name)
-        result = if table.composite_key?
-          table.items.at(key, range_key)
-        else
-          table.items[key]
-        end
+        result = table.items.at(key, range_key)
         result.delete unless result.attributes.to_h.empty?
         true
       end
@@ -98,7 +94,10 @@ module Dynamoid
       #
       # @since 0.2.0
       def delete_table(table_name)
-        @@connection.tables[table_name].delete
+        Dynamoid.logger.info "Deleting #{table_name} table. This could take a while."
+        table = @@connection.tables[table_name]
+        table.delete
+        sleep 0.5 while table.exists? == true
       end
 
       # @todo Add a DescribeTable method.
@@ -119,11 +118,8 @@ module Dynamoid
         range_key = options.delete(:range_key)
         table = get_table(table_name)
 
-        result = if table.composite_key?
-          table.items.at(key, range_key)
-        else
-          table.items[key]
-        end.attributes.to_h(options)
+        result = table.items.at(key, range_key).attributes.to_h(options)
+
         if result.empty?
           nil
         else
@@ -131,6 +127,16 @@ module Dynamoid
         end
       end
 
+      def update_item(table_name, key, options = {}, &block)
+        range_key = options.delete(:range_key)
+        conditions = options.delete(:conditions) || {}
+        table = get_table(table_name)
+        item = table.items.at(key, range_key)
+        item.attributes.update(conditions.merge(:return => :all_new), &block)
+      rescue AWS::DynamoDB::Errors::ConditionalCheckFailedException
+        raise Dynamoid::Errors::ConditionalCheckFailedException
+      end
+
       # List all tables on DynamoDB.
       #
       # @since 0.2.0

data/lib/dynamoid/components.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Dynamoid
-  
+
   # All modules that a Document is composed of are defined in this
   # module, to keep the document class from getting too cluttered.
   module Components
@@ -10,15 +10,14 @@ module Dynamoid
       extend ActiveModel::Translation
       extend ActiveModel::Callbacks
 
-      define_model_callbacks :create, :save, :destroy
-      
+      define_model_callbacks :create, :save, :destroy, :initialize
+
       before_create :set_created_at
       before_save :set_updated_at
     end
 
     include ActiveModel::AttributeMethods
     include ActiveModel::Conversion
-    include ActiveModel::Dirty
     include ActiveModel::MassAssignmentSecurity
     include ActiveModel::Naming
     include ActiveModel::Observing
@@ -31,5 +30,7 @@ module Dynamoid
     include Dynamoid::Associations
     include Dynamoid::Criteria
     include Dynamoid::Validations
+    include Dynamoid::IdentityMap
+    include Dynamoid::Dirty
   end
 end

data/lib/dynamoid/config.rb

@@ -3,7 +3,7 @@ require "uri"
 require "dynamoid/config/options"
 
 module Dynamoid
-  
+
   # Contains all the basic configuration information required for Dynamoid: both sensible defaults and required fields.
   module Config
     extend self
@@ -11,7 +11,7 @@ module Dynamoid
     include ActiveModel::Observing
 
     # All the default options.
-    option :adapter, :default => 'local'
+    option :adapter, :default => 'aws-sdk'
     option :namespace, :default => defined?(Rails) ? "dynamoid_#{Rails.application.class.parent_name}_#{Rails.env}" : "dynamoid"
     option :logger, :default => defined?(Rails)
     option :access_key
@@ -22,8 +22,11 @@ module Dynamoid
     option :partitioning, :default => false
     option :partition_size, :default => 200
     option :endpoint, :default => 'dynamodb.us-east-1.amazonaws.com'
+    option :use_ssl, :default => true
+    option :port, :default => '80'
     option :included_models, :default => []
-    
+    option :identity_map, :default => false
+
     # The default logger for Dynamoid: either the Rails logger or just stdout.
     #
     # @since 0.2.0
@@ -37,7 +40,7 @@ module Dynamoid
     def logger
       @logger ||= default_logger
     end
-    
+
     # If you want to, set the logger manually to any output you'd like. Or pass false or nil to disable logging entirely.
     #
     # @since 0.2.0