paypal_adaptive 0.3.2 → 0.3.3

data/README.markdown

@@ -17,7 +17,7 @@ Create paypal_adaptive.yml to your config folder:
       password: "sandbox_password"
       signature: "sandbox_signature"
       application_id: "sandbox_app_id"
-      ssl_cert_file:
+      api_cert_file:
 
     test:
       environment: "sandbox"
@@ -25,7 +25,7 @@ Create paypal_adaptive.yml to your config folder:
       password: "sandbox_password"
       signature: "sandbox_signature"
       application_id: "sandbox_app_id"
-      ssl_cert_file:
+      api_cert_file: "/path/to_cert"
 
     production:
       environment: "production"
@@ -33,7 +33,7 @@ Create paypal_adaptive.yml to your config folder:
       password: "my_production_password"
       signature: "my_production_signature"
       application_id: "my_production_app_id"
-      ssl_cert_file:
+      api_cert_file: "/path/to_cert"
 
 You can also use ENV variables when specifying your configuration. eg.
 ```<%= ENV[''paypal.username'] %>```
@@ -76,6 +76,11 @@ Additionally, you can make calls to Paypal Adaptive's other APIs:
 
 Input is just a Hash just like the pay method. Refer to the Paypal manual for more details.
 
+### Using the embedded payment flow
+Instead of redirecting to the url from ```redirect_to pay_response.approve_paypal_payment_url``` you can generate the action url for your
+form by using ```pay_response.approve_paypal_payment_url 'MY TYPE' ``` The two types that are supported for embedded payment are 'light' and 'mini'
+More information about these types can be found here https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_APIntro
+
 ### Certificate validation
 You can set the location of the key file you downloaded from PayPal, in paypal_adaptive.yml
 for each environment, e.g.:
@@ -86,11 +91,14 @@ for each environment, e.g.:
       password: "sandbox_password"
       signature: "sandbox_signature"
       application_id: "sandbox_app_id"
-      ssl_cert_file: "/path/to/your/private.key"
+      api_cert_file: "/path/to/your/private.key"
 
-The ssl_cert_file should point to your cert_key_pem.txt that is downloaded through the paypal developer interface. It will contain a section that specifies the RSA private key and another section that specifies a certificate. If this is left empty, paypal_adaptive will attempt to use the signature method of validation with PayPal, so your signature config must not be nil.
+The api_cert_file should point to your cert_key_pem.txt that is downloaded through the paypal developer interface. It will contain a section that specifies the RSA private key and another section that specifies a certificate. If this is left empty, paypal_adaptive will attempt to use the signature method of validation with PayPal, so your signature config must not be nil.
 
 ## Changelog
+0.3.3
+Handle JSON parsing error. Added validation for config.
+
 0.3.2
 Added support to api certificate since ssl_cert_file config is now used to set CA Authority. thanks jimbocortes
 

data/config/paypal_adaptive.yml

@@ -4,7 +4,7 @@ development:
   password: "signupforuseratsandboxpaypal"
   signature: "signupforuseratsandboxpaypal"
   application_id: "APP-TEST"
-  ssl_cert_file:
+  api_cert_file: "/path/to_cert"
 
 test:
   environment: "sandbox"
@@ -12,7 +12,7 @@ test:
   password: "signupforuseratsandboxpaypal"
   signature: "signupforuseratsandboxpaypal"
   application_id: "APP-TEST"
-  ssl_cert_file:
+  api_cert_file: "/path/to_cert"
 
 production:
   environment: "production"
@@ -20,7 +20,7 @@ production:
   password: "my_production_password"
   signature: "my_production_signature"
   application_id: "my_production_app_id"
-  ssl_cert_file:
+  api_cert_file: "/path/to_cert"
 
 with_erb_tags:
   environment: "sandbox"
@@ -28,4 +28,4 @@ with_erb_tags:
   password: <%= ENV['paypal.password'] %>
   signature: "signupforuseratsandboxpaypal"
   application_id: "APP-TEST"
-  ssl_cert_file:
+  api_cert_file: "/path/to_cert"

data/lib/paypal_adaptive/config.rb

@@ -22,6 +22,8 @@ module PaypalAdaptive
       raise "Could not load settings from config file" unless config
       config.merge!(config_override) unless config_override.nil?
 
+      validate_config(config)
+
       if config["retain_requests_for_test"] == true
         @retain_requests_for_test = true
       else
@@ -49,6 +51,14 @@ module PaypalAdaptive
       end
     end
 
+    def validate_config(config)
+      raise "No username in paypal_adaptive.yml specified." unless config['username']
+      raise "No password in paypal_adaptive.yml specified." unless config['password']
+      raise "No application_id in paypal_adaptive.yml specified." unless config['application_id']
+
+      true
+    end
+
     def config_filepath
       if defined?(Rails)
         Rails.root.join("config", "paypal_adaptive.yml")

data/lib/paypal_adaptive/request.rb

@@ -102,9 +102,11 @@ module PaypalAdaptive
 
       begin
         response_data = http.post(path, api_request_data, @headers)
-        return JSON.parse(response_data.body)
+        JSON.parse(response_data.body)
       rescue Net::HTTPBadGateway => e
         rescue_error_message(e, "Error reading from remote server.")
+      rescue JSON::ParserError => e
+        rescue_error_message(e, "Response is not in JSON format.")
       rescue Exception => e
         case e
         when Errno::ECONNRESET

data/lib/paypal_adaptive/version.rb

@@ -1,4 +1,4 @@
 module PaypalAdaptive
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end
 

data/paypal_adaptive.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("json", "~>1.0")
   s.add_dependency("jsonschema", "~>2.0.0")
-  s.add_dependency("rake", "~>0.8")
+  s.add_dependency("rake")
 
   s.rubyforge_project = "paypal_adaptive"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paypal_adaptive
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70212142494100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212142494100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jsonschema
-  requirement: &70212142493220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,18 +37,28 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70212142493220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70212142492480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212142492480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Lightweight wrapper for Paypal's Adaptive Payments API
 email:
 - tommy.chheng@gmail.com
@@ -112,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: paypal_adaptive
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Lightweight wrapper for Paypal's Adaptive Payments API