moip2 1.0.0 → 1.1.0

data/lib/moip2/bank_accounts_api.rb

@@ -0,0 +1,51 @@
+module Moip2
+  class BankAccountsApi
+    attr_reader :client
+
+    def initialize(client)
+      @client = client
+    end
+
+    def create(account_id, bank_account)
+      Resource::BankAccount.new client, client.post(
+        base_account_path(account_id),
+         bank_account,
+      )
+    end
+
+    def show(bank_account_id)
+      Resource::BankAccount.new client, client.get(
+        base_bank_account_path(bank_account_id),
+      )
+    end
+
+    def delete(bank_account_id)
+      Resource::BankAccount.new client, client.delete(
+        base_bank_account_path(bank_account_id),
+      )
+    end
+
+    def update(bank_account_id, bank_account)
+      Resource::BankAccount.new client, client.put(
+        base_bank_account_path(bank_account_id),
+        bank_account,
+      )
+    end
+
+    def find_all(account_id)
+      Resource::BankAccount.new client, client.get(
+        base_account_path(account_id),
+      )
+    end
+
+    private
+
+    def base_bank_account_path(bank_account_id)
+      "/v2/bankaccounts/#{bank_account_id}"
+    end
+
+    def base_account_path(account_id)
+      "/v2/accounts/#{account_id}/bankaccounts"
+    end
+  end
+end

data/lib/moip2/client.rb

@@ -4,12 +4,12 @@ module Moip2
 
     attr_reader :env, :auth, :uri
 
-    def initialize(env = :sandbox, auth = nil, host = get_base_uri(env), opts = {})
+    def initialize(env = :sandbox, auth = nil, opts = {})
       @env = env.to_sym
       @auth = auth
       @opts = opts
 
-      @uri = host
+      @uri = get_base_uri
       self.class.base_uri @uri
     end
 
@@ -62,20 +62,20 @@ module Moip2
       create_response resp
     end
 
-    private
-
-    def get_base_uri(env)
-      return ENV["base_uri"] if ENV["base_uri"]
-
-      @env = env.to_sym
-
+    def host
       if production?
-        "https://api.moip.com.br"
+        "api.moip.com.br"
       else
-        "https://sandbox.moip.com.br"
+        "sandbox.moip.com.br"
       end
     end
 
+    private
+
+    def get_base_uri
+      "https://#{host}"
+    end
+
     def create_response(resp)
       raise NotFoundError, "Resource not found" if resp.code == 404
 

data/lib/moip2/connect_api.rb

@@ -2,25 +2,14 @@ module Moip2
   class ConnectApi
     attr_reader :client
 
-    CONNECT_SANDBOX = "connect-sandbox.moip.com.br".freeze
-    CONNECT_PRODUCTION = "connect.moip.com.br".freeze
-
     def initialize(client)
       @client = client
     end
 
