espago 0.1.2 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27e99a50c2ebe74762fb3cfbb1d808dfc465fdb9
-  data.tar.gz: dfeead9293c23e0c4f4d3a7ccc682d21ef327cb1
+  metadata.gz: 9c90725a6354df09346f5e47d7a47d89fc7af563
+  data.tar.gz: 65649ff9aac8ce18cd04d1623a11fa8c55a40e12
 SHA512:
-  metadata.gz: 206a547e448d6cf77996f7d288d9ef563042f7521f6c8d6918dba776fbfdb19708a7939fb8ad51087879035bcbd6273e4f50120691c084f1193d9ed24d492592
-  data.tar.gz: ac022203b3f4ede07c8ea8e2e7298e70e843456f7aedd7f5c86957c362de0914d234ca9e5996628eb35bddfb2479dbcc6bc9340ad635fe1990d2552a3df93570
+  metadata.gz: 518ef7b212cb3e789d4cd24bc992e8515bc01516d0ea5db5c1c97d3f75c43bdb89142220586aff3f92878a9d6508c51205071bcd8cff88e6d1fd1636d07cfaf0
+  data.tar.gz: 9da66c2cba20692a5821dd094c0cf30337767b9f3c7fdd17ee818a0e2a8864f3328ff6e7695e5a3ab45b81ac368f0d47c6ba52c0ed0a0def396dabd8cfb71d05

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
-  - "1.9.2"
-  - "1.9.3"
-  - "2.0.0"
-  - "2.1.5"
+  - "2.1.10"
+  - "2.2.5"
+  - "2.3.1"
 
 addons:
   code_climate:

data/Gemfile.lock

@@ -1,20 +1,51 @@
 PATH
   remote: .
   specs:
-    espago (0.1.2)
+    espago (0.1.8)
       facets
       faraday
+      rails
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actionmailer (3.2.22)
+      actionpack (= 3.2.22)
+      mail (~> 2.5.4)
+    actionpack (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
+      builder (~> 3.0.0)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+    activesupport (3.2.22)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
     addressable (2.3.6)
+    arel (3.0.3)
+    builder (3.0.4)
     codeclimate-test-reporter (0.4.1)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.0.8)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
     facets (2.9.3)
     faraday (0.8.7)
       multipart-post (~> 1.1)
@@ -30,17 +61,50 @@ GEM
     guard-rspec (2.3.3)
       guard (>= 1.1)
       rspec (~> 2.11)
+    hike (1.2.3)
+    i18n (0.7.0)
+    journey (1.0.4)
+    json (1.8.3)
     listen (0.7.2)
     lumberjack (1.0.2)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     method_source (0.8.1)
+    mime-types (1.25.1)
     multi_json (1.5.0)
     multipart-post (1.2.0)
+    polyglot (0.3.5)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
+    rack (1.4.7)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (3.2.22)
+      actionmailer (= 3.2.22)
+      actionpack (= 3.2.22)
+      activerecord (= 3.2.22)
+      activeresource (= 3.2.22)
+      activesupport (= 3.2.22)
+      bundler (~> 1.0)
+      railties (= 3.2.22)
+    railties (3.2.22)
+      actionpack (= 3.2.22)
+      activesupport (= 3.2.22)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
     rake (10.0.2)
     rb-fsevent (0.9.3)
+    rdoc (3.12.2)
+      json (~> 1.4)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -57,7 +121,17 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     slop (3.3.3)
+    sprockets (2.2.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.16.0)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.44)
     vcr (2.9.3)
     webmock (1.20.4)
       addressable (>= 2.3.6)

data/app/helpers/espago/masterpass_helper.rb

@@ -0,0 +1,13 @@
+module Espago::MasterpassHelper
+  def espago_masterpass_button(data)
+    render :partial => 'espago_masterpass/masterpass_button', :locals => { :data => Espago::Masterpass.prepare_form(data)}
+  end
+
+  def espago_masterpass_pairing_button(data)
+    render :partial => 'espago_masterpass/masterpass_pairing_button', :locals => { :data => Espago::Masterpass.prepare_pairing_form(data)}
+  end
+
+    def espago_masterpass_precheckout_button(data)
+    render :partial => 'espago_masterpass/masterpass_precheckout_button', :locals => { :data => Espago::Masterpass.prepare_precheckout_form(data)}
+  end
+end

