dynamoid_advanced_where 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77c5c86c6aeccd5d5cd9db4a6e030a3527d17c87776fb05de5a06966699a1167
-  data.tar.gz: 02426eb629574d8bcd1ec7507c1f6795d0e3f22577ef54c21bf203351ccd81d3
+  metadata.gz: 1b7427e4321a6c8c50704320ff3912868bd50d3471dae090a26059c107f25210
+  data.tar.gz: e87fbb9ac716caefdc16bf3190b2cbd0075263dae6aff9e88154271717055691
 SHA512:
-  metadata.gz: dcb79577e6f5e90cccb482e77d26614f7be1fe16bf265970441176fd794c0760107a994f444eabe9290151f5dfea9d8c263f359b663e7d5c87536a85540c38ac
-  data.tar.gz: 5e736cf0adaa648c1b088ddb938ce8a41080df77e243fe8cb0cb70fb561ae985582e3002c9078eed4d2ebd3284cccee30c657d9f24806082520f0055c5b22849
+  metadata.gz: 33c0c156eef5278bc77f7679bf56762f23937e2dc949da35a4dd16b8c4d0e3fa4e4f20d864faaac9b0e4ec99a9befe56994d87287c96452570582b93921e649f
+  data.tar.gz: 1b0eab5b78254e4352d72d2930daf2aa1645b27e2759e87024387dd6efeaa9ed9bc70536e3fc0fd1c0fe0cdafcf4c2b22f8548672d0d3496ebb1c64687efe0ec

data/.github/workflows/lint.yml

@@ -0,0 +1,21 @@
+name: 'Lint'
+
+on: push
+
+jobs:
+  run-rubocop:
+    name: Lint code
+    strategy:
+      fail-fast: false
+      matrix:
+        rubyVersion: ["2.7.6"]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.rubyVersion }}
+          bundler-cache: true
+          cache-version: "${{ matrix.rubyVersion }}-0"
+      - name: Run RuboCop
+        run: bundle exec rubocop

data/.github/workflows/test.yml

@@ -0,0 +1,39 @@
+name: Test
+
+on: push
+
+jobs:
+  run-tests:
+    name: Test code
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 3.0.4
+          - 2.7.6
+          - 3.1.2
+    services:
+      dynamodb:
+        image: amazon/dynamodb-local
+        ports:
+          - 8000/tcp
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          cache-version: ${{ matrix.ruby }}-0
+      - name: Run RSpec
+        env:
+          AWS_ACCESS_KEY_ID: asdf
+          AWS_SECRET_ACCESS_KEY: asdf
+          CI: true
+          DYNAMODB_HOST: http://localhost:${{job.services.dynamodb.ports[8000]}}/
+        run: bundle exec rspec
+      - name: Coveralls
+        uses: coverallsapp/github-action@v1.1.2
+        continue-on-error: true
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

data/.rubocop-https---raw-githubusercontent-com-GetTerminus-ruby-shared-configs-master--rubocop-3-1-yml

@@ -0,0 +1,5 @@
+inherit_from:
+  - https://raw.githubusercontent.com/GetTerminus/ruby_shared_configs/master/.rubocop.yml
+
+Style/HashSyntax:
+  EnforcedShorthandSyntax: either

data/.rubocop-https---raw-githubusercontent-com-GetTerminus-ruby-shared-configs-master--rubocop-yml

@@ -0,0 +1,91 @@
+AllCops:
+  Exclude:
+    - Makefile
+    - vendor/**/*
+    - bin/**/*
+
+Layout/EndOfLine:
+  Enabled: false
+
+Style/DateTime:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Lint/Debugger:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArguments:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Lint/UnusedMethodArgument:
+  AllowUnusedKeywordArguments: true
+
+Layout/LineLength:
+  Enabled: true
+  Max: 280
+  IgnoreCopDirectives: true
+  AllowedPatterns: ['\A#', '\A\s*sig { .* }\Z']
+  Exclude:
+    - '**/*_pb.rb'
+
+Metrics/AbcSize:
+  Enabled: true
+  Max: 48
+
+Metrics/CyclomaticComplexity:
+  Max: 9
+
+Metrics/MethodLength:
+  Enabled: true
+  Max: 32
+
+Layout/ParameterAlignment:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+
+Naming/MethodParameterName:
+  Enabled: true
+  AllowedNames: ['io', 'id', 'to', 'by', 'on', 'in', 'at', '_'] # Defaults + _
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Style/ParallelAssignment:
+  Enabled: true
+
+Metrics/ClassLength:
+  Max: 240
+
+Metrics/BlockLength:
+  Max: 30
+  Exclude:
+    - spec/**/*.rb
+    - '**/*_pb.rb'
+
+Metrics/ParameterLists:
+  Max: 6
+
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - spec/**/*.rb
+
+Style/BlockDelimiters:
+  Enabled: true
+  Exclude:
+    - spec/**/*