-    def self.connect_uri(production = false)
-      production ? CONNECT_PRODUCTION : CONNECT_SANDBOX
-    end
-
-    def self.host(env = :sandbox)
-      "https://#{connect_uri(env == :production)}"
-    end
-
     def authorize_url(client_id, redirect_uri, scope)
       URI::HTTPS.build(
-        host:  self.class.connect_uri(client.production?),
-        path:  "/oauth/authorize",
+        host: client.host,
+        path: "/oauth/authorize",
         query: URI.encode_www_form(
           response_type: "code",
           client_id: client_id,

data/lib/moip2/connect_client.rb

@@ -0,0 +1,11 @@
+module Moip2
+  class ConnectClient < Client
+    def host
+      if production?
+        "connect.moip.com.br"
+      else
+        "connect-sandbox.moip.com.br"
+      end
+    end
+  end
+end

data/lib/moip2/entry_api.rb

@@ -0,0 +1,21 @@
+module Moip2
+  class EntryApi
+    attr_reader :client
+
+    def initialize(client)
+      @client = client
+    end
+
+    def base_path
+      "/v2/entries"
+    end
+
+    def show(id)
+      Resource::Entry.new client, client.get("#{base_path}/#{id}")
+    end
+
+    def find_all
+      Resource::Entry.new client, client.get("#{base_path}")
+    end
+  end
+end

data/lib/moip2/multi_payment_api.rb

@@ -17,5 +17,13 @@ module Moip2
     def show(multi_payment_id)
       Resource::MultiPayment.new client.get("/v2/multipayments/#{multi_payment_id}")
     end
+
+    def capture(multi_payment_id)
+      Resource::MultiPayment.new client.post("/v2/multipayments/#{multi_payment_id}/capture", {})
+    end
+
+    def void(multi_payment_id)
+      Resource::MultiPayment.new client.post("/v2/multipayments/#{multi_payment_id}/void", {})
+    end
   end
 end

data/lib/moip2/order_api.rb

@@ -18,13 +18,14 @@ module Moip2
       Resource::Order.new client, client.get("#{base_path}/#{id}")
     end
 
-    def find_all(limit: nil, offset: nil, filters: nil)
+    def find_all(limit: nil, offset: nil, q: nil, filters: nil)
       encoded_filters = Moip2::Util::FiltersEncoder.encode(filters)
 
       # `URI.encode...` will accept nil params, but they will pollute the URI
       params = {
         limit: limit,
         offset: offset,
+        q: q,
         filters: encoded_filters,
       }.reject { |_, value| value.nil? }
 

data/lib/moip2/resource/balances.rb

@@ -0,0 +1,12 @@
+module Moip2
+  module Resource
+    class Balances < SimpleDelegator
+      attr_reader :client
+
+      def initialize(client, response)
+        super(response)
+        @client = client
+      end
+    end
+  end
+end

data/lib/moip2/resource/bank_account.rb

@@ -0,0 +1,12 @@
+module Moip2
+  module Resource
+    class BankAccount < SimpleDelegator
+      attr_reader :client
+
+      def initialize(client, response)
+        super(response)
+        @client = client
+      end
+    end
+  end
+end

data/lib/moip2/resource/entry.rb

@@ -0,0 +1,13 @@
+
+module Moip2
+  module Resource
+    class Entry < SimpleDelegator
+      attr_reader :client
+
+      def initialize(client, response)
+        super(response)
+        @client = client
+      end
+    end
+  end
+end

data/lib/moip2/version.rb

@@ -1,3 +1,3 @@
 module Moip2
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.0".freeze
 end

data/lib/moip2/webhooks_api.rb

@@ -6,12 +6,28 @@ module Moip2
       @client = client
     end
 
-    def base_path
-      "/v2/webhooks"
+    def find_all(limit: nil, offset: nil, resource_id: nil, event: nil)
+      # `URI.encode...` will accept nil params, but they will pollute the URI
+      params = {
+        limit: limit,
+        offset: offset,
+        resourceId: resource_id,
+        event: event,
+      }.reject { |_, value| value.nil? }
+
+      query_string = URI.encode_www_form(params)
+      path = "#{base_path}?#{query_string}"
+      response = client.get(path)
+
+      # We need to transform raw JSON in Webhooks objects
+      response.webhooks.map! { |webhooks| Resource::Webhooks.new client, webhooks }
+      Resource::Webhooks.new client, response
     end
 
-    def show
-      Resource::Webhooks.new(client, client.get(base_path.to_s))
+    private
+
+    def base_path
+      "/v2/webhooks"
     end
   end
 end

data/lib/moip2.rb

@@ -9,6 +9,7 @@ require "moip2/auth/oauth"
 
 require "moip2/resource/account"
 require "moip2/resource/order"
+require "moip2/resource/entry"
 require "moip2/resource/payment"
 require "moip2/resource/multi_order"
 require "moip2/resource/multi_payment"
@@ -20,10 +21,14 @@ require "moip2/resource/webhooks"
 require "moip2/resource/connect"
 require "moip2/resource/credit_card"
 require "moip2/resource/notification"
+require "moip2/resource/balances"
+require "moip2/resource/bank_account"
 
 require "moip2/response"
 require "moip2/client"
+require "moip2/connect_client"
 require "moip2/order_api"
+require "moip2/entry_api"
 require "moip2/multi_order_api"
 require "moip2/payment_api"
 require "moip2/multi_payment_api"
@@ -36,6 +41,8 @@ require "moip2/webhooks_api"
 require "moip2/accounts_api"
 require "moip2/connect_api"
 require "moip2/notifications_api"
+require "moip2/balances_api"
+require "moip2/bank_accounts_api"
 
 require "moip2/exceptions/invalid_enviroment_error"
 

data/moip2.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
     "Caio Gama",
     "João Lucas Lucchetta",
     "Caio Gaspar",
+    "Jair Bressani Junior",
   ]
   spec.email = [
     "rodrigo.saito@moip.com.br",
@@ -20,6 +21,7 @@ Gem::Specification.new do |spec|
     "caio.gama@moip.com.br",
     "joao.lucchetta@moip.com.br",
     "caio.gaspar@moip.com.br",
+    "jair.bressani@moip.com.br",
   ]
   spec.summary       = "Ruby client for moip v2 api"
   spec.description   = "Ruby client for moip v2 api"

data/spec/moip2/balances_api_spec.rb

@@ -0,0 +1,22 @@
+describe Moip2::BalancesApi do
+  let(:balances_api) { described_class.new sandbox_oauth_client }
+
+  describe "#show" do
+    let(:balances) do
+      VCR.use_cassette("get_balances") do
+        balances_api.show
+      end
+    end
+
+    it {
+      expect(balances).to have_attributes(
+        unavailable: be_an(Array),
+        future: be_an(Array),
+        current: be_an(Array),
+      )
+    }
+    it { expect(balances.unavailable.first).to have_attributes(amount: be_a(Numeric), currency: be_a(String)) }
+    it { expect(balances.future.first).to have_attributes(amount: be_a(Numeric), currency: be_a(String)) }
+    it { expect(balances.current.first).to have_attributes(amount: be_a(Numeric), currency: be_a(String)) }
+  end
+end

data/spec/moip2/bank_accounts_api_spec.rb

@@ -0,0 +1,173 @@
+describe Moip2::BankAccountsApi do
+  let(:bank_accounts_api) { described_class.new sandbox_client }
+
+  describe "#create" do
+    context "when given an existent moip account" do
+      let(:bank_account) do
+        {
+          bank_number: "237",
+          agency_number: "12345",
+          agency_check_number: "0",
+          account_number: "12345678",
+          account_check_number: "7",
+          type: "CHECKING",
+          holder: {
+            tax_document: {
+              type: "CPF",
+              number: "255.328.259-12",
+            },
+            fullname: "Jose Silva dos Santos",
+          },
+        }
+      end
+
+      let(:created_bank_account) do
+        VCR.use_cassette("bank_account_create_sucess") do
+          bank_accounts_api.create("MPA-CULBBYHD11", bank_account)
+        end
+      end
+
+      it "creates an bank_account accordingly" do
+        expect(created_bank_account.id).to_not be_nil
+        expect(created_bank_account.agency_number).to eq("12345")
+        expect(created_bank_account.holder.tax_document.number).to eq("255.328.259-12")
+        expect(created_bank_account.holder.tax_document.type).to eq("CPF")
+        expect(created_bank_account.holder.fullname).to eq("Jose Silva dos Santos")
+        expect(created_bank_account.account_number).to eq("12345678")
+        expect(created_bank_account.account_check_number).to eq("7")
+        expect(created_bank_account.bank_name).to_not be_nil
+        expect(created_bank_account.agency_check_number).to eq("0")
+        expect(created_bank_account.bank_number).to eq("237")
+      end
+    end
+
+    context "when given a nonexistent moip account" do
+      let(:non_created_bank_account) do
+        {
+          bank_number: "237",
+          agency_number: "12345",
+          agency_check_number: "0",
+          account_number: "12345678",
+          account_check_number: "7",
+          type: "CHECKING",
+          holder: {
+            tax_document: {
+              type: "CPF",
+              number: "255.328.259-12",
+            },
+            fullname: "Jose Silva dos Santos",
+          },
+        }
+      end
+
+      let(:bank_account) do
+        VCR.use_cassette("bank_account_create_fail") do
+          bank_accounts_api.create("MPA-F00B4R123456", non_created_bank_account)
+        end
+      end
+
+      it { expect(bank_account.response.code).to eq("401") }
+    end
+  end
+
+  describe "#show" do
+    context "when given an existent bank_account" do
+      let(:bank_account) do
+        VCR.use_cassette("bank_account_show_existent") do
+          bank_accounts_api.show("BKA-YBG1D8FKXXMT")
+        end
+      end
+
+      it "shows an the bank_account accordingly" do
+        expect(bank_account.id).to_not be_nil
+        expect(bank_account.agency_number).to eq("12345")
+        expect(bank_account.holder.tax_document.number).to eq("255.328.259-12")
+        expect(bank_account.holder.tax_document.type).to eq("CPF")
+        expect(bank_account.holder.fullname).to eq("Jose Silva dos Santos")
+        expect(bank_account.account_number).to eq("12345678")
+        expect(bank_account.account_check_number).to eq("7")
+        expect(bank_account.bank_name).to_not be_nil
+        expect(bank_account.agency_check_number).to eq("0")
+        expect(bank_account.bank_number).to eq("237")
+      end
+    end
+
+    context "when given a nonexistent account" do
+      let(:bank_account) do
+        VCR.use_cassette("bank_account_show_nonexistent") do
+          bank_accounts_api.show("BKA-F00B4R123456")
+        end
+      end
+
+      it { expect { bank_account }.to raise_error(Moip2::NotFoundError) }
+    end
+  end
+
+  describe "#find_all" do
+    let(:bank_account) do
+      VCR.use_cassette("bank_account_find_all") do
+        bank_accounts_api.find_all("MPA-CULBBYHD11")
+      end
+    end
+    it { expect(bank_account.first["id"]).to eq("BKA-EQW51MWMAO22") }
+  end
+
+  describe "#update" do
+    let(:bank_account) do
+      {
+        bank_number: "237",
+        agency_number: "54321",
+        agency_check_number: "0",
+        account_number: "12345678",
+        account_check_number: "7",
+        type: "CHECKING",
+        holder: {
+          tax_document: {
+            type: "CPF",
+            number: "255.328.259-12",
+          },
+          fullname: "Jose Silva dos Santos",
+        },
+      }
+    end
+
+    let(:updated_bank_account) do
+      VCR.use_cassette("bank_account_update") do
+        bank_accounts_api.update("BKA-QQSVKMC06A6I", bank_account)
+      end
+    end
+
+    it "returns an bank_account accordingly to the update" do
+      expect(updated_bank_account.id).to_not be_nil
+      expect(updated_bank_account.agency_number).to eq("54321")
+      expect(updated_bank_account.holder.tax_document.number).to eq("255.328.259-12")
+      expect(updated_bank_account.holder.tax_document.type).to eq("CPF")
+      expect(updated_bank_account.holder.fullname).to eq("Jose Silva dos Santos")
+      expect(updated_bank_account.account_number).to eq("12345678")
+      expect(updated_bank_account.account_check_number).to eq("7")
+      expect(updated_bank_account.bank_name).to_not be_nil
+      expect(updated_bank_account.agency_check_number).to eq("0")
+      expect(updated_bank_account.bank_number).to eq("237")
+    end
+  end
+
+  describe "#delete" do
+    context "when given an existent bank account" do
+      let(:bank_account) do
+        VCR.use_cassette("bank_account_deleted_existent") do
+          bank_accounts_api.delete("BKA-YBG1D8FKXXMT")
+        end
+      end
+      it { expect(bank_account.response.code).to eq("200") }
+    end
+
+    context "when given a nonexistent bank account" do
+      let(:bank_account) do
+        VCR.use_cassette("bank_account_deleted_nonexistent") do
+          bank_accounts_api.delete("BKA-F00B4R123456")
+        end
+      end
+      it { expect { bank_account }.to raise_error(Moip2::NotFoundError) }
+    end
+  end
+end

data/spec/moip2/client_spec.rb

@@ -16,105 +16,42 @@ describe Moip2::Client do
   end
 
   describe "initialize on sandbox with OAuth" do
-    let(:client) do
-      described_class.new :sandbox, auth
-    end
-
-    let(:client) { described_class.new :sandbox, oauth }
-    it { expect(client.uri).to eq ENV["sandbox_url"] }
-    it { expect(client.env).to eq :sandbox }
-    it {
-      expect(client.opts[:headers]["Authorization"]).to eq "OAuth 9fdc242631454d4c95d82e27b4127394_v2"
-    }
-  end
-
-  describe "initialize on production" do
-    let(:client) do
-      described_class.new :production, oauth
-    end
-
-    it { expect(client.uri).to eq "https://api.moip.com.br" }
-    it { expect(client.env).to eq :production }
-    it {
-      expect(client.opts[:headers]["Authorization"]).to eq "OAuth 9fdc242631454d4c95d82e27b4127394_v2"
-    }
-  end
-
-  describe "initialize on sandbox with base_uri and OAuth" do
-    before do
-      ENV["base_uri"] = "http://localhost:5000"
-    end
-
     let(:client) do
       described_class.new :sandbox, oauth
     end
 
-    it { expect(client.uri).to eq "http://localhost:5000" }
+    it { expect(client.uri).to eq "https://sandbox.moip.com.br" }
     it { expect(client.env).to eq :sandbox }
-    it {
-      expect(client.opts[:headers]["Authorization"]).to eq "OAuth 9fdc242631454d4c95d82e27b4127394_v2"
-    }
-  end
-
-  describe "initialize on production with base_uri and OAuth" do
-    before do
-      ENV["base_uri"] = "http://localhost:5000"
+    it do
+      expect(client.opts[:headers]["Authorization"]).
+        to eq "OAuth 9fdc242631454d4c95d82e27b4127394_v2"
     end
+  end
 
+  describe "initialize on production with OAuth" do
     let(:client) do
       described_class.new :production, oauth
     end
 
-    it { expect(client.uri).to eq "http://localhost:5000" }
+    it { expect(client.uri).to eq "https://api.moip.com.br" }
     it { expect(client.env).to eq :production }
-    it {
-      expect(client.opts[:headers]["Authorization"]).to eq "OAuth 9fdc242631454d4c95d82e27b4127394_v2"
-    }
-  end
-
-  describe "initialize on sandbox with base_uri" do
-    before do
-      ENV["base_uri"] = "http://localhost:5000"
-    end
-
-    let(:client) do
-      described_class.new :sandbox, auth
+    it do
+      expect(client.opts[:headers]["Authorization"]).
+        to eq "OAuth 9fdc242631454d4c95d82e27b4127394_v2"
     end
-
-    it { expect(client.uri).to eq "http://localhost:5000" }
-    it { expect(client.env).to eq :sandbox }
-    it { expect(client.opts[:headers]["Authorization"]).to eq "Basic VE9LRU46U0VDUkVU" }
   end
 
-  describe "initialize on production with base_uri" do
-    before do
-      ENV["base_uri"] = "http://localhost:5000"
-    end
-
-    let(:client) do
-      described_class.new :production, auth
-    end
-
-    it { expect(client.uri).to eq "http://localhost:5000" }
-    it { expect(client.env).to eq :production }
-    it { expect(client.opts[:headers]["Authorization"]).to eq "Basic VE9LRU46U0VDUkVU" }
-  end
-
-  describe "initialize on sandbox" do
-    before do
-      ENV["base_uri"] = nil
-    end
-
+  describe "initialize on sandbox with Basic authentication" do
     let(:client) do
       described_class.new :sandbox, auth
     end
 
-    it { expect(client.uri).to eq ENV["sandbox_url"] }
+    it { expect(client.uri).to eq "https://sandbox.moip.com.br" }
     it { expect(client.env).to eq :sandbox }
     it { expect(client.opts[:headers]["Authorization"]).to eq "Basic VE9LRU46U0VDUkVU" }
   end
 
-  describe "initialize on production" do
+  describe "initialize on production with Basic authentication" do
     let(:client) do
       described_class.new :production, auth
     end

data/spec/moip2/connect_api_spec.rb

@@ -1,5 +1,5 @@
 describe Moip2::ConnectApi do
-  let(:connect_api) { described_class.new sandbox_client_connect }
+  let(:connect_api) { described_class.new sandbox_connect_client }
 
   describe "#authorize_url" do
     let (:authorize_url) do