data/app/helpers/espago/secure_web_page_helper.rb

@@ -0,0 +1,5 @@
+module Espago::SecureWebPageHelper
+  def espago_secure_web_page_form(data)
+    render :partial => 'espago_secure_web_page/form', :locals => { :data => Espago::SecureWebPage.prepare_form(data)}
+  end
+end

data/app/views/espago_masterpass/_masterpass_button.html.haml

@@ -0,0 +1,20 @@
+= form_tag '',authenticity_token: false, id: :masterpass_espago_form do
+  = hidden_field_tag 'masterpass_action', data[:masterpass_action]
+  = hidden_field_tag 'app_id', data[:app_id]
+  = hidden_field_tag 'session_id', data[:session_id]
+  = hidden_field_tag 'amount', data[:amount]
+  = hidden_field_tag 'currency', data[:currency]
+  = hidden_field_tag 'description', data[:description]
+  = hidden_field_tag 'api_version', data[:api_version]
+  = hidden_field_tag 'checksum',  data[:checksum]
+  - data[:shopping_cart_items].each_with_index do |shopping_cart_item,index|
+    = hidden_field_tag "shopping_cart_items[#{index}][description]",  shopping_cart_item[:description]
+    = hidden_field_tag "shopping_cart_items[#{index}][quantity]",  shopping_cart_item[:quantity]
+    = hidden_field_tag "shopping_cart_items[#{index}][value]",  shopping_cart_item[:value]
+    = hidden_field_tag "shopping_cart_items[#{index}][image_url]",  shopping_cart_item[:image_url]
+
+  .button
+    = button_tag( t("activerecord.models.espago.masterpass.buy"), style:'float:left')
+    #espagoloading{style:"display:none;float:left"}
+      %img{src:'https://sandbox.masterpass.com/lightbox/version90/Switch/assets/img/spinner.gif', style:'margin-left:10px;width:30px'}
+

data/app/views/espago_masterpass/_masterpass_pairing_button.html.haml

@@ -0,0 +1,11 @@
+= form_tag '',authenticity_token: false, id: :masterpass_espago_form do
+  = hidden_field_tag 'masterpass_action', data[:masterpass_action]
+  = hidden_field_tag 'app_id', data[:app_id]
+  = hidden_field_tag 'session_id', data[:session_id]
+  = hidden_field_tag 'user_id', data[:user_id]
+  = hidden_field_tag 'api_version', data[:api_version]
+  = hidden_field_tag 'checksum',  data[:checksum]
+  .button
+    = button_tag( t("activerecord.models.espago.masterpass.pairing"), style:'float:left')
+    #espagoloading{style:"display:none;float:left"}
+      %img{src:'https://sandbox.masterpass.com/lightbox/version90/Switch/assets/img/spinner.gif', style:'margin-left:10px;width:30px'}

data/app/views/espago_masterpass/_masterpass_precheckout_button.html.haml

@@ -0,0 +1,21 @@
+= form_tag '',authenticity_token: false, id: :masterpass_espago_form do
+  = hidden_field_tag 'masterpass_action', data[:masterpass_action]
+  = hidden_field_tag 'client_id', data[:client_id]
+  = hidden_field_tag 'app_id', data[:app_id]
+  = hidden_field_tag 'session_id', data[:session_id]
+  = hidden_field_tag 'amount', data[:amount]
+  = hidden_field_tag 'currency', data[:currency]
+  = hidden_field_tag 'description', data[:description]
+  = hidden_field_tag 'api_version', data[:api_version]
+  = hidden_field_tag 'checksum',  data[:checksum]
+  - data[:shopping_cart_items].each_with_index do |shopping_cart_item,index|
+    = hidden_field_tag "shopping_cart_items[#{index}][description]",  shopping_cart_item[:description]
+    = hidden_field_tag "shopping_cart_items[#{index}][quantity]",  shopping_cart_item[:quantity]
+    = hidden_field_tag "shopping_cart_items[#{index}][value]",  shopping_cart_item[:value]
+    = hidden_field_tag "shopping_cart_items[#{index}][image_url]",  shopping_cart_item[:image_url]
+
+  / .button
+  /   = button_tag( t("activerecord.models.espago.masterpass.buy"), style:'float:left')
+  #espagoloading{style:"display:none;float:left"}
+    %img{src:'https://sandbox.masterpass.com/lightbox/version90/Switch/assets/img/spinner.gif', style:'margin-left:10px;width:30px'}
+

