payhyper 0.2.3 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGEwMGYyMjgxOWVlOTQ4ZjVlYWYzODVmOTQwZDVhMzU2MDAyYjg4OQ==
-  data.tar.gz: !binary |-
-    NzVlNTE5OTdiZGY2MzYyM2Q5YjQ1YjQxMWM3MzUzYjkyY2YxNGE5Mw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZTc5ZjgzZDc3Y2IxZWI1N2I1MzAyOTczYjg3ZWYwYjAzYjE1MDY0NjliYzkw
-    N2VjYWRmZWU5NDc0YWVjMTk1MzNjNDhmZDI0YWFkNjljYmMyYmNmOGI3ZDc5
-    YjQxNTdmMTZlOTA1YTkyYWFkM2Q4NDUwN2U1MTQxMmM2MGUwZjQ=
-  data.tar.gz: !binary |-
-    NzJkYmRhMTZmODBmMzY5YjlmZDY0YWE5Mjk5Y2FlNGQxNmExODBjZDQxOTE1
-    NmE0YjMzYTY3MTllMWIzYjhlY2I5NTRlNGFhYTEzNDhiMGM1ZWQwMWM5Yzlh
-    MWIzNzk4N2Y3NGUxZThjOWFiY2E5ZjcxODIwN2FjODkzNzg0YWU=
+SHA1:
+  metadata.gz: a0765918e4ad00fc1a1efb9c21030831110d50fe
+  data.tar.gz: 5f424f23813782dc5cdc916bd1c7ad03dbc09574
+SHA512:
+  metadata.gz: 69080fb75e1f6cfb4eaa815100524d14f2c40c64bff2fc0eec990e1c92126119921259793f3d3b029a280e603f787d5f7cd8f6e146fea156afba1cb7481d3a4a
+  data.tar.gz: ee023675b08c6964f5d7644d5bc17516f67dde123760c98d80c9b981c10957c5c80e830399a9d265d94bf0ffcc55e6ad68e804c5f66a8bf804583bf21e97d171

data/lib/payhyper/version.rb

@@ -1,3 +1,3 @@
 module PayHyper
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/lib/payhyper.rb

@@ -35,14 +35,32 @@ module PayHyper
     @base_url = BASE_URLS[mode]
   end
 
-  def self.raise_if_not_setup!
-    raise PayHyperError, "Must call setup() first" if @access_key_id.nil? || @access_key_secret.nil? || @base_url.nil?
+  def self.at_door!(name, phone, email, country, amount, currency, address = nil, invoice = nil, tag = nil) # TODO: There is a lot of overlap with "in_store!", refactor.
+    raise_if_not_setup!
+    # == Clean-up fields ==
+    currency = currency.upcase if currency && currency.is_a?(String)
+    country = country.upcase if country && country.is_a?(String)
+    if phone && phone.is_a?(String)
+      phone = phone.gsub(/[^0-9]/, "") # Remove non-numeric characters.
+      phone = phone.gsub(/^0*/, "") # Remove leading zeros.
+      if country && COUNTRY_CODES[country] && !phone.start_with?(COUNTRY_CODES[country])
+        phone = COUNTRY_CODES[country] + phone # Add country code.
+      end
+    end
+    # == Validate ==
+    raise ValidationError, "Country specified is incorrect or not supported." unless COUNTRIES.include?(country)
+    raise ValidationError, "Incorrect amount, must be positive." if amount.to_i <= 0
+    raise ValidationError, "Currency is incorrect or not supported." unless CURRENCIES.include?(currency)
+    raise ValidationError, "Incorrect phone, or not in a supported country." if phone.nil? || !phone.match(/\A962[0-9]{8,9}\z/)
+    raise ValidationError, "Invalid email." if email.nil? || !email.match(/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/)
+    raise ValidationError, "Name is mandatory." if name.nil? || name.strip.length == 0
+    # == Do the request ==
+    make_call("/v1/at-door", { :name => name, :phone => phone, :email => email, :country => country, :amount => amount, :currency => currency, :address => address, :invoice => invoice, :tag => tag })
   end
 
-  def self.create_order!(service, country, amount, currency, phone, email, tag = nil)
+  def self.in_store!(name, phone, email, country, amount, currency, tag = nil) # TODO: There is a lot of overlap with "at_door!", refactor.
     raise_if_not_setup!
     # == Clean-up fields ==
-    service = service.to_s.gsub("_", "-") if [:at_door, :in_store].include?(service)
     currency = currency.upcase if currency && currency.is_a?(String)
     country = country.upcase if country && country.is_a?(String)
     if phone && phone.is_a?(String)
@@ -53,20 +71,61 @@ module PayHyper
       end
     end
     # == Validate ==
-    raise ValidationError, "Incorrect service specified." unless ["at-door", "in-store"].include?(service)
     raise ValidationError, "Country specified is incorrect or not supported." unless COUNTRIES.include?(country)
     raise ValidationError, "Incorrect amount, must be positive." if amount.to_i <= 0
     raise ValidationError, "Currency is incorrect or not supported." unless CURRENCIES.include?(currency)
     raise ValidationError, "Incorrect phone, or not in a supported country." if phone.nil? || !phone.match(/\A962[0-9]{8,9}\z/)
     raise ValidationError, "Invalid email." if email.nil? || !email.match(/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/)
