openpay 1.0.7 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 69310039f78e74baefd2e96785c830f19f2902f3
-  data.tar.gz: e71006cf6228aafdd92a95bf7f86bb28763c1e75
+SHA256:
+  metadata.gz: 908d4735c18ecdeb9521040c4fc9b19189539d21fd16709deafd67459725d0d5
+  data.tar.gz: 9c04f62e083ead6ea73e269529c496dfa347c633d8217a8665f4e9618e986402
 SHA512:
-  metadata.gz: 3a917c8bdf259cf8580cf3538925948cddbd7e0f6550b833a2e24d6fde96680b29bb1ac4ccc04561b654d76f8f4ebbef19745cd898697d5806ea5be243aa50a9
-  data.tar.gz: 6d433a86393555430d727393fb8581d96041cb3e8fd65db2891a38edc3e2bae44734a89c107ef2b5f87d41e5025ed129b1ccdb1acd65122a1fcaac91b95b3163
+  metadata.gz: 1edc635785a82ecdd9e3746943063151a1c204a1f10d120feb4544ff3f47098581a734bc820a926b29356166c52888c2a6333451676d28957c2079430d6ebdad
+  data.tar.gz: 9726aeeb22f7b637728ce9c14bb2ce806335dafb72eb49d46fb513b5b9bb2720eca7a34150de538ec67f5762d7896f1fdc0a9cdb3701e97a28512878ae476e1e

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.project

data/.travis.yml

@@ -1,3 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.4.2
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'

data/Gemfile

@@ -2,8 +2,8 @@ source 'https://rubygems.org'
 
 gem 'rspec'
 gem 'rspec-expectations'
-gem 'rest-client',  '~>1.6.7'
-gem 'factory_girl' ,  '4.2.0'
+gem 'factory_bot', '4.8.2'
+gem 'rest-client', '~> 2.0', '>= 2.0.2'
 
 # Specify your gem's dependencies in Openpay.gemspec
 gemspec

data/README.md

