openpay 1.0.3 → 1.0.4

data/lib/openpay/charges.rb

@@ -11,36 +11,53 @@ class Charges < OpenPayResource
     end
   end
 
-
-  def cancel(transaction_id,customer_id=nil)
+  def cancel(transaction_id, customer_id=nil)
     if customer_id
       customers=@api_hook.create(:customers)
       customers.cancel_charge(customer_id, transaction_id)
     else
-         post('', transaction_id+'/cancel')
-     end
+      post('', transaction_id+'/cancel')
+    end
   end
 
-
-  def refund(transaction_id,description,customer_id=nil)
+  def refund(transaction_id, description, customer_id=nil)
     if customer_id
       customers=@api_hook.create(:customers)
-      customers.refund_charge(customer_id,transaction_id,description)
+      customers.refund_charge(customer_id, transaction_id, description)
     else
       post(description, transaction_id+'/refund')
     end
   end
 
-
-  def capture(transaction_id,customer_id=nil)
+  def capture(transaction_id, customer_id=nil)
     if customer_id
       customers=@api_hook.create(:customers)
-      customers.capture_charge(customer_id,transaction_id )
+      customers.capture_charge(customer_id, transaction_id)
     else
-      post( '',transaction_id+'/capture')
+      post('', transaction_id+'/capture')
     end
   end
 
+  def confirm_capture(options)
+
+    customer_id = options.fetch(:customer_id) { '' }
+    transaction_id = options.fetch(:transaction_id)
+    amount = options.fetch(:amount)
+
+    if amount.nil? or transaction_id.nil?
+      raise OpenpayException.new
+    end
+
+    amount_hash = { amount: amount }
+
+    unless customer_id.empty?
+      customers=@api_hook.create(:customers)
+      customers.confirm_customer_capture(customer_id, transaction_id, amount_hash)
+    else
+      post(amount_hash, transaction_id+'/capture')
+    end
+
+  end
 
   def each(customer_id=nil)
     if customer_id
@@ -54,8 +71,6 @@ class Charges < OpenPayResource
     end
   end
 
-
-
   def get(charge='', customer_id=nil)
     if customer_id
       customers=@api_hook.create(:customers)
@@ -74,4 +89,13 @@ class Charges < OpenPayResource
     end
   end
 
-end
+  def list(search_params, customer_id=nil)
+    if customer_id
+      customers=@api_hook.create(:customers)
+      customers.list_charges(customer_id, search_params)
+    else
+      super search_params
+    end
+  end
+
+end

data/lib/openpay/customers.rb

@@ -1,16 +1,13 @@
 require 'open_pay_resource'
 
-
-
 class Customers < OpenPayResource
 
-
   #Bankaccount
-  def create_bank_account(customer,bank_account)
-    create(bank_account,"#{customer}/bankaccounts")
+  def create_bank_account(customer, bank_account)
+    create(bank_account, "#{customer}/bankaccounts")
   end
 
-  def get_bank_account(customer,bank_id)
+  def get_bank_account(customer, bank_id)
     get("#{customer}/bankaccounts/#{bank_id}")
   end
 
@@ -18,89 +15,102 @@ class Customers < OpenPayResource
     get("#{customer}/bankaccounts/")
   end
 
+  def list_bankaccounts(customer, search_params)
+    get("#{customer}/bankaccounts#{search_params.to_s}")
+  end
+
   def each_bank_account(customer)
     get("#{customer}/bankaccounts/").each do |account|
-       yield account
+      yield account
     end
   end
 
-
-  def delete_bank_account(customer,bank_id)
+  def delete_bank_account(customer, bank_id)
     delete("#{customer}/bankaccounts/#{bank_id}")
   end
 
   def delete_all_bank_accounts(customer)
     if env == :production
-      raise OpenpayException.new('This method is not supported on PRODUCTION',false)
+      raise OpenpayException.new('This method is not supported on PRODUCTION', false)
     end
     each_bank_account(customer) do |account|
       delete("#{customer}/bankaccounts/#{account['id']}")
     end
   end
 
