dynamo-record 0.4.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e81e37de2e8ba6804662a756c1af90a60a85bc1e
-  data.tar.gz: 512d203880a9b118735f17fb66886578e5b3ed1a
+SHA256:
+  metadata.gz: 9a8e9652f6a8164e4c7f9d1ca2ae3c0509c396ebc11e6e9d0596fd1c132184c1
+  data.tar.gz: f0b31912eba1e7a0b53068e530e2c9b6573a7b4edeb3ff94315d3599dfd6789f
 SHA512:
-  metadata.gz: c6dec5f3cef468bd4dcbb024c17d7e45a2cf55507c895fb66f082dc37bf9db55ab0ac6fa67f6a3f3215fcf88d708b03705235f660db8e5172b52f1b40eded2e8
-  data.tar.gz: b8eb760aef776b82c3ea5d1ded6cb02aca7201937cb390a9629e94002f73ce81974475386b15f85e05bf7b6ca5b571476bac93ab4d5b607d09843c26138b7ebb
+  metadata.gz: b8664fc94e0a0a72f4ca4f44682d6fbff512c3808a0ab89a8626c691e93b20b894852f240174ac8dc6c4c44498274c6a436ac48c0184ea10e839720625df18b3
+  data.tar.gz: 69b6aaacf990a51b25363791b14c5d500d227fe9a53e404bf55d7668b335d6f2795a743ec2d16aaa4c694d90aee5d8034c7aaae3fe1bd3bd5a72d34ee0dd2a59

data/.rubocop.yml

@@ -1,9 +1,11 @@
-Rails:
-  Enabled: true
+require:
+  - rubocop-rails
 
 AllCops:
+  NewCops: disable
+  SuggestExtensions: false
   TargetRailsVersion: 4.2
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
 
 Metrics/AbcSize:
   Max: 20 # Default: 15
@@ -11,19 +13,22 @@ Metrics/AbcSize:
 Metrics/ClassLength:
   Max: 200 # Default: 100
 
-Metrics/LineLength:
-  Max: 120 # Default: 80
-
 Metrics/MethodLength:
   Max: 20 # Default: 10
 
 Metrics/BlockLength:
   Max: 30
   Exclude:
-    - 'dynamo-record.gemspec'
-    - 'spec/**/*.rb'
+    - dynamo-record.gemspec
+    - spec/**/*.rb
+
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
 
-Layout/AlignParameters:
+Layout/LineLength:
+  Max: 120 # Default: 80
+
+Layout/ParameterAlignment:
   # Alignment of parameters in multi-line method calls.
   #
   # The `with_fixed_indentation` style aligns the following lines with one
@@ -33,8 +38,16 @@ Layout/AlignParameters:
   #       b)
   EnforcedStyle: with_fixed_indentation
 
-Lint/EndAlignment:
-  EnforcedStyleAlignWith: variable
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - spec/**/*.rb
+
+Naming/FileName:
+  Exclude:
+    - spec/gemfiles/*
+
+Naming/VariableNumber:
+  EnforcedStyle: snake_case
 
 Style/Documentation:
   # This cop checks for missing top-level documentation of classes and modules.
@@ -43,18 +56,6 @@ Style/Documentation:
   # classes or other modules.
   Enabled: false
 
-Style/FrozenStringLiteralComment:
-  # `when_needed` will add the frozen string literal comment to files
-  # only when the `TargetRubyVersion` is set to 2.3+.
-  # `always` will always add the frozen string literal comment to a file
-  # regardless of the Ruby version or if `freeze` or `<<` are called on a
-  # string literal. If you run code against multiple versions of Ruby, it is
-  # possible that this will create errors in Ruby 2.3.0+.
-  #
-  # See: https://wyeworks.com/blog/2015/12/1/immutable-strings-in-ruby-2-dot-3
-  EnforcedStyle: when_needed
-  Enabled: false
-
 Style/NumericPredicate:
   Exclude:
-    - 'spec/**/*.rb'
+    - spec/**/*.rb

data/.travis.yml

@@ -4,18 +4,25 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.3
-  - 2.4
+  - 2.6
+  - 2.7
+  - 3.0
 
 gemfile:
