dynamoid 0.4.1 → 0.5.0

data/spec/dynamoid_spec.rb

@@ -2,4 +2,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Dynamoid" do
 
+  it "doesn't puke when asked for the assocations of a new record" do
+    User.new.books.should == []
+  end
+
 end

data/spec/spec_helper.rb

@@ -5,16 +5,19 @@ MODELS = File.join(File.dirname(__FILE__), "app/models")
 
 require 'rspec'
 require 'dynamoid'
+require 'pry'
 require 'mocha'
 
+ENV['ACCESS_KEY'] ||= 'abcd'
+ENV['SECRET_KEY'] ||= '1234'
+
 Dynamoid.configure do |config|
-  if ENV['ACCESS_KEY'] && ENV['SECRET_KEY']
-    config.adapter = 'aws_sdk'
-    config.access_key = ENV['ACCESS_KEY']
-    config.secret_key = ENV['SECRET_KEY']
-  else
-    config.adapter = 'local'
-  end
+  config.adapter = 'aws_sdk'
+  config.access_key = ENV['ACCESS_KEY']
+  config.secret_key = ENV['SECRET_KEY']
+  config.endpoint = 'localhost'
+  config.port = '4567'
+  config.use_ssl = false
   config.namespace = 'dynamoid_tests'
   config.warn_on_scan = false
 end
@@ -29,26 +32,19 @@ Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require file }
 
 RSpec.configure do |config|
   config.mock_with(:mocha)
-  
-  if ENV['ACCESS_KEY'] && ENV['SECRET_KEY']
-    config.before(:each) do
-      Dynamoid::Adapter.list_tables.each do |table|
-        if table =~ /^#{Dynamoid::Config.namespace}/
-          table = Dynamoid::Adapter.get_table(table)
-          table.items.each {|i| i.delete}
-        end
-      end      
-    end
-    
-    config.after(:suite) do
-      Dynamoid::Adapter.list_tables.each do |table|
-        Dynamoid::Adapter.delete_table(table) if table =~ /^#{Dynamoid::Config.namespace}/
+
+  config.before(:each) do
+    Dynamoid::Adapter.list_tables.each do |table|
+      if table =~ /^#{Dynamoid::Config.namespace}/
+        table = Dynamoid::Adapter.get_table(table)
+        table.items.each {|i| i.delete}
       end
     end
-  else
-    config.before(:each) do
-      Dynamoid::Adapter.tables = []
-      Dynamoid::Adapter.reset_data
+  end
+
+  config.after(:suite) do
+    Dynamoid::Adapter.list_tables.each do |table|
+      Dynamoid::Adapter.delete_table(table) if table =~ /^#{Dynamoid::Config.namespace}/
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +140,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.17.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.17.2
+- !ruby/object:Gem::Dependency
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,23 +172,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: fake_dynamo
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -187,6 +203,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.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.
@@ -261,7 +293,6 @@ files:
 - 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
@@ -275,23 +306,26 @@ files:
 - 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
@@ -302,9 +336,11 @@ files:
 - 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
@@ -326,7 +362,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1975783982419623416
+      hash: 396768872286184895
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -335,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Dynamoid is an ORM for Amazon's DynamoDB

data/lib/dynamoid/adapter/local.rb

@@ -1,196 +0,0 @@
-module Dynamoid
-  module Adapter
-    
-    # This gimpy hash construct should be equivalent to Amazon's actual DynamoDB, for offline development.
-    # All tests pass with either this or connecting to the real DynamoDB, and that's good enough for me.
-    module Local
-      extend self
-      
-      # The hash holding all of our data.
-      #
-      # @return [Hash] a hash of raw values
-      #
-      # @since 0.2.0
-      def data
-        @data ||= {}
-      end
-    
-      # A convenience method for testing that destroys all table data without destroying their structure.
-      #
-      # @since 0.2.0
-      def reset_data
-        self.data.each {|k, v| v[:data] = {}}
-      end
-    
-      # Get many items at once from the hash.
-      # 
-      # @example Retrieve IDs 1 and 2 from the table testtable
-      #   Dynamoid::Adapter::Local.batch_get_item('table1' => ['1', '2'])
-      #
-      # @param [Hash] options the hash of tables and IDs to retrieve
-      #
-      # @return [Hash] a hash where keys are the table names and the values are the retrieved items
-      #
-      # @since 0.2.0
-      def batch_get_item(options)
-        Hash.new { |h, k| h[k] = Array.new }.tap do |hash|
-          options.each do |table_name, keys|
-            table = data[table_name]
-            if table[:range_key]
-              Array(keys).each do |hash_key, range_key|
-                hash[table_name] << get_item(table_name, hash_key, :range_key => range_key)
-              end
-            else
-              Array(keys).each do |key|
-                hash[table_name] << get_item(table_name, key)
-              end
-            end
-          end
-        end
-      end
-    
-      # Create a table.
-      #
-      # @param [String] table_name the name of the table to create
-      # @param [Symbol] key the table's primary key (defaults to :id)
-      # @param [Hash] options provide a range_key here if you want one for the table
-      #
-      # @since 0.2.0
-      def create_table(table_name, key, options = {})
-        range_key = options[:range_key] && options[:range_key].keys.first
-        data[table_name] = {:hash_key => key, :range_key => range_key, :data => {}}
-      end
-    
-      # Removes an item from the hash.
-      #
-      # @param [String] table_name the name of the table
-      # @param [String] key the hash key of the item to delete
-      # @param [Number] range_key the range key of the item to delete, required if the table has a composite key
-      #
-      # @since 0.2.0
-      def delete_item(table_name, key, options = {})
-        range_key = options.delete(:range_key)
-        data[table_name][:data].delete("#{key}.#{range_key}")
-      end
-    
-      # Deletes an entire table from the hash.
-      #
-      # @param [String] table_name the name of the table to destroy
-      #
-      # @since 0.2.0
-      def delete_table(table_name)
-        data.delete(table_name)
-      end
-    
-      # @todo Add a DescribeTable method.
-    
-      # Fetches an item from the hash.
-      #
-      # @param [String] table_name the name of the table
-      # @param [String] key the hash key of the item to find
-      # @param [Number] range_key the range key of the item to find, required if the table has a composite key
-      #
-      # @return [Hash] a hash representing the raw item
-      #
-      # @since 0.2.0
-      def get_item(table_name, key, options = {})
-        range_key = options[:range_key]
-        if data[table_name][:data]
-          data[table_name][:data]["#{key}.#{range_key}"]
-        else
-          nil
-        end
-      end
-    
-      # List all tables on DynamoDB.
-      #
-      # @since 0.2.0
-      def list_tables
-        data.keys
-      end
-    
-      # Persists an item in the hash.
-      #
-      # @param [String] table_name the name of the table
-      # @param [Object] object a hash or Dynamoid object to persist
-      #
-      # @since 0.2.0
-      def put_item(table_name, object)
-        table = data[table_name]
-        table[:data][object[table[:hash_key]]]
-        table[:data]["#{object[table[:hash_key]]}.#{object[table[:range_key]]}"] = object.delete_if{|k, v| v.nil? || (v.respond_to?(:empty?) && v.empty?)}
-      rescue
-        raise data.inspect
-      end
-    
-      # Query the hash.
-      #
-      # @param [String] table_name the name of the table
-      # @param [Hash] opts the options to query the table with
-      # @option opts [String] :hash_value the value of the hash key to find
-      # @option opts [Range] :range_value find the range key within this range
-      # @option opts [Number] :range_greater_than find range keys greater than this
-      # @option opts [Number] :range_less_than find range keys less than this
-      # @option opts [Number] :range_gte find range keys greater than or equal to this
-      # @option opts [Number] :range_lte find range keys less than or equal to this
-      #
-      # @return [Array] an array of all matching items
-      #
-      # @since 0.2.0
-      def query(table_name, opts = {})
-        id = opts[:hash_value]
-        hash_key = data[table_name][:hash_key]
-        range_key = data[table_name][:range_key]
-
-        results = if opts[:range_value]
-          data[table_name][:data].values.find_all{|v| v[hash_key] == id && !v[range_key].nil? && opts[:range_value].include?(v[range_key])}
-        elsif opts[:range_greater_than]
-          data[table_name][:data].values.find_all{|v| v[hash_key] == id && !v[range_key].nil? && v[range_key] > opts[:range_greater_than]}
-        elsif opts[:range_less_than]
-          data[table_name][:data].values.find_all{|v| v[hash_key] == id && !v[range_key].nil? && v[range_key] < opts[:range_less_than]}
-        elsif opts[:range_gte]
-          data[table_name][:data].values.find_all{|v| v[hash_key] == id && !v[range_key].nil? && v[range_key] >= opts[:range_gte]}
-        elsif opts[:range_lte]  
-          data[table_name][:data].values.find_all{|v| v[hash_key] == id && !v[range_key].nil? && v[range_key] <= opts[:range_lte]}
-        else
-          data[table_name][:data].values.find_all{|v| v[hash_key] == id}
-        end
-
-        results = drop_till_start(results, opts[:next_token], range_key, hash_key)
-        results = results.take(opts[:limit]) if opts[:limit]
-        results
-      end
-    
-      # Scan the hash.
-      #
-      # @param [String] table_name the name of the table
-      # @param [Hash] scan_hash a hash of attributes: matching records will be returned by the scan
-      #
-      # @return [Array] an array of all matching items
-      #
-      # @since 0.2.0
-      def scan(table_name, scan_hash, opts = {})
-        return [] if data[table_name].nil?
-        results = data[table_name][:data].values.flatten.select{|d| scan_hash.all?{|k, v| !d[k].nil? && d[k] == v}}
-        results = drop_till_start(results, opts[:next_token], data[table_name][:range_key], data[table_name][:hash_key])
-        results = results.take(opts[:limit]) if opts[:limit]
-        results
-      end
-
-      def drop_till_start(results, next_token, range_key, hash_key)
-        return results unless next_token
-
-        hash_value = next_token[:hash_key_element].values.first
-        range_value = next_token[:range_key_element].values.first if next_token[:range_key_element]
-
-        results = results.drop_while do |r|
-          (r[hash_key] != hash_value or r[range_key] != range_value)
-        end.drop(1)
-      end
-    
-      # @todo Add an UpdateItem method.
-    
-      # @todo Add an UpdateTable method.
-    end
-  end
-end