aws-dev-utils 1.4.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4687e761d49ec6e0b5c4c49e8a0eb2bbca0505940b309c5b62eb2b82413645d6
-  data.tar.gz: 6916a3900eba9cef3409f86a0ec7eb0984eb0b631c18a1b18f617ad49070c6f9
+  metadata.gz: 0fa3a5f5b41c92caa60a64b79f2c1710d6600f0306e48ef33f9c338489b23a11
+  data.tar.gz: 5673be8d53221e6997e7eb0c68245481fefe7587352f40b329820a7aa88a2cd0
 SHA512:
-  metadata.gz: 472cbb329917024f484fc736d7226b5e4e6207ec3d9223e4df1d9c5a619a882f7dfcbc612a26e87a689ad3b781a75bfb36bc47410bf88a84b4381be9317a0a7d
-  data.tar.gz: d2403e51af30fb2c4205305fbe8c258b03bbcb1cd080ffa726f20ffa6006ac9b0ff731af0f3a991f0cf8c5da93f3d95c5e9c402db25051d4a7e075f240edc4d5
+  metadata.gz: c4c426208915958d31aa394852de7c4bb6998c6e93a3e8562db7c8a84a38f65b3f481fbc16bbd45f658450f3a960873b0a16be76de21cf7949f92f49cd452a8a
+  data.tar.gz: '08febba1667d5f9865980fc6161bdd70b620586d9acbb2409c6f7b6b0c6481c7301267fd87a7c4ebb76c58c97427e67b8d4747a7a41fa35952e9ee9699365a88'

data/README.md

@@ -9,7 +9,7 @@ AWS Dev Utilities is available from RubyGems.
 ### Option 1: Via Bundler
 Add the following to your application's Gemfile:
 ```ruby
-gem 'aws-dev-utils', '~> 1.4'
+gem 'aws-dev-utils', '~> 1.5'
 ```
 And then execute:
 ```
@@ -18,7 +18,7 @@ $ bundle install
 ### Option 2: Via `gem install`
 Execute the following inside your application directory:
 ```
-$ gem install aws-dev-utils -v '~> 1.4'
+$ gem install aws-dev-utils -v '~> 1.5'
 ```
 ## Usage
 Add the following at the top of each Ruby script, or in each module/class you want to use the `with_next_token`, `with_cache` or `with_retry` functions:
@@ -32,7 +32,7 @@ Many AWS operations limit the number of results returned with each response. To
 This functionality is rarely needed and causes a lot of boilerplate code.  
 Using the `client.with_next_token` the paged results will be collected for you.
 The AWS client function and its results will be concatenated until either no more results are available or the max number of requests is reached.  
-_`with_next_token` works with APIs that use `next_token`, `next_marker` or `next_continuation_token`._
+_`with_next_token` works with APIs that use `next_token`, `next_marker`, `next_continuation_token` or `next_record_name`._
 
 ```ruby
 require 'aws-dev-utils'

data/lib/aws-dev-utils/client_wrapper.rb

@@ -14,7 +14,7 @@ module AwsDevUtils
     end
 
     # @return ClientWrapper with next_token option
-    def with_next_token max=100
+    def with_next_token max=NextTokenWrapper::DEFAULT_MAX
       self.class.new(@client, @options.merge(next_token: max))
     end
 

data/lib/aws-dev-utils/next_token_wrapper.rb

@@ -1,42 +1,53 @@
 module AwsDevUtils
   class NextTokenWrapper
 
+    DEFAULT_MAX=100
+
     # Initialize a new NextTokenWrapper, internal use only
     # @params client [Aws client / NextTokenWrapper / RetryWrapper]
     # @param max [Integer] - max number of requests
-    def initialize client, max=100
+    def initialize client, max=DEFAULT_MAX
       @client = client
       @max = max
     end
 
-    def method_missing m, *args, &block
-      do_call(m,*args,&block)
+    def method_missing method, *args, &block
+      do_call(method, *args, &block)
     end
 
     private
+    def do_call method, *args, &block
+      response = @client.send(method, *args, &block).to_h
+      i = 1
+      req_keys, next_req_keys = extract_keys response
+
+      return response if req_keys.nil?
+
+      props = args.first || {}
+      while req_keys.all?{ |req_keys| response[req_keys] } && i < @max do
+        i += 1
+        pagination_token_props =  Hash[next_req_keys.zip(req_keys.map { |req_keys| response[req_keys] } ) ]
+        new_response = @client.send(method, props.merge(pagination_token_props)).to_h
 
-    def do_call m, *args, &block
-      @client.send(m , *args, &block).to_h.tap do |r|
-        i = 1
-        key, key2 = extract_keys r
-        while(key && r[key] && i < @max) do
-          i += 1
-          res = @client.send(m, (args[0]||{}).merge(key2 => r[key])).to_h
-          res.each { |k,v| r[k] = v.is_a?(Array) ? r[k].concat(v) : v }
-          r.delete_if {|k,v| !res.keys.include?(k) }
-        end
-        r.delete key
+        new_response.each { |k,v| new_response[k] = v.is_a?(Array) ? response[k]+new_response[k] : v }
+
+        response = new_response
       end
+
+      req_keys.each { |req_keys| response.delete req_keys}
+      response
     end
 
-    def extract_keys x
+    def extract_keys response
       case
-      when x[:next_token]
-        [:next_token, :next_token]
-      when x[:next_marker]
-        [:next_marker, :marker]
-      when x[:next_continuation_token]
-        [:next_continuation_token, :continuation_token]
+      when response[:next_token]
+        [[:next_token], [:next_token]]
+      when response[:next_marker]
+        [[:next_marker], [:marker]]
+      when response[:next_continuation_token]
+        [[:next_continuation_token], [:continuation_token]]
+      when response[:next_record_name]
+        [[:next_record_type, :next_record_name], [:start_record_type, :start_record_name]]
       else nil
       end
     end

data/lib/aws-dev-utils/refinements.rb

@@ -5,7 +5,8 @@ module AwsDevUtils
 
     refine Seahorse::Client::Base do
       def with_next_token *args
-        AwsDevUtils::ClientWrapper.new(self).yield_self { |c| c.send(__callee__, *args) }
+        c = AwsDevUtils::ClientWrapper.new(self)
+        c.send(__callee__, *args)
       end
       alias_method :with_retry, :with_next_token
       alias_method :with_cache, :with_next_token

data/lib/aws-dev-utils/version.rb

@@ -1,3 +1,3 @@
 module AwsDevUtils
-  VERSION = '1.4.9'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-dev-utils
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.0
 platform: ruby
 authors:
 - Amobee BI Infrastructure
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -70,14 +70,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Ruby library gem that provides common AWS utilities