pagseguro_next 0.3.0 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d3621033463227471c1b4362c07c95b8ad7206f0c6f5bc2c069165a93928abe
-  data.tar.gz: 6b5982f6bcd85b16f8292b9af569631ea92b7d5902ceb4e500ffbc877dbf5f5d
+  metadata.gz: 9d8d5c482eeb6f8f11b69afa543a5442e5dd51bd19618c29c638b97336727ca9
+  data.tar.gz: e55870d29cfaa04a62d6caba34697978f609f9e16ec325e3799e9c75758d9d3b
 SHA512:
-  metadata.gz: 71cb4ddd6afe3c7a184adb96a390f9b93b9e2aecf78e3aec2ebb46c4d9a685b318acfb61ac35996612ec286edb22bf1b3f98cedd185446ba5518b96406dad65b
-  data.tar.gz: 17dce35c20f36132e611a442507287f06d2b65202e8b991a245db2dff61bf9392120c3277d1aee771dde9f95855e1439c85f04968e8f29fb0d10c36e85090324
+  metadata.gz: cfa3b8b81b219d52ce9ef2e3b40f16b1eaf9499cd34db7edd7a0c88df0f7a614fa256a54b8429979d16b4d42e5afac2d0df2ba24ce3fece41bad4995404d251e
+  data.tar.gz: 41661204533864b295164a1f541fef2cf819a331dd6fd70db6b68757d0724564c6eea0b831501fa79047985c2fea8c83861ec2723ca83caa2b1edf036976b58d

data/Rakefile

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-Rake::TestTask.new(:spec) do |t|
-  t.libs << "spec"
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["spec/**/*_spec.rb"]
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task default: :spec
+task default: :test

data/lib/pagseguro.rb

@@ -1,4 +1,5 @@
-require "hashie"
+# frozen_string_literal: true
+
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/hash/reverse_merge"
@@ -7,8 +8,8 @@ require "active_support/core_ext/object/json"
 require "active_support/core_ext/module/attribute_accessors"
 
 module PagSeguro
-  autoload :API,            "pagseguro/api"
-  autoload :Base,           "pagseguro/base"
+  autoload :Client,         "pagseguro/client"
+  autoload :Restful,        "pagseguro/restful"
   autoload :Subscriptions,  "pagseguro/subscriptions"
   autoload :PaymentOrders,  "pagseguro/payment_orders"
   autoload :Sessions,       "pagseguro/sessions"
@@ -16,10 +17,15 @@ module PagSeguro
   autoload :Authorizations, "pagseguro/authorizations"
   autoload :Checkout,       "pagseguro/checkout"
   autoload :Transactions,   "pagseguro/transactions"
-  autoload :Response,       "pagseguro/response"
+  autoload :Mash,           "pagseguro/mash"
 
-  FORMATS = {
+  ACCEPTS = {
     json: "application/vnd.pagseguro.com.br.v3+json;charset=ISO-8859-1",
+    xml: "application/vnd.pagseguro.com.br.v3+xml;charset=ISO-8859-1"
+  }
+
+  FORMATS = {
+    json: "application/json;charset=ISO-8859-1",
     xml: "application/xml;charset=ISO-8859-1"
   }
 
@@ -40,8 +46,8 @@ module PagSeguro
         site: "https://pagseguro.uol.com.br"
       },
       sandbox: {
-        site: "https://sandbox.pagseguro.uol.com.br",
-        api:  "https://ws.sandbox.pagseguro.uol.com.br"
+        api:  "https://ws.sandbox.pagseguro.uol.com.br",
+        site: "https://sandbox.pagseguro.uol.com.br"
       }
     }
   end

data/lib/pagseguro/authorizations.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 module PagSeguro
-  class Authorizations < Base
+  class Authorizations
+    include Restful
+
     PERMISSIONS = {
       checkouts:            "CREATE_CHECKOUTS",
       notifications:        "RECEIVE_TRANSACTION_NOTIFICATIONS",
@@ -12,42 +16,32 @@ module PagSeguro
     }
 
     def create(params)