-  - spec/gemfiles/rails-4.2.gemfile
-  - spec/gemfiles/rails-5.0.gemfile
-  - spec/gemfiles/rails-5.1.gemfile
+  - spec/gemfiles/rails-5.2.gemfile
+  - spec/gemfiles/rails-6.0.gemfile
+  - spec/gemfiles/rails-6.1.gemfile
+
+# Rails 5.2 doesn't support Ruby 3.0, so don't try
+matrix:
+  exclude:
+  - rvm: 3.0
+    gemfile: spec/gemfiles/rails-5.2.gemfile
 
 before_install: gem update bundler
 bundler_args: --jobs 3
 install: bundle install --jobs 3
 
 script:
-  - bash -c "if [ '$TRAVIS_RUBY_VERSION' = '2.4' ] && [[ '$BUNDLE_GEMFILE' == *'rails-5.0'* ]]; then bundle exec rubocop --fail-level autocorrect; fi"
+  - bash -c "if [ '$TRAVIS_RUBY_VERSION' = '3.0' ] && [[ '$BUNDLE_GEMFILE' == *'rails-6.1'* ]]; then bundle exec rubocop --fail-level autocorrect; fi"
   - bundle exec rspec

data/Dockerfile

@@ -1,22 +1,21 @@
 FROM instructure/rvm
 
 WORKDIR /app
-
-COPY dynamo-record.gemspec Gemfile /app/
-COPY lib/dynamo/record/version.rb /app/lib/dynamo/record/version.rb
-
-USER root
-RUN mkdir -p /app/coverage \
-             /app/spec/gemfiles/.bundle \
-             /app/spec/internal/log \
- && chown -R docker:docker /app
-
-USER docker
-RUN /bin/bash -l -c "cd /app && rvm-exec 2.4 bundle install --jobs 5"
-COPY . /app
-
 USER root
 RUN chown -R docker:docker /app
 USER docker
 
-CMD /bin/bash -l -c "rvm-exec 2.4 bundle exec wwtd"
+COPY --chown=docker:docker dynamo-record.gemspec Gemfile /app/
+COPY --chown=docker:docker lib/dynamo/record/version.rb /app/lib/dynamo/record/version.rb
+
+RUN mkdir -p coverage \
+             spec/gemfiles/.bundle \
+             spec/internal/log
+
+RUN bash -lc "rvm 2.6,2.7,3.0 do gem install --no-document bundler -v '~> 2.2'"
+RUN bash -lc "cd /app && rvm-exec 2.6 bundle install --jobs 5"
+RUN bash -lc "cd /app && rvm-exec 2.7 bundle install --jobs 5"
+RUN bash -lc "cd /app && rvm-exec 3.0 bundle install --jobs 5"
+COPY --chown=docker:docker . /app
+
+CMD /bin/bash -lc "rvm-exec 3.0 bundle exec wwtd"

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Jenkinsfile

@@ -0,0 +1,45 @@
+#!/usr/bin/env groovy
+
+pipeline {
+    agent {
+        label 'docker'
+    }
+    options {
+        ansiColor("xterm")
+        buildDiscarder(logRotator(numToKeepStr: '50'))
+        timeout(time: 20, unit: 'MINUTES')
+    }
+    stages {
+        stage('Build') {
+            steps {
+                sh 'docker-compose pull dynamo'
+                sh 'docker-compose up -d dynamo'
+                sh 'docker-compose build --pull app'
+            }
+        }
+        stage('Test') {
+            steps {
+                sh '''
+                    docker-compose run --rm app /bin/bash -l -c \
+                        "rvm-exec 3.0 bundle exec rubocop --fail-level autocorrect"
+                    docker-compose run --name coverage app
+                '''
+            }
+            post {
+                always {
+                    sh 'docker cp coverage:/app/coverage .'
+                    sh 'docker-compose down --rmi=all --volumes --remove-orphans'
+
+                    publishHTML target: [
+                      allowMissing: false,
+                      alwaysLinkToLastBuild: false,
+                      keepAll: true,
+                      reportDir: "coverage",
+                      reportFiles: 'index.html',
+                      reportName: 'Coverage Report'
+                    ]
+                }
+            }
+        }
+    }
+}

data/README.md

@@ -211,11 +211,13 @@ gem with multiple versions of Ruby. This requires docker and docker-compose to
 be installed. To get started, run the following:
 
 ```bash
-./build.sh
+docker-compose build --pull
+docker-compose up -d dynamo
+docker-compose run --rm app
 ```
 
 This will install the gem in a docker image with all versions of Ruby installed,
