spree_iugu_bank_slip 3.0.4.1 → 3.0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3351a1c664c65ad22c4adfbdf336f7e03268252e
-  data.tar.gz: 288357b9df8cb4276f6accbb602b8d731f13bcef
+  metadata.gz: 95fc0f8d4b12e056ad1207dffd1c3cecd74f0a94
+  data.tar.gz: 657085b396ab4d63c4dbff82a043fb874ec4be4c
 SHA512:
-  metadata.gz: 365a29461ef8d66a9ac27a4b482388d8e2dc428a3926d84b8808fee1acac56ffa45fc9890499cb4c230a862dda318d3ef44e1033094123ce38e5df0c16486cb7
-  data.tar.gz: b51a574f0be1235b6683e3f6be1305ea95e5f8c10e743c4169236d000c3e4a42b0b10b7424c6bf5254920bcbcb1427ffa9e306e8a0f8dfddf8356a5d7e8c5964
+  metadata.gz: 358f8e306c2a2d4fee7fd98f9ced27d0b429f819b32d64434f498abbe682dd574e2af7b79f1987caee1f64b02fa66fb8daa1b273fa917c3c0e4412ca64421754
+  data.tar.gz: df676140b248b461d714a5739b18ba77e0cadac85a5e333750097ea5682c385d61b5b1f47477e2f5a3e3f8f05e98d188918465a4ee134cc48ed1f5bed6b7be9d

data/.travis.yml

@@ -7,6 +7,6 @@ script:
   - bundle exec rspec
 language: ruby
 rvm:
+  - 2.1.5
   - 2.2.3
-  - 2.2.4
-before_install: gem install ruby_dep -v 1.2.0
+  - 2.2.4

data/app/models/spree/payment_method/bank_slip.rb

@@ -40,7 +40,7 @@ module Spree
           phone = billing_address[:phone]
         end
 
-        notification_url = Spree::Store.current.url
+        notification_url = Spree::BankSlipConfig[:store_url]
         notification_url << Spree::Core::Engine.routes.url_helpers.bank_slip_status_changed_path(source.id)
 
         due_date = Date.today + Spree::BankSlipConfig[:days_to_due_date].days
@@ -147,8 +147,16 @@ module Spree
       #
       # @return [ActiveMerchant::Billing::Response]
       #
-      def void(response_code, gateway_options)
+      def void(response_code, _gateway_options)
         bank_slip = Spree::BankSlip.find_by invoice_id: response_code
+        return ActiveMerchant::Billing::Response.new(false, Spree.t('bank_slip.messages.void_fail'), {}, {}) if bank_slip.nil?
+
+        # Verifica na Iugu se o boleto esta pendente
+        # se tiver, faz o cancelamento
+        invoice = Iugu::Invoice.fetch response_code
+        if invoice.status == 'pending'
+          invoice.cancel
+        end
         bank_slip.update_attribute(:status, 'canceled')
 
         ActiveMerchant::Billing::Response.new(true, Spree.t('bank_slip.messages.successfully_voided'), {}, authorization: response_code)
@@ -164,6 +172,14 @@ module Spree
       #
       def cancel(response_code)
         bank_slip = Spree::BankSlip.find_by invoice_id: response_code
+        return ActiveMerchant::Billing::Response.new(false, Spree.t('bank_slip.messages.void_fail'), {}, {}) if bank_slip.nil?
+
+        # Verifica na Iugu se o boleto esta pendente
+        # se tiver, faz o cancelamento
+        invoice = Iugu::Invoice.fetch response_code
+        if invoice.status == 'pending'
+          invoice.cancel
+        end
         bank_slip.update_attribute(:status, 'canceled')
 
         ActiveMerchant::Billing::Response.new(true, Spree.t('bank_slip.messages.successfully_voided'), {}, authorization: response_code)

data/app/views/spree/admin/bank_slip_settings/edit.html.erb

@@ -31,12 +31,16 @@
             </div>
           </div>
           <div class="row">