-      xml = build_request(params).to_xml
-
-      response = api.post "/v2/authorizations/request", xml do |conn|
-        conn.headers[:content_type] = FORMATS[:xml]
-        conn.headers[:accept] = FORMATS[:xml]
-      end
-
-      parse response.body["authorizationRequest"]
+      body = build_request(params).to_xml
+      response = post("/v2/authorizations/request", body, xml: :simple)
+      response.authorization_request
     end
 
     def find_by_notification_code(code)
-      response = api.get "/v2/authorizations/notifications/#{code}" do |conn|
-        conn.headers[:content_type] = FORMATS[:xml]
-        conn.headers[:accept] = FORMATS[:xml]
-      end
-
-      parse response.body["authorization"]
+      response = get("/v2/authorizations/notifications/#{code}", nil, xml: :simple)
+      response.authorization
     end
 
     def url(code)
-      api.build_url :site, "/v2/authorization/request.jhtml", code: code
+      url_for :site, "/v2/authorization/request.jhtml", code: code
     end
 
     private
-
-    def build_request(params)
-      builder do
-        authorizationRequest do
-          redirectURL params[:redirect_url]
-          permissions do
-            params[:permissions].each do |aliased|
-              code PERMISSIONS[aliased]
+      def build_request(params)
+        builder do
+          authorizationRequest do
+            redirectURL params[:redirect_url]
+            permissions do
+              params[:permissions].each do |aliased|
+                code PERMISSIONS[aliased]
+              end
             end
           end
         end
       end
-    end
   end
 end

data/lib/pagseguro/checkout.rb

@@ -1,42 +1,41 @@
-module PagSeguro
-  class Checkout < Base
-    def create(params)
-      params = build_request(params).to_xml
+# frozen_string_literal: true
 
-      response = api.post "/v2/checkout", params do |conn|
-        conn.headers[:content_type] = FORMATS[:xml]
-        conn.headers[:accept] = FORMATS[:xml]
-      end
+module PagSeguro
+  class Checkout
+    include Restful
 
-      parse response.body["checkout"]
+    def create(params)
+      body = build_request(params).to_xml(encoding: "UTF-8")
+      response = post("/v2/checkout", body, xml: :simple)
+      response.checkout
     end
 
     def url(code)
-      api.build_url :site, "/v2/checkout/payment.html", code: code
+      url_for :site, "/v2/checkout/payment.html", code: code
     end
 
     private
-
-    def build_request(params)
-      builder do
-        checkout do
-          currency "BRL"
-          sender do
-            ip params[:remote_ip]
-          end if params.key?(:remote_ip)
-          items do
-            item do
-              id params[:id]
-              description params[:description]
-              amount format("%.2f", params[:amount].to_f)
-              quantity 1
+      def build_request(params)
+        builder do
+          checkout do
+            currency "BRL"
+            sender do
+              ip params[:remote_ip]
+            end if params.key?(:remote_ip)
+            items do
+              item do
+                id params[:id]
+                description { cdata(params[:description]) }
+                amount format("%.2f", params[:amount])
+                quantity 1
+              end
             end
-          end
-          shipping do
-            addressRequired false
+            shipping do
+              addressRequired false
+            end
+            redirectURL params[:redirect_url] if params.key?(:redirect_url)
           end
         end
       end
-    end
   end
 end

data/lib/pagseguro/{api.rb → client.rb}

@@ -1,23 +1,25 @@
+# frozen_string_literal: true
+
 require "faraday"
 require "faraday_middleware"
 
 module PagSeguro
-  class API
-    delegate :get, :post, :put, :patch, to: :@connection
-
-    attr_reader :options, :logger
+  class Client
+    attr_reader :options, :logger, :connection
 
     def initialize(options = {})
       @options = options
       @logger = options.delete(:logger)
-      @connection ||= Faraday.new api_url do |conn|
+      @connection = Faraday.new api_url do |conn|
         conn.request :json
+        conn.response :logger, logger, bodies: true if logger
+        conn.response :mashify, mash_class: PagSeguro::Mash
         conn.response :xml,  content_type: /\bxml$/
         conn.response :json, content_type: /\bjson$/