data/app/views/espago_secure_web_page/_form.html.haml

@@ -0,0 +1,25 @@
+= form_tag Espago::SecureWebPage.form_post, authenticity_token: false, id: :espago_secure_web_page do
+  = hidden_field_tag 'api_version', data[:api_version]
+  = hidden_field_tag 'app_id', data[:app_id]
+  = hidden_field_tag 'kind', data[:kind]
+  
+  = hidden_field_tag 'session_id', data[:session_id]
+  = hidden_field_tag 'amount', data[:amount]
+  = hidden_field_tag 'currency', data[:currency]
+  = hidden_field_tag 'title', data[:title]
+
+  = hidden_field_tag 'description', data[:description]
+  = hidden_field_tag 'email', data[:email]
+  = hidden_field_tag 'positive_url', data[:positive_url]
+  = hidden_field_tag 'negative_url', data[:negative_url]
+  
+  = hidden_field_tag 'ts',  data[:ts]
+  = hidden_field_tag 'checksum',  data[:checksum]
+  - data[:shopping_cart_items].each_with_index do |shopping_cart_item,index|
+    = hidden_field_tag "shopping_cart_items[#{index}][description]",  shopping_cart_item[:description]
+    = hidden_field_tag "shopping_cart_items[#{index}][quantity]",  shopping_cart_item[:quantity]
+    = hidden_field_tag "shopping_cart_items[#{index}][value]",  shopping_cart_item[:value]
+    = hidden_field_tag "shopping_cart_items[#{index}][image_url]",  shopping_cart_item[:image_url]
+
+  .button
+    = button_tag( t("activerecord.models.espago.secure_web_page.buy"), style:'float:left')

data/espago.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "faraday"
   gem.add_dependency "facets"
+  gem.add_dependency "rails"
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "pry"

data/lib/espago.rb

@@ -2,6 +2,9 @@ require "espago/version"
 require "espago/client"
 require "espago/router"
 require "espago/back_request"
+require "espago/masterpass"
+require "espago/secure_web_page"
+require "espago/engine"
 require 'forwardable'
 
 module Espago
@@ -9,8 +12,8 @@ module Espago
   class << self
     extend Forwardable
 
-    def_delegators :default_client, :public_key, :app_id, :app_password, :api_version, :send_request, :production
-    def_delegators :default_client, :public_key= , :app_id= , :app_password=, :api_version=, :production=
+    def_delegators :default_client, :public_key, :app_id, :app_password, :api_version, :send_request, :production, :checksum_key
+    def_delegators :default_client, :public_key= , :app_id= , :app_password=, :api_version=, :production=,:checksum_key=
 
     def method_missing(method, *args, &block)
       if Router.new(method, args[0]).path_exists?
@@ -20,6 +23,10 @@ module Espago
       end
     end
 
+    def self.setup
+      yield self
+    end
+
     private
     def default_client
       @default_client ||= Espago::Client.new

data/lib/espago/api_connection/dcc_decision_post.rb

@@ -0,0 +1,9 @@
+module Espago
+  class ApiConnection
+    class DccDecisionPost < Api
+      def request(params = {})
+        @connection.post "charges/#{params[:charge_id]}/dcc_decision", params
+      end
+    end
+  end
+end

data/lib/espago/api_connection/masterpass_post.rb

@@ -0,0 +1,9 @@
+module Espago
+  class ApiConnection
+    class MasterpassPost < ApiPost
+      def request(params = {})
+        super("masterpass", params)
+      end
+    end
+  end
+end

data/lib/espago/client.rb

@@ -3,18 +3,24 @@ require "espago/response"
 
 module Espago
   class Client
-    attr_accessor :public_key, :app_id, :app_password, :api_version, :production
+    attr_accessor :public_key, :app_id, :app_password, :api_version, :production, :checksum_key
     NotAuthenticated = Class.new(StandardError)
 
     def initialize(options = {})