-
- #Charges
+  #Charges
   # customers.create_charge(customer_id,charge)
-  def create_charge(customer_id,charge)
-      create(charge,"#{customer_id}/charges")
+  def create_charge(customer_id, charge)
+    create(charge, "#{customer_id}/charges")
   end
 
   #gets a charge_id for a given customer_id
-  def get_charge(customer_id,charge_id)
+  def get_charge(customer_id, charge_id)
     get("#{customer_id}/charges/#{charge_id}")
   end
 
+  def list_charges(customer, search_params)
+    get("#{customer}/charges#{search_params.to_s}")
+  end
+
   #return all charges for the given customer_id
   def all_charges(customer_id)
     get("#{customer_id}/charges/")
   end
 
-  def cancel_charge(customer_id,charge_id)
-    post(charge_id,"#{customer_id}/charges/#{charge_id}/cancel")
+  def cancel_charge(customer_id, charge_id)
+    post(charge_id, "#{customer_id}/charges/#{charge_id}/cancel")
   end
 
-  def refund_charge(customer_id,charge_id,description)
-    post(description,"#{customer_id}/charges/#{charge_id}/refund")
+  def refund_charge(customer_id, charge_id, description)
+    post(description, "#{customer_id}/charges/#{charge_id}/refund")
   end
 
-  def capture_charge(customer_id,charge_id)
-      post('',"#{customer_id}/charges/#{charge_id}/capture")
+  def capture_charge(customer_id, charge_id)
+    post('', "#{customer_id}/charges/#{charge_id}/capture")
   end
 
-
+  def confirm_customer_capture(customer_id, charge_id, amount)
+    post(amount, "#{customer_id}/charges/#{charge_id}/capture")
+  end
 
   #Payouts
-  def create_payout(customer_id,payout)
-    post(payout,"#{customer_id}/payouts")
+  def create_payout(customer_id, payout)
+    post(payout, "#{customer_id}/payouts")
   end
 
   def all_payouts(customer_id)
-   get("#{customer_id}/payouts")
+    get("#{customer_id}/payouts")
   end
 
-  def get_payout(customer_id,payout_id)
+  def get_payout(customer_id, payout_id)
     get("#{customer_id}/payouts/#{payout_id}")
   end
 
   def each_payout(customer_id)
-     all_payouts(customer_id).each do |pay|
-       yield pay
-     end
+    all_payouts(customer_id).each do |pay|
+      yield pay
+    end
   end
 
-
-
+  def list_payouts(customer, search_params)
+    get("#{customer}/payouts#{search_params.to_s}")
+  end
 
   #Transfers
-  def create_transfer(customer_id,transfer)
-    post(transfer,"#{customer_id}/transfers")
+  def create_transfer(customer_id, transfer)
+    post(transfer, "#{customer_id}/transfers")
   end
 
   def all_transfers(customer_id)
     get("#{customer_id}/transfers/")
   end
 
-  def get_transfer(customer_id,transfer_id)
+  def list_transfers(customer, search_params)
+    get("#{customer}/transfers#{search_params.to_s}")
+  end
+
+  def get_transfer(customer_id, transfer_id)
     get("#{customer_id}/transfers/#{transfer_id}")
   end
 
@@ -110,85 +120,81 @@ class Customers < OpenPayResource
     end
   end
 
-
-
-
   #Subscriptions
-  def create_subscription(subscription, plan_id)
-    post(subscription,"#{plan_id}/subscriptions")
+  def create_subscription(subscription, customer_id)
+    #revisar la url
+    post(subscription, "#{customer_id}/subscriptions")
   end
 
-
-  def delete_subscription(customer_id,subscription_id)
+  def delete_subscription(customer_id, subscription_id)
     delete("#{customer_id}/subscriptions/#{subscription_id}")
   end
 
-
-  def get_subscription(customer_id,subscription_id)
+  def get_subscription(customer_id, subscription_id)
     get("#{customer_id}/subscriptions/#{subscription_id}")
   end
 
-
   def all_subscriptions(customer_id)
     get("#{customer_id}/subscriptions/")
   end
 