-        conn.response :logger, logger, bodies: true if logger
+        conn.response :raise_error
         conn.adapter :net_http
         conn.params = auth_params
-        conn.headers[:accept] = FORMATS[:json]
+        conn.headers[:accept] = ACCEPTS[:json]
       end
     end
 
@@ -49,40 +51,39 @@ module PagSeguro
       @transactions ||= Transactions.new(self)
     end
 
-    def build_url(source, path, params = {})
+    def url_for(source, path, params = {})
       url = URI(send("#{source}_url"))
       url.path = path
       url.query = params.to_query
       url.to_s
     end
 
-    private
+    protected
+      def environment
+        options[:environment] || PagSeguro.environment
+      end
 
-    def site_url
-      PagSeguro.uris[environment.to_sym][:site]
-    end
+      def site_url
+        PagSeguro.uris[environment.to_sym][:site]
+      end
 
-    def api_url
-      PagSeguro.uris[environment.to_sym][:api]
-    end
+      def api_url
+        PagSeguro.uris[environment.to_sym][:api]
+      end
 
-    def environment
-      options[:environment] || PagSeguro.environment
-    end
+      def auth_params
+        auth = {}
 
-    def auth_params
-      auth = {}
+        if options.key?(:app) || options.key?(:app_id)
+          auth[:appId]  = options.fetch :app_id, PagSeguro.app_id
+          auth[:appKey] = options.fetch :app_key, PagSeguro.app_key
+          auth[:authorizationCode] = options[:authorization_code]
+        else
+          auth[:token] = options.fetch :token, PagSeguro.token
+          auth[:email] = options.fetch :email, PagSeguro.email
+        end
 
-      if options.key?(:app) || options.key?(:app_id)
-        auth[:appId]  = options.fetch :app_id, PagSeguro.app_id
-        auth[:appKey] = options.fetch :app_key, PagSeguro.app_key
-        auth[:authorizationCode] = options[:authorization_code]
-      else
-        auth[:token] = options.fetch :token, PagSeguro.token
-        auth[:email] = options.fetch :email, PagSeguro.email
+        auth.compact
       end
-
-      auth.compact
-    end
   end
 end

data/lib/pagseguro/mash.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "hashie"
+
+module PagSeguro
+  class Mash < Hashie::Mash
+    protected
+      def convert_key(key)
+        key.to_s.underscore
+      end
+
+      def convert_value(val, duping = false)
+        obj = super
+        obj = self.class.new(obj) if Hashie::Mash == obj
+        obj
+      end
+
+      def initializing_reader(key)
+        ck = convert_key(key)
+        regular_writer(ck, self.class.new) unless key?(ck)
+        regular_reader(ck)
+      end
+  end
+end

data/lib/pagseguro/payment_orders.rb

@@ -1,20 +1,12 @@
-module PagSeguro
-  class PaymentOrders < Base
-    class Item < Hashie::Dash
-      include Hashie::Extensions::Dash::PropertyTranslation
-      include Hashie::Extensions::IgnoreUndeclared
-      include Hashie::Extensions::IndifferentAccess
+# frozen_string_literal: true
 
-      property :amount, transform_with: ->(value) { format "R$%.2f", value }
-      property :scheduling_date, from: :schedulingDate, transform_with: ->(value) { value.to_date }
-      property :last_event_date, from: :lastEventDate, transform_with: ->(value) { value.to_date }
-    end
+module PagSeguro
+  class PaymentOrders
+    include Restful
 
     def fetch(code, params = {})
-      params.reverse_merge! status: 5, page: 0
-      response = api.get("/pre-approvals/#{code}/payment-orders", params)
-      orders = response.body["paymentOrders"] || {}
-      orders.values.map { |item| Item.new item }
+      response = get("/pre-approvals/#{code}/payment-orders", params, {})
+      response.paymentOrders.values || {}
     end
   end
 end

data/lib/pagseguro/plans.rb

@@ -1,23 +1,39 @@
+# frozen_string_literal: true
+
 module PagSeguro