+    raise ValidationError, "Name is mandatory." if name.nil? || name.strip.length == 0
     # == Do the request ==
-    body = JSON.dump({ :service => service, :country => country, :amount => amount, :currency => currency, :phone => phone, :email => email, :tag => tag })
+    make_call("/v1/in-store", { :name => name, :phone => phone, :email => email, :country => country, :amount => amount, :currency => currency, :tag => tag })
+  end
+
+  def self.parse_notification(request)
+    raise_if_not_setup!
+    if check_ani_authenticity(request)
+      request.env["rack.input"].rewind # In case someone forgot to rewind the input.
+      body = request.env["rack.input"].read
+      request.env["rack.input"].rewind # Be nice to others.
+      JSON.load(body)
+    else
+      nil
+    end
+  end
+
+  class PayHyperError < StandardError; end
+  class ValidationError < PayHyperError; end
+  class CommunicationError < PayHyperError; end
+
+  private
+
+  def self.raise_if_not_setup!
+    raise PayHyperError, "Must call setup() first" if @access_key_id.nil? || @access_key_secret.nil? || @base_url.nil?
+  end
+
+  def self.check_ani_authenticity(request)
+    authorization = request.env["HTTP_AUTHORIZATION"]
+    return false unless authorization
+    matches = authorization.match(/\A(.*) (.*):(.*)/)
+    return false unless matches
+    method, access_key_id, input_signature = matches.captures
+    return false unless method == "Hyper" && access_key_id && input_signature && access_key_id == @access_key_id
+    request.env["rack.input"].rewind # In case someone forgot to rewind the input.
+    body = request.env["rack.input"].read
+    request.env["rack.input"].rewind # Be nice to others.
+    canonical_request_representation = [request.env["REQUEST_METHOD"], request.env["HTTP_HOST"], request.env["PATH_INFO"], request.env["CONTENT_TYPE"], body].join("\n") # TODO: security bug if the webserver doesn't check host headers.
+    correct_signature = Security.sign(@access_key_secret, canonical_request_representation)
+    return Security.secure_compare(correct_signature, input_signature)
+  end
+
+  def self.make_call(endpoint, body)
+    body = JSON.dump(body)
     failure = "Unknown error"
     begin
-      uri = URI.parse(@base_url + "/v1/orders")
+      uri = URI.parse(@base_url + endpoint)
       content_type = "application/json; charset=utf-8"
       signature = Security.sign(@access_key_secret, ["POST", uri.port == uri.default_port ? uri.host : "#{uri.host}:#{uri.port}", uri.request_uri, content_type, body.encode("UTF-8")].join("\n")) # Would be great if this could read directly from the request's headers.
-      res = RestClient.post(@base_url + "/v1/orders", body, :content_type => content_type, :authorization => "Hyper #{@access_key_id}:#{signature}")
+      res = RestClient.post(@base_url + endpoint, body, :content_type => content_type, :authorization => "Hyper #{@access_key_id}:#{signature}")
       failure = false
     rescue RestClient::Exception => e # HTTP status codes not in 200-207, 301-303 and 307 result in a RestClient::Exception.
       if e.http_code && e.http_code.to_i == 422 && e.http_body
@@ -96,35 +155,4 @@ module PayHyper
     end
   end
 
-  def self.check_ani_authenticity(request)
-    raise_if_not_setup!
-    authorization = request.env["HTTP_AUTHORIZATION"]
-    return false unless authorization
-    matches = authorization.match(/\A(.*) (.*):(.*)/)
-    return false unless matches
-    method, access_key_id, input_signature = matches.captures
-    return false unless method == "Hyper" && access_key_id && input_signature && access_key_id == @access_key_id
-    request.env["rack.input"].rewind # In case someone forgot to rewind the input.
-    body = request.env["rack.input"].read
-    request.env["rack.input"].rewind # Be nice to others.
-    canonical_request_representation = [request.env["REQUEST_METHOD"], request.env["HTTP_HOST"], request.env["PATH_INFO"], request.env["CONTENT_TYPE"], body].join("\n") # TODO: security bug if the webserver doesn't check host headers.
-    correct_signature = Security.sign(@access_key_secret, canonical_request_representation)
-    return Security.secure_compare(correct_signature, input_signature)
-  end
-
-  def self.parse_notification(request)
-    raise_if_not_setup!
-    if check_ani_authenticity(request)
-      request.env["rack.input"].rewind # In case someone forgot to rewind the input.
-      body = request.env["rack.input"].read
-      request.env["rack.input"].rewind # Be nice to others.
-      JSON.load(body)
-    else
-      nil
-    end
-  end
-
-  class PayHyperError < StandardError; end
-  class ValidationError < PayHyperError; end
-  class CommunicationError < PayHyperError; end
 end

data/payhyper.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
 
   s.name          = 'payhyper'
   s.version       = PayHyper::VERSION
-  s.date          = '2013-08-07'
+  s.date          = '2014-04-26'
   s.summary       = 'The Ruby bindings of the Hyper API'
   s.description   = 'Hyper is an API for cash collection. See http://payhyper.com for more.'
   s.authors       = ["Sinan Taifour"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: payhyper
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Sinan Taifour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -28,7 +28,7 @@ dependencies:
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
     - - <
@@ -38,7 +38,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
     - - <
@@ -65,17 +65,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The Ruby bindings of the Hyper API