-      @public_key, @app_id, @app_password, @api_version = options.values_at( :public_key, :app_id, :app_password, :api_version)
+      @public_key, @app_id, @app_password, @api_version, @checksum_key = options.values_at( :public_key, :app_id, :app_password, :api_version, :checksum_key)
       @connection = options[:connection] || ApiConnection
     end
 
     def send_request(path, method, params = {})
-      raise NotAuthenticated unless valid?
-      connection = @connection.new(enviroment,api_version_header)
-      connection.authenticate(@app_id, @app_password)
+      
+      app_id = params[:app_id].present? ?  params.delete(:app_id) : @app_id
+      app_password = params[:app_password].present? ? params.delete(:app_password) : @app_password 
+      production_param = !params[:production].nil? ? params.delete(:production) : production 
+      
+      raise NotAuthenticated unless valid?(app_id, app_password)
+      
+      connection = @connection.new(enviroment(production_param),api_version_header)
+      connection.authenticate(app_id, app_password)
       connection.create(path, method, params)
     end
 
@@ -23,21 +29,21 @@ module Espago
     end
 
     private
-    def enviroment
-      production ? "https://secure.espago.com/api" : "https://sandbox.espago.com/api"
+    def enviroment(production_param)
+      # "http://127.0.0.1:3007/api"
+      production_param ? "https://secure.espago.com/api" : "https://sandbox.espago.com/api"
     end
 
     def api_version_header
-      if @api_version.to_s == '3'
+      if @api_version.to_f.to_s == '3.0'
         {'Accept' => "application/vnd.espago.v3+json"}
       else
         {'Accept' => "application/vnd.espago.v2+json"}
       end
     end
 
-
-    def valid?
-      @app_id && @app_password
+    def valid?(app_id, app_password)
+      app_id && app_password
     end
   end
 end

data/lib/espago/engine.rb

@@ -0,0 +1,5 @@
+require 'rails'
+module Espago
+  class Engine < Rails::Engine
+  end
+end

data/lib/espago/masterpass.rb

@@ -0,0 +1,52 @@
+module Espago
+  class Masterpass
+    def self.friendly_token
+      SecureRandom.base64(15).tr('+/=lIO0', 'aqrsxyz')
+    end
+
+    def self.calculate(string)
+      Digest::MD5.hexdigest(string)
+    end
+
+    def self.calculate_checksum(app_id, session_id, amount, currency, checksum_key)
+      calculate [app_id.to_s, session_id.to_s, amount.to_s, currency.to_s, checksum_key.to_s].join('|')
+    end
+
+    def self.calculate_checksum_pairing(app_id, session_id, user_id, checksum_key)
+      calculate [app_id.to_s, session_id.to_s, user_id.to_s, checksum_key.to_s].join('|')
+    end
+
+    def self.masterpass_post(api_v=nil)
+    end
+
+    def self.make_currency(data_currency)
+      (data_currency || Espago.currency).upcase
+    end
+
+    def self.prepare_form(data)
+      data[:masterpass_action] ||=  'checkout'
+      data[:app_id] ||=  Espago.app_id
+      data[:api_version] ||= Espago.api_version
+      data[:amount] = format('%.2f', data[:amount])
+      data[:checksum] = calculate_checksum(data[:app_id],data[:session_id],data[:amount],data[:currency],data[:checksum_key]|| Espago.checksum_key)
+      data
+    end
+
+    def self.prepare_pairing_form(data)
+      data[:masterpass_action] ||=  'pairing'
+      data[:app_id] ||=  Espago.app_id
+      data[:api_version] ||= Espago.api_version
+      data[:checksum] = calculate_checksum_pairing(data[:app_id],data[:session_id],data[:user_id],data[:checksum_key]|| Espago.checksum_key)
+      data
+    end
+    def self.prepare_precheckout_form(data)
+      data[:masterpass_action] ||=  'precheckout'
+      data[:app_id] ||=  Espago.app_id
+      data[:api_version] ||= Espago.api_version
+      data[:amount] = format('%.2f', data[:amount])
+      data[:checksum] = calculate_checksum(data[:app_id],data[:session_id],data[:amount],data[:currency],data[:checksum_key]|| Espago.checksum_key)
+      data
+    end
+
+  end
+end

data/lib/espago/secure_web_page.rb