data/.rubocop.yml

@@ -1,3 +1,9 @@
+inherit_from:
+  - .rubocop_todo.yml
+  - https://raw.githubusercontent.com/GetTerminus/ruby_shared_configs/master/.rubocop-3-1.yml
+
+
+
 AllCops:
   Exclude:
     - bin/*

data/.rubocop_todo.yml

@@ -0,0 +1,42 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2022-10-31 20:09:20 UTC using RuboCop version 1.18.4.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'dynamoid_advanced_where.gemspec'
+
+# Offense count: 6
+Lint/MissingSuper:
+  Exclude:
+    - 'lib/dynamoid_advanced_where/nodes/and_node.rb'
+    - 'lib/dynamoid_advanced_where/nodes/exists_node.rb'
+    - 'lib/dynamoid_advanced_where/nodes/field_node.rb'
+    - 'lib/dynamoid_advanced_where/nodes/operation_node.rb'
+    - 'lib/dynamoid_advanced_where/nodes/or_node.rb'
+    - 'lib/dynamoid_advanced_where/nodes/root_node.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowComments, AllowNil.
+Lint/SuppressedException:
+  Exclude:
+    - 'lib/dynamoid_advanced_where/batched_updater.rb'
+
+# Offense count: 1
+Naming/AccessorMethodName:
+  Exclude:
+    - 'lib/dynamoid_advanced_where/batched_updater.rb'
+
+# Offense count: 1
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
+Naming/MethodParameterName:
+  Exclude:
+    - 'lib/dynamoid_advanced_where/nodes/root_node.rb'

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+3.0.4

data/Gemfile.lock

@@ -1,105 +1,115 @@
 PATH
   remote: .
   specs:
-    dynamoid_advanced_where (1.4.0)
+    dynamoid_advanced_where (1.5.0)
       dynamoid (>= 3.2, < 4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4)
-      activesupport (= 6.1.4)
-    activesupport (6.1.4)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.482.0)
-    aws-sdk-core (3.119.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.654.0)
+    aws-sdk-core (3.166.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-dynamodb (1.78.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-dynamodb (1.62.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.4)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
-    bundler-audit (0.8.0)
+    bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     childprocess (4.1.0)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
+    concurrent-ruby (1.1.10)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.5.0)
     dynamoid (3.7.1)
       activemodel (>= 4)
       aws-sdk-dynamodb (~> 1.0)
       concurrent-ruby (>= 1.0)
-    fasterer (0.9.0)
+    fasterer (0.10.0)
       colorize (~> 0.7)
-      ruby_parser (>= 3.14.1)
-    i18n (1.8.10)
+      ruby_parser (>= 3.19.1)
+    hashdiff (1.0.1)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
-    jmespath (1.4.0)
+    jmespath (1.6.1)
+    json (2.6.2)
     method_source (1.0.0)
-    minitest (5.14.4)
-    overcommit (0.58.0)
+    minitest (5.16.3)
+    overcommit (0.59.1)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
       rexml (~> 3.2)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
+    public_suffix (5.0.0)
+    rainbow (3.1.1)
     rake (10.5.0)
-    regexp_parser (2.1.1)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.18.4)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.37.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.8.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.8.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.23.0)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    ruby_parser (3.16.0)
-      sexp_processor (~> 4.15, >= 4.15.1)
-    sexp_processor (4.15.3)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+    ruby_parser (3.19.1)
+      sexp_processor (~> 4.16)
+    sexp_processor (4.16.1)
+    thor (1.2.1)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.3.0)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -117,6 +127,7 @@ DEPENDENCIES
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop
+  webmock
 
 BUNDLED WITH
-   2.1.4
+   2.3.12

data/README.md

@@ -114,6 +114,16 @@ Valid on field types: `string`, or `set/array` of `String` / `Integer`
 #### Example
 `where{|r| r.foo.includes?(123) }` and `where{|r| r.foo.includes?('foo') }`
 
+### In?
+This operator may be used to check if:
+
+* A string field is one of an enumerable set of values
+
+Valid on field types: `string`
+
+#### Example
+`where{|r| r.foo.in?(['foo', 'bar']) }`
+
 ### Working with Map and Raw types
 When it comes to map and raw attribute types, DAW takes the approach of
 trusting you, since the exact format is not explicitly defined or enforced.

data/dynamoid_advanced_where.gemspec

@@ -40,4 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'webmock'
 end

data/lib/dynamoid_advanced_where/batched_updater.rb

@@ -22,8 +22,8 @@ module DynamoidAdvancedWhere
         return_values: 'ALL_NEW',
         key: {
           klass.hash_key => hash_key,
-          klass.range_key => range_key
-        }.delete_if { |k, _v| k.nil? }
+          klass.range_key => range_key,
+        }.delete_if { |k, _v| k.nil? },
       }
       resp = client.update_item(update_item_arguments.merge(key_args))
 
@@ -87,7 +87,7 @@ module DynamoidAdvancedWhere
       filter = merge_multiple_sets(
         [
           field_update_arguments,
-          add_update_args
+          add_update_args,
         ],
         result_base: filter_builder.to_scan_filter,
       )
@@ -103,7 +103,7 @@ module DynamoidAdvancedWhere
 
       update_args.merge!(
         collected_update_expression: [
-          "#{command} #{update_args[:collected_update_expression].join(', ')}"
+          "#{command} #{update_args[:collected_update_expression].join(', ')}",
         ]
       )
     end
@@ -114,7 +114,7 @@ module DynamoidAdvancedWhere
           [
             explicit_set_args,
             list_append_for_arrays,
-            increment_field_updates
+            increment_field_updates,
           ]
         ),
         command: 'SET'
@@ -142,8 +142,8 @@ module DynamoidAdvancedWhere
       builder_hash = {
         collected_update_expression: [],
         expression_attribute_values: {
-          ":#{zero_prefix}": 0
-        }
+          ":#{zero_prefix}": 0,
+        },
       }
 
       _increments.each_with_object(builder_hash) do |(field, change), h|
@@ -169,8 +169,8 @@ module DynamoidAdvancedWhere
       builder_hash = {
         collected_update_expression: [],
         expression_attribute_values: {
-          ":#{empty_list_prefix}": []
-        }
+          ":#{empty_list_prefix}": [],
+        },
       }
 
       update_args = _array_appends.each_with_object(builder_hash) do |to_append, h|
@@ -205,9 +205,9 @@ module DynamoidAdvancedWhere
         {
           expression_attribute_names: Hash[update_target],
           expression_attribute_values: {
-            ":#{prefix}" => dump(value, field_name)
-          }
-        }
+            ":#{prefix}" => dump(value, field_name),
+          },
+        },
       ]
     end
 

data/lib/dynamoid_advanced_where/filter_builder.rb

@@ -5,7 +5,7 @@ require_relative './nodes/null_node'
 module DynamoidAdvancedWhere
   class FilterBuilder
     VALID_COMPARETORS_FOR_RANGE_FILTER = [
-      Nodes::GreaterThanNode
+      Nodes::GreaterThanNode,
     ].freeze
 
     attr_accessor :expression_node, :klass
@@ -18,13 +18,13 @@ module DynamoidAdvancedWhere
     def index_nodes
       [
         extract_query_filter_node,
-        extract_range_key_node
+        extract_range_key_node,
       ].compact
     end
 
     def to_query_filter
       {
-        key_condition_expression: key_condition_expression
+        key_condition_expression: key_condition_expression,
       }.merge!(expression_filters)
     end
 
@@ -41,21 +41,21 @@ module DynamoidAdvancedWhere
     def key_condition_expression
       @key_condition_expression ||= [
         extract_query_filter_node,
-        extract_range_key_node
+        extract_range_key_node,
       ].compact.map(&:to_expression).join(' AND ')
     end
 
     def expression_attribute_names
       [
         expression_node,
-        *index_nodes
+        *index_nodes,
       ].map(&:expression_attribute_names).inject({}, &:merge!)
     end
 
     def expression_attribute_values
       [
         expression_node,
-        *index_nodes
+        *index_nodes,
       ].map(&:expression_attribute_values).inject({}, &:merge!)
     end
 
@@ -63,7 +63,7 @@ module DynamoidAdvancedWhere
       {
         filter_expression: expression_node.to_expression,
         expression_attribute_names: expression_attribute_names,
-        expression_attribute_values: expression_attribute_values
+        expression_attribute_values: expression_attribute_values,
       }.delete_if { |_, v| v.nil? || v.empty? }
     end
 

data/lib/dynamoid_advanced_where/nodes/array_literal_node.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'securerandom'
+
+module DynamoidAdvancedWhere
+  module Nodes
+    class ArrayLiteralNode
+      attr_accessor :value, :attr_prefix
+
+      def initialize(value)
+        self.value = value
+        self.attr_prefix = SecureRandom.hex
+        freeze
+      end
+
+      def to_expression
+        values = value.each_with_index.map do |_, idx|
+          ":#{attr_prefix}#{idx}"
+        end
+        "(#{values.join(', ')})"
+      end
+
+      def expression_attribute_names
+        {}
+      end
+
+      def expression_attribute_values
+        value.each_with_index.map do |val, idx|
+          [":#{attr_prefix}#{idx}", val]
+        end.to_h
+      end
+    end
+  end
+end

data/lib/dynamoid_advanced_where/nodes/exists_node.rb

@@ -30,7 +30,7 @@ module DynamoidAdvancedWhere
 
       def expression_attribute_values
         {
-          ":#{prefix}" => nil
+          ":#{prefix}" => nil,
         }
       end
     end

data/lib/dynamoid_advanced_where/nodes/field_node.rb

@@ -4,6 +4,7 @@ require_relative './equality_node'
 require_relative './greater_than_node'
 require_relative './exists_node'
 require_relative './includes'
+require_relative './in_node'
 require_relative './subfield'
 
 module DynamoidAdvancedWhere
@@ -60,6 +61,7 @@ module DynamoidAdvancedWhere
 
     class StringAttributeNode < FieldNode
       include Concerns::SupportsIncludes
+      include Concerns::SupportsIn
     end
 
     class NativeBooleanAttributeNode < FieldNode; end
@@ -74,13 +76,11 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsGreaterThan
 
       ALLOWED_COMPARISON_TYPES = [
-        Numeric
+        Numeric,
       ].freeze
 
       def parse_right_hand_side(val)
-        unless ALLOWED_COMPARISON_TYPES.detect { |k| val.is_a?(k) }
-          raise ArgumentError, "unable to compare number to `#{val.class}`"
-        end
+        raise ArgumentError, "unable to compare number to `#{val.class}`" unless ALLOWED_COMPARISON_TYPES.detect { |k| val.is_a?(k) }
 
         val
       end
@@ -166,6 +166,7 @@ module DynamoidAdvancedWhere
     FIELD_MAPPING = {
       { type: :string } => StringAttributeNode,
       { type: :number } => NumberAttributeNode,
+      { type: :integer } => NumberAttributeNode,
 
       # Boolean Fields
       { type: :boolean, store_as_native_boolean: true } =>
@@ -199,7 +200,7 @@ module DynamoidAdvancedWhere
       { type: :raw } => RawAttributeNode,
 
       # Custom Object
-      ->(c) { c[:type].is_a?(Class) } => CustomClassAttributeNode
+      ->(c) { c[:type].is_a?(Class) } => CustomClassAttributeNode,
     }.freeze
   end
 end

data/lib/dynamoid_advanced_where/nodes/in_node.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module DynamoidAdvancedWhere
+  module Nodes
+    class InNode < OperationNode
+      def to_expression
+        "#{lh_operation.to_expression} IN #{rh_operation.to_expression}"
+      end
+    end
+
+    module Concerns
+      module SupportsIn
+        def in?(other_value)
+          val = if respond_to?(:parse_right_hand_side)
+                  parse_right_hand_side(other_value)
+                else
+                  other_value
+                end
+
+          raise 'Expected parameter of `in?` to be an array' unless val.is_a?(Array)
+
+          InNode.new(
+            lh_operation: self,
+            rh_operation: ArrayLiteralNode.new(val)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/dynamoid_advanced_where/nodes.rb

@@ -3,6 +3,7 @@
 require_relative './nodes/base_node'
 require_relative './nodes/field_node'
 require_relative './nodes/literal_node'
+require_relative './nodes/array_literal_node'
 require_relative './nodes/operation_node'
 require_relative './nodes/root_node'
 require_relative './nodes/and_node'

data/lib/dynamoid_advanced_where/query_builder.rb

@@ -67,7 +67,7 @@ module DynamoidAdvancedWhere
       self.class.new(**{
         klass: klass,
         start_hash: start_hash,
-        root_node: root_node
+        root_node: root_node,
       }.merge(changes))
     end
   end

data/lib/dynamoid_advanced_where/query_materializer.rb

@@ -48,7 +48,7 @@ module DynamoidAdvancedWhere
 
     def each_page_via_query
       query = {
-        table_name: table_name
+        table_name: table_name,
       }.merge(filter_builder.to_query_filter)
 
       query[:limit] = query_builder.record_limit if query_builder.record_limit
@@ -76,7 +76,7 @@ module DynamoidAdvancedWhere
 
     def each_page_via_scan
       query = {
-        table_name: table_name
+        table_name: table_name,
       }.merge(filter_builder.to_scan_filter)
 
       query[:limit] = query_builder.record_limit if query_builder.record_limit

data/lib/dynamoid_advanced_where/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DynamoidAdvancedWhere
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid_advanced_where
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Brian Malinconico
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynamoid
@@ -142,6 +142,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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'
 description: things
 email:
 - bmalinconico@terminus.com
@@ -149,10 +163,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/lint.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop-https---raw-githubusercontent-com-GetTerminus-ruby-shared-configs-master--rubocop-3-1-yml"
+- ".rubocop-https---raw-githubusercontent-com-GetTerminus-ruby-shared-configs-master--rubocop-yml"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-version"
 - ".travis.yml"
 - Appraisals
@@ -180,11 +198,13 @@ files:
 - lib/dynamoid_advanced_where/integrations/model.rb
 - lib/dynamoid_advanced_where/nodes.rb
 - lib/dynamoid_advanced_where/nodes/and_node.rb
+- lib/dynamoid_advanced_where/nodes/array_literal_node.rb
 - lib/dynamoid_advanced_where/nodes/base_node.rb
 - lib/dynamoid_advanced_where/nodes/equality_node.rb
 - lib/dynamoid_advanced_where/nodes/exists_node.rb
 - lib/dynamoid_advanced_where/nodes/field_node.rb
 - lib/dynamoid_advanced_where/nodes/greater_than_node.rb
+- lib/dynamoid_advanced_where/nodes/in_node.rb
 - lib/dynamoid_advanced_where/nodes/includes.rb
 - lib/dynamoid_advanced_where/nodes/less_than_node.rb
 - lib/dynamoid_advanced_where/nodes/literal_node.rb
@@ -197,10 +217,10 @@ files:
 - lib/dynamoid_advanced_where/query_builder.rb
 - lib/dynamoid_advanced_where/query_materializer.rb
 - lib/dynamoid_advanced_where/version.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,8 +235,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: things
 test_files: []

data/.circleci/config.yml

@@ -1,129 +0,0 @@
-version: 2.0
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - "ruby-2.5"
-      - "ruby-2.6"
-      - "ruby-2.7"
-      - "ruby-3.0"
-
-jobs:
-  "ruby-3.0":
-    docker:
-      - image: ruby:2.5
-      - image: amazon/dynamodb-local
-        environment:
-          MAX_HEAP_SIZE: 1024m
-          HEAP_NEWSIZE: 512m
-
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "Appraisals" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
-      - run:
-          name: install dependencies
-          command: |
-            gem update bundler
-            bundle install
-            bundle exec appraisal install
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "Appraisals" }}
-      - run:  bundle exec appraisal rspec --format progress
-
-  "ruby-2.5":
-    docker:
-      - image: ruby:2.5
-      - image: amazon/dynamodb-local
-        environment:
-          MAX_HEAP_SIZE: 1024m
-          HEAP_NEWSIZE: 512m
-
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "Appraisals" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
-      - run:
-          name: install dependencies
-          command: |
-            gem update bundler
-            bundle install
-            bundle exec appraisal install
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "Appraisals" }}
-      - run:  bundle exec appraisal rspec --format progress
-
-  "ruby-2.6":
-    docker:
-      - image: ruby:2.6
-      - image: amazon/dynamodb-local
-        environment:
-          MAX_HEAP_SIZE: 1024m
-          HEAP_NEWSIZE: 512m
-
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "Appraisals" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
-      - run:
-          name: install dependencies
-          command: |
-            gem update bundler
-            bundle install
-            bundle exec appraisal install
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "Appraisals" }}
-      - run: bundle exec appraisal rspec --format progress
-
-  "ruby-2.7":
-    docker:
-      - image: ruby:2.7
-      - image: amazon/dynamodb-local
-        environment:
-          MAX_HEAP_SIZE: 1024m
-          HEAP_NEWSIZE: 512m
-
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "Appraisals" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
-      - run:
-          name: install dependencies
-          command: |
-            gem update bundler
-            bundle install
-            bundle exec appraisal install
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}-{{ checksum "Appraisals" }}
-      - run: bundle exec appraisal rspec --format progress
-
-
-
-
-
-