dynamoid 0.7.1 → 1.0.0

data/lib/dynamoid/identity_map.rb

@@ -3,11 +3,7 @@ module Dynamoid
     extend ActiveSupport::Concern
 
     def self.clear
-      models.each { |m| m.identity_map.clear }
-    end
-
-    def self.models
-      Dynamoid::Config.included_models
+      Dynamoid.included_models.each { |m| m.identity_map.clear }
     end
 
     module ClassMethods

data/lib/dynamoid/persistence.rb

@@ -1,4 +1,6 @@
+require 'bigdecimal'
 require 'securerandom'
+require 'yaml'
 
 # encoding: utf-8
 module Dynamoid
@@ -41,16 +43,7 @@ module Dynamoid
           :range_key => range_key_hash
         }.merge(options)
 
-        return true if table_exists?(options[:table_name])
-
-        Dynamoid::Adapter.tables << options[:table_name] if Dynamoid::Adapter.create_table(options[:table_name], options[:id], options)
-      end
-
-      # Does a table with this name exist?
-      #
-      # @since 0.2.0
-      def table_exists?(table_name)
-        Dynamoid::Adapter.tables ? Dynamoid::Adapter.tables.include?(table_name) : false
+        Dynamoid.adapter.create_table(options[:table_name], options[:id], options)
       end
 
       def from_database(attrs = {})
@@ -71,64 +64,73 @@ module Dynamoid
         end
       end
 
-      # Undump a value for a given type. Given a string, it'll determine (based on the type provided) whether to turn it into a
-      # string, integer, float, set, array, datetime, or serialized return value.
+      # Undump a string value for a given type.
       #
       # @since 0.2.0
       def undump_field(value, options)
-        if value.nil? && (default_value = options[:default])
-          value = default_value.respond_to?(:call) ? default_value.call : default_value
-        else
-          return if value.nil? || (value.respond_to?(:empty?) && value.empty?)
-        end
+        if (field_class = options[:type]).is_a?(Class)
+          raise 'Dynamoid class-type fields do not support default values' if options[:default]
 
-        case options[:type]
-        when :string
-          value.to_s
-        when :integer
-          value.to_i
-        when :float
-          value.to_f
-        when :set, :array
-          if value.is_a?(Set) || value.is_a?(Array)
-            value
-          else
-            Set[value]
-          end
-        when :datetime
-          if value.is_a?(Date) || value.is_a?(DateTime) || value.is_a?(Time)
-            value
-          else
-            Time.at(value).to_datetime
+          if field_class.respond_to?(:dynamoid_load)
+            field_class.dynamoid_load(value)
           end
-        when :serialized
+        elsif options[:type] == :serialized
           if value.is_a?(String)
             options[:serializer] ? options[:serializer].load(value) : YAML.load(value)
           else
             value
           end
-        when :boolean
-          # persisted as 't', but because undump is called during initialize it can come in as true
-          if value == 't' || value == true
-            true
-          elsif value == 'f' || value == false
-            false
-          else
-            raise ArgumentError, "Boolean column neither true nor false"
-          end
         else
-          raise ArgumentError, "Unknown type #{options[:type]}"
+          if value.nil? && (default_value = options[:default])
+            value = default_value.respond_to?(:call) ? default_value.call : default_value
+          end
+
+          if !value.nil?
+            case options[:type]
+              when :string
+                value.to_s
+              when :integer
+                Integer(value)
+              when :number
+                BigDecimal.new(value.to_s)
+              when :array
+                value.to_a
+              when :set
+                Set.new(value)
+              when :datetime
+                if value.is_a?(Date) || value.is_a?(DateTime) || value.is_a?(Time)
+                  value
+                else
+                  Time.at(value).to_datetime
+                end
+              when :boolean
+                # persisted as 't', but because undump is called during initialize it can come in as true
+                if value == 't' || value == true
+                  true
+                elsif value == 'f' || value == false
+                  false
+                else
+                  raise ArgumentError, "Boolean column neither true nor false"
+                end
+              else
+                raise ArgumentError, "Unknown type #{options[:type]}"
+            end
+          end
         end
       end
 
       def dynamo_type(type)
-        case type
-        when :integer, :float, :datetime
-          :number
-        when :string, :serialized
-          :string
+        if type.is_a?(Class)
+          type.respond_to?(:dynamoid_field_type) ? type.dynamoid_field_type : :string
         else
-          raise 'unknown type'
+          case type
+            when :integer, :number, :datetime
+              :number
+            when :string, :serialized
+              :string
+            else
+              raise 'unknown type'
+          end
         end
       end
 
@@ -155,7 +157,7 @@ module Dynamoid
     # @since 0.2.0
     def save(options = {})
       self.class.create_table
-      
+
       if new_record?
         conditions = { :unless_exists => [self.class.hash_key]}
         conditions[:unless_exists] << range_key if(range_key)
@@ -176,22 +178,26 @@ module Dynamoid
     def update!(conditions = {}, &block)
       run_callbacks(:update) do
         options = range_key ? {:range_key => dump_field(self.read_attribute(range_key), self.class.attributes[range_key])} : {}
-        new_attrs = Dynamoid::Adapter.update_item(self.class.table_name, self.hash_key, options.merge(:conditions => conditions)) do |t|
-          if(self.class.attributes[:lock_version])
-            raise "Optimistic locking cannot be used with Partitioning" if(Dynamoid::Config.partitioning)
-            t.add(lock_version: 1)
-          end
 
-          yield t
+        begin
+          new_attrs = Dynamoid.adapter.update_item(self.class.table_name, self.hash_key, options.merge(:conditions => conditions)) do |t|
+            if(self.class.attributes[:lock_version])
+              t.add(lock_version: 1)
+            end
+
+            yield t
+          end
+          load(new_attrs)
+        rescue Dynamoid::Errors::ConditionalCheckFailedException
+          raise Dynamoid::Errors::StaleObjectError.new(self, 'update')
         end
-        load(new_attrs)
       end
     end
 
     def update(conditions = {}, &block)
       update!(conditions, &block)
       true
-    rescue Dynamoid::Errors::ConditionalCheckFailedException
+    rescue Dynamoid::Errors::StaleObjectError
       false
     end
 
@@ -205,13 +211,12 @@ module Dynamoid
       self
     end
 
-    # Delete this object from the datastore and all indexes.
+    # Delete this object from the datastore.
     #
     # @since 0.2.0
     def delete
-      delete_indexes
       options = range_key ? {:range_key => dump_field(self.read_attribute(range_key), self.class.attributes[range_key])} : {}
-      Dynamoid::Adapter.delete(self.class.table_name, self.hash_key, options)
+      Dynamoid.adapter.delete(self.class.table_name, self.hash_key, options)
     end
 
     # Dump this object's attributes into hash form, fit to be persisted into the datastore.
@@ -232,34 +237,39 @@ module Dynamoid
     #
     # @since 0.2.0
     def dump_field(value, options)
-      return if value.nil? || (value.respond_to?(:empty?) && value.empty?)
-
-      case options[:type]
-      when :string
-        value.to_s
-      when :integer
-        value.to_i
-      when :float
-        value.to_f
-      when :set, :array
-        if value.is_a?(Set) || value.is_a?(Array)
-          value
+      if (field_class = options[:type]).is_a?(Class)
+        if value.respond_to?(:dynamoid_dump)
+          value.dynamoid_dump
+        elsif field_class.respond_to?(:dynamoid_dump)
+          field_class.dynamoid_dump(value)
         else
-          Set[value]
+          raise ArgumentError, "Neither #{field_class} nor #{value} support serialization for Dynamoid."
         end