+  def list_subscriptions(customer, search_params)
+    get("#{customer}/subscriptions#{search_params.to_s}")
+  end
+
   def each_subscription(customer_id)
     all_subscriptions(customer_id).each do |cust|
-        yield cust
+      yield cust
     end
   end
 
+  def update_subscription(subscription, customer, params)
+    put(params, "#{customer}/subscriptions/#{subscription}")
+  end
 
   def delete_all_subscriptions(customer_id)
     if env == :production
-      raise OpenPayError ('This method is not supported on PRODUCTION')
+      raise OpenpayException.new('This method is not supported on PRODUCTION', false)
     end
     all_subscriptions(customer_id).each do |sub|
-      delete_subscription(customer_id,sub['id'])
+      delete_subscription(customer_id, sub['id'])
     end
   end
 
-
-
-
   #Card
-  def create_card(customer,card)
-       create(card,"#{customer}/cards")
+  def create_card(customer, card)
+    create(card, "#{customer}/cards")
   end
 
-
-  def get_card(customer,card_id)
+  def get_card(customer, card_id)
     get("#{customer}/cards/#{card_id}")
   end
 
-
-  def delete_card(customer,card_id)
-      delete("#{customer}/cards/#{card_id}")
+  def delete_card(customer, card_id)
+    delete("#{customer}/cards/#{card_id}")
   end
 
-
   def delete_all_cards(customer_id)
     if env == :production
-      raise OpenPayError ('This method is not supported on PRODUCTION')
+      raise OpenpayException.new('This method is not supported on PRODUCTION', false)
     end
     each_card(customer_id) do |card|
-      delete_card(customer_id,card['id'])
+      delete_card(customer_id, card['id'])
     end
   end
 
-
   def each_card(customer)
-       get("#{customer}/cards").each do |card|
-           yield card
-       end
+    get("#{customer}/cards").each do |card|
+      yield card
+    end
   end
 
+  def list_cards(customer, search_params)
+    get("#{customer}/cards#{search_params.to_s}")
+  end
 
   def all_cards(customer)
     get("#{customer}/cards")
   end
 
-
-
-end
+end

data/lib/openpay/errors/openpay_exception_factory.rb

@@ -1,49 +1,43 @@
 class OpenpayExceptionFactory
 
-
-
-  def   OpenpayExceptionFactory::create(exception)
+  def OpenpayExceptionFactory::create(exception)
 
     LOG.warn("An exception has been raised (original exception class: #{exception.class})")
-    LOG.warn("An exception has been raised (original exception class: #{exception.message })")
-
 
     case exception
 
       #resource not found
       #malformed jason, invalid data, invalid request
-      when   RestClient::BadRequest , RestClient::ResourceNotFound ,
-                   RestClient::Conflict , RestClient::PaymentRequired ,
-                   RestClient::UnprocessableEntity
-
-            oe=OpenpayTransactionException.new exception.http_body
-            LOG.warn "-OpenpayTransactionException: #{exception.http_body}"
-            @errors=true
-            raise  oe
-
+      when RestClient::BadRequest, RestClient::ResourceNotFound,
+          RestClient::Conflict, RestClient::PaymentRequired,
+          RestClient::UnprocessableEntity
 
+        oe=OpenpayTransactionException.new exception.http_body
+        LOG.warn "-OpenpayTransactionException: #{exception.http_body}"
+        @errors=true
+        raise oe
 
       #connection, timeouts, network related errors
-      when Errno::EADDRINUSE , Errno::ETIMEDOUT ,OpenSSL::SSL::SSLError
-        #since this execeptions are not based on the rest api exeptions
+      when Errno::EADDRINUSE, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError
+        #since this exceptions are not based on the rest api exceptions
         #we do not have the json message so we just build the exception
         #with the original exception message set in e.description and e.message
         oe=OpenpayConnectionException.new(exception.message,false)
         LOG.warn exception.message
         @errors=true
-        raise  oe
+        raise oe
       #badgateway-connection error, invalid credentials
       when  RestClient::BadGateway, RestClient::Unauthorized
             oe=OpenpayConnectionException.new exception.http_body
             LOG.warn exception.http_body
             @errors=true
