antbird 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e856fa219aa6977816eb17109225439b602a073ca0481b00bb2e474dcd757e0
-  data.tar.gz: 802baa6e45a28da47204e6e8fe47d9b9bb66ffd4d5a061e958d8ddc68008a96e
+  metadata.gz: 8d6972953a2ec1f37d057b6a9dd477593fc06a11b7f343f8c57d0f0fa9e31ee1
+  data.tar.gz: bd672bd59f69c2c6d77f90714da1112f441a8d6372d1ce3a9ae641778e2ee2f6
 SHA512:
-  metadata.gz: d6c020d3139d94edd7f4b354bf892f422e5fd6bfaab2250f05de237ca817c7f89397cd3f09628a63fcb7b64e46141062d460dea8525f0592048fcf448c0d3e9b
-  data.tar.gz: 8259edb19088e64d0c5d4cc751870710f801ab64fb4dbc91bfbe1083a4657ed56b0da3a34134209e69864f839cd2fdda5865e13c6e394422d68d6251fad94512
+  metadata.gz: b2fea4c7232a0b7209a4c4729ee4ffcd7c4a985de2bf9ec718919b8c01577528fba618ea68a4811aebea5ec47c964baf6b8e0c668327afcf15679d84ee3a3bbc
+  data.tar.gz: 04c28e273287890b585b500ce7733399057602a8ff52f8924445317d25d680134b944fbcfdc2950a0648bf8425e2e89fb06ae3255dc25683a670ad4babe560a1

data/.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 2.7
         bundler-cache: true
     - run: bundle install --jobs 4 --retry 3
     - name: Wait for elasticsearch

data/lib/antbird/client.rb

@@ -26,7 +26,7 @@ module Antbird
     end
     attr_reader :scope, :url, :version
     attr_reader :read_timeout, :open_timeout, :adapter
-    attr_reader :api_specs
+    attr_reader :api_specs, :last_request
 
     def scoped(new_scope = {})
       Client.new(
@@ -43,11 +43,13 @@ module Antbird
 
       body   = extract_body(params)
       scopes = extract_scopes(params)
+      forced_method = extract_method(params)
 
       # Greedy match
       api_path = nil
+      api_path_template = nil
       path_methods = nil
-      api_spec['url']['paths'].sort { |a, b| b.size <=> a.size }.each do |path|
+      sort_url_paths(api_spec['url']['paths']).each do |path|
         if path.is_a?(Hash)
           path_methods = path['methods']
           path = path['path']
@@ -57,19 +59,40 @@ module Antbird
           scopes[$1.to_sym] || @scope[$1.to_sym] || match
         end
 
-        break api_path = embeded unless embeded.include?('{')
+        unless embeded.include?('{')
+          api_path_template = path
+          api_path = embeded
+          break
+        end
       end
 
       unless api_path
         raise "API path not found: paths: #{api_spec['url']['paths']}, scope: #{@scope}"
       end
 
-      methods = (Array(path_methods) + Array(api_spec['methods'])).map(&:downcase).map(&:to_sym)
-      method = methods.include?(:post) ? :post : methods.first
+      methods = (path_methods || api_spec['methods']).map { |m| m.downcase.to_sym }
+      method =
+        if forced_method
+          forced_method
+        elsif methods.include?(:put)
+          :put
+        elsif methods.include?(:post)
+          :post
+        else
+          methods.first
+        end
 
       read_timeout = params.delete(:read_timeout)
       params.reject! { |_, v| v.nil? }
 
+      @last_request = {
+        method: method,
+        forced_method: forced_method,
+        api_path: api_path,
+        api_path_template: api_path_template,
+        params: params
+      }
+
       response =
         case method
         when :head
@@ -116,6 +139,10 @@ module Antbird
       response.body
     end
 
+    def extract_method(params)
+      params.delete(:method)&.to_sym
+    end
+
     def extract_scopes(params)
       scopes = {}
       [:index, :type, :id].each do |s|
@@ -165,6 +192,18 @@ module Antbird
 
     private
 
+    # NOTE: stable sort
+    def sort_url_paths(url_paths)
+      i = 0
+      url_paths.sort_by do |path|
+        if path.is_a?(Hash)
+          [-path['path'].count('{'), (path['deprecated'] ? 1 : 0), i += 1]
+        else
+          [-path.count('{'), i += 1]
+        end
+      end
+    end
+
     def handle_errors!(response)
       if response.status >= 500
         raise ServerError, response

data/lib/antbird/version.rb

@@ -1,3 +1,3 @@
 module Antbird
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antbird
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - fukayatsu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday