pr-pin 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e52cacf6c475aff3f5bce1ae540a40311d62907bb7384b797a63daa8e064434d
-  data.tar.gz: 8f45f062ed9148fb0a8c3e85b6d8ce3b3176193404b2479d4fc3404421457b48
+  metadata.gz: 915ba4a1b62cee7806b8e50335d40bc7b5ae6ad5f3feb54147eef6112d3a46a2
+  data.tar.gz: cb6e578f737a1102a284e9f6cb18bc2be0ec119c9dcad5287506529a413c0a11
 SHA512:
-  metadata.gz: 7647fc611ae51dd161fa406344f7fed7dca217aba9779e01ef06287f556a1f9ac2a29a5163183bd8dd8421c471ee06f123e1fe3121b8aec3b49061e8b88c72a2
-  data.tar.gz: b6a18bd913ec606128be3a7db21dddc3a42d62bd4cc24cfaec6a2158670811bb4d27eb2955353ea09b026a64f7e0afe04a64eb1243825cc77446d1a597571bee
+  metadata.gz: 1b4e1ca34d765ae2d152e58c37495940a00335cbd4b18dea237e9a0c9a310497733a2604d98d9b0bc65a530862dcb4a88b5f1fdf0f9e805227b5f7e12c484c25
+  data.tar.gz: 1d415283974aecc4a07cce0b69c5757c359dab4665a091b5a6bad9a3507897c0c36e3a282ca705c300b212dd95c0a8d0a92a1837282331db13362aa2b686ed53

data/README.md