-      when :datetime
-        value.to_time.to_f
-      when :serialized
-        options[:serializer] ? options[:serializer].dump(value) : value.to_yaml
-      when :boolean
-        value.to_s[0]
       else
-        raise ArgumentError, "Unknown type #{options[:type]}"
+        case options[:type]
+          when :string
+            !value.nil? ? value.to_s : nil
+          when :integer
+            !value.nil? ? Integer(value) : nil
+          when :number
+            !value.nil? ? value : nil
+          when :set
+            !value.nil? ? Set.new(value) : nil
+          when :array
+            !value.nil? ? value : nil
+          when :datetime
+            !value.nil? ? value.to_time.to_f : nil
+          when :serialized
+            options[:serializer] ? options[:serializer].dump(value) : value.to_yaml
+          when :boolean
+            !value.nil? ? value.to_s[0] : nil
+          else
+            raise ArgumentError, "Unknown type #{options[:type]}"
+        end
       end
     end
     
-    # Persist the object into the datastore. Assign it an id first if it doesn't have one; then afterwards,
-    # save its indexes.
+    # 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)
@@ -275,18 +285,23 @@ module Dynamoid
         # Add an optimistic locking check if the lock_version column exists
         if(self.class.attributes[:lock_version])
           conditions ||= {}
-          raise "Optimistic locking cannot be used with Partitioning" if(Dynamoid::Config.partitioning)
-          self.lock_version = (lock_version || 0) + 1 
+          self.lock_version = (lock_version || 0) + 1
           #Uses the original lock_version value from ActiveModel::Dirty in case user changed lock_version manually
           (conditions[:if] ||= {})[:lock_version] = changes[:lock_version][0] if(changes[:lock_version][0])
         end
 
-        Dynamoid::Adapter.write(self.class.table_name, self.dump, conditions)
-        save_indexes
-        @new_record = false
-        true
+        begin
+          Dynamoid.adapter.write(self.class.table_name, self.dump, conditions)
+          @new_record = false
+          true
+        rescue Dynamoid::Errors::ConditionalCheckFailedException => e
+          if new_record?
+            raise Dynamoid::Errors::RecordNotUnique.new(e, self)
+          else
+            raise Dynamoid::Errors::StaleObjectError.new(self, 'persist')
+          end
+        end
       end
     end
   end
-
 end

metadata

@@ -1,309 +1,176 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 0.7.1
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
-- Josh Symonds
+- Josh
+- Symonds
+- Logan
+- Bowers
+- Craig
+- Heneveld
+- Anatha
+- Kumaran
+- Jason
+- Dew
+- Luis
+- Arias
+- Stefan
+- Neculai
+- Philip
+- White
+- Peeyush
+- Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: tzinfo
+  name: aws-sdk-resources
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  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:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fake_dynamo
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-- !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.
-email: josh@joshsymonds.com
+email: 
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
 files:
-- .document
-- .rspec
-- .travis.yml
 - Gemfile
-- Gemfile.lock
-- Gemfile_activemodel4
-- Gemfile_activemodel4.lock
 - LICENSE.txt
 - README.markdown
 - Rakefile