@@ -0,0 +1,28 @@
+require "forwardable"
+module Espago
+  class SecureWebPage
+    attr_accessor :production
+
+    def self.calculate_checksum(app_id, kind, session_id,amount,currency,ts,checksum_key)
+      Digest::MD5.hexdigest(
+        [app_id.to_s, kind, session_id.to_s, amount.to_s, currency.to_s, ts.to_s, checksum_key.to_s].join('|')
+      )
+    end
+
+    def self.form_post(api_v=nil)
+      Espago.production ? "https://secure.espago.com/secure_web_page" : "https://sandbox.espago.com/secure_web_page"
+    end
+
+    def self.prepare_form(data)
+      data[:kind] ||=  'sale'
+      data[:ts] ||=  Time.now.to_i
+      data[:app_id] ||=  Espago.app_id
+      data[:api_version] ||= Espago.api_version
+      data[:amount] = format('%.2f', data[:amount])
+      data[:checksum] = calculate_checksum(data[:app_id],data[:kind],data[:session_id],data[:amount],data[:currency],data[:ts],data[:checksum_key]|| Espago.checksum_key)
+      data
+    end
+
+
+  end
+end

data/lib/espago/version.rb

@@ -1,3 +1,3 @@
 module Espago
-  VERSION = "0.1.2"
+  VERSION = "0.1.8"
 end

data/lib/generators/espago/install_generator.rb

@@ -0,0 +1,20 @@
+require 'securerandom'
+
+module Espago
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      desc "Creates a Espago initializer"
+
+      def copy_initializer
+        template "espago.rb", "config/initializers/espago.rb"
+      end
+
+      def show_readme
+        readme "README" if behavior == :invoke
+      end
+
+    end
+  end
+end

data/lib/generators/espago/templates/README

@@ -0,0 +1,10 @@
+===============================================================================
+
+You need to do some manual setup to get Espago working:
+
+1.  Review settings in new config/initializers/espago.rb and update where
+    neccessary.
+
+2.  Restart app
+
+===============================================================================

data/lib/generators/espago/templates/espago.rb

@@ -0,0 +1,6 @@
+Espago.app_id = espago_app_id
+Espago.app_password = espago_app_password
+Espago.public_key = espago_public_key
+Espago.production = espago_production
+Espago.api_version = espago_api_version
+Espago.checksum_key = espago_checksum_key

data/spec/espago/client_spec.rb

@@ -38,6 +38,18 @@ describe Espago::Client do
     end
   end
 
+  context "#send_request_with_app_id_and_password" do
+    subject { Espago::Client.new(connection: stubbed_api_connection, api_version: 2) }
+    let(:method) { :get }
+    let(:path) { :new_client }
+    let(:params) { { name: "Jan Kowalski", app_id: 'app_id_test', app_password: 'secret'} }
+
+    it "should create an api request" do
+      subject.send_request(path, method, params).should eq('returned api data')
+    end
+
+  end
+
   context "#parse_response" do
     subject { Espago::Client.new }
 

data/spec/features/charges_spec_with_params_spec.rb

