dynamoid_advanced_where 1.3.0 → 1.5.0

data/lib/dynamoid_advanced_where/batched_updater.rb

@@ -5,6 +5,7 @@ module DynamoidAdvancedWhere
     DEEP_MERGE_ATTRIBUTES = %i[expression_attribute_names expression_attribute_values].freeze
 
     attr_accessor :query_builder, :_set_values, :_array_appends, :_set_appends, :_increments
+
     delegate :klass, to: :query_builder
 
     def initialize(query_builder:)
@@ -21,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))
 
@@ -102,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
@@ -113,7 +114,7 @@ module DynamoidAdvancedWhere
           [
             explicit_set_args,
             list_append_for_arrays,
-            increment_field_updates
+            increment_field_updates,
           ]
         ),
         command: 'SET'
@@ -129,11 +130,10 @@ module DynamoidAdvancedWhere
 
       _set_values.each_with_object(builder_hash) do |(k, v), h|
         prefix = merge_in_attr_placeholders(h, k, v)
-        h[:collected_update_expression] << "##{prefix} = :#{prefix}"
+        h[:collected_update_expression] << "#{prefix[0]} = :#{prefix[1]}"
       end
     end
 
-
     def increment_field_updates
       return {} if _increments.empty?
 
@@ -142,13 +142,13 @@ 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|
         prefix = merge_in_attr_placeholders(h, field, change)
-        builder_hash[:collected_update_expression] << "##{prefix} = if_not_exists(##{prefix}, :#{zero_prefix}) + :#{prefix}"
+        builder_hash[:collected_update_expression] << "#{prefix[0]} = if_not_exists(#{prefix[0]}, :#{zero_prefix}) + :#{prefix[1]}"
       end
     end
 
@@ -158,7 +158,7 @@ module DynamoidAdvancedWhere
       _set_appends.each_with_object(builder_hash) do |to_append, h|
         to_append.each do |k, v|
           prefix = merge_in_attr_placeholders(h, k, v)
-          builder_hash[:collected_update_expression] << "##{prefix} :#{prefix}"
+          builder_hash[:collected_update_expression] << "#{prefix[0]} :#{prefix[1]}"
         end
       end
     end
@@ -169,14 +169,14 @@ 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|
         to_append.each do |k, v|
           prefix = merge_in_attr_placeholders(h, k, v)
-          builder_hash[:collected_update_expression] << "##{prefix}  = list_append(if_not_exists(##{prefix}, :#{empty_list_prefix}), :#{prefix})"
+          builder_hash[:collected_update_expression] << "#{prefix[0]}  = list_append(if_not_exists(#{prefix[0]}, :#{empty_list_prefix}), :#{prefix[1]})"
         end
       end
 
@@ -184,7 +184,7 @@ module DynamoidAdvancedWhere
     end
 
     def merge_in_attr_placeholders(hsh, field_name, value)
-      prefix, new_data = prefixerize(field_name, value)
+      *prefix, new_data = prefixerize(field_name, value)
 
       hsh.merge!(new_data, &method(:hash_extendeer))
 
@@ -192,16 +192,22 @@ module DynamoidAdvancedWhere
     end
 
     def prefixerize(field_name, value)
+      field_names = field_name.is_a?(Array) ? field_name : [field_name]
       prefix = SecureRandom.hex
 
+      update_target = field_names.each_with_index.map do |name, idx|
+        ["##{prefix}#{idx}", name]
+      end
+
       [
+        update_target.map(&:first).join('.').to_s,
         prefix,
         {
-          expression_attribute_names: { "##{prefix}" => field_name },
+          expression_attribute_names: Hash[update_target],
           expression_attribute_values: {
-            ":#{prefix}" => dump(value, klass.attributes[field_name])
-          }
-        }
+            ":#{prefix}" => dump(value, field_name),
+          },
+        },
       ]
     end
 
@@ -222,8 +228,15 @@ module DynamoidAdvancedWhere
       )
     end
 
-    def dump(value, config)
-      Dynamoid::Dumping.dump_field(value, config)
+    def dump(value, field_name)
+      if klass.attributes[field_name]
+        Dynamoid::Dumping.dump_field(value, klass.attributes[field_name])
+      elsif value.respond_to?(:dynamoid_dump)
+        value.dynamoid_dump
+      else
+        value
+
+      end
     end
   end
 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/integrations/model.rb

@@ -31,4 +31,4 @@ module DynamoidAdvancedWhere
   end
 end
 
-Dynamoid::Document.send(:include, DynamoidAdvancedWhere::Integrations::Model)
+Dynamoid::Document.include DynamoidAdvancedWhere::Integrations::Model

data/lib/dynamoid_advanced_where/nodes/and_node.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-
 module DynamoidAdvancedWhere
   module Nodes
     module Concerns

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/base_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'securerandom'
 
 module DynamoidAdvancedWhere
@@ -15,4 +17,3 @@ module DynamoidAdvancedWhere
     end
   end
 end
-

data/lib/dynamoid_advanced_where/nodes/exists_node.rb

@@ -10,6 +10,7 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsLogicalOr
 
       attr_accessor :field_node, :prefix