-and install all gem dependencies in the Ruby 2.4 set of gems. It will also
+and install all gem dependencies in the Ruby 2.6 set of gems. It will also
 download and spin up a DynamoDB Local container for use with specs. Finally, it
 will run [wwtd](https://github.com/grosser/wwtd), which runs all specs across
 all supported version of Ruby and Rails, bundling gems for each combination
@@ -228,7 +230,7 @@ Individual spec runs can be started like so:
 
 ```bash
 docker-compose run --rm app /bin/bash -l -c \
-  "BUNDLE_GEMFILE=spec/gemfiles/rails-5.0.gemfile rvm-exec 2.4 bundle exec rspec"
+  "BUNDLE_GEMFILE=spec/gemfiles/rails-6.1.gemfile rvm-exec 3.0 bundle exec rspec"
 ```
 
 If you'd like to mount your git checkout within the docker container running

data/dynamo-record.gemspec

@@ -1,4 +1,6 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dynamo/record/version'
 
@@ -33,18 +35,21 @@ Gem::Specification.new do |s|
   end
   s.require_paths = ['lib']
 
-  s.add_dependency 'aws-record', '~> 1.1'
-  s.add_dependency 'activemodel', '>= 4.2', '< 5.2'
-  s.add_dependency 'railties', '>= 4.2', '< 5.2'
+  s.required_ruby_version = '>= 2.6'
+
+  s.add_dependency 'activemodel', '>= 5.2', '< 6.2'
+  s.add_dependency 'aws-record', '~> 2.0'
+  s.add_dependency 'railties', '>= 5.2', '< 6.2'
 
-  s.add_development_dependency 'activesupport', '>= 4.2', '< 5.2'
-  s.add_development_dependency 'bundler', '~> 1.15'
-  s.add_development_dependency 'byebug', '~> 9.0'
-  s.add_development_dependency 'combustion', '~> 0.6.0'
-  s.add_development_dependency 'rake', '~> 12.0'
+  s.add_development_dependency 'activesupport', '>= 5.2', '< 6.2'
+  s.add_development_dependency 'bundler', '~> 2.2'
+  s.add_development_dependency 'byebug', '~> 11.0'
+  s.add_development_dependency 'combustion', '~> 1.3'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.6'
-  s.add_development_dependency 'rubocop', '~> 0.50.0'
-  s.add_development_dependency 'simplecov', '~> 0.14'
-  s.add_development_dependency 'webmock', '~> 2.1'
+  s.add_development_dependency 'rubocop', '~> 1.8.1'
+  s.add_development_dependency 'rubocop-rails', '~> 2.9.1'
+  s.add_development_dependency 'simplecov', '~> 0.16'
+  s.add_development_dependency 'webmock', '~> 3.3'
   s.add_development_dependency 'wwtd', '~> 1.3'
 end

data/lib/dynamo/record.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require 'active_model'
 require 'aws-record'
 require 'rails/railtie'
 
 require 'dynamo/record/marshalers'
+require 'dynamo/record/batch_get'
 require 'dynamo/record/batch_write'
 require 'dynamo/record/batch_request'
 require 'dynamo/record/model'
@@ -17,3 +20,15 @@ require 'dynamo/record/task_helpers/drop_table'
 require 'dynamo/record/task_helpers/list_tables'
 require 'dynamo/record/task_helpers/migration_runner'
 require 'dynamo/record/task_helpers/scale'
+
+module Dynamo
+  module Record
+    class << self
+      attr_writer :logger
+
+      def logger
+        @logger ||= Logger.new($stdout).tap { |log| log.progname = name }
+      end
+    end
+  end
+end

data/lib/dynamo/record/batch_get.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Dynamo
+  module Record
+    module BatchGet
+      BATCH_SIZE = 100
+
+      module ClassMethods
+        def batch_get(keys)
+          process_batch_get_requests(keys)
+        end
+
+        private
+
+        def process_batch_get_requests(keys) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+          attempt = 1
+          results = []
+          unprocessed_keys = keys.dup.map(&:stringify_keys)
+          while !unprocessed_keys.empty? && attempt <= max_retries
+            batch = unprocessed_keys.shift(BATCH_SIZE)
+            Dynamo::Record.logger.debug "#{name} batch_get_item #{batch.count} request_items"
+            processed, unprocessed = get_batch_from_dynamo(batch)
+            results.concat(processed)
+
+            next if unprocessed.empty?
+
+            Dynamo::Record.logger.debug "#{name} batch_get_item #{unprocessed.count} unprocessed_keys"
+            unprocessed_keys.unshift(*unprocessed)
+            sleep(rand(1 << attempt) + 1)
+            attempt += 1
+          end
+
+          if !unprocessed_keys.empty? && attempt > max_retries
+            raise NumberOfRetriesExceeded.new(keys), 'Number of retries exceeded'
+          end
+
+          results.map { |r| build_item_from_hash(r) }
+        end
+
+        # BatchGetItem will return a partial result if provisioned throughput is
+        # exceeded or an internal error occurs. If all items cannot be processed
+        # ProvisionedThroughputExceededException is raised.
+        # https://docs.aws.amazon.com/sdkforruby/api/Aws/DynamoDB/Client.html#batch_get_item-instance_method
+        def get_batch_from_dynamo(batch)
+          response = dynamodb_client.batch_get_item(
+            request_items: {
+              table_name => { keys: batch }
+            }
+          )
+          [
+            response.responses[table_name],
+            response.unprocessed_keys[table_name]&.keys || []
+          ]
+        rescue Aws::DynamoDB::Errors::ProvisionedThroughputExceededException
+          [[], batch]
+        end
+
+        # Convert response hashes to Record instances
+        # Adapted from `build_item_from_resp` used by `find` but that method is closely tied to get_item response format
+        # https://github.com/aws/aws-sdk-ruby-record/blob/v2.3.0/lib/aws-record/record/item_operations.rb#L593
+        def build_item_from_hash(resp)
+          record = new
+          data = record.instance_variable_get('@data')
+          attributes.attributes.each do |name, attr|
+            data.set_attribute(name, attr.extract(resp))
+            data.new_record = false
+          end
+          record
+        end
+      end
+
+      class NumberOfRetriesExceeded < RuntimeError
+        attr_reader :keys
+
+        def initialize(keys)
+          super
+          @keys = keys
+        end
+      end
+    end
+  end
+end

data/lib/dynamo/record/batch_request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     class BatchRequest
@@ -13,7 +15,7 @@ module Dynamo
       end
 
       def request
-        @_request ||= send("#{type}_request")
+        @request ||= send("#{type}_request")
       end
 
       def save_request
@@ -33,25 +35,29 @@ module Dynamo
       end
 
       def request_size
-        @_request_size ||= request.to_json.length
+        @request_size ||= request.to_json.length
       end
 
       def validate_request_size
         return unless request_size > MAX_RECORD_SIZE
+
         raise RecordTooLargeError.new(record), 'Record is too large'
       end
 
       def validate_type
         return if %i[save delete].include? type
+
         raise UnsupportedRequestTypeError
       end
     end
 
     class UnsupportedRequestTypeError < RuntimeError; end
+
     class RecordTooLargeError < RuntimeError
       attr_reader :record
 
       def initialize(record)
+        super
         @record = record
       end
     end

data/lib/dynamo/record/batch_write.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     module BatchWrite
       BATCH_SIZE = 25
-      DEFAULT_MAX_RETRIES = 5
       MAX_PAYLOAD_SIZE = 16_000_000 # 16 MB
 
       module ClassMethods
@@ -62,11 +63,14 @@ module Dynamo
           if retry_count > max_retries
             raise NumberOfRetriesExceeded.new(unprocessed_items.map(&:record)), 'Number of retries exceeded'
           end
+
           sleep(rand(1 << retry_count) + 1)
           process_batch_write_requests(unprocessed_items, retry_count + 1)
         end
 
         def pre_batch(requests)
+          return [] if requests.empty?
+
           current_batch_size = 0
           requests.each_with_object([[]]) do |request, batches|
             if batches.last.length >= BATCH_SIZE || current_batch_size + request.request_size > MAX_PAYLOAD_SIZE
@@ -77,17 +81,13 @@ module Dynamo
             current_batch_size += request.request_size
           end
         end
-
-        # Override in model if you want it to be different.
-        def max_retries
-          DEFAULT_MAX_RETRIES
-        end
       end
 
       class NumberOfRetriesExceeded < RuntimeError
         attr_reader :unprocessed_items
 
         def initialize(unprocessed_items)
+          super
           @unprocessed_items = unprocessed_items
         end
       end

data/lib/dynamo/record/marshalers.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     module Marshalers
-      COMPOSITE_DELIMETER = '|'.freeze
+      COMPOSITE_DELIMETER = '|'
 
       def self.included(sub_class)
         sub_class.extend(ClassMethods)
@@ -25,15 +27,14 @@ module Dynamo
           opts[:dynamodb_type] = 'S'
 
           # It is very unfortunate that Aws::Record used `attr`
-          # rubocop:disable Style/Attr
           attr(name, Aws::Record::Marshalers::StringMarshaler.new(opts), opts)
-          # rubocop:enable Style/Attr
         end
 
         def define_readers(name, parts, cast_function)
           parts.each_with_index do |part, i|
             raise "#{part} already defined" unless parts.find_index(part) == i
             next if method_defined?(part)
+
             define_method(part) do
               # @data is used internally by Aws::Record to store all of the attributes
               @data.get_attribute(name).split(COMPOSITE_DELIMETER)[i].send(cast_function)

data/lib/dynamo/record/model.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     module Model
-      COMPOSITE_DELIMITER = '|'.freeze
+      COMPOSITE_DELIMITER = '|'
+      DEFAULT_MAX_RETRIES = 5
 
       def self.included(klass)
         klass.include(Aws::Record)
@@ -9,6 +12,7 @@ module Dynamo
 
         klass.extend ClassMethods
         klass.extend Dynamo::Record::BatchWrite::ClassMethods
+        klass.extend Dynamo::Record::BatchGet::ClassMethods
         klass.send :prepend, InstanceMethods
       end
 
@@ -19,6 +23,7 @@ module Dynamo
 
         def scan
           raise 'no scanning in production' if Rails.env.production?
+
           super
         end
 
@@ -104,7 +109,9 @@ module Dynamo
           string.split(COMPOSITE_DELIMITER)
         end
 
-        # TODO: Create a batch save method.
+        def max_retries
+          DEFAULT_MAX_RETRIES
+        end
       end
 
       module InstanceMethods

data/lib/dynamo/record/model_existence_validator.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     class ModelExistenceValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
         return if options[:model].exists? value
+
         record.errors[attribute] << (options[:message] || "#{attribute}:#{value} is not a valid #{options[:model]}")
       end
     end

data/lib/dynamo/record/railtie.rb

@@ -1,8 +1,14 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     class Railtie < Rails::Railtie
       railtie_name :dynamo_record
 
+      initializer 'logger' do
+        Dynamo::Record.logger = Rails.logger
+      end
+
       rake_tasks do
         load 'tasks/dynamo.rake'
       end

data/lib/dynamo/record/table_migration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     class TableMigration
@@ -13,11 +15,11 @@ module Dynamo
         migration = Aws::Record::TableMigration.new(model)
         begin
           migration.client.describe_table(table_name: model.table_name)
-          return :exists
+          :exists
         rescue Aws::DynamoDB::Errors::ResourceNotFoundException
           yield migration
           migration.wait_until_available
-          return :migrated
+          :migrated
         end
       end
 
@@ -39,10 +41,11 @@ module Dynamo
         end
       rescue Aws::DynamoDB::Errors::ValidationException => e
         return e.message if e.message == 'Table already has an enabled stream'
+
         raise e
       end
 
-      def self.migrate_table?(update_provisioned_throughput = false)
+      def self.migrate_table?(update_provisioned_throughput: false)
         unless update_provisioned_throughput
           table_name = table_config.instance_values['model_class'].table_name
           described_table = table_config.client.describe_table table_name: table_name

data/lib/dynamo/record/task_helpers/cleanup.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     module TaskHelpers
       class Cleanup
         def self.run
           raise 'Task not available on production' if Rails.env.production?
-          Dir[Rails.root.join('app', 'models', '*.rb').to_s].each do |filename|
+
+          Dir[Rails.root.join('app/models/*.rb').to_s].each do |filename|
             delete_by_class(filename)
           end
         end
@@ -12,6 +15,7 @@ module Dynamo
         def self.delete_by_class(filename)
           klass = File.basename(filename, '.rb').camelize.constantize
           return unless klass.included_modules.include? Dynamo::Record::Model
+
           Rails.logger.info "Deleting all items in table: #{klass}"
           klass.scan.each(&:delete!)
         end

data/lib/dynamo/record/task_helpers/drop_all_tables.rb

@@ -1,14 +1,18 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     module TaskHelpers
       class DropAllTables
-        def self.run(override = false)
+        def self.run(override: false)
           raise 'Task not available on production' if Rails.env.production?
+
           env = Rails.env
           dynamodb = Aws::DynamoDB::Client.new
           tables = dynamodb.list_tables
           tables.table_names.map do |t|
             next unless t.include?(env) || override
+
             dt = dynamodb.delete_table(table_name: t)
             dt ? "Deleted: #{t}" : "Delete failed: #{t}"
           end

data/lib/dynamo/record/task_helpers/drop_table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     module TaskHelpers

data/lib/dynamo/record/task_helpers/list_tables.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     module TaskHelpers

data/lib/dynamo/record/task_helpers/migration_runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     module TaskHelpers
@@ -7,8 +9,8 @@ module Dynamo
           filename_regexp = /\A([0-9]+)_([_a-z0-9]*)\.?([_a-z0-9]*)?\.rb\z/
 
           # Sorts the files located in `db/dynamo_migrate` to ensure order is preserved
-          Dir[Rails.root.join("#{path}/*.rb")].sort.each do |f|
-            migration = migration(f, filename_regexp, constants)
+          Dir[Rails.root.join("#{path}/*.rb")].sort.each do |file|
+            migration = migration(file, filename_regexp, constants)
 
             # starts the migration
             yield "Migrating: #{migration}"
@@ -28,9 +30,10 @@ module Dynamo
           end
         end
 
-        def self.migration(f, filename_regexp, constants)
-          raise "Non-numeric prefix: #{f}" if File.basename(f).scan(filename_regexp).first.nil?
-          require f
+        def self.migration(file, filename_regexp, constants)
+          raise "Non-numeric prefix: #{file}" if File.basename(file).scan(filename_regexp).first.nil?
+
+          require file
 
           # finds the constant that was added on the require statement above
           migration_sym = (DynamoMigrate.constants - constants).first
@@ -52,18 +55,22 @@ module Dynamo
 
         def self.up(migration)
           return unless migration.respond_to? :up
+
           status_message migration.up
         end
 
         def self.table_config_check(migration)
           return unless migration.respond_to? :table_config
+
           status_message migration.table_config_check
         end
 
         def self.update(migration)
           return unless migration.respond_to? :update
+
           status = migration.update
           return 'Migration successful' if status == :updated
+
           status
         end
       end

data/lib/dynamo/record/task_helpers/scale.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
     module TaskHelpers
       class Scale
-        attr_reader :model, :attribute_selector, :new_throughput
-        attr_reader :migration, :existing_throughput, :model_name
+        attr_reader :model, :attribute_selector, :new_throughput, :migration, :existing_throughput, :model_name
 
         def initialize(model_name, attribute_selector, new_throughput)
           @model_name = model_name

data/lib/dynamo/record/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Dynamo
   module Record
-    VERSION = '0.4.0'.freeze
+    VERSION = '1.4.0'
   end
 end

data/lib/tasks/dynamo.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :dynamo do
   desc 'Run dynamo migrations'
   task migrate: :environment do
@@ -5,7 +7,7 @@ namespace :dynamo do
   end
 
   desc 'Drops all dynamo tables and re-runs migrations'
-  task :reset do
+  task reset: :environment do
     Rake::Task['dynamo:drop_all'].invoke
     Rake::Task['dynamo:migrate'].invoke
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamo-record
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Davis McClellan
@@ -14,138 +14,138 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-record
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: aws-record
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -166,42 +166,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -236,13 +250,14 @@ files:
 - ".travis.yml"
 - Dockerfile
 - Gemfile
+- Jenkinsfile
 - LICENSE.txt
 - README.md
-- build.sh
 - docker-compose.override.example.yml
 - docker-compose.yml
 - dynamo-record.gemspec
 - lib/dynamo/record.rb
+- lib/dynamo/record/batch_get.rb
 - lib/dynamo/record/batch_request.rb
 - lib/dynamo/record/batch_write.rb
 - lib/dynamo/record/marshalers.rb
@@ -270,17 +285,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Extensions to Aws::Record for working with DynamoDB.
 test_files: []
-has_rdoc: 

data/build.sh

@@ -1,20 +0,0 @@
-#!/bin/bash -ex
-
-COMPOSE_FILE="docker-compose.yml"
-
-function cleanup() {
-  exit_code=$?
-  set +e
-  docker cp coverage:/app/coverage .
-  docker-compose kill
-  docker-compose rm -f
-  exit $exit_code
-}
-trap cleanup INT TERM EXIT
-
-docker-compose pull dynamo
-docker-compose up -d dynamo
-docker-compose build --pull app
-docker-compose run --rm app /bin/bash -l -c \
-  "rvm-exec 2.4 bundle exec rubocop --fail-level autocorrect"
-docker-compose run --name coverage app $@