dynamodb-api 0.6.2 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9be0f31417b188293408482f8661646b207c587e62f19b252cba0beecb9f7a7
-  data.tar.gz: e449872d243d29819b761edf6503f5931cd838436eabb2584bd7ea238125573f
+  metadata.gz: 1276a3be5e1124f79957caee61c7585e3f59f37da5f12e2fac5d638238727ee8
+  data.tar.gz: c36d86b1087075fd6c154e5491cd08e6effcc0e91ffa0d96595d31fafc33eabc
 SHA512:
-  metadata.gz: 43976f0890badbe08057345c9576d6cb48cd623ac97b1363bab6cc9dfaa245cded0cba11dc694a6d4213e0b08ab30ac8436f86b249553859220cb03224068ffa
-  data.tar.gz: 66be89216803aeb7644a12a5107894cc1531eb14c9ca70bae8dc304fdeffd985d1ba4ac83d8ff07eaa381138e51e4b90c8aa22f056c4e62e55ec21fce12a43fc
+  metadata.gz: a3c366b1cd32a307c6756bb4fb50ba43cafa98b5ff69f430ec55d638a5566492ee98f8554531196b27749e83ed2af2f26267cd12d9661feb193bb6ad63d44be9
+  data.tar.gz: 3cac38591e633e466439a2c12eaec0311828138caeb45bdc76f6c420321725a082fba136e2c0f2f826db40ba35c5e8bd5b672ffe2bb43ec10080d4e3f3bdbb31

data/.github/workflows/build.yml

@@ -0,0 +1,28 @@
+name: build
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.4, 2.5, 2.6, 2.7]
+        gemfile: [ aws_sdk_2_rails_5, aws_sdk_2_rails_6, aws_sdk_3_rails_5, aws_sdk_3_rails_6 ]
+        exclude:
+        - { ruby: 2.4, gemfile: aws_sdk_2_rails_6 }
+        - { ruby: 2.4, gemfile: aws_sdk_3_rails_6 }
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+      TEST_DYNAMODB_ENDPOINT: 'http://0.0.0.0:8000'
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bin/setup
+    - run: docker-compose up -d
+    - run: docker ps
+    - run: bundle exec rubocop --fail-level=C
+    - run: bundle exec rake spec
+    - run: docker-compose down

data/Appraisals

@@ -1,7 +1,19 @@
-appraise "aws-sdk-2" do
+appraise "aws-sdk-2-rails-5" do
   gem "aws-sdk", "~> 2"
+  gem "activesupport", "~> 5"
 end
 
-appraise "aws-sdk-3" do
+appraise "aws-sdk-2-rails-6" do
+  gem "aws-sdk", "~> 2"
+  gem "activesupport", "~> 6"
+end
+
+appraise "aws-sdk-3-rails-5" do
+  gem "aws-sdk", "~> 3"
+  gem "activesupport", "~> 5"
+end
+
+appraise "aws-sdk-3-rails-6" do
   gem "aws-sdk", "~> 3"
+  gem "activesupport", "~> 6"
 end

data/CHANGELOG.md