-  class Plans < Base
-    def create(params)
-      params[:amount_per_payment] = to_money params[:amount_per_payment]
-      params = parameterize params
+  class Plans
+    include Restful
 
-      parse_body api.post("/pre-approvals/request", preApproval: params)
+    def create(params)
+      body = build_request(params).to_xml
+      post("/pre-approvals/request", body, xml: :versioned)
     end
 
     def update(code, params)
       params[:amount_per_payment] = to_money params[:amount_per_payment]
       params = parameterize params
 
-      api.put "/pre-approvals/request/#{code}/payment", params
+      put("/pre-approvals/request/#{code}/payment", params)
     end
 
     private
+      def to_money(value)
+        format "%.2f", value.to_f
+      end
 
-    def to_money(value)
-      format "%.2f", value.to_f
-    end
+      def build_request(params)
+        builder do
+          preApprovalRequest do
+            reference params[:reference]
+            preApproval do
+              charge params[:charge]
+              name { cdata(params[:name]) }
+              details { cdata(params[:details]) }
+              period params[:period]
+              amountPerPayment format("%.2f", params[:amount_per_payment])
+            end
+          end
+        end
+      end
   end
 end

data/lib/pagseguro/restful.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "nokogiri"
+
+module PagSeguro
+  module Restful
+    attr_reader :client
+
+    delegate :url_for, :connection, to: :client
+
+    def initialize(client)
+      @client = client
+    end
+
+    protected
+      def get(path, options = {}, xml: nil)
+        headers = headerize(xml) if xml
+        connection.get(path, options, headers).body
+      end
+
+      def post(path, options = {}, xml: nil)
+        headers = headerize(xml) if xml
+        connection.post(path, options, headers).body
+      end
+
+      def put(path, options = {})
+        connection.put(path, options).body
+      end
+
+      def patch(path, options = {})
+        connection.patch(path, options).body
+      end
+
+      def delete(path, options = {})
+        connection.delete(path, options).body
+      end
+
+      def headerize(xml)
+        if xml == :simple
+          { accept: FORMATS[:xml], content_type: FORMATS[:xml] }
+        elsif xml == :versioned
+          { accept: ACCEPTS[:xml], content_type: FORMATS[:xml] }
+        end
+      end
+
+      def parameterize(hash)
+        hash.as_json.deep_transform_keys! { |key| key.to_s.camelize(:lower) }
+      end
+
+      def builder(&block)
+        Nokogiri::XML::Builder.new { |xml| xml.instance_eval(&block) }
+      end
+  end
+end

data/lib/pagseguro/sessions.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 module PagSeguro
-  class Sessions < Base
-    def create
-      response = api.post "/v2/sessions" do |conn|
-        conn.headers[:accept] = FORMATS[:xml]
-      end
+  class Sessions
+    include Restful
 
-      parse response.body["session"]
+    def create
+      response = post("/v2/sessions", nil, xml: :simple)
+      response.session
     end
   end
 end

data/lib/pagseguro/subscriptions.rb

@@ -1,23 +1,25 @@
+# frozen_string_literal: true
+
 module PagSeguro
-  class Subscriptions < Base
+  class Subscriptions
+    include Restful
+
     def find_by_notification_code(code)
-      parse_body api.get("/pre-approvals/notifications/#{code}")
+      get("/pre-approvals/notifications/#{code}")
     end
 
     def create(params)
       params = parameterize params
-
-      parse_body api.post("/pre-approvals", params)
+      post("/pre-approvals", params)
     end
 
     def update(code, params)
       params = parameterize params
-
-      api.put("/pre-approvals/#{code}/payment-method", params)
+      put("/pre-approvals/#{code}/payment-method", params)
     end
 
     def url(code)
-      api.build_url :site, "/v2/pre-approvals/request.html", code: code
+      url_for :site, "/v2/pre-approvals/request.html", code: code
     end
   end
 end

data/lib/pagseguro/transactions.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 module PagSeguro
-  class Transactions < Base
+  class Transactions
+    include Restful
+
     STATUSES = {
       "0" => :initiated,
       "1" => :waiting_payment,
@@ -14,25 +18,15 @@ module PagSeguro
     }
 
     def find(code)
