paypal_permissions 0.0.3.3 → 0.0.3.4

data/lib/active_merchant/billing/gateways/paypal_permissions/x_pp_authorization.rb

@@ -0,0 +1,41 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module XPPAuthorization
+      public
+      def x_pp_authorization_header url, access_token, access_token_verifier
+        timestamp = Time.now.to_i.to_s
+        signature = x_pp_authorization_signature url, timestamp, access_token, access_token_verifier
+        { 'X-PP-AUTHORIZATION' => "token=#{access_token},signature=#{signature},timestamp=#{timestamp}" }
+      end
+
+      public
+      def x_pp_authorization_signature url, timestamp, access_token, access_token_verifier
+        # no query params, but if there were, this is where they'd go
+        query_params = {}
+        key = [
+          URI.encode(@password),
+          URI.encode(access_token_verifier),
+        ].join("&")
+
+        params = query_params.dup.merge({
+          "oauth_consumer_key" => @login,
+          "oauth_version" => "1.0",
+          "oauth_signature_method" => "HMAC-SHA1",
+          "oauth_token" => access_token,
+          "oauth_timestamp" => timestamp,
+        })
+        sorted_params = Hash[params.sort]
+        sorted_query_string = sorted_params.to_query
+
+        base = [
+          "POST",
+          URI.encode(url),
+          URI.encode(sorted_query_string)
+        ].join("&")
+
+        hexdigest = OpenSSL::HMAC.hexdigest('sha1', key, base)
+        Base64.encode64(hexdigest).chomp
+      end
+    end
+  end
+end

data/lib/generators/active_record/paypal_permissions_generator.rb

@@ -23,51 +23,20 @@ module ActiveRecord
 
       def inject_paypal_permissions_content
         inject_into_class(model_path, class_name, model_contents + <<ACCESSIBLE_FIELDS) if model_exists?
-  attr_accessible :request_permissions_ack, :request_permissions_correlation_id, :request_permissions_request_token,
-                  :request_permissions_verifier, :request_permissions_envelope_timestamp,
-                  :request_permissions_errors, :request_permissions_raw_response,
-                  :request_permissions_callback_ack, :request_permissions_callback_correlation_id, :request_permissions_callback_request_token,
-                  :request_permissions_callback_verifier, :request_permissions_callback_envelope_timestamp,
-                  :request_permissions_callback_errors, :request_permissions_callback_raw_response,
-                  :get_access_token_ack, :get_access_token_correlation_id, :get_access_token_access_token,
-                  :get_access_token_verifier, :get_access_token_envelope_timestamp,
-                  :get_access_token_errors, :get_access_token_raw_response
+  attr_accessible :ppp_access_token, :ppp_access_token_verifier
 ACCESSIBLE_FIELDS
       end
 
       def migration_data
 <<MIGRATION_FIELDS
-      # RequestPermissions response fields
-      t.string :request_permissions_ack
-      t.string :request_permissions_correlation_id
-      t.string :request_permissions_request_token
-      t.datetime :request_permissions_envelope_timestamp
-      t.text :request_permissions_errors
-      t.text :request_permissions_raw_response
-
-      # RequestPermissions callback fields
-      t.string :request_permissions_callback_ack
-      t.string :request_permissions_callback_correlation_id
-      t.string :request_permissions_callback_verifier
-      t.datetime :request_permissions_callback_envelope_timestamp
-      t.text :request_permissions_callback_errors
-      t.text :request_permissions_callback_raw_response
-      
       # GetAccessToken response fields
-      t.string :get_access_token_ack
-      t.string :get_access_token_correlation_id
-      t.string :get_access_token_access_token
-      t.string :get_access_token_verifier
-      t.datetime :get_access_token_envelope_timestamp
-      t.text :get_access_token_errors
-      t.text :get_access_token_raw_response
+      t.string :ppp_access_token
+      t.string :ppp_access_token_verifier
 MIGRATION_FIELDS
       end
 
       def indexes
 <<INDEXES
-    add_index :#{table_name}, :request_permissions_request_token
-    add_index :#{table_name}, :get_access_token_access_token
 INDEXES
       end
     end

data/lib/generators/paypal_permissions/install_generator.rb

