webpay_rails 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c5dd0af35b42f251d1a42ac62f6782cc81e1c62
-  data.tar.gz: e055ac2da4f8285ace56cfdc9e431fdcee59c5b8
+  metadata.gz: 23f8e8fe1419a4ac0dd8de9572fc19c2fbe3bc43
+  data.tar.gz: 9590cb7972cadb66a52ba53c00d30511f1bba908
 SHA512:
-  metadata.gz: d1289617f1025538ab9aceac7872f373e2145c1c1cd83621688084b5f75c0f4392af0af6107abf70573e0e8ae2791f99b0cad36ca547c4727f4f587493ad4f59
-  data.tar.gz: 3fdf4acc44422aedbb74d9eea988c2858bde353f0596233f82b8e55a5efc220568a4b92cceed919a4110270de85a64da612fef87e40490022e3839640262dce9
+  metadata.gz: ed9baa4e2f68e458865569d8361c22f3fd0a46a91619b7b54f82ea4338e189bdcee6aa8a4abd811388e44c7cdebcff38950f8bd87ecebaf43686747c261c0f48
+  data.tar.gz: be7d8ce811b8946bcd31da14f9975661b66a727f1aeb721602aa59608ac2fb560d2e185162cb4a64f276ba93ab6e58f50c67114c90c224bf3401ec56086dc857

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.0.2 - 2016-08-30
+
+#### enhancements
+* add rails logger support for savon
+* add missing attributes on transanction result (`session_id`, `card_expiration_date`, `shares_number`)
+
 ### 1.0.1 - 2016-08-26
 
 #### bug fixes

data/README.md

@@ -36,7 +36,8 @@ class Order < ActiveRecord::Base
     webpay_cert: '-----BEGIN CERTIFICATE-----
 ...
 -----END CERTIFICATE-----',
-    environment: :integration
+    environment: :integration,
+    log: Rails.env.development?
   })
 end
 ```
@@ -61,8 +62,8 @@ This method return a `Transaction` object, that contain a redirection `url` and
 <% if @transaction.success? %>
   <%= form_tag(@transaction.url, method: "post") do %>
     <%= hidden_field_tag(:token_ws, @transaction.token) %>
-    <%= submit_tag("Pagar con Webpay")
-  <%= end %>
+    <%= submit_tag("Pagar con Webpay") %>
+  <% end %>
 <% end %>
 ```
 