@@ -6,6 +6,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+---
+
+## [0.9.1] - 2020-11-21
+### Security
+- [#59](https://github.com/walkersumida/dynamodb-api/pull/59) Update rake version
+
+### Removed
+- [#57](https://github.com/walkersumida/dynamodb-api/pull/57) Unsupport ruby2.3 and activesupport4
+
+## [0.9.0] - 2020-02-24
+### Fixed
+- [#56](https://github.com/walkersumida/dynamodb-api/pull/56) Make the `begins_with` and `between` available
+
+## [0.8.1] - 2019-06-03
+### Fixed
+- [#49](https://github.com/walkersumida/dynamodb-api/pull/49) not be added table name prefix
+- [#48](https://github.com/walkersumida/dynamodb-api/pull/48) Improvement DX
+
+## [0.8.0] - 2019-03-03
+### Added
+- [#39](https://github.com/walkersumida/dynamodb-api/pull/39) `next` method
+
+## [0.7.0] - 2018-12-23
+### Added
+- [#34](https://github.com/walkersumida/dynamodb-api/pull/34) `scan` method
+
 ## [0.6.2] - 2018-12-13
 ### Added
 - [#32](https://github.com/walkersumida/dynamodb-api/pull/32) `remove_attributes` method

data/Dockerfile

@@ -0,0 +1,15 @@
+FROM ruby:2.5.5
+
+ENV APP_ROOT /app
+WORKDIR $APP_ROOT
+
+COPY . $APP_ROOT
+
+RUN \
+  echo 'gem: --no-document' >> ~/.gemrc && \
+  cp ~/.gemrc /etc/gemrc && \
+  chmod uog+r /etc/gemrc && \
+  bundle config --global build.nokogiri --use-system-libraries && \
+  bundle config --global jobs 4 && \
+  bin/setup && \
+  rm -rf ~/.gem

data/README.md

@@ -1,6 +1,6 @@
 # Dynamodb::Api
 
-[![Build Status](https://travis-ci.org/walkersumida/dynamodb-api.svg?branch=master)](https://travis-ci.org/walkersumida/dynamodb-api)
+![Build Status](https://github.com/walkersumida/dynamodb-api/workflows/build/badge.svg?branch=master)
 [![Gem Version](https://badge.fury.io/rb/dynamodb-api.svg)](https://badge.fury.io/rb/dynamodb-api)
 
 ## Installation
@@ -57,6 +57,64 @@ cars table.
 |3 |3 |Model S |0.20120601e8 |0 |
 |4 |1 |S2000 |0.19980101e8 |1 |
 
+### Scan
+
+Scan returns items in random order.
+
+```ruby
+scan = Dynamodb::Api.scan
+scan.from('cars')
+items = scan.all.items
+```
+
+| id | maker_id(Partition key) | model | release_date(Sort key) | status |
+|:---|:---|:---|:---|:---|
+|1 |1 |Accord |0.19760508e8 |0 |
+|2 |2 |CROWN |0.19550101e8 |0 |
+|3 |3 |Model S |0.20120601e8 |0 |
+|4 |1 |S2000 |0.19980101e8 |1 |
+
+#### Filter
+
+```ruby
+scan = Dynamodb::Api.scan
+scan.from('cars').
+  filter('model = :model', ':model': 'S2000')
+items = scan.all.items
+```
+
+| id | maker_id(Partition key) | model | release_date(Sort key) | status |
+|:---|:---|:---|:---|:---|
+|4 |1 |S2000 |0.19980101e8 |1 |
+
+#### Limit
+
+```ruby
+scan = Dynamodb::Api.scan
+scan.from('cars').
+  limit(1)
+items = scan.all.items
+```
+
+| id | maker_id(Partition key) | model | release_date(Sort key) | status |
+|:---|:---|:---|:---|:---|
+|1 |1 |Accord |0.19760508e8 |0 |
+
+#### Next(Paging)
+
+```ruby
+scan = Dynamodb::Api.scan
+scan.from('cars').
+  limit(1)
+_items = scan.all.items
+items = scan.next.items
+```
+
+| id | maker_id(Partition key) | model | release_date(Sort key) | status |
+|:---|:---|:---|:---|:---|
+|2 |2 |CROWN |0.19550101e8 |0 |
+
+
 ### Query
 https://docs.aws.amazon.com/sdkforruby/api/Aws/DynamoDB/Client.html#query-instance_method
 
@@ -131,6 +189,22 @@ items = query.all.items
 |:---|:---|:---|:---|:---|
 |1 |1 |Accord |0.19760508e8 |0 |
 
+####  Next(Paging)
+
+```ruby
+query = Dynamodb::Api.query
+query.from('cars').index('index_maker_id_release_date').
+  where(['maker_id', '=', 1]).
+  order('asc'). # default: 'desc'
+  limit(1)
+_items = query.all.items
+items = query.next.items
+```
+
+| id | maker_id(Partition key) | model | release_date(Sort key) | status |
+|:---|:---|:---|:---|:---|
+|4 |1 |S2000 |0.19980101e8 |1 |
+
 #### Expression Attribute Names
 
 Words reserved in DynamoDB can not be used without special processing.
@@ -211,11 +285,10 @@ client.create_backup(
 ## Development
 
 - Run `docker-compose up` to run the dynamodb_local.
-- After checking out the repo, run `bin/setup` to install dependencies.
-- Run `bundle exec rake spec` to run the tests. Or run `bundle exec appraisal aws-sdk-* rake spec` to run the tests. Replase `*` with aws sdk major version.
-- You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+- Run `docker-compose run ruby bundle exec rake spec` to run the tests. Or run `docker-compose run ruby bundle exec appraisal aws-sdk-* rake spec` to run the tests. Replase `*` with aws sdk major version.
+- You can also run `docker-compose run ruby bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `docker-compose run ruby bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `docker-compose run ruby bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/bin/console

@@ -21,7 +21,7 @@ Aws.config.update(
 )
 
 Dynamodb::Api.config do |config|
-  config.endpoint = 'http://0.0.0.0:8000'
+  config.endpoint = 'http://dynamodb:8000'
 end
 
 IRB.start(__FILE__)

data/docker-compose.yml

@@ -1,6 +1,12 @@
 version: '3'
 services:
+  ruby:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - .:/app
   dynamodb:
-    image: cnadiminti/dynamodb-local:2018-04-11
+    image: amazon/dynamodb-local
     ports:
       - 8000:8000

data/dynamodb-api.gemspec

@@ -23,10 +23,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'aws-sdk', '>= 2'
-  spec.add_runtime_dependency('activesupport', '>= 4')
+  spec.add_runtime_dependency('activesupport', '>= 5')
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rubocop-airbnb'

data/gemfiles/{aws_sdk_2.gemfile → aws_sdk_2_rails_5.gemfile}

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "pry-byebug", platforms: :ruby
 gem "aws-sdk", "~> 2"
+gem "activesupport", "~> 5"
 
 gemspec path: "../"

data/gemfiles/aws_sdk_2_rails_6.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry-byebug", platforms: :ruby
+gem "aws-sdk", "~> 2"
+gem "activesupport", "~> 6"
+
+gemspec path: "../"

data/gemfiles/{aws_sdk_3.gemfile → aws_sdk_3_rails_5.gemfile}

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "pry-byebug", platforms: :ruby
 gem "aws-sdk", "~> 3"
+gem "activesupport", "~> 5"
 
 gemspec path: "../"

data/gemfiles/aws_sdk_3_rails_6.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry-byebug", platforms: :ruby
+gem "aws-sdk", "~> 3"
+gem "activesupport", "~> 6"
+
+gemspec path: "../"

data/lib/dynamodb/api.rb

@@ -5,7 +5,9 @@ require 'active_support/core_ext'
 require 'dynamodb/api/version'
 require 'dynamodb/api/config'
 require 'dynamodb/api/adapter'
+require 'dynamodb/api/base'
 require 'dynamodb/api/query'
+require 'dynamodb/api/scan'
 require 'dynamodb/api/relation'
 require 'dynamodb/api/relation/query_methods'
 require 'dynamodb/api/relation/from_clause'
@@ -40,6 +42,10 @@ module Dynamodb
       Delete::Tables.delete_tables
     end
 
+    def scan
+      Scan.new
+    end
+
     def query
       Query.new
     end

data/lib/dynamodb/api/base.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'dynamodb/api/relation'
+
+module Dynamodb
+  module Api
+    class Base # :nodoc:
+      include Relation
+      attr_accessor :last_evaluated_key
+
+      def all
+        raise NotImplementedError, "You must implement #{self.class}##{__method__}"
+      end
+
+      def next
+        raise NotImplementedError, "You must implement #{self.class}##{__method__}"
+      end
+
+      private
+
+      def build_input
+        raise NotImplementedError, "You must implement #{self.class}##{__method__}"
+      end
+
+      def base_params
+        raise NotImplementedError, "You must implement #{self.class}##{__method__}"
+      end
+
+      def order_direct(clause)
+        clause&.direct ? clause.direct : OrderClause.new.direct
+      end
+
+      def select_name(clause)
+        clause&.name ? clause.name : SelectClause.new.name
+      end
+
+      # Build filter clause.
+      # `filter_expression`: e.g. "Artist = :a"
+      # `expression_attribute_values`: e.g. { ":a" => "No One You Know" }
+      #
+      # @param input [Aws::DynamoDB::Types::ScanInput]
+      # @return [Aws::DynamoDB::Types::ScanInput]
+      def build_filter_clause(input)
+        return input if filter_clause&.expression.blank?
+        input[:filter_expression] = filter_clause.expression
+        if filter_clause.values.present?
+          if input[:expression_attribute_values].nil?
+            input[:expression_attribute_values] = {}
+          end
+          input[:expression_attribute_values].
+            merge!(filter_clause.values)
+        end
+        input
+      end
+
+      def build_expression_attribute_names(input)
+        if filter_clause&.reserved_words.present?
+          expression_attribute.add(filter_clause.reserved_words)
+        end
+        if expression_attribute.names.present?
+          input[:expression_attribute_names] = expression_attribute.names
+        end
+      end
+    end
+  end
+end

data/lib/dynamodb/api/config.rb

@@ -15,6 +15,13 @@ module Dynamodb
       option :retry_limit, default: 10
       option :table_name_prefix, default: ''
       option :index_name_prefix, default: ''
+
+      # @param value [String] the table name
+      # @return [String] the table name
+      def build_table_name(value)
+        return value unless table_name_prefix?
+        "#{table_name_prefix}#{value}"
+      end
     end
   end
 end

data/lib/dynamodb/api/delete/item.rb

@@ -3,9 +3,13 @@
 module Dynamodb
   module Api
     module Delete
-      class Item # :nodoc:
+      class Item
+        # @param key [Hash] the item key
+        # @param table_name [String] the table name
         def self.delete_item(key, table_name)
           client = Adapter.client
+          table_name = Dynamodb::Api::Config.build_table_name(table_name)
+
           client.delete_item(key: key, table_name: table_name)
         end
       end

data/lib/dynamodb/api/delete/tables.rb

@@ -4,6 +4,7 @@ module Dynamodb
   module Api
     module Delete
       class Tables # :nodoc:
+        # TODO: add rspec
         def self.delete_tables
           client = Adapter.client
           table_names = client.list_tables[:table_names]

data/lib/dynamodb/api/map/operator.rb

@@ -4,21 +4,24 @@ module Dynamodb
   module Api
     module Map
       class Operator # :nodoc:
+        # Replace the Dynamodb Operators
+        # @param k [String] The Dynamodb Operator
+        # @return [String]
         def self.key(k)
           k = k.gsub(' ', '')
           case k
-          when '='
-            'EQ'
-          when '!='
-            'NE'
-          when '<='
-            'LE'
-          when '<'
-            'LT'
-          when '>='
-            'GE'
-          when '>'
-            'GT'
+          when 'EQ'
+            '='
+          when 'NE'
+            '!='
+          when 'LE'
+            '<='
+          when 'LT'
+            '<'
+          when 'GE'
+            '>='
+          when 'GT'
+            '>'
           else
             k
           end

data/lib/dynamodb/api/put/item.rb

@@ -3,9 +3,13 @@
 module Dynamodb
   module Api
     module Put
-      class Item # :nodoc:
+      class Item
+        # @param key [Hash] the item key
+        # @param table_name [String] the table name
         def self.put_item(item, table_name)
           client = Adapter.client
+          table_name = Dynamodb::Api::Config.build_table_name(table_name)
+
           client.put_item(item: item, table_name: table_name)
         end
       end

data/lib/dynamodb/api/query.rb

@@ -4,55 +4,53 @@ require 'dynamodb/api/relation'
 
 module Dynamodb
   module Api
-    class Query # :nodoc:
-      include Relation
-
+    class Query < Base # :nodoc:
       def all
-        Adapter.client.query(build_query)
-      end
-
-      private
-
-      def build_query
-        build_params = base_params.merge(build_filter_clause)
-        build_params[:scan_index_forward] = order_direct(order_clause)
-        build_params[:select] = select_name(select_clause)
-        build_expression_attribute_names(build_params)
-        build_params[:limit] = limit_clause.number if limit_clause&.number
-        build_params
+        result = Adapter.client.query(build_input)
+        @last_evaluated_key = result.last_evaluated_key
+        result
       end
 
-      def base_params
-        {
-          table_name: from_clause.name,
-          index_name: index_clause.name,
-          key_conditions: where_clause.key_conditions,
-        }
+      def next
+        return nil if @last_evaluated_key.blank?
+        input = build_input
+        input[:exclusive_start_key] = @last_evaluated_key
+        result = Adapter.client.query(input)
+        @last_evaluated_key = result.last_evaluated_key
+        return nil if result.count.zero?
+        result
       end
 
-      def order_direct(clause)
-        clause&.direct ? clause.direct : OrderClause.new.direct
-      end
-
-      def select_name(clause)
-        clause&.name ? clause.name : SelectClause.new.name
-      end
+      private
 
-      def build_filter_clause
-        return {} if filter_clause&.expression.blank?
-        {
-          filter_expression: filter_clause.expression,
-          expression_attribute_values: filter_clause.values,
-        }
+      # Build options.
+      #
+      # @return [Aws::DynamoDB::Types::ScanInput]
+      def build_input
+        input = Aws::DynamoDB::Types::QueryInput.new
+        input[:expression_attribute_values] = {}
+        input = base_input(input)
+        input = build_filter_clause(input)
+        input[:scan_index_forward] = order_direct(order_clause)
+        input[:select] = select_name(select_clause)
+        build_expression_attribute_names(input)
+        input[:limit] = limit_clause.number if limit_clause&.number
+        input
       end
 
-      def build_expression_attribute_names(params)
-        if filter_clause&.reserved_words.present?
-          expression_attribute.add(filter_clause.reserved_words)
-        end
-        if expression_attribute.names.present?
-          params[:expression_attribute_names] = expression_attribute.names
-        end
+      # Build required options.
+      # `key_condition_expression`: e.g. "Artist = :a"
+      # `expression_attribute_values`: e.g. { ":a" => "No One You Know" }
+      #
+      # @param input [Aws::DynamoDB::Types::ScanInput]
+      # @return [Aws::DynamoDB::Types::ScanInput]
+      def base_input(input)
+        input[:table_name] = from_clause.name
+        input[:index_name] = index_clause.name
+        input[:key_condition_expression] = where_clause.key_condition
+        input[:expression_attribute_values].
+          merge!(where_clause.attribute_values)
+        input
       end
     end
   end

data/lib/dynamodb/api/relation/from_clause.rb

@@ -6,11 +6,9 @@ module Dynamodb
       class FromClause # :nodoc:
         attr_reader :name
 
+        # @param name [String] the table name
         def initialize(name)
-          if Dynamodb::Api::Config.table_name_prefix?
-            name = Dynamodb::Api::Config.table_name_prefix + name
-          end
-          @name = name
+          @name = Dynamodb::Api::Config.build_table_name(name)
         end
       end
     end

data/lib/dynamodb/api/relation/query_methods.rb

@@ -24,8 +24,8 @@ module Dynamodb
           self
         end
 
-        def where(key_conditions)
-          self.where_clause = Relation::WhereClause.new(key_conditions)
+        def where(expression)
+          self.where_clause = Relation::WhereClause.new(expression)
           self
         end
 

data/lib/dynamodb/api/relation/where_clause.rb

@@ -4,24 +4,89 @@ module Dynamodb
   module Api
     module Relation
       class WhereClause # :nodoc:
-        attr_reader :key_conditions
+        attr_reader :key_condition
+        attr_reader :attribute_values
 
         KEY = 0
         VALUE = 2
         OPERATOR = 1
+        FROM = 0
+        TO = 1
 
-        def initialize(key_conditions)
-          @key_conditions = build(key_conditions)
+        # @param conditions [Array]
+        def initialize(conditions)
+          built_conditions = build(conditions)
+          @key_condition = built_conditions[:key_conditions]
+          @attribute_values = built_conditions[:attribute_values]
         end
 
         private
 
-        def build(key_conditions)
-          conditions = format_conditions(key_conditions)
-          conditions.each_with_object({}) do |c, h|
-            h[c[KEY]] = {
-              attribute_value_list: format_value(c[VALUE]),
-              comparison_operator: Map::Operator.key(c[OPERATOR]),
+        # Build where clause.
+        #
+        # @param conditions [Array]
+        def build(conditions)
+          init = { key_conditions: [], attribute_values: {} }
+          conditions = format_conditions(conditions)
+          built = conditions.each_with_object(init) do |c, h|
+            h[:key_conditions] <<
+              format_key_condition(c[KEY], c[OPERATOR])
+            h[:attribute_values].
+              merge!(format_values(c[KEY], c[OPERATOR], c[VALUE]))
+          end
+          built[:key_conditions] =
+            built[:key_conditions].join(' AND ')
+          built
+        end
+
+        # Format to the `key_condition_expression`.
+        # e.g.
+        #   `format_key_condition("Artist", "=")` =>
+        #     `"Artist = :Artist"`
+        #
+        #   `format_key_condition("Artist", "begins_with")` =>
+        #     `"begins_with(Artist, :Artist)"`
+        #
+        #   `format_key_condition("Year", "between")` =>
+        #     `"Year between :from_Year and :to_Year"`
+        #
+        # @param key [String] a attribute name
+        # @param operator [String] a operator
+        # @return [String] Formatted expression.
+        def format_key_condition(key, operator)
+          case operator.downcase
+          when 'begins_with'
+            "#{operator.downcase}(#{key}, :#{key})"
+          when 'between'
+            "#{key} #{operator.downcase}" \
+              " :from_#{key} AND :to_#{key}"
+          else
+            "#{key} #{Map::Operator.key(operator)} :#{key}"
+          end
+        end
+
+        # Format to the `expression_attribute_values`
+        # e.g.
+        #   `format_values("Artist", "=", "blue")` =>
+        #     `{ ":Artist" => "blue" }`
+        #
+        #   `format_values("Year", "between", [1999, 2020])` =>
+        #     `{ ":from_Year" => 1999, ":to_Year" => 2020 }`
+        #
+        # @param key [String] a attribute name
+        # @param operator [String] a operator
+        # @param values [Object] values
+        # @return [Hash<Object>] Formatted expression.
+        def format_values(key, operator, values)
+          case operator.downcase
+          when 'between'
+            {
+              ":from_#{key}" => values[FROM],
+              ":to_#{key}" => values[TO],
+            }
+          else
+            {
+              ":#{key}" => values.is_a?(Array) ? values[0] : values,
             }
           end
         end
@@ -30,11 +95,6 @@ module Dynamodb
           return [conditions] unless conditions[0].is_a?(Array)
           conditions
         end
-
-        def format_value(value)
-          return [value] unless value.is_a?(Array)
-          value
-        end
       end
     end
   end

data/lib/dynamodb/api/scan.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'dynamodb/api/relation'
+
+module Dynamodb
+  module Api
+    class Scan < Base # :nodoc:
+      def all
+        result = Adapter.client.scan(build_input)
+        @last_evaluated_key = result.last_evaluated_key
+        result
+      end
+
+      def next
+        return nil if @last_evaluated_key.blank?
+        input = build_input
+        input[:exclusive_start_key] = @last_evaluated_key
+        result = Adapter.client.scan(input)
+        @last_evaluated_key = result.last_evaluated_key
+        result
+      end
+
+      private
+
+      def build_input
+        input = Aws::DynamoDB::Types::ScanInput.new
+        input = base_input(input)
+        input = build_filter_clause(input)
+        input[:index_name] = index_clause.name if index_clause&.name
+        input[:select] = select_name(select_clause)
+        build_expression_attribute_names(input)
+        input[:limit] = limit_clause.number if limit_clause&.number
+        input
+      end
+
+      def base_input(input)
+        input[:table_name] = from_clause.name
+        input
+      end
+    end
+  end
+end

data/lib/dynamodb/api/update/base.rb

@@ -7,7 +7,7 @@ module Dynamodb
         def update_item(key, cols, table_name)
           @key = key
           @cols = cols
-          @table_name = table_name
+          @table_name = Dynamodb::Api::Config.build_table_name(table_name)
 
           client = Adapter.client
           client.update_item(build_update_clause)

data/lib/dynamodb/api/version.rb

@@ -1,5 +1,5 @@
 module Dynamodb
   module Api
-    VERSION = '0.6.2'.freeze
+    VERSION = '0.9.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamodb-api
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.9.1
 platform: ruby
 authors:
 - WalkerSumida
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2021-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -30,42 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -129,15 +115,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".pryrc"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -146,10 +133,13 @@ files:
 - bin/setup
 - docker-compose.yml
 - dynamodb-api.gemspec
-- gemfiles/aws_sdk_2.gemfile
-- gemfiles/aws_sdk_3.gemfile
+- gemfiles/aws_sdk_2_rails_5.gemfile
+- gemfiles/aws_sdk_2_rails_6.gemfile
+- gemfiles/aws_sdk_3_rails_5.gemfile
+- gemfiles/aws_sdk_3_rails_6.gemfile
 - lib/dynamodb/api.rb
 - lib/dynamodb/api/adapter.rb
+- lib/dynamodb/api/base.rb
 - lib/dynamodb/api/config.rb
 - lib/dynamodb/api/config/options.rb
 - lib/dynamodb/api/delete/item.rb
@@ -167,6 +157,7 @@ files:
 - lib/dynamodb/api/relation/query_methods.rb
 - lib/dynamodb/api/relation/select_clause.rb
 - lib/dynamodb/api/relation/where_clause.rb
+- lib/dynamodb/api/scan.rb
 - lib/dynamodb/api/update/attributes.rb
 - lib/dynamodb/api/update/base.rb
 - lib/dynamodb/api/update/item.rb
@@ -175,7 +166,7 @@ homepage: https://github.com/walkersumida/dynamodb-api
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,9 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: aws dynamodb api
 test_files: []

data/.travis.yml

@@ -1,19 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-gemfile:
-  - gemfiles/aws_sdk_2.gemfile
-  - gemfiles/aws_sdk_3.gemfile
-
-before_install: gem install bundler -v 1.16.2
-
-before_script:
-  - docker-compose up -d
-
-script: bundle exec rubocop --fail-level=C
-
-after_script:
-  - docker-compose down