@@ -1,12 +1,12 @@
-<img src="http://www.openpay.mx/img/logo.png">
+![Openpay Ruby](http://www.openpay.mx/img/github/ruby.jpg)
 
-# Openpay-Ruby [![Build Status](https://travis-ci.org/open-pay/openpay-ruby.png?branch=master)](https://travis-ci.org/open-pay/openpay-ruby)
+[![Build Status](https://travis-ci.org/open-pay/openpay-ruby.png?branch=master)](https://travis-ci.org/open-pay/openpay-ruby)
 
 [![Gem Version](https://badge.fury.io/rb/openpay.svg)](http://badge.fury.io/rb/openpay)
 
-##Description
+## Description
 
-ruby client for *Openpay api* services (version 1.0.7)
+ruby client for *Openpay api* services (version 2.0)
 
 This is a ruby client implementing the payment services for *Openpay* at openpay.mx
 
@@ -31,9 +31,9 @@ Or install it from the command line:
 
     $ gem install openpay
 
-###Requirements
+### Requirements
 
-    * ruby 1.9 or higher
+    * ruby 2.4 or higher
 
 ## Usage
 
@@ -135,15 +135,15 @@ Methods without inputs will return a ruby hash.
 ```ruby
 it 'creates a fee using a json message' do
   #create new customer
-  customer_hash= FactoryGirl.build(:customer)
+  customer_hash= FactoryBot.build(:customer)
   customer=@customers.create(customer_hash)
 
   #create customer card   , using factory girl to build the hash for us
-  card_hash=FactoryGirl.build(:valid_card)
+  card_hash=FactoryBot.build(:valid_card)
   card=@cards.create(card_hash, customer['id'])
 
   #create charge
-  charge_hash=FactoryGirl.build(:card_charge, source_id: card['id'], order_id: card['id'], amount: 4000)
+  charge_hash=FactoryBot.build(:card_charge, source_id: card['id'], order_id: card['id'], amount: 4000)
   charge=@charges.create(charge_hash, customer['id'])
 
   #create customer fee , using json as input, we get json as ouput
@@ -175,14 +175,14 @@ pp card_hash   =>
 :city=>"Queretaro"}}
 ```
 
-Next, how we construct  the preceding hash using **FactoryGirl**.
-**FactoryGirl** was used in our test suite to facilitate hash construction.
+Next, how we construct  the preceding hash using **FactoryBot**.
+**FactoryBot** was used in our test suite to facilitate hash construction.
 It  may help you  as well at your final implementation if you decide to use hashes.
 (more examples at *test/Factories.rb*)
 
 ```ruby
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :valid_card, class:Hash do
         bank_name  'visa'
         holder_name 'Vicente Olmos'
@@ -204,7 +204,7 @@ FactoryGirl.define do
   end
 ```
 
-###Methods design
+### Methods design
 
 This ruby API standardize the method names across all different resources using the **create**,**get**,**update** and **delete** verbs.
 
@@ -213,14 +213,14 @@ For full method documentation take a look at:
 
 The test suite at *test/spec* is a good source of reference.
 
-#####create
+##### create
 
    Creates the given resource
  ```ruby
      open_pay_resource.create(representation,customer_id=nil)
  ```
 
-#####get
+##### get
 
    Gets an instance of a  given resource
 
@@ -228,7 +228,7 @@ The test suite at *test/spec* is a good source of reference.
 open_pay_resource.get(object_id,customer_id=nil)
 ```
 
-#####update
+##### update
 
    Updates an instance of a given resource
 
@@ -236,7 +236,7 @@ open_pay_resource.get(object_id,customer_id=nil)
 open_pay_resource.update(representation,customer_id=nil)
 ```
 
-#####delete
+##### delete
 
   Deletes an instance of the given resource
 
@@ -250,13 +250,13 @@ open_pay_resource.delete(object_id,customer_id=nil)
 open_pay_resource.all(customer_id=nil)
 ```
 
-#####each
+##### each
    Returns a block for each instance resource
 ```ruby
 open_pay_resource.each(customer_id=nil)
  ```
 
-#####delete_all(available only under the development environment)
+##### delete_all(available only under the development environment)
 
    Deletes all instances of the given resource
 
@@ -266,7 +266,7 @@ open_pay_resource.delete_all(customer_id=nil)
 ```
 
 
-###API Methods
+### API Methods
 
 
 #### bank_accounts
@@ -722,7 +722,7 @@ This API generates 3 different Exception classes.
 
 ```ruby
 email='foo'
-customer_hash = FactoryGirl.build(:customer, email: email)
+customer_hash = FactoryBot.build(:customer, email: email)
 begin
     customers.create(customer_hash)
 rescue OpenpayTransactionException => e
@@ -745,7 +745,7 @@ rescue OpenpayApiTransactionError => e
 end
 ```
 
-###These exceptions have the following attributes:
+### These exceptions have the following attributes:
 
 - *category*
 - *description*
@@ -758,17 +758,17 @@ For more information about categories, descriptions and codes take a look at:
 - http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
 
 
-##Debug
+## Debug
 
 In the Openpay dashboard you are able to see every request and its corresponding request/response.
     - https://sandbox-dashboard.openpay.mx
 
-##Developer Notes
+## Developer Notes
 
 - bank accounts for merchant cannot be created using the api. It should be done through the dashboard.
 - Is recommended to reset your account using the dashboard when running serious testing (assure clean state)
 - check openpay_api.rb for Logger configuration
-- travis  https://travis-ci.org/open-pay/openpay-ruby , if a test fails it will leave leave some records, it may affect posterior tests.
+- travis  https://travis-ci.org/open-pay/openpay-ruby , if a test fails it will leave some records, it may affect posterior tests.
    it is recommended to reset the console/account to assure a clean state after a failure occurs.
 
 ## More information

data/Rakefile

@@ -4,8 +4,9 @@
  task :default => [:spec]
 
  desc 'run specifications'
+ 
  RSpec::Core::RakeTask.new do |t|
-   t.pattern = 'test/spec/*'
+   t.pattern = Dir.glob('test/spec/**/*_spec.rb')
  end
 
 

data/lib/openpay.rb

@@ -14,6 +14,8 @@ module Openpay
   require 'openpay/open_pay_resource'
 
   #resource classes
+  require 'openpay/points'
+  require 'openpay/tokens'
   require 'openpay/bankaccounts'
   require 'openpay/cards'
   require 'openpay/charges'
@@ -24,6 +26,7 @@ module Openpay
   require 'openpay/subscriptions'
   require 'openpay/transfers'
   require 'openpay/charges'
+  require 'openpay/webhooks'
 
   #misc
   require 'openpay/utils/search_params'

data/lib/openpay/open_pay_resource.rb

@@ -62,13 +62,17 @@ class OpenPayResource
       terminated = false
     end
 
+    strUrl = url(args, terminated)
+    strUrlAux = delete_ending_slash(strUrl)
+
     LOG.debug("#{resource_name}:")
     LOG.debug("   GET Resource URL:#{url(args, terminated)}")
     res=RestClient::Request.new(
         :method => :get,
-        :url => url(args, terminated),
+        :url => strUrlAux,
         :user => @private_key,
         :timeout => @timeout,
+        :ssl_version => :TLSv1_2,
         :headers => {:accept => :json,
                      :content_type => :json,
                      :user_agent => 'Openpay/v1  Ruby-API',
@@ -92,15 +96,20 @@ class OpenPayResource
 
     @errors=false
 
+    
+    strUrl = url(args)
+    strUrlAux = delete_ending_slash(strUrl)
+
     LOG.debug("#{self.class.name.downcase}:")
-    LOG.debug("    DELETE  URL:#{url(args)}")
+    LOG.debug("    DELETE  URL:#{strUrlAux}")
 
     res=''
     req=RestClient::Request.new(
         :method => :delete,
-        :url => url(args),
+        :url => strUrlAux,
         :user => @private_key,
         :timeout => @timeout,
+        :ssl_version => :TLSv1_2,
         :headers => {:accept => :json,
                      :content_type => :json,
                      :user_agent => 'Openpay/v1  Ruby-API',
@@ -131,18 +140,22 @@ class OpenPayResource
       return_hash=false
     end
 
+    
+    strUrl = url(args)
+    strUrlAux = delete_ending_slash(strUrl)
+
     # LOG.debug("#{self.class.name.downcase}:")
-     LOG.debug "   POST URL:#{url(args)}"
+     LOG.debug "   POST URL:#{strUrlAux}"
      LOG.debug "   json: #{json}"
 
     begin
-
       #request
       res= RestClient::Request.new(
           :method => :post,
-          :url => url(args),
+          :url => strUrlAux,
           :user => @private_key,
           :timeout => @timeout,
+          :ssl_version => :TLSv1_2,
           :payload => json,
           :headers => {:accept => :json,
                        :content_type => :json,
@@ -178,15 +191,19 @@ class OpenPayResource
       return_hash=false
     end
 
-    LOG.info "PUT URL:#{url}"
+    strUrl = url(args)
+    strUrlAux = delete_ending_slash(strUrl)
+
+    LOG.info "PUT URL:#{strUrlAux}"
     #LOG.info "   json: #{json}"
 
-    begin
+    begin 
       res= RestClient::Request.new(
           :method => :put,
-          :url => url(args),
+          :url => strUrlAux,
           :user => @private_key,
           :timeout => @timeout,
+          :ssl_version => :TLSv1_2,
           :payload => json,
           :headers => {:accept => :json,
                        :content_type => :json,
@@ -223,6 +240,9 @@ class OpenPayResource
   private
 
   def url(args = '', terminated = true)
+    if args.nil? || args.empty?
+      terminated = false
+    end
     termination = terminated ? '/' : ''
     @base_url + "#{@merchant_id}/" + resource_name + termination + args
   end
@@ -231,6 +251,17 @@ class OpenPayResource
     self.class.name.to_s.downcase
   end
 
+  def delete_ending_slash(url)
+    slash = '/'
+    strUrl = url
+    strUrlAux = url
+    ending = strUrl.to_s[-1,1]
+    if ending == slash
+      strUrlAux = strUrl.to_s[0,strUrl.length - 1]
+    end
+    strUrlAux
+  end
+
   def is_filter_string?(args)
     is_filter = false
     if args =~ /^\?/

data/lib/openpay/points.rb

@@ -0,0 +1,10 @@
+require 'open_pay_resource'
+
+class Points < OpenPayResource
+
+   def getPointsBalance(token_id)
+         tokens=@api_hook.create(:tokens)
+         tokens.getPoints(token_id)
+   end
+
+end

data/lib/openpay/tokens.rb

@@ -0,0 +1,7 @@
+require 'open_pay_resource'
+
+class Tokens < OpenPayResource
+  def getPoints(token_id)
+    get("#{token_id}/points")
+  end
+end

data/lib/openpay/utils/search_params.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'cgi'
 module OpenpayUtils
 
   class SearchParams < OpenStruct
@@ -8,7 +9,9 @@ module OpenpayUtils
       filter = '?'
       self.marshal_dump.each do |attribute, value|
         if attribute =~ /(\w+)_(gte|lte)/
-          attribute = "#{$1}[#{$2}]"
+          square_bracket_open_encode = CGI.escape('[')
+          square_bracket_close_encode = CGI.escape(']')
+          attribute = "#{$1}#{square_bracket_open_encode}#{$2}#{square_bracket_close_encode}"
         end
         filter << "#{attribute}=#{value}&"
       end

data/lib/openpay/webhooks.rb

@@ -0,0 +1,9 @@
+require 'open_pay_resource'
+
+class Webhooks < OpenPayResource
+  
+  def verify(webhook_id, code)
+   post('', "#{webhook_id}/verify/#{code}")
+  end
+  
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Openpay
-  VERSION = '1.0.7'
+  VERSION = '2.0.1'
 end

data/openpay.gemspec

@@ -7,20 +7,20 @@ require 'version'
 Gem::Specification.new do |spec|
   spec.name          = "openpay"
   spec.version       = Openpay::VERSION
-  spec.authors       = ["ronnie_bermejo"]
-  spec.email         =  ["ronnie.bermejo.mx@gmail.com"]
-  spec.description   = %q{ruby client for Openpay API services (version 1.0.5)}
+  spec.authors       = ["Openpay","ronnie_bermejo"]
+  spec.email         =  ["hola@openpay.mx"]
+  spec.description   = %q{ruby client for Openpay API services (version 2.0.1)}
   spec.summary       = %q{ruby api for openpay resources}
   spec.homepage      = "http://openpay.mx/"
-  spec.license       = "Apache"
+  spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec)/})
   spec.require_paths = ['lib','lib/openpay','openpay','.']
 
-  spec.add_runtime_dependency 'rest-client'  , '~>1.6.7'
-  spec.add_runtime_dependency 'json'
+  spec.add_runtime_dependency 'rest-client'  , '~>2.0'
+  spec.add_runtime_dependency 'json', '>= 1.8'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/test/Factories.rb

@@ -1,12 +1,12 @@
-require 'factory_girl'
+require 'factory_bot'
 
 
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :customer, class: Hash do
-    name 'Ronnie'
-    last_name 'Bermejo'
-    email 'ronnie.bermejo.mx@gmail.com'
+    name 'Guadalupe'
+    last_name 'Reyes'
+    email 'lupereyes@lemail.com'
     phone_number '0180012345'
     address { {
         postal_code: '76190',
@@ -28,7 +28,7 @@ FactoryGirl.define do
     holder_name 'Vicente Olmos'
     expiration_month '09'
     card_number '4111111111111111'
-    expiration_year '14'
+    expiration_year '25'
     bank_code 'bmx'
     cvv2 '111'
     address { {
@@ -45,13 +45,13 @@ FactoryGirl.define do
 
   end
 
-  factory :valid_card2, class: Hash do
+   factory :valid_card2, class: Hash do
 
     bank_name 'visa'
     holder_name 'Alma Olmos'
     expiration_month '09'
     card_number '4242424242424242'
-    expiration_year '14'
+    expiration_year '22'
     bank_code 'bmx'
     cvv2 '111'
     address { {
@@ -68,13 +68,13 @@ FactoryGirl.define do
 
   end
 
-  factory :only_deposit, class: Hash do
+    factory :only_deposit, class: Hash do
 
     bank_name 'visa'
     holder_name 'Alma Olmos'
     expiration_month '09'
     card_number '4444444444444448'
-    expiration_year '14'
+    expiration_year '20'
     bank_code 'bmx'
     cvv2 '111'
     address { {
@@ -97,7 +97,7 @@ FactoryGirl.define do
     holder_name 'Vicente Olmos'
     expiration_month '09'
     card_number '4000000000000069'
-    expiration_year '14'
+    expiration_year '21'
     bank_code 'bmx'
     cvv2 '111'
     address { {
@@ -114,6 +114,7 @@ FactoryGirl.define do
 
   end
 
+ 
   factory :bank_account, class: Hash do
 
     holder_name 'Juan Perez'
@@ -129,19 +130,20 @@ FactoryGirl.define do
     amount "1000"
     description "Cargo inicial a tarjeta"
     source_id "string"
-    method "card"
+    add_attribute :method, "card"
     order_id 'required'
 
     initialize_with { attributes }
 
   end
+  
 
   factory :bank_charge, class: Hash do
 
     amount "10000"
     description "Cargo con banco"
     order_id 'required'
-    method "bank_account"
+    add_attribute :method, "bank_account"
 
     initialize_with { attributes }
 
@@ -162,7 +164,7 @@ FactoryGirl.define do
 
   factory :payout_card, class: Hash do
 
-    method 'card'
+    add_attribute :method, 'card'
     destination_id '4444444444444448'
     amount '2'
     description 'Retiro de saldo semanal'
@@ -173,7 +175,7 @@ FactoryGirl.define do
 
   factory :payout_bank_account, class: Hash do
 
-    method 'bank_account'
+    add_attribute :method, 'bank_account'
     amount '1000'
     destination_id 'required'
     description 'Retiro de saldo semanal'
@@ -187,7 +189,7 @@ FactoryGirl.define do
     amount '150.00'
     status_after_retry 'cancelled'
     retry_times 2
-    name 'Curso de ingles'
+    add_attribute :name ,'TODO INCLUIDO'
     repeat_unit 'week'
     trial_days 30
     repeat_every 1
@@ -208,5 +210,17 @@ FactoryGirl.define do
     plan_id 'required'
     initialize_with { attributes }
   end
+  
+  factory :webhook1, class: Hash do
+    url 'https://requestb.in/15r2d5n1'
+    event_types ['charge.succeeded','charge.created','charge.cancelled','charge.failed']
+    initialize_with { attributes }
+  end
+
+  factory :webhook2, class: Hash do
+    url 'https://requestb.in/s3pj3ds3'
+    event_types ['charge.succeeded','charge.created','charge.cancelled','charge.failed']
+    initialize_with { attributes }
+  end
 
 end