-            <div class="col-sm-12">
+            <div class="col-sm-6">
               <%= label_tag(:doc_customer_attr, Spree.t(:doc_customer_attr) + ': ') + tag(:br) %>
               <%= select_tag :doc_customer_attr,
                              options_for_select(@user_attr.collect { |item| [Spree.t(item), item] }, @config.doc_customer_attr),
                              class: 'select2', include_blank: true %>
             </div>
+            <div class="col-sm-6">
+              <%= label_tag(:store_url, Spree.t(:store_url) + ': ') + tag(:br) %>
+              <%= text_field_tag :store_url, @config.store_url, class: 'form-control' %>
+            </div>
           </div>
         </div>
       </div>

data/config/locales/en.yml

@@ -18,6 +18,7 @@ en:
     paid_in: Paid In
     invoice_id: Invoice ID
     generate_bank_slip: Generate Billet
+    store_url: Store URL
     bank_slip:
       messages:
         iugu_fail: Request to Iugu fail!

data/config/locales/pt-br.yml

@@ -18,6 +18,7 @@ pt-BR:
     paid_in: Pago Em
     invoice_id: "Número Boleto"
     generate_bank_slip: Gerar boleto
+    store_url: URL da loja
     bank_slip:
       messages:
         iugu_fail: "Requisição falhou!"

data/lib/spree/bank_slip_configuration.rb

@@ -6,6 +6,7 @@ module Spree
     preference :days_to_due_date,  :integer, default: 3     # Dias para a data de vencimento
     preference :ignore_due_email,  :boolean, default: true  # Ignorar email de cobranca
     preference :log_requests,      :boolean, default: false # Salva no log os parametros enviados e recebidos nas requisicoes
+    preference :store_url,         :string,  default: ''    # URL da loja para a montagem da url de retorno
 
   end
 end

data/spec/controllers/spree/bank_slips_controller_spec.rb

@@ -21,6 +21,16 @@ describe Spree::BankSlipsController, type: :controller do
     end
 
     it 'should change status to canceled' do
