dynamoid 1.3.4 → 2.0.0

data/lib/dynamoid/persistence.rb

@@ -21,7 +21,7 @@ module Dynamoid
         table_base_name = options[:name] || base_class.name.split('::').last
           .downcase.pluralize
 
-        @table_name ||= [Dynamoid::Config.namespace.to_s,table_base_name].reject(&:empty?).join("_")
+        @table_name ||= [Dynamoid::Config.namespace.to_s, table_base_name].reject(&:empty?).join('_')
       end
 
       # Creates a table.
@@ -41,14 +41,14 @@ module Dynamoid
           range_key_hash = nil
         end
         options = {
-          :id => self.hash_key,
-          :table_name => self.table_name,
-          :write_capacity => self.write_capacity,
-          :read_capacity => self.read_capacity,
-          :range_key => range_key_hash,
-          :hash_key_type => dynamo_type(attributes[self.hash_key][:type]),
-          :local_secondary_indexes => self.local_secondary_indexes.values,
-          :global_secondary_indexes => self.global_secondary_indexes.values
+          id: self.hash_key,
+          table_name: self.table_name,
+          write_capacity: self.write_capacity,
+          read_capacity: self.read_capacity,
+          range_key: range_key_hash,
+          hash_key_type: dynamo_type(attributes[self.hash_key][:type]),
+          local_secondary_indexes: self.local_secondary_indexes.values,
+          global_secondary_indexes: self.global_secondary_indexes.values
         }.merge(options)
 
         Dynamoid.adapter.create_table(options[:table_name], options[:id], options)
@@ -74,9 +74,7 @@ module Dynamoid
             if incoming.has_key?(attribute)
               hash[attribute] = undump_field(incoming[attribute], options)
             elsif options.has_key?(:default)
-              default_value = options[:default]
-              value = default_value.respond_to?(:call) ? default_value.call : default_value.dup
-              hash[attribute] = value
+              hash[attribute] = evaluate_default_value(options[:default])
             else
               hash[attribute] = nil
             end
@@ -140,13 +138,12 @@ module Dynamoid
                   UNIX_EPOCH_DATE + value.to_i
                 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"
+                  raise ArgumentError, 'Boolean column neither true nor false'
                 end
               else
                 raise ArgumentError, "Unknown type #{options[:type]}"
@@ -185,7 +182,15 @@ module Dynamoid
             when :raw
               !value.nil? ? value : nil
             when :boolean
-              !value.nil? ? value.to_s[0] : nil
+              if !value.nil?
+                if options[:store_as_native_boolean]
+                  !!value # native boolean type
+                else
+                  value.to_s[0] # => "f" or "t"
+                end
+              else
+                nil
+              end
             else
               raise ArgumentError, "Unknown type #{options[:type]}"
           end
@@ -207,6 +212,19 @@ module Dynamoid
         end
       end
 
+      def import(objects)
+        documents = objects.map { |attrs|
+          self.build(attrs).tap { |item|
+            item.hash_key = SecureRandom.uuid if item.hash_key.blank?
+          }
+        }
+
+        Dynamoid.adapter.batch_write_item(self.table_name, documents.map(&:dump))
+
+        documents.each { |d| d.new_record = false }
+        documents
+      end
+
       private
 
       def undump_hash(hash)
@@ -231,6 +249,20 @@ module Dynamoid
           val
         end
       end
+
+      # Evaluates the default value given, this is used by undump
+      # when determining the value of the default given for a field options.
+      #
+      # @param [Object] :value the attribute's default value
+      def evaluate_default_value(val)
+        if val.respond_to?(:call)
+          val.call
+        elsif val.duplicable?
+          val.dup
+        else
+          val
+        end
+      end
     end
 
     # Set updated_at and any passed in field to current DateTime. Useful for things like last_login_at, etc.
@@ -256,15 +288,13 @@ module Dynamoid
       self.class.create_table
 
       if new_record?
-        conditions = { :unless_exists => [self.class.hash_key]}
+        conditions = { unless_exists: [self.class.hash_key]}
         conditions[:unless_exists] << range_key if(range_key)
 
         run_callbacks(:create) { persist(conditions) }
       else
         persist
       end
-
-      self
     end
 
     #
@@ -274,10 +304,10 @@ 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])} : {}
+        options = range_key ? {range_key: dump_field(self.read_attribute(range_key), self.class.attributes[range_key])} : {}
 
         begin
-          new_attrs = Dynamoid.adapter.update_item(self.class.table_name, self.hash_key, options.merge(:conditions => conditions)) do |t|
+          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
@@ -316,11 +346,11 @@ 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])} : {}
+      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: {}}
         conditions[:if][:lock_version] =
           if changes[:lock_version].nil?
             self.lock_version
@@ -360,7 +390,7 @@ module Dynamoid
     # @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?