-      response = api.get "/v3/transactions/#{code}" do |conn|
-        conn.headers[:accept] = FORMATS[:xml]
-      end
-
-      parse_body response
+      transform get("/v3/transactions/#{code}", nil, xml: :simple)
     end
 
     def find_by_notification_code(code)
-      response = api.get "/v2/transactions/notifications/#{code}" do |conn|
-        conn.headers[:accept] = FORMATS[:xml]
-      end
-
-      parse_body response
+      transform get("/v2/transactions/notifications/#{code}", nil, xml: :simple)
     end
 
     private
-
-    def parse_body(response)
-      parse(response.body).yield_self do |body|
+      def transform(body)
         if body.transaction?
           body.transaction.status = STATUSES[body.transaction.status]
           body.transaction
@@ -42,6 +36,5 @@ module PagSeguro
           body
         end
       end
-    end
   end
 end

data/lib/pagseguro/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagSeguro
-  VERSION = "0.3.0"
+  VERSION = "1.0.4"
 end

data/lib/pagseguro_next.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative "pagseguro"

data/pagseguro_next.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "pagseguro/version"
@@ -16,14 +18,15 @@ Gem::Specification.new do |spec|
   spec.files        += Dir.glob("lib/**/*.rb")
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", [">= 0.7.4", "< 1.0"]
+  spec.add_dependency "faraday", "~> 0.17"
   spec.add_dependency "faraday_middleware", "~> 0.13"
-  spec.add_dependency "hashie", [">= 3.4.6", "< 3.7.0"]
+  spec.add_dependency "hashie", ">= 3.4.6"
   spec.add_dependency "nokogiri", ">= 1.6"
   spec.add_dependency "activesupport", ">= 4"
+  spec.add_dependency "multi_xml", "~> 0.6"
 
   spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "vcr", "~> 4.0"
   spec.add_development_dependency "webmock", "~> 3.5"

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pagseguro_next
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.4
 platform: ruby
 authors:
 - Rainer Borene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-20 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -51,9 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,9 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: multi_xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,16 +112,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -172,13 +174,13 @@ files:
 - README.md
 - Rakefile
 - lib/pagseguro.rb
-- lib/pagseguro/api.rb
 - lib/pagseguro/authorizations.rb
-- lib/pagseguro/base.rb
 - lib/pagseguro/checkout.rb
+- lib/pagseguro/client.rb
+- lib/pagseguro/mash.rb
 - lib/pagseguro/payment_orders.rb
 - lib/pagseguro/plans.rb
-- lib/pagseguro/response.rb
+- lib/pagseguro/restful.rb
 - lib/pagseguro/sessions.rb
 - lib/pagseguro/subscriptions.rb
 - lib/pagseguro/transactions.rb
@@ -204,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Yet another client to PagSeguro API

data/lib/pagseguro/base.rb

@@ -1,31 +0,0 @@
-require "nokogiri"
-
-module PagSeguro
-  class Base
-    attr_reader :api
-
-    def initialize(api)
-      @api = api
-    end
-
-    def parse(hash)
-      Response.new(hash)
-    end
-
-    def parse_body(response)
-      parse response.body
-    end
-
-    def parameterize(hash)
-      hash.as_json.deep_transform_keys! do |key|
-        key.to_s.camelize(:lower)
-      end
-    end
-
-    def builder(&block)
-      Nokogiri::XML::Builder.new do |xml|
-        xml.instance_eval(&block)
-      end
-    end
-  end
-end

data/lib/pagseguro/response.rb

@@ -1,21 +0,0 @@
-module PagSeguro
-  class Response < Hashie::Mash
-    protected
-
-    def convert_key(key)
-      key.to_s.underscore
-    end
-
-    def convert_value(val, duping = false)
-      obj = super
-      obj = self.class.new(obj) if Hashie::Mash == obj
-      obj
-    end
-
-    def initializing_reader(key)
-      ck = convert_key(key)
-      regular_writer(ck, self.class.new) unless key?(ck)
-      regular_reader(ck)
-    end
-  end
-end