+
       def initialize(field_node:)
         self.field_node = field_node
         self.prefix = SecureRandom.hex
@@ -29,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
@@ -20,9 +21,7 @@ module DynamoidAdvancedWhere
             config.respond_to?(:call) ? config.call(attr_config) : config <= attr_config
           end&.last
 
-          unless specific_klass
-            raise ArgumentError, "unable to find field type for `#{attr_config}`"
-          end
+          raise ArgumentError, "unable to find field type for `#{attr_config}`" unless specific_klass
 
           specific_klass.new(field_path: field_path)
         end
@@ -62,7 +61,9 @@ module DynamoidAdvancedWhere
 
     class StringAttributeNode < FieldNode
       include Concerns::SupportsIncludes
+      include Concerns::SupportsIn
     end
+
     class NativeBooleanAttributeNode < FieldNode; end
 
     class StringBooleanAttributeNode < FieldNode
@@ -75,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
@@ -91,9 +90,10 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsGreaterThan
 
       def parse_right_hand_side(val)
-        if val.is_a?(Date)
+        case val
+        when Date
           val.to_time.to_i
-        elsif val.is_a?(Time)
+        when Time
           val.to_f
         else
           raise ArgumentError, "unable to compare datetime to type #{val.class}"
@@ -105,9 +105,7 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsGreaterThan
 
       def parse_right_hand_side(val)
-        if !val.is_a?(Date) || val.is_a?(DateTime)
-          raise ArgumentError, "unable to compare date to type #{val.class}"
-        end
+        raise ArgumentError, "unable to compare date to type #{val.class}" if !val.is_a?(Date) || val.is_a?(DateTime)
 
         (val - Dynamoid::Persistence::UNIX_EPOCH_DATE).to_i
       end
@@ -117,9 +115,7 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsIncludes
 
       def parse_right_hand_side(val)
-        unless val.is_a?(String)
-          raise ArgumentError, "unable to compare date to type #{val.class}"
-        end
+        raise ArgumentError, "unable to compare date to type #{val.class}" unless val.is_a?(String)
 
         val
       end
@@ -129,9 +125,7 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsIncludes
 
       def parse_right_hand_side(val)
-        unless val.is_a?(Integer)
-          raise ArgumentError, "unable to compare integer value to type #{val.class}"
-        end
+        raise ArgumentError, "unable to compare integer value to type #{val.class}" unless val.is_a?(Integer)
 
         val
       end
@@ -141,9 +135,7 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsIncludes
 
       def parse_right_hand_side(val)
-        unless val.is_a?(String)
-          raise ArgumentError, "unable to compare string to type #{val.class}"
-        end
+        raise ArgumentError, "unable to compare string to type #{val.class}" unless val.is_a?(String)
 
         val
       end
@@ -153,9 +145,7 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsIncludes
 
       def parse_right_hand_side(val)
-        unless val.is_a?(Integer)
-          raise ArgumentError, "unable to compare integer to type #{val.class}"
-        end
+        raise ArgumentError, "unable to compare integer to type #{val.class}" unless val.is_a?(Integer)
 
         val
       end
@@ -176,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 } =>
@@ -209,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/greater_than_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamoidAdvancedWhere
   module Nodes
     class GreaterThanNode < OperationNode

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/includes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamoidAdvancedWhere
   module Nodes
     class IncludesNode < OperationNode

data/lib/dynamoid_advanced_where/nodes/literal_node.rb

@@ -6,6 +6,7 @@ module DynamoidAdvancedWhere
   module Nodes
     class LiteralNode
       attr_accessor :value, :attr_prefix
+
       def initialize(value)
         self.value = value
         self.attr_prefix = SecureRandom.hex

data/lib/dynamoid_advanced_where/nodes/not.rb

@@ -37,6 +37,5 @@ module DynamoidAdvancedWhere
         "NOT(#{sub_node.to_expression})"
       end
     end
-
   end
 end

data/lib/dynamoid_advanced_where/nodes/or_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamoidAdvancedWhere
   module Nodes
     class OrNode < BaseNode

data/lib/dynamoid_advanced_where/nodes/root_node.rb

@@ -40,7 +40,7 @@ module DynamoidAdvancedWhere
                             instance_eval(&blk)
                           else
                             blk.call(self)
-                       end
+                          end
       end
     end
   end

data/lib/dynamoid_advanced_where/nodes.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './nodes'
 require_relative './query_materializer'
 require_relative './batched_updater'
@@ -65,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,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamoidAdvancedWhere
-  VERSION = "1.3.0"
+  VERSION = '1.5.0'
 end

data/lib/dynamoid_advanced_where.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'dynamoid'
 
-require "dynamoid_advanced_where/version"
-require "dynamoid_advanced_where/integrations/model"
+require 'dynamoid_advanced_where/version'
+require 'dynamoid_advanced_where/integrations/model'
 
 module DynamoidAdvancedWhere
-      # Your code goes here...
+  # Your code goes here...
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid_advanced_where
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Brian Malinconico
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynamoid
@@ -31,7 +31,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: bundler-audit
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: bundler-audit
+  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: fasterer
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -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: []