+        self.hash_key = SecureRandom.uuid if self.hash_key.blank?
 
         # Add an exists check to prevent overwriting existing records with new ones
         if(new_record?)
@@ -372,7 +402,7 @@ module Dynamoid
         if(self.class.attributes[:lock_version])
           conditions ||= {}
           self.lock_version = (lock_version || 0) + 1
-          #Uses the original lock_version value from ActiveModel::Dirty in case user changed lock_version manually
+          # 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
 

data/lib/dynamoid/railtie.rb

@@ -3,7 +3,7 @@ if defined? (Rails)
   module Dynamoid
     class Railtie < Rails::Railtie
       rake_tasks do
-        Dir[File.join(File.dirname(__FILE__),'tasks/*.rake')].each { |f| load f }
+        Dir[File.join(File.dirname(__FILE__), 'tasks/*.rake')].each { |f| load f }
       end
     end
   end

data/lib/dynamoid/validations.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Dynamoid
-  
+
   # Provide ActiveModel validations to Dynamoid documents.
   module Validations
     extend ActiveSupport::Concern
@@ -12,7 +12,7 @@ module Dynamoid
     #
     # @since 0.2.0
     def save(options = {})
-      options.reverse_merge!(:validate => true)
+      options.reverse_merge!(validate: true)
       return false if options[:validate] and (not valid?)
       super
     end
@@ -30,7 +30,8 @@ module Dynamoid
     # @since 0.2.0
     def save!
       raise Dynamoid::Errors::DocumentNotValid.new(self) unless valid?
-      save(:validate => false)
+      save(validate: false)
+      self
     end
 
     module ClassMethods

data/lib/dynamoid/version.rb

@@ -1,3 +1,3 @@
 module Dynamoid
-  VERSION = "1.3.4"
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Josh Symonds
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -82,16 +82,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -180,30 +180,16 @@ dependencies:
   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'
-- !ruby/object:Gem::Dependency
-  name: rspec-retry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 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.
@@ -216,6 +202,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- ".coveralls.yml"
 - ".document"
 - ".gitignore"
 - ".rspec"
@@ -227,15 +214,13 @@ files:
 - README.md
 - Rakefile
 - Vagrantfile
+- docker-compose.yml
 - dynamoid.gemspec
 - gemfiles/rails_4_0.gemfile
-- gemfiles/rails_4_0.gemfile.lock
 - gemfiles/rails_4_1.gemfile
-- gemfiles/rails_4_1.gemfile.lock
 - gemfiles/rails_4_2.gemfile
-- gemfiles/rails_4_2.gemfile.lock
 - gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_0.gemfile.lock
+- gemfiles/rails_5_1.gemfile
 - lib/dynamoid.rb
 - lib/dynamoid/adapter.rb
 - lib/dynamoid/adapter_plugin/aws_sdk_v2.rb
@@ -286,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Dynamoid is an ORM for Amazon's DynamoDB

data/gemfiles/rails_4_0.gemfile.lock

@@ -1,150 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    dynamoid (1.3.0)
-      activemodel (>= 4)
-      aws-sdk-resources (~> 2)
-      concurrent-ruby (>= 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.0.13)
-      actionpack (= 4.0.13)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.4)
-    activesupport (4.0.13)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    appraisal (2.1.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (4.0.2)
-    aws-sdk-core (2.8.11)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.8.11)
-      aws-sdk-core (= 2.8.11)
-    aws-sigv4 (1.0.0)
-    builder (3.1.4)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    coveralls (0.8.19)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.12.0)
-      term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    erubis (2.7.0)
-    i18n (0.8.1)
-    jmespath (1.3.1)
-    json (2.0.3)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (4.7.5)
-    multi_json (1.12.1)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.0.13)
-      actionmailer (= 4.0.13)
-      actionpack (= 4.0.13)
-      activerecord (= 4.0.13)
-      activesupport (= 4.0.13)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.13)
-      sprockets-rails (~> 2.0)
-    railties (4.0.13)
-      actionpack (= 4.0.13)
-      activesupport (= 4.0.13)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-retry (0.5.3)
-      rspec-core (> 3.3, < 3.6)
-    rspec-support (3.5.0)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    term-ansicolor (1.4.1)
-      tins (~> 1.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tins (1.13.2)
-    tzinfo (0.3.53)
-    wwtd (1.3.0)
-    yard (0.9.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 4)
-  appraisal (~> 2.1)
-  bundler (~> 1.14)
-  coveralls
-  dynamoid!
-  nokogiri (~> 1.6.8.1)
-  pry (~> 0.10)
-  rails (~> 4.0.0)
-  rake (~> 12.0)
-  rspec (~> 3.0)
-  rspec-retry
-  wwtd (~> 1.3)
-  yard
-
-BUNDLED WITH
-   1.14.6