@@ -0,0 +1,89 @@
+
+require "spec_helper"
+
+describe 'Espago.charges_with_params' do
+  
+  before :each do
+      Espago.app_id = ''
+      Espago.app_password = ''
+      Espago.public_key = ''
+      Espago.production = true
+  end
+  
+  it "should get list of charges" do
+    VCR.use_cassette('charges get') do
+      response = Espago.charges :get,{app_id: 'app_id_test', app_password: 'app_password_test', production: false}
+      response.count.should eq(589)
+    end
+  end
+
+  it "should get info abount charges" do
+    VCR.use_cassette('charges get pay_mTOngouLTJWZ0w') do
+      response = Espago.charges :get,{charge_id:'pay_mTOngouLTJWZ0w', app_id: 'app_id_test', app_password: 'app_password_test', production: false}
+      response.status.should eq(200)
+      response.channel.should eq('elavon')
+      response.state.should eq('executed')
+      response.currency.should eq('PLN')
+      response.description.should eq('Test12345')
+      response.client.should eq('cli_YM5tKz6-IfhN7T')
+      response.created_at.should eq Time.at(1416917311)
+    end
+  end
+
+  it "should get params from new charge" do
+    VCR.use_cassette('charges post') do
+      response = Espago.charges :post, { 
+                                         app_id: 'app_id_test',
+                                         app_password: 'app_password_test',
+                                         production: false,
+                                         amount:'49.99',
+                                         currency:'PLN',
+                                         description:'Test12345',
+                                         card: {
+                                           first_name: 'Jan',
+                                           last_name: 'Kowalski',
+                                           number: '4242424242424242',
+                                           verification_value: '123',
+                                           year:'2015',
+                                           month:'2'
+                                         },
+                                         }
+      response.status.should eq(201)
+      response.channel.should eq('elavon')
+      response.state.should eq('executed')
+      response.currency.should eq('PLN')
+      response.description.should eq('Test12345')
+      response.client.should eq('cli_YM5tKz6-IfhN7T')
+      response.created_at.should eq Time.at(1416917311)
+    end
+  end
+
+  it "should get 204 status after destroy charge" do
+    VCR.use_cassette('charges destroy') do
+      response = Espago.charges :delete,{charge_id:'pay_kQmS_3RTfm4eix', app_id: 'app_id_test', app_password: 'app_password_test', production: false}
+      response.state.should eq('reversed')
+    end
+  end
+
+  it "should get refunded status after refund charge" do
+    VCR.use_cassette('charges refund') do
+      response = Espago.charges_refund :post,{charge_id:'pay_lQGyIon5qG59O5', app_id: 'app_id_test', app_password: 'app_password_test', production: false}
+      response.state.should eq('refunded')
+    end
+  end
+
+  it "should get params from complete charge" do
+    VCR.use_cassette('charges complete') do
+      response = Espago.charges_complete :post,{charge_id:'pay_kQmS_3RTfm4eix', app_id: 'app_id_test', app_password: 'app_password_test', production: false}
+      response.state.should eq('executed')
+    end
+  end
+
+  it "should get params from complete charge (deprecated)" do
+    VCR.use_cassette('charges complete deprecation') do
+      response = Espago.complete :post,{charge_id:'pay_Wmu3hmXJIG4jsg', app_id: 'app_id_test', app_password: 'app_password_test', production: false}
+      response.state.should eq('executed')
+    end
+  end
+
+end

data/spec/features/dcc_decision_spec.rb

@@ -0,0 +1,20 @@
+
+require "spec_helper"
+
+describe 'Espago.dcc_decision' do
+
+  it "should get params from new charge" do
+    VCR.use_cassette('dcc_decision post') do
+      response = Espago.dcc_decision :post, {charge_id:'pay_mTOngouLTJWZ0w', decision:'Y'}
+      response.status.should eq(201)
+      response.channel.should eq('elavon')
+      response.state.should eq('executed')
+      response.currency.should eq('PLN')
+      response.description.should eq('Test12345')
+      response.client.should eq('cli_YM5tKz6-IfhN7T')
+      response.created_at.should eq Time.at(1416917311)
+    end
+  end
+
+
+end

data/spec/fixtures/cassettes/dcc_decision_post.yml

@@ -0,0 +1,48 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://app_id_test:app_password_test@sandbox.espago.com/api/charges/pay_mTOngouLTJWZ0w/dcc_decision
+    body:
+      encoding: US-ASCII
+      string: decision=Y
+    headers:
+      Accept:
+      - application/vnd.espago.v2+json
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Meta-Request-Version:
+      - 0.2.2
+      X-Ua-Compatible:
+      - IE=Edge
+      Etag:
+      - '"972a1a29ea0e1d4a67e169d8b84b506a"'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Set-Cookie:
+      - _session_id=d98575dab0f9a2cbdc9c8c91fab16247; path=/; HttpOnly
+      X-Request-Id:
+      - 2f00526303e5645e1c0a69f02d9a0afb
+      X-Runtime:
+      - '1.214083'
+      Connection:
+      - close
+      Server:
+      - thin 1.5.0 codename Knife
+    body:
+      encoding: UTF-8
+      string: '{"id":"pay_mTOngouLTJWZ0w","description":"Test12345","channel":"elavon","amount":"49.99","currency":"PLN","state":"executed","client":"cli_YM5tKz6-IfhN7T","created_at":1416917311,"card":{"company":"VI","last4":"4242","year":2015,"month":2,"first_name":"Jan","last_name":"Kowalski","authorized":null,"created_at":1416917311},"issuer_response_code":"00","reversable":true,"transaction_id":"tn_5puLXUWDf"}'
+    http_version:
+  recorded_at: Tue, 25 Nov 2014 12:08:32 GMT
+recorded_with: VCR 2.9.3

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@
 require 'simplecov'
 SimpleCov.start
 