-            raise  oe
+            raise oe
 
       when  RestClient::Exception , RestClient::InternalServerError
             oe=OpenpayException.new exception.http_body
             LOG.warn exception.http_body
             @errors=true
-             raise  oe
+            raise oe
       else
         #We won't hide unknown exceptions , those should be raised
         LOG.warn exception.message
@@ -51,10 +45,4 @@ class OpenpayExceptionFactory
     end
   end
 
-
-
-
-
-
-
-end
+end

data/lib/openpay/fees.rb

@@ -2,4 +2,4 @@ require 'open_pay_resource'
 
 class Fees < OpenPayResource
 
-end
+end

data/lib/openpay/open_pay_resource.rb

@@ -1,5 +1,3 @@
-
-
 #This class is the abstract base class for other Openpay resources
 #This class defines the basic rest verbs making use of the rest-api gem.
 #Method aliases are created to provide friendly names.
@@ -7,21 +5,20 @@ class OpenPayResource
 
   attr_accessor :api_hook
 
-  def initialize(merchant_id,private_key,production=false)
-     @merchant_id=merchant_id
-     @private_key=private_key
-     #assigns base url depending the requested env
-     @base_url=OpenpayApi::base_url(production)
-     @errors=false
+  def initialize(merchant_id, private_key, production=false)
+    @merchant_id=merchant_id
+    @private_key=private_key
+    #assigns base url depending the requested env
+    @base_url=OpenpayApi::base_url(production)
+    @errors=false
     @production=production
     @timeout=90
-     #created resources should have a hook with the base class to keep control of created resources
+    #created resources should have a hook with the base class to keep control of created resources
     @api_hook=nil
   end
 
-
 #returns the env set
-  def  env
+  def env
     if @production
       :production
     else
@@ -31,12 +28,11 @@ class OpenPayResource
 
   #errors on last call
   def errors?
-     @errors
+    @errors
   end
 
-
-  def list(args='')
-    @base_url+ "#{@merchant_id}/"+ self.class.name.to_s.downcase+"/"+args
+  def list(search_params)
+    get(search_params.to_s)
   end
 
   def each
@@ -48,7 +44,7 @@ class OpenPayResource
   def delete_all
 
     if env == :production
-      raise OpenpayException.new('delete_all method cannot be used on production',false)
+      raise OpenpayException.new('delete_all method cannot be used on production', false)
     end
 
     each do |res|
@@ -59,13 +55,18 @@ class OpenPayResource
 
   def get(args='')
 
-    @errors=false
+    @errors = false
+    terminated = true
 