@@ -76,11 +77,11 @@ When Webpay send a __POST__ to `return_url` with `token_ws`, we need to ask for
 @result = Order.transaction_result(params[:token_ws])
 ```
 
-This method return a `TransactionResult` object, that contain an `accounting_date`, `buy_order`, `card_number`, `amount`, `commerce_code`, `authorization_code`, `payment_type_code`, `response_code`, `transaction_date`, `url_redirection` and `vci`.
+This method return a `TransactionResult` object, that contain an `buy_order`, `session_id`, `accounting_date`, `transaction_date`, `vci`, `url_redirection`, `card_number`, `card_expiration_date`, `authorization_code`, `payment_type_code`, `response_code`, `amount`, `shares_number` and `commerce_code`.
 
 At this point we have confirmed the transaction with Transbank, performing the operation `acknowledge_transaction` by means of `transaction_result`.
 
-Now we need to send back the customer to `url_redirection` with `token_ws` in the same way we did earlier in the initialization of the transaction.
+Now we need to send back the customer to `url_redirection` with `token_ws` through __GET__ method.
 
 #### Ending a transaction
 

data/lib/webpay_rails/base.rb

@@ -22,11 +22,7 @@ module WebpayRails
 
         raise WebpayRails::InvalidCertificate unless WebpayRails::Verifier.verify(response, webpay_cert)
 
-        document = Nokogiri::HTML(response.to_s)
-        WebpayRails::Transaction.new({
-          token: document.at_xpath('//token').text.to_s,
-          url: document.at_xpath('//url').text.to_s
-        })
+        WebpayRails::Transaction.new(Nokogiri::HTML(response.to_s))
       end
 
       def transaction_result(token)
@@ -36,24 +32,11 @@ module WebpayRails
           raise WebpayRails::FailedGetResult
         end
 
-        raise WebpayRails::InvalidResultResponse unless response
+        raise WebpayRails::InvalidResultResponse if response.blank?
 
         acknowledge_transaction(token)
 
-        document = Nokogiri::HTML(response.to_s)
-        WebpayRails::TransactionResult.new({
-          accounting_date: document.at_xpath('//accountingdate').text.to_s,
-          buy_order: document.at_xpath('//buyorder').text.to_s,
-          card_number: document.at_xpath('//cardnumber').text.to_s,
-          amount: document.at_xpath('//amount').text.to_s,
-          commerce_code: document.at_xpath('//commercecode').text.to_s,
-          authorization_code: document.at_xpath('//authorizationcode').text.to_s,
-          payment_type_code: document.at_xpath('//paymenttypecode').text.to_s,
-          response_code: document.at_xpath('//responsecode').text.to_s,
-          transaction_date: document.at_xpath('//transactiondate').text.to_s,
-          url_redirection: document.at_xpath('//urlredirection').text.to_s,
-          vci: document.at_xpath('//vci').text.to_s
-        })
+        WebpayRails::TransactionResult.new(Nokogiri::HTML(response.to_s))
       end
 
       def acknowledge_transaction(token)
@@ -63,7 +46,7 @@ module WebpayRails
           raise WebpayRails::FailedAcknowledgeTransaction
         end
 
-        raise WebpayRails::InvalidAcknowledgeResponse unless response
+        raise WebpayRails::InvalidAcknowledgeResponse if response.blank?
       end
     end
   end

data/lib/webpay_rails/railites.rb

@@ -0,0 +1,7 @@
+module WebpayRails
+  class Railties < ::Rails::Railtie
+    initializer 'Rails logger' do
+      WebpayRails.logger = Rails.logger
+    end
+  end
+end

data/lib/webpay_rails/soap.rb

@@ -7,7 +7,7 @@ module WebpayRails
       @public_cert = OpenSSL::X509::Certificate.new(args[:public_cert])
       @environment = args[:environment]
 
-      self.class.client(wsdl: wsdl_path)
+      self.class.client(wsdl: wsdl_path, log: args[:log], logger: WebpayRails.logger)
     end
 
     def init_transaction(commerce_code, amount, buy_order, session_id, return_url, final_url)

data/lib/webpay_rails/transaction.rb

@@ -1,14 +1,24 @@
 module WebpayRails
   class Transaction
-    attr_reader :token, :url
+    def self.attr_list
+      [:token, :url]
+    end
 
-    def initialize(args)
-      @token = args[:token]
-      @url = args[:url]
+    def initialize(document)
+      self.class.attr_list.each do |k|
+        v = document.at_xpath("//#{k.to_s.tr('_', '')}")
+        send("#{k}=", v.text.to_s) unless v.nil?
+      end
     end
 
     def success?
-      !@token.blank?
+      !token.blank?
     end
+
+    attr_reader *attr_list
+
+  private
+
+    attr_writer *attr_list
   end
 end

data/lib/webpay_rails/transaction_result.rb

@@ -1,25 +1,35 @@
 module WebpayRails
   class TransactionResult
-    attr_reader :accounting_date, :buy_order, :card_number, :amount, :commerce_code,
-      :authorization_code, :payment_type_code, :response_code, :transaction_date,
-      :url_redirection, :vci
-
-    def initialize(args)
-      @accounting_date = args[:accounting_date]
-      @buy_order = args[:buy_order]
-      @card_number = args[:card_number]
-      @amount = args[:amount]
-      @commerce_code = args[:commerce_code]
-      @authorization_code = args[:authorization_code]
-      @payment_type_code = args[:payment_type_code]
-      @response_code = args[:response_code]
-      @transaction_date = args[:transaction_date]
-      @url_redirection = args[:url_redirection]
-      @vci = args[:vci]
+
+    def self.attr_list
+      [
+        :buy_order, :session_id, :accounting_date, :transaction_date, :vci,
+        :url_redirection,
+
+        # card details
+        :card_number, :card_expiration_date,
+
+        # transaction details
+        :authorization_code, :payment_type_code, :response_code,
+        :amount, :shares_number, :commerce_code
+      ]
+    end
+
+    def initialize(document)
+      self.class.attr_list.each do |k|
+        v = document.at_xpath("//#{k.to_s.tr('_', '')}")
+        send("#{k}=", v.text.to_s) unless v.nil?
+      end
     end
 
     def approved?
-      @response_code.to_i == 0
+      response_code.to_i == 0
     end
+
+    attr_reader *attr_list
+
+  private
+
+    attr_writer *attr_list
   end
 end

data/lib/webpay_rails/version.rb

@@ -1,3 +1,3 @@
 module WebpayRails
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

data/lib/webpay_rails.rb

@@ -1,3 +1,4 @@
+require 'rails'
 require 'active_support/concern'
 
 require 'signer'
@@ -13,10 +14,15 @@ require 'webpay_rails/soap'
 require 'webpay_rails/verifier'
 require 'webpay_rails/transaction'
 require 'webpay_rails/transaction_result'
+require 'webpay_rails/railites'
 
 module WebpayRails
   autoload :Base, 'webpay_rails/base'
 
+  class << self
+    attr_accessor :logger
+  end
+
   def self.extended(base)
     base.include WebpayRails::Base
 

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'bundler/setup'
 Bundler.setup
 
+require 'active_record'
 require 'webpay_rails'
 
 RSpec.configure do |config|

data/spec/webpay_rails_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'active_record'
 
 silence_warnings do
   ActiveRecord::Migration.verbose = false
@@ -82,7 +81,8 @@ CpEvgcRIv/OeIi6Jbuu3NrPdGPwzYkzlOQnmgio5RGb6GSs+OQ0mUWZ9J1+YtdZc+xTga0x7nsCT
 2QR2bX/W2H6ktRcLsgBK9mq7lE36p3q6c9DtZJE+xfA4NGCYWM9hd8pbusnoNO7AFxJZOuuvLZI7
 JvD7YLhPvCYKry7N6x3l
 -----END CERTIFICATE-----',
-    environment: :integration
+    environment: :integration,
+    log: false
   })
 end
 
@@ -90,12 +90,12 @@ describe WebpayRails do
   let(:amount) { 1000 }
   let(:buy_order) { rand(1111111..9999999) }
   let(:session_id) { 'aj2h4kj2' }
-  let(:result_url) { 'http://localhost:3000/tbknormal?option=result' }
+  let(:return_url) { 'http://localhost:3000/tbknormal?option=return' }
   let(:final_url) { 'http://localhost:3000/tbknormal?option=final' }
 
   describe WebpayRails::Transaction do
     describe "when all is ok" do
-      let(:transaction) { Order.init_transaction(amount, buy_order, session_id, result_url, final_url) }
+      let(:transaction) { Order.init_transaction(amount, buy_order, session_id, return_url, final_url) }
 
       it { expect(transaction).to be_kind_of(WebpayRails::Transaction) }
 
@@ -114,6 +114,7 @@ describe WebpayRails do
 
     describe "when not" do
       it { expect{Order.init_transaction(amount, buy_order, session_id, '', '')}.to raise_error(WebpayRails::FailedInitTransaction) }
+      it { expect{Order.init_transaction(0, buy_order, session_id, return_url, final_url)}.to raise_error(WebpayRails::FailedInitTransaction) }
     end
   end
 

data/webpay_rails.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'savon', '~> 2'
   s.add_dependency 'nokogiri', '~> 1.6', '>= 1.6.7.2'
   s.add_dependency 'activesupport', '>= 3.2'
+  s.add_dependency 'railties', '>= 4.1.0', '< 5.1'
 
   s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'activerecord', '>= 3.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpay_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Sebastián Orellana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: signer
@@ -72,6 +72,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +167,7 @@ files:
 - lib/webpay_rails.rb
 - lib/webpay_rails/base.rb
 - lib/webpay_rails/errors.rb
+- lib/webpay_rails/railites.rb
 - lib/webpay_rails/soap.rb
 - lib/webpay_rails/transaction.rb
 - lib/webpay_rails/transaction_result.rb