+
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: espago
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.8
 platform: ruby
 authors:
 - Piotrek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -40,6 +40,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +209,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/helpers/espago/masterpass_helper.rb
+- app/helpers/espago/secure_web_page_helper.rb
+- app/views/espago_masterpass/_masterpass_button.html.haml
+- app/views/espago_masterpass/_masterpass_pairing_button.html.haml
+- app/views/espago_masterpass/_masterpass_precheckout_button.html.haml
+- app/views/espago_secure_web_page/_form.html.haml
 - espago.gemspec
 - lib/espago.rb
 - lib/espago/api_connection.rb
@@ -216,11 +236,13 @@ files:
 - lib/espago/api_connection/clients_put.rb
 - lib/espago/api_connection/clients_subscriptions_get.rb
 - lib/espago/api_connection/complete_post.rb
+- lib/espago/api_connection/dcc_decision_post.rb
 - lib/espago/api_connection/invoice_items_delete.rb
 - lib/espago/api_connection/invoice_items_get.rb
 - lib/espago/api_connection/invoice_items_post.rb
 - lib/espago/api_connection/invoices_get.rb
 - lib/espago/api_connection/line_items_get.rb
+- lib/espago/api_connection/masterpass_post.rb
 - lib/espago/api_connection/plans_delete.rb
 - lib/espago/api_connection/plans_get.rb
 - lib/espago/api_connection/plans_post.rb
@@ -232,13 +254,19 @@ files:
 - lib/espago/api_connection/tokens_post.rb
 - lib/espago/back_request.rb
 - lib/espago/client.rb
+- lib/espago/engine.rb
 - lib/espago/error.rb
 - lib/espago/error/api_error.rb
 - lib/espago/error/authentication_error.rb
 - lib/espago/error/invalid_request_error.rb
+- lib/espago/masterpass.rb
 - lib/espago/response.rb
 - lib/espago/router.rb
+- lib/espago/secure_web_page.rb
 - lib/espago/version.rb
+- lib/generators/espago/install_generator.rb
+- lib/generators/espago/templates/README
+- lib/generators/espago/templates/espago.rb
 - spec/espago/api_connection_spec.rb
 - spec/espago/back_request_spec.rb
 - spec/espago/client_spec.rb
@@ -247,7 +275,9 @@ files:
 - spec/espago/router_spec.rb
 - spec/features/apis_spec.rb
 - spec/features/charges_spec.rb
+- spec/features/charges_spec_with_params_spec.rb
 - spec/features/clients_spec.rb
+- spec/features/dcc_decision_spec.rb
 - spec/features/error_spec.rb
 - spec/features/invoice_items_spec.rb
 - spec/features/invoices_spec.rb
@@ -272,6 +302,7 @@ files:
 - spec/fixtures/cassettes/clients_post.yml
 - spec/fixtures/cassettes/clients_put.yml
 - spec/fixtures/cassettes/clients_subscriptions.yml
+- spec/fixtures/cassettes/dcc_decision_post.yml
 - spec/fixtures/cassettes/error_400.yml
 - spec/fixtures/cassettes/error_401.yml
 - spec/fixtures/cassettes/error_500.yml
@@ -313,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Espago api wrapper
@@ -326,7 +357,9 @@ test_files:
 - spec/espago/router_spec.rb
 - spec/features/apis_spec.rb
 - spec/features/charges_spec.rb
+- spec/features/charges_spec_with_params_spec.rb
 - spec/features/clients_spec.rb
+- spec/features/dcc_decision_spec.rb
 - spec/features/error_spec.rb
 - spec/features/invoice_items_spec.rb
 - spec/features/invoices_spec.rb
@@ -351,6 +384,7 @@ test_files:
 - spec/fixtures/cassettes/clients_post.yml
 - spec/fixtures/cassettes/clients_put.yml
 - spec/fixtures/cassettes/clients_subscriptions.yml
+- spec/fixtures/cassettes/dcc_decision_post.yml
 - spec/fixtures/cassettes/error_400.yml
 - spec/fixtures/cassettes/error_401.yml
 - spec/fixtures/cassettes/error_500.yml