@@ -10,6 +10,7 @@ module PaypalPermissions
         dev_test_config = <<-DEV_TEST_CONFIG
 #{Rails.application.class.name.split('::').first}::Application.configure do
   config.after_initialize do
+    ActiveMerchant::Billing::Base.mode = :test
     permissions_options = {
       :login => 'TODO: your PayPal sandbox caller login',
       :password => 'TODO: your PayPal sandbox caller password',
@@ -24,6 +25,7 @@ end
         prod_config = <<-PROD_CONFIG
 #{Rails.application.class.name.split('::').first}::Application.configure do
   config.after_initialize do
+    ActiveMerchant::Billing::Base.mode = :production
     permissions_options = {
       :login => 'TODO: your PayPal live caller login',
       :password => 'TODO: your PayPal live caller password',
@@ -54,11 +56,13 @@ end
       end
 
       def copy_initializer
-        template "paypal_permissions.rb", "config/initializers/paypal_permissions.rb"
+        # Nothing in the initializer yet, but once there is, just uncomment the following.
+        # template "paypal_permissions.rb", "config/initializers/paypal_permissions.rb"
       end
 
       def copy_locale
-        copy_file "../../../config/locales/en.yml", "config/locales/paypal_permissions.en.yml"
+        # Nothing in the locales file yet, but once there is, just uncomment the following.
+        # copy_file "../../../config/locales/en.yml", "config/locales/paypal_permissions.en.yml"
       end
 
       def show_readme

data/lib/generators/paypal_permissions/orm_helpers.rb

@@ -3,7 +3,6 @@ module PaypalPermissions
     module OrmHelpers
       def model_contents
 <<-CONTENT
-  # validates :request_permissions_ack, :presence => true
 CONTENT
       end
 

data/lib/generators/paypal_permissions/paypal_permissions_generator.rb

@@ -15,8 +15,11 @@ module PaypalPermissions
 
       def insert_paypal_permissions_routes
         if options.routes?
-          route "match '#{plural_name}/request_permissions_callback' => '#{plural_name}#request_permissions_callback', :via => [ :post ], :as => :#{plural_name}_request_permissions_callback_url"
+          # The request_permissions_callback route needs to be *first* in the routes.rb file,
+          # but the generator inserts them at the top of the file, so call them in reverse order.
+
           route "resources :#{plural_name}"
+          route "match '#{plural_name}/request_permissions_callback' => '#{plural_name}#request_permissions_callback', :via => [ :get ], :as => :#{plural_name}_request_permissions_callback"
         end
       end
     end

data/lib/paypal_permissions.rb

@@ -1,6 +1,2 @@
 require "paypal_permissions/version"
 require "active_merchant/billing/gateways/paypal_permissions"
-
-module PaypalPermissions
-  # Your code goes here...
-end

data/lib/paypal_permissions/version.rb

@@ -1,3 +1,3 @@
 module PaypalPermissions
-  VERSION = "0.0.3.3"
+  VERSION = "0.0.3.4"
 end

data/paypal_permissions.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "vcr", "~> 1.11"
 
-  s.add_runtime_dependency 'railties', '~> 3.0'
+  s.add_runtime_dependency "railties", "~> 3.0"
   s.add_runtime_dependency "activesupport", "~> 3.0"
   s.add_runtime_dependency "activemerchant"
   s.add_runtime_dependency "rspec", "~> 2.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paypal_permissions
 version: !ruby/object:Gem::Version
-  version: 0.0.3.3
+  version: 0.0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000Z
+date: 2012-04-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153018600 !ruby/object:Gem::Requirement
+  requirement: &2156303680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153018600
+  version_requirements: *2156303680
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2153018100 !ruby/object:Gem::Requirement
+  requirement: &2156302160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.11'
   type: :development
   prerelease: false
-  version_requirements: *2153018100
+  version_requirements: *2156302160
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2153017580 !ruby/object:Gem::Requirement
+  requirement: &2156298500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153017580
+  version_requirements: *2156298500
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153017100 !ruby/object:Gem::Requirement
+  requirement: &2156295860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153017100
+  version_requirements: *2156295860
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &2153016700 !ruby/object:Gem::Requirement
+  requirement: &2156293880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153016700
+  version_requirements: *2156293880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153016120 !ruby/object:Gem::Requirement
+  requirement: &2156256740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *2153016120
+  version_requirements: *2156256740
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &2153015680 !ruby/object:Gem::Requirement
+  requirement: &2156255120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153015680
+  version_requirements: *2156255120
 description: ! '"A gem to support PayPal Permissions API for Rails applications using
   ActiveMerchant."'
 email:
@@ -101,13 +101,75 @@ files:
 - README.md
 - Rakefile
 - config/locales/en.yml
-- examples/app/controllers/paypal_perms_controller.rb
-- examples/app/models/paypal_perm.rb
-- examples/db/migrate/paypal_permissions_create_paypal_perms.rb
+- examples.old/app/controllers/paypal_perms_controller.rb
+- examples.old/app/models/paypal_perm.rb
+- examples.old/db/migrate/paypal_permissions_create_paypal_perms.rb
+- examples/.gitignore
+- examples/Gemfile
+- examples/README.rdoc
+- examples/Rakefile
+- examples/app/assets/images/rails.png
+- examples/app/assets/javascripts/application.js
+- examples/app/assets/javascripts/merchants.js.coffee
+- examples/app/assets/stylesheets/application.css
+- examples/app/assets/stylesheets/merchants.css.scss
+- examples/app/controllers/application_controller.rb
+- examples/app/controllers/merchants_controller.rb
+- examples/app/controllers/ppp_models_controller.rb
+- examples/app/helpers/application_helper.rb
+- examples/app/helpers/merchants_helper.rb
+- examples/app/mailers/.gitkeep
+- examples/app/models/.gitkeep
+- examples/app/models/merchant.rb
+- examples/app/views/layouts/application.html.erb
+- examples/app/views/merchants/show.html.erb
+- examples/config.ru
+- examples/config/application.rb
+- examples/config/boot.rb
+- examples/config/database.yml
+- examples/config/environment.rb
+- examples/config/environments/development.rb
+- examples/config/environments/production.rb
+- examples/config/environments/test.rb
+- examples/config/initializers/backtrace_silencers.rb
+- examples/config/initializers/inflections.rb
+- examples/config/initializers/mime_types.rb
+- examples/config/initializers/secret_token.rb
+- examples/config/initializers/session_store.rb
+- examples/config/initializers/wrap_parameters.rb
+- examples/config/locales/en.yml
+- examples/config/routes.rb
+- examples/db/migrate/20120415205138_paypal_permissions_create_merchants.rb
+- examples/db/seeds.rb
+- examples/doc/README_FOR_APP
+- examples/lib/assets/.gitkeep
+- examples/lib/tasks/.gitkeep
+- examples/log/.gitkeep
+- examples/public/404.html
+- examples/public/422.html
+- examples/public/500.html
+- examples/public/favicon.ico
+- examples/public/index.html
+- examples/public/robots.txt
+- examples/script/rails
+- examples/test/fixtures/.gitkeep
+- examples/test/fixtures/merchants.yml
+- examples/test/functional/.gitkeep
+- examples/test/functional/merchants_controller_test.rb
+- examples/test/integration/.gitkeep
+- examples/test/performance/browsing_test.rb
+- examples/test/test_helper.rb
+- examples/test/unit/.gitkeep
+- examples/test/unit/helpers/merchants_helper_test.rb
+- examples/test/unit/merchant_test.rb
+- examples/vendor/assets/javascripts/.gitkeep
+- examples/vendor/assets/stylesheets/.gitkeep
+- examples/vendor/plugins/.gitkeep
 - lib/active_merchant.rb
 - lib/active_merchant/billing.rb
 - lib/active_merchant/billing/gateways.rb
 - lib/active_merchant/billing/gateways/paypal_permissions.rb
+- lib/active_merchant/billing/gateways/paypal_permissions/x_pp_authorization.rb
 - lib/generators/active_record/paypal_permissions_generator.rb
 - lib/generators/active_record/templates/migration.rb
 - lib/generators/active_record/templates/migration_existing.rb
@@ -137,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 465604947276467303
+      hash: -141637157395021901
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 465604947276467303
+      hash: -141637157395021901
 requirements: []
 rubyforge_project: paypal_permissions
 rubygems_version: 1.8.10