@@ -114,7 +114,7 @@ Coverage of https://pinpayments.com/developers/api-reference
 | Charges | POST /charges | Creates a new charge | [:link:](https://pinpayments.com/developers/api-reference/charges#post-charges) | :heavy_check_mark: |
 | Charges | PUT /charges/charge-token/capture | Captures a previously authorised charge | [:link:](https://pinpayments.com/developers/api-reference/charges#put-charges) | :x: |
 | Charges | GET /charges | Returns a paginated list of all charges | [:link:](https://pinpayments.com/developers/api-reference/charges#get-charges) | :heavy_check_mark: |
-| Charges | GET /charges/search | Returns a paginated list of charges matching the search criteria | [:link:](https://pinpayments.com/developers/api-reference/charges#search-charges) | :x: |
+| Charges | GET /charges/search | Returns a paginated list of charges matching the search criteria | [:link:](https://pinpayments.com/developers/api-reference/charges#search-charges) | :heavy_check_mark: |
 | Charges | GET /charges/charge-token | Returns the details of a charge | [:link:](https://pinpayments.com/developers/api-reference/charges#get-charge) | :x: |
 | Customers | POST /customers | Creates a new customer | [:link:](https://pinpayments.com/developers/api-reference/customers#post-customers) | :heavy_check_mark: |
 | Customers | GET /customers | Returns a paginated list of all customers | [:link:](https://pinpayments.com/developers/api-reference/customers#get-customers) | :heavy_check_mark: |

data/lib/pr/pin.rb

@@ -1,3 +1,4 @@
+require 'concurrent'
 require 'dry-container'
 require 'pr/pin/version'
 require 'pr/pin/adapter'
@@ -13,7 +14,7 @@ module PR
     extend Dry::Container::Mixin
 
     register(:environments, memoize: true) do
-      Concurrent::Hash.new
+      {}
     end
 
     register(:default_error_handler) { |error| error }

data/lib/pr/pin/adapter/dataset.rb

@@ -2,8 +2,8 @@ module PR
   module Pin
     module Adapter
       class Dataset < ROM::HTTP::Dataset
-        config.default_request_handler = Handlers::JSONRequest
-        config.default_response_handler = Handlers::JSONResponse
+        config.default_request_handler = Handlers::JSONRequest.new
+        config.default_response_handler = Handlers::JSONResponse.new
 
         option :secret_key, type: ROM::Types::Strict::String
         option :error_handler

data/lib/pr/pin/adapter/handlers/json_request.rb

@@ -3,41 +3,32 @@ module PR
     module Adapter
       class Handlers
         class JSONRequest
-          class << self
-            def client(host, port)
-              clients["#{host}:#{port}"] ||= Net::HTTP.new(
-                host,
-                port
-              ).tap do |client|
+          SSL_PORT = 443
+
+          def call(dataset)
+            uri = dataset.uri
+
+            http = Net::HTTP.new(uri.host, uri.port).tap do |client|
+              if SSL_PORT == client.port
                 client.use_ssl = true
                 client.verify_mode = OpenSSL::SSL::VERIFY_PEER
               end
             end
 
-            def call(dataset)
-              uri = dataset.uri
+            request_class = Net::HTTP.const_get(
+              PR::Pin::Inflector.classify(dataset.request_method)
+            )
 
-              request_class = Net::HTTP.const_get(
-                PR::Pin::Inflector.classify(dataset.request_method)
-              )
+            request = request_class.new(uri.request_uri)
+            request.basic_auth(dataset.secret_key, '')
 
-              request = request_class.new(uri.request_uri)
-              request.basic_auth(dataset.secret_key, '')
-
-              dataset.headers.each_with_object(request) do |(header, value), request|
-                request[header.to_s] = value
-              end
-
-              request.body = dataset.params.to_json if dataset.params.any?
-
-              client(uri.host, uri.port).request(request)
+            dataset.headers.each_with_object(request) do |(header, value), request|
+              request[header.to_s] = value
             end
 
-            private
+            request.body = dataset.params.to_json if dataset.params.any?
 
-            def clients
-              @clients ||= Concurrent::Hash.new
-            end
+            http.request(request)
           end
         end
       end

data/lib/pr/pin/adapter/handlers/json_response.rb

@@ -5,11 +5,12 @@ module PR
         class JSONResponse
           SUCCESS_CODES = %w(200 201).freeze
 
-          def self.call(response, dataset)
+          def call(response, dataset)
             result = JSON.parse(
               response.body,
               symbolize_names: true
             )
+
             pagination_result = result.fetch(:pagination, false)
 
             if SUCCESS_CODES.include?(response.code)

data/lib/pr/pin/api/paginated_result.rb

@@ -0,0 +1,39 @@
+module PR
+  module Pin
+    module API
+      class PaginatedResult < Result
+        def each_page(&_block)
+          return enum_for(:each_page) unless block_given?
+
+          page = self
+
+          loop do
+            yield(page)
+
+            break unless page.next_page
+
+            relation = __relation__.add_params(page: page.next_page)
+            page = self.class.wrap(relation) { relation.paginate }
+          end
+        end
+
+        def pages
+          page = self
+
+          return [page] unless page.next_page
+
+          to_fetch = page.next_page..page.total_pages
+
+          remaining_pages = to_fetch.map do |page_num|
+            Concurrent::Promises.future do
+              relation = __relation__.add_params(page: page_num)
+              self.class.wrap(relation) { relation.paginate }
+            end
+          end
+
+          [page, *remaining_pages.map(&:value!)]
+        end
+      end
+    end
+  end
+end

data/lib/pr/pin/api/result.rb

@@ -2,12 +2,20 @@ module PR
   module Pin
     module API
       class Result < SimpleDelegator
+        attr_reader :__relation__
+        private :__relation__
+
         def self.wrap(relation, &block)
-          new(block.call)
+          new(block.call, relation)
         rescue PR::Pin::Adapter::ResponseError => error
           relation.dataset.error_handler.(Error.new(error))
         end
 
+        def initialize(result, relation)
+          @__relation__ = relation
+          super(result)
+        end
+
         def success?
           true
         end

data/lib/pr/pin/relations/charges.rb

@@ -16,8 +16,8 @@ module PR
           attribute :card, Types::JSON::Hash
           attribute :transfer, Types::Array.of(Types::JSON::Hash)
           attribute :amount_refunded, Types::Strict::Integer
-          attribute :total_fees, Types::Strict::Integer
-          attribute :merchant_entitlement, Types::Strict::Integer
+          attribute :total_fees, Types::Strict::Integer.optional
+          attribute :merchant_entitlement, Types::Strict::Integer.optional
           attribute :refund_pending, Types::Strict::Bool
           attribute :authorisation_expired, Types::Strict::Bool
           attribute :captured, Types::Strict::Bool

data/lib/pr/pin/repositories.rb

@@ -1,6 +1,7 @@
 require 'rom-repository'
 require 'pr/pin/api/error'
 require 'pr/pin/api/result'
+require 'pr/pin/api/paginated_result'
 require 'pr/pin/struct'
 require 'pr/pin/repositories/concerns/common'
 require 'pr/pin/repositories/charges'

data/lib/pr/pin/repositories/charges.rb

@@ -3,6 +3,14 @@ module PR
     module Repositories
       class Charges < ROM::Repository[:charges]
         include Concerns::Common
+
+        def search(**params)
+          relation = root.append_path('search').with_params(params)
+
+          API::PaginatedResult.wrap(relation) do
+            relation.paginate
+          end
+        end
       end
     end
   end

data/lib/pr/pin/repositories/concerns/common.rb

@@ -14,12 +14,12 @@ module PR
           end
 
           def list(page: 1, per_page: nil)
-            API::Result.wrap(root) do
-              root.with_params(
-                page: page,
-                per_page: per_page
-              ).paginate
-            end
+            relation = root.with_params(
+              page: page,
+              per_page: per_page
+            )
+
+            API::PaginatedResult.wrap(relation) { relation.paginate }
           end
         end
       end

data/lib/pr/pin/version.rb

@@ -1,5 +1,5 @@
 module PR
   module Pin
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pr-pin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - AMHOL
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +186,7 @@ files:
 - lib/pr/pin/adapter/relation.rb
 - lib/pr/pin/adapter/response.rb
 - lib/pr/pin/api/error.rb
+- lib/pr/pin/api/paginated_result.rb
 - lib/pr/pin/api/result.rb
 - lib/pr/pin/error.rb
 - lib/pr/pin/inflector.rb
@@ -210,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Pin Payments API wrapper inplemented using rom-rb HTTP adapter.