-- VERSION
-- doc/.nojekyll
-- doc/Dynamoid.html
-- doc/Dynamoid/Adapter.html
-- doc/Dynamoid/Adapter/AwsSdk.html
-- doc/Dynamoid/Adapter/Local.html
-- doc/Dynamoid/Associations.html
-- doc/Dynamoid/Associations/Association.html
-- doc/Dynamoid/Associations/BelongsTo.html
-- doc/Dynamoid/Associations/ClassMethods.html
-- doc/Dynamoid/Associations/HasAndBelongsToMany.html
-- doc/Dynamoid/Associations/HasMany.html
-- doc/Dynamoid/Associations/HasOne.html
-- doc/Dynamoid/Associations/ManyAssociation.html
-- doc/Dynamoid/Associations/SingleAssociation.html
-- doc/Dynamoid/Components.html
-- doc/Dynamoid/Config.html
-- doc/Dynamoid/Config/Options.html
-- doc/Dynamoid/Criteria.html
-- doc/Dynamoid/Criteria/Chain.html
-- doc/Dynamoid/Criteria/ClassMethods.html
-- doc/Dynamoid/Dirty.html
-- doc/Dynamoid/Dirty/ClassMethods.html
-- doc/Dynamoid/Document.html
-- doc/Dynamoid/Document/ClassMethods.html
-- doc/Dynamoid/Errors.html
-- doc/Dynamoid/Errors/ConditionalCheckFailedException.html
-- doc/Dynamoid/Errors/DocumentNotValid.html
-- doc/Dynamoid/Errors/Error.html
-- doc/Dynamoid/Errors/InvalidField.html
-- doc/Dynamoid/Errors/InvalidQuery.html
-- doc/Dynamoid/Errors/MissingRangeKey.html
-- doc/Dynamoid/Fields.html
-- doc/Dynamoid/Fields/ClassMethods.html
-- doc/Dynamoid/Finders.html
-- doc/Dynamoid/Finders/ClassMethods.html
-- doc/Dynamoid/IdentityMap.html
-- doc/Dynamoid/IdentityMap/ClassMethods.html
-- doc/Dynamoid/Indexes.html
-- doc/Dynamoid/Indexes/ClassMethods.html
-- doc/Dynamoid/Indexes/Index.html
-- doc/Dynamoid/Middleware.html
-- doc/Dynamoid/Middleware/IdentityMap.html
-- doc/Dynamoid/Persistence.html
-- doc/Dynamoid/Persistence/ClassMethods.html
-- doc/Dynamoid/Validations.html
-- doc/_index.html
-- doc/class_list.html
-- doc/css/common.css
-- doc/css/full_list.css
-- doc/css/style.css
-- doc/file.LICENSE.html
-- doc/file.README.html
-- doc/file_list.html
-- doc/frames.html
-- doc/index.html
-- doc/js/app.js
-- doc/js/full_list.js
-- doc/js/jquery.js
-- doc/method_list.html
-- doc/top-level-namespace.html
 - dynamoid.gemspec
 - lib/dynamoid.rb
 - lib/dynamoid/adapter.rb
-- lib/dynamoid/adapter/aws_sdk.rb
+- lib/dynamoid/adapter_plugin/aws_sdk_v2.rb
 - lib/dynamoid/associations.rb
 - lib/dynamoid/associations/association.rb
 - lib/dynamoid/associations/belongs_to.rb
@@ -323,71 +190,31 @@ files:
 - 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/car.rb
-- spec/app/models/magazine.rb
-- spec/app/models/message.rb
-- spec/app/models/nuclear_submarine.rb
-- spec/app/models/sponsor.rb
-- spec/app/models/subscription.rb
-- spec/app/models/tweet.rb
-- spec/app/models/user.rb
-- spec/app/models/vehicle.rb
-- spec/dynamoid/adapter/aws_sdk_spec.rb
-- spec/dynamoid/adapter_spec.rb
-- spec/dynamoid/associations/association_spec.rb
-- spec/dynamoid/associations/belongs_to_spec.rb
-- spec/dynamoid/associations/has_and_belongs_to_many_spec.rb
-- spec/dynamoid/associations/has_many_spec.rb
-- spec/dynamoid/associations/has_one_spec.rb
-- spec/dynamoid/associations_spec.rb
-- 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
-- spec/dynamoid/validations_spec.rb
-- spec/dynamoid_spec.rb
-- spec/spec_helper.rb
-- spec/support/with_partitioning.rb
-homepage: http://github.com/Veraticus/Dynamoid
+homepage: http://github.com/Dynamoid/Dynamoid
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1424756410628377815
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Dynamoid is an ORM for Amazon's DynamoDB
 test_files: []