+      stub_iugu({ filename: 'fetch', method: :get, url: 'https://api.iugu.com/v1/invoices/1',
+                  headers: {
+                      'Accept'=>'application/json', 'Accept-Charset'=>'utf-8',
+                      'Accept-Encoding'=>'gzip, deflate', 'Accept-Language'=>'pt-br;q=0.9,pt-BR',
+                      'Content-Length'=>'2', 'Content-Type'=>'application/json; charset=utf-8',
+                      'User-Agent'=>'Iugu RubyLibrary'
+                  }, body: '{}' })
+      stub_iugu({ filename: 'canceled', method: :put, body: '{}',
+                  url: 'https://api.iugu.com/v1/invoices/1/cancel' })
+
       request_params = {
           bank_slip_id: slip.id,
           data: {

data/spec/features/admin/bank_slip_settings_spec.rb

@@ -24,6 +24,7 @@ describe 'Bank Slip Settings', { type: :feature, js: true } do
       Spree::BankSlipConfig[:iugu_api_token] = ''
       Spree::BankSlipConfig[:days_to_due_date] = 3
       Spree::BankSlipConfig[:ignore_due_email] = true
+      Spree::BankSlipConfig[:store_url] = true
       Iugu.api_key = ''
     end
 
@@ -59,5 +60,13 @@ describe 'Bank Slip Settings', { type: :feature, js: true } do
       expect(find_field('doc_customer_attr').value).to eq 'authentication_token'
     end
 
+    it 'can edit store url' do
+      fill_in 'store_url', with: 'http://localhost'
+      click_button 'Update'
+
+      expect(Spree::BankSlipConfig[:store_url]).to eq 'http://localhost'
+      expect(find_field('store_url').value).to eq 'http://localhost'
+    end
+
   end
 end

data/spec/fixtures/iugu_responses/canceled.json

@@ -0,0 +1,131 @@
+{
+  "id": "1",
+  "due_date": "2016-01-09",
+  "currency": "BRL",
+  "discount_cents": null,
+  "email": "spree@example.com",
+  "items_total_cents": 1000,
+  "notification_url": null,
+  "return_url": null,
+  "status": "canceled",
+  "tax_cents": null,
+  "updated_at": "2016-01-06T13:24:21-02:00",
+  "total_cents": 1000,
+  "total_paid_cents": 0,
+  "paid_at": null,
+  "taxes_paid_cents": null,
+  "paid_cents": null,
+  "cc_emails": null,
+  "financial_return_date": null,
+  "payable_with": "all",
+  "overpaid_cents": null,
+  "ignore_due_email": true,
+  "ignore_canceled_email": true,
+  "advance_fee_cents": null,
+  "secure_id": "1",
+  "secure_url": "http://localhost:3000",
+  "customer_id": null,
+  "customer_ref": null,
+  "customer_name": null,
+  "user_id": null,
+  "total": "R$ 10,00",
+  "taxes_paid": "R$ 0,00",
+  "total_paid": "R$ 0,00",
+  "total_overpaid": "R$ 0,00",
+  "fines_on_occurrence_day": null,
+  "total_on_occurrence_day": null,
+  "fines_on_occurrence_day_cents": null,
+  "total_on_occurrence_day_cents": null,
+  "advance_fee": null,
+  "paid": "R$ 0,00",
+  "interest": null,
+  "discount": null,
+  "created_at": "06/01, 13:24 h",
+  "refundable": null,
+  "installments": null,
+  "transaction_number": 1111,
+  "payment_method": null,
+  "created_at_iso": "2016-01-06T13:24:20-02:00",
+  "updated_at_iso": "2016-01-06T13:24:21-02:00",
+  "financial_return_dates": null,
+  "bank_slip": {
+    "digitable_line": "00000000000000000000000000000000000000000000000",
+    "barcode_data": "00000000000000000000000000000000000000000000",
+    "barcode": "http://localhost:3000"
+  },
+  "items": [
+    {
+      "id": "34F9D7F67E5244EF99796936CF208E35",
+      "description": "Item Um",
+      "price_cents": 1000,
+      "quantity": 1,
+      "created_at": "2016-01-06T13:24:20-02:00",
+      "updated_at": "2016-01-06T13:24:20-02:00",
+      "price": "R$ 10,00"
+    }
+  ],
+  "variables": [
+    {
+      "id": "06B21226727C4121AC4BDB524DC0DA45",
+      "variable": "payer.address.country",
+      "value": "Brasil"
+    },
+    {
+      "id": "1D6D9BAA1D4E44F8A428B409371BF12F",
+      "variable": "payer.address.zip_code",
+      "value":"12122-00"
+    },
+    {
+      "id": "2D26D1E24B1240D1A42EF4826AF758E7",
+      "variable": "payer.phone",
+      "value": "12121212"
+    },
+    {
+      "id": "34B880D1A6EA4A8F81583B8093AFC548",
+      "variable": "payer.phone_prefix",
+      "value": "11"
+    },
+    {
+      "id": "5242B104C9F942A6A2891EB17B6AD3B1",
+      "variable": "payer.name",
+      "value": "Nome do Cliente"
+    },
+    {
+      "id": "605E45FCC8444E22A28BF38A2409582B",
+      "variable": "payer.address.number",
+      "value": "700"
+    },
+    {
+      "id": "726310D0E206478E8F5609813C35387B",
+      "variable": "payment_data.transaction_number",
+      "value": "1111"
+    },
+    {
+      "id": "9DEA3D530F12427896818A60BABF753A",
+      "variable": "payer.address.street",
+      "value": "Rua Tal"
+    },
+    {
+      "id": "A4BD3C27296C440A8EC7F983F75132D8",
+      "variable": "payer.cpf_cnpj",
+      "value": "12312312312"
+    },
+    {
+      "id": "E66AF99801BA4071ABBD80FDA6A1B534",
+      "variable": "payer.address.city",
+      "value": "São Paulo"
+    },
+    {
+      "id": "E9197DB3A6A74B9BBA4BCDF2E9553774",
+      "variable": "payer.email",
+      "value": "spree@example.com"
+    },
+    {
+      "id": "F2711AED42874D61ACC2D893EAAA43E0",
+      "variable": "payer.address.state",
+      "value": "SP"
+    }
+  ],
+  "custom_variables": [],
+  "logs": []
+}

data/spec/models/spree/payment_method/bank_slip_spec.rb

@@ -14,7 +14,7 @@ describe Spree::PaymentMethod::BankSlip, type: :model do
   it 'payment method should not be auto captured' do
     expect(object.auto_capture).to be_falsey
   end
-
+  
   context 'authorize' do
 
     it 'should authorize when Iugu create the invoice' do
@@ -31,7 +31,7 @@ describe Spree::PaymentMethod::BankSlip, type: :model do
     end
 
     it 'should unauthorize when Iugu return error' do
-      stub_iugu 'create_error'
+      stub_iugu({ filename: 'create_error' })
       Spree::BankSlipConfig[:days_to_due_date] = -10
       response = object.authorize '1599', slip, slip.payment.gateway_options
 
@@ -48,12 +48,32 @@ describe Spree::PaymentMethod::BankSlip, type: :model do
   end
 
   context 'void' do
+
+    let(:headers) do
+      {
+          'Accept'=>'application/json', 'Accept-Charset'=>'utf-8',
+          'Accept-Encoding'=>'gzip, deflate', 'Accept-Language'=>'pt-br;q=0.9,pt-BR',
+          'Content-Length'=>'2', 'Content-Type'=>'application/json; charset=utf-8',
+          'User-Agent'=>'Iugu RubyLibrary'
+      }
+      end
+
     it 'should void successfully' do
-      object.void '1', slip.payment.gateway_options
+      response_code = '1'
+      stub_iugu({ filename: 'fetch', method: :get, url: "https://api.iugu.com/v1/invoices/#{response_code}",
+                  headers: headers, body: '{}' })
+      stub_iugu({ filename: 'canceled', method: :put, body: '{}',
+                  url: "https://api.iugu.com/v1/invoices/#{response_code}/cancel" })
+
+      object.void response_code, slip.payment.gateway_options
       expect(slip.reload.canceled?).to be_truthy
     end
 
     it 'should return error when bank slip not found' do
+      response_code = '10'
+      stub_iugu({ filename: 'fetch', method: :get, url: "https://api.iugu.com/v1/invoices/#{response_code}",
+                  headers: headers, body: '{}' })
+
       response = object.void 10, slip.payment.gateway_options
       expect(response.success?).to be_falsey
       expect(slip.reload.canceled?).to be_falsey
@@ -61,30 +81,35 @@ describe Spree::PaymentMethod::BankSlip, type: :model do
   end
 
   context 'cancel' do
+
+    let(:headers) do
+      {
+          'Accept'=>'application/json', 'Accept-Charset'=>'utf-8',
+          'Accept-Encoding'=>'gzip, deflate', 'Accept-Language'=>'pt-br;q=0.9,pt-BR',
+          'Content-Length'=>'2', 'Content-Type'=>'application/json; charset=utf-8',
+          'User-Agent'=>'Iugu RubyLibrary'
+      }
+    end
+
     it 'should cancel successfully' do
+      response_code = '1'
+      stub_iugu({ filename: 'fetch', method: :get, url: "https://api.iugu.com/v1/invoices/#{response_code}",
+                  headers: headers, body: '{}' })
+      stub_iugu({ filename: 'canceled', method: :put, body: '{}',
+                  url: "https://api.iugu.com/v1/invoices/#{response_code}/cancel" })
+
       object.cancel 1
       expect(slip.reload.canceled?).to be_truthy
     end
 
     it 'should return error when bank slip not found' do
+      response_code = '10'
+      stub_iugu({ filename: 'fetch', method: :get, url: "https://api.iugu.com/v1/invoices/#{response_code}",
+                  headers: headers, body: '{}' })
+
       response = object.cancel 10
       expect(response.success?).to be_falsey
     end
   end
 
-  def stub_iugu(filename = 'create')
-    create_response = JSON.parse File.read("spec/fixtures/iugu_responses/#{filename}.json")
-
-    # Stub da criacao da fatura
-    stub_request(:post, 'https://api.iugu.com/v1/invoices').
-        with(headers: {'Accept'=>'application/json',
-                       'Accept-Charset'=>'utf-8',
-                       'Accept-Encoding'=>'gzip, deflate',
-                       'Accept-Language'=>'pt-br;q=0.9,pt-BR',
-                       'Content-Type'=>'application/json; charset=utf-8',
-                       'User-Agent'=>'Iugu RubyLibrary'},
-             body: hash_including({'method' => 'bank_slip'})).
-        to_return(body: create_response.to_json, status: 200)
-  end
-
 end

data/spec/support/stub_iugu.rb

@@ -0,0 +1,21 @@
+def stub_iugu(params = {})
+  conf = {
+      filename: 'create',
+      method: :post,
+      url: 'https://api.iugu.com/v1/invoices',
+      headers: {'Accept'=>'application/json',
+                'Accept-Charset'=>'utf-8',
+                'Accept-Encoding'=>'gzip, deflate',
+                'Accept-Language'=>'pt-br;q=0.9,pt-BR',
+                'Content-Type'=>'application/json; charset=utf-8',
+                'User-Agent'=>'Iugu RubyLibrary'},
+      body: hash_including({'method' => 'bank_slip'})
+  }.merge(params)
+
+  create_response = JSON.parse File.read("spec/fixtures/iugu_responses/#{conf[:filename]}.json")
+
+  stub_request(conf[:method], conf[:url]).
+      with(headers: conf[:headers],
+           body: conf[:body]).
+      to_return(body: create_response.to_json, status: 200)
+end

data/spree_iugu_bank_slip.gemspec

@@ -2,16 +2,11 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_iugu_bank_slip'
-  s.version     = '3.0.4.1'
+  s.version     = '3.0.4.2'
   s.summary     = 'Boleto do Iugu como forma de pagamento no Spree Commerce'
   s.description = s.summary
+  s.required_ruby_version = '>= 2.1.0'
 
-  begin
-    require 'ruby_dep/travis'
-    s.required_ruby_version = RubyDep::Travis.new.version_constraint
-  rescue LoadError
-    abort "Install 'ruby_dep' gem before building this gem"
-  end
 
   s.author    = 'Zaez Team'
   s.email     = 'contato@zaez.net'
@@ -45,5 +40,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'guard-shell'
   s.add_development_dependency 'http_logger'
-  s.add_development_dependency 'ruby_dep', '~> 1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_iugu_bank_slip
 version: !ruby/object:Gem::Version
-  version: 3.0.4.1
+  version: 3.0.4.2
 platform: ruby
 authors:
 - Zaez Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -318,20 +318,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby_dep
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 description: Boleto do Iugu como forma de pagamento no Spree Commerce
 email: contato@zaez.net
 executables: []
@@ -372,6 +358,7 @@ files:
 - lib/spree_iugu_bank_slip/factories.rb
 - spec/controllers/spree/bank_slips_controller_spec.rb
 - spec/features/admin/bank_slip_settings_spec.rb
+- spec/fixtures/iugu_responses/canceled.json
 - spec/fixtures/iugu_responses/create.json
 - spec/fixtures/iugu_responses/create_error.json
 - spec/fixtures/iugu_responses/fetch.json
@@ -379,6 +366,7 @@ files:
 - spec/models/spree/payment_method/bank_slip_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara_login.rb
+- spec/support/stub_iugu.rb
 - spree_iugu_bank_slip.gemspec
 homepage: http://zaez.net
 licenses: []
@@ -389,12 +377,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
-    - !ruby/object:Gem::Version
-      version: '2.2'
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -410,6 +395,7 @@ summary: Boleto do Iugu como forma de pagamento no Spree Commerce
 test_files:
 - spec/controllers/spree/bank_slips_controller_spec.rb
 - spec/features/admin/bank_slip_settings_spec.rb
+- spec/fixtures/iugu_responses/canceled.json
 - spec/fixtures/iugu_responses/create.json
 - spec/fixtures/iugu_responses/create_error.json
 - spec/fixtures/iugu_responses/fetch.json
@@ -417,3 +403,4 @@ test_files:
 - spec/models/spree/payment_method/bank_slip_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara_login.rb
+- spec/support/stub_iugu.rb