-    LOG.debug("#{self.class.name.downcase}:")
-    LOG.debug("   GET Resource URL:#{url(args)}")
+    if is_filter_string?(args)
+      terminated = false
+    end
+
+    LOG.debug("#{resource_name}:")
+    LOG.debug("   GET Resource URL:#{url(args, terminated)}")
     res=RestClient::Request.new(
         :method => :get,
-        :url => url(args),
+        :url => url(args, terminated),
         :user => @private_key,
         :timeout => @timeout,
         :headers => {:accept => :json,
@@ -76,7 +77,7 @@ class OpenPayResource
     json_out=nil
     begin
       json_out=res.execute
-     #exceptions
+        #exceptions
     rescue Exception => e
       @errors=true
       #will raise the appropriate exception and return
@@ -87,42 +88,39 @@ class OpenPayResource
 
   end
 
- def delete(args)
+  def delete(args)
 
-   @errors=false
+    @errors=false
 
-   LOG.debug("#{self.class.name.downcase}:")
-   LOG.debug("    DELETE  URL:#{url(args)}")
+    LOG.debug("#{self.class.name.downcase}:")
+    LOG.debug("    DELETE  URL:#{url(args)}")
 
-   res=''
-   req=RestClient::Request.new(
-       :method => :delete,
-       :url => url(args),
-       :user => @private_key,
-       :timeout => @timeout,
-       :headers => {:accept => :json,
-                    :content_type => :json,
-                    :user_agent => 'Openpay/v1  Ruby-API',
-       }
-   )
+    res=''
+    req=RestClient::Request.new(
+        :method => :delete,
+        :url => url(args),
+        :user => @private_key,
+        :timeout => @timeout,
+        :headers => {:accept => :json,
+                     :content_type => :json,
+                     :user_agent => 'Openpay/v1  Ruby-API',
+        }
+    )
 
-  begin
+    begin
       res=req.execute
-      #exceptions
-  rescue Exception => e
-    @errors=true
-    #will raise the appropriate exception and return
-    OpenpayExceptionFactory::create(e)
-  end
-
+        #exceptions
+    rescue Exception => e
+      @errors=true
+      #will raise the appropriate exception and return
+      OpenpayExceptionFactory::create(e)
+    end
     #returns a hash
-   JSON[res] if not res.empty?
-
- end
+    JSON[res] if not res.empty?
+  end
 
-  def post(message,args='')
+  def post(message, args='')
 
-    return_hash=false
     @errors=false
 
     if message.is_a?(Hash)
@@ -133,17 +131,16 @@ class OpenPayResource
       return_hash=false
     end
 
-    LOG.debug("#{self.class.name.downcase}:")
-    LOG.debug "   POST URL:#{url(args)}"
-    #For security reasons we keep it hide
-    #LOG.debug "   json: #{json}"
+    # LOG.debug("#{self.class.name.downcase}:")
+     LOG.debug "   POST URL:#{url(args)}"
+     LOG.debug "   json: #{json}"
 
     begin
 
-    #request
-    res= RestClient::Request.new(
+      #request
+      res= RestClient::Request.new(
           :method => :post,
-          :url => url(args) ,
+          :url => url(args),
           :user => @private_key,
           :timeout => @timeout,
           :payload => json,
@@ -151,9 +148,9 @@ class OpenPayResource
                        :content_type => :json,
                        :user_agent => 'Openpay/v1  Ruby-API',
                        :json => json}
-      ) .execute
+      ).execute
 
-    #exceptions
+        #exceptions
     rescue Exception => e
       @errors=true
       #will raise the appropriate exception and return
@@ -169,9 +166,7 @@ class OpenPayResource
 
   end
 
-
-
-  def put (message,args='')
+  def put(message, args='')
 
     return_hash=false
 
@@ -183,7 +178,6 @@ class OpenPayResource
       return_hash=false
     end
 
-
     LOG.info "PUT URL:#{url}"
     #LOG.info "   json: #{json}"
 
@@ -198,29 +192,25 @@ class OpenPayResource
                        :content_type => :json,
                        :user_agent => 'Openpay/v1  Ruby-API',
                        :json => json}
-      ) .execute
-    rescue   RestClient::BadRequest  => e
+      ).execute
+    rescue RestClient::BadRequest => e
       warn e.http_body
       @errors=true
-      return JSON.parse  e.http_body
+      return JSON.parse e.http_body
     end
 
-
     if return_hash
-       JSON.parse res
+      JSON.parse res
     else
-       res
+      res
     end
 
   end
 
-
   #aliases for rest verbs
   alias_method :all, :get
-  alias_method :list, :get
   alias_method :update, :put
-  alias_method  :create , :post
-
+  alias_method :create, :post
 
   def hash2json(jash)
     JSON.generate(jash)
@@ -230,13 +220,23 @@ class OpenPayResource
     JSON[json]
   end
 
+  private
 
- private
-  def url(args='')
-    @base_url+"#{@merchant_id}/"+ self.class.name.to_s.downcase+ '/'+args
+  def url(args = '', terminated = true)
+    termination = terminated ? '/' : ''
+    @base_url + "#{@merchant_id}/" + resource_name + termination + args
   end
 
+  def resource_name
+    self.class.name.to_s.downcase
+  end
 
+  def is_filter_string?(args)
+    is_filter = false
+    if args =~ /^\?/
+       is_filter = true
+    end
+    is_filter
+  end
 
-
-end
+end