jonathantron-paypal 3.0.0pre3 → 3.0.0pre4

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 = 3.0.0 (git)
 
+    Update spec task to use the new RSpec module name
+    Remove constant/class variable usage and use Thread specific configurations
     Start spec on Paypal::Helpers::Common.paypal_setup
     Fix specs for Paypal::Config
     Upgrade dev dependencies to use Rspec >= 2.0.0.a

data/Gemfile

@@ -1,5 +1,6 @@
 source :gemcutter
 
+gem "bundler"
 gem "rack", ">= 1.0.0"
 gem "json_pure"
 gem "rake"

data/Gemfile.lock

@@ -0,0 +1,89 @@
+--- 
+dependencies: 
+  fakeweb: 
+    group: 
+    - :default
+    version: ">= 0"
+    require: 
+    - fakeweb
+  bluecloth: 
+    group: 
+    - :default
+    version: ">= 0"
+  rake: 
+    group: 
+    - :default
+    version: ">= 0"
+  rspec: 
+    group: 
+    - :default
+    version: ">= 2.0.0.a"
+  yard: 
+    group: 
+    - :default
+    version: ">= 0"
+  rack: 
+    group: 
+    - :default
+    version: ">= 1.0.0"
+  rcov: 
+    group: 
+    - :default
+    version: ">= 0.9.8"
+  jeweler: 
+    group: 
+    - :default
+    version: ">= 0"
+  bundler: 
+    group: 
+    - :default
+    version: ">= 0"
+  json_pure: 
+    group: 
+    - :default
+    version: ">= 0"
+  nokogiri: 
+    group: 
+    - :default
+    version: ">= 0"
+specs: 
+- rake: 
+    version: 0.8.7
+- bluecloth: 
+    version: 2.0.7
+- bundler: 
+    version: 0.9.25
+- diff-lcs: 
+    version: 1.1.2
+- fakeweb: 
+    version: 1.2.8
+- json_pure: 
+    version: 1.4.3
+- gemcutter: 
+    version: 0.5.0
+- git: 
+    version: 1.2.5
+- rubyforge: 
+    version: 2.0.4
+- jeweler: 
+    version: 1.4.0
+- nokogiri: 
+    version: 1.4.2
+- rack: 
+    version: 1.2.1
+- rcov: 
+    version: 0.9.8
+- rspec-core: 
+    version: 2.0.0.beta.17
+- rspec-expectations: 
+    version: 2.0.0.beta.17
+- rspec-mocks: 
+    version: 2.0.0.beta.17
+- rspec: 
+    version: 2.0.0.beta.17
+- yard: 
+    version: 0.5.8
+hash: f248241b76b1508705a1057a180c95c99716930f
+sources: 
+- Rubygems: 
+    uri: http://gemcutter.org

data/Rakefile

@@ -27,8 +27,8 @@ rescue LoadError
 end
 
 require "rspec/core/rake_task"
-::Rspec::Core::RakeTask.new(:spec)
-::Rspec::Core::RakeTask.new(:rcov) do |spec|
+::RSpec::Core::RakeTask.new(:spec)
+::RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
   spec.rcov_opts = "--exclude spec/"
 end

data/jonathantron-paypal.gemspec

@@ -0,0 +1,90 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{jonathantron-paypal}
+  s.version = "3.0.0pre4"
+
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jonathan Tron", "Joseph Halter", "Tobias Luetke"]
+  s.date = %q{2010-07-16}
+  s.description = %q{Integrate Paypal Express}
+  s.email = %q{jonathan@tron.name}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "CHANGELOG.md",
+     "Gemfile",
+     "Gemfile.lock",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "jonathantron-paypal.gemspec",
+     "lib/paypal.rb",
+     "lib/paypal/certs/paypal_sandbox.pem",
+     "lib/paypal/config.rb",
+     "lib/paypal/helpers/common.rb",
+     "lib/paypal/helpers/rails.rb",
+     "lib/paypal/notification.rb",
+     "lib/paypal/rails.rb",
+     "lib/paypal/version.rb",
+     "misc/PayPal - Instant Payment Notification - Technical Overview.pdf",
+     "misc/multiruby.sh",
+     "misc/paypal.psd",
+     "spec/config_spec.rb",
+     "spec/fixtures/business_cert.pem",
+     "spec/fixtures/business_key.pem",
+     "spec/helpers/common_spec.rb",
+     "spec/notification_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/JonathanTron/paypal}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Paypal Express Integration}
+  s.test_files = [
+    "spec/config_spec.rb",
+     "spec/helpers/common_spec.rb",
+     "spec/notification_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, [">= 1.0.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0.a"])
+      s.add_development_dependency(%q<rcov>, [">= 0.9.8"])
+      s.add_development_dependency(%q<nokogiri>, [">= 0"])
+      s.add_development_dependency(%q<bluecloth>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<fakeweb>, [">= 0"])
+    else
+      s.add_dependency(%q<rack>, [">= 1.0.0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.a"])
+      s.add_dependency(%q<rcov>, [">= 0.9.8"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<bluecloth>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<fakeweb>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rack>, [">= 1.0.0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.a"])
+    s.add_dependency(%q<rcov>, [">= 0.9.8"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<bluecloth>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<fakeweb>, [">= 0"])
+  end
+end
+

data/lib/paypal/config.rb

@@ -1,24 +1,22 @@
 module Paypal
   module Config
-    IPN_URL_SANDBOX    = "https://www.sandbox.paypal.com/cgi-bin/webscr"
-    IPN_URL_PRODUCTION = "https://www.paypal.com/cgi-bin/webscr"
+    def self.ipn_urls
+      Thread.current[:ipn_urls] ||= {
+        :sandbox => "https://www.sandbox.paypal.com/cgi-bin/webscr",
+        :production => "https://www.paypal.com/cgi-bin/webscr"
+      }
+    end
 
-    @@mode = :sandbox
     def self.mode=(new_mode)
       raise ArgumentError.new("Paypal::Config.mode should be either :sandbox or :production (you tried to set it as : #{new_mode})") unless [:sandbox, :production].include?(new_mode.to_sym)
-      @@mode = new_mode.to_sym
+      Thread.current[:mode] = new_mode.to_sym
     end
     def self.mode
-      @@mode
+      Thread.current[:mode] ||= :sandbox
     end
     
     def self.ipn_url
-      case @@mode
-      when :sandbox
-        IPN_URL_SANDBOX
-      when :production
-        IPN_URL_PRODUCTION
-      end
+      ipn_urls[mode]
     end
     
     def self.ipn_validation_path
@@ -29,29 +27,27 @@ module Paypal
       "#{ipn_url}?cmd=_notify-validate"
     end
 
-    @@paypal_sandbox_cert = File.read(File.join(File.dirname(__FILE__), 'certs', 'paypal_sandbox.pem'))
     def self.paypal_sandbox_cert=(new_cert)
-      @@paypal_sandbox_cert = new_cert
+      Thread.current[:paypal_sandbox_cert] = new_cert
     end
     def self.paypal_sandbox_cert
-      @@paypal_sandbox_cert
+      Thread.current[:paypal_sandbox_cert] ||= File.read(File.join(File.dirname(__FILE__), 'certs', 'paypal_sandbox.pem'))
     end
 
-    @@paypal_production_cert = nil
     def self.paypal_production_cert=(new_cert)
-      @@paypal_production_cert = new_cert
+      Thread.current[:paypal_production_cert] = new_cert
     end
     def self.paypal_production_cert
-      @@paypal_production_cert
+      Thread.current[:paypal_production_cert]
     end
 
     def self.paypal_cert
-      case @@mode
+      case mode
       when :sandbox
-        @@paypal_sandbox_cert
+        paypal_sandbox_cert
       when :production
-        raise StandardError.new("You should set Paypal::Config.paypal_production_cert with your paypal production certificate") if @@paypal_production_cert.nil?
-        @@paypal_production_cert
+        raise StandardError.new("You should set Paypal::Config.paypal_production_cert with your paypal production certificate") unless paypal_production_cert
+        paypal_production_cert
       end
     end
   end

data/lib/paypal/version.rb

@@ -1,3 +1,3 @@
 module Paypal
-  VERSION = "3.0.0pre3"
+  VERSION = "3.0.0pre4"
 end

data/spec/config_spec.rb

@@ -2,12 +2,29 @@ require "spec_helper"
 
 describe Paypal::Config do
   after do
+    Thread.current.keys.each do |key|
+      Thread.current[key] = nil unless key =~ /^__.+__$/
+    end
     Paypal.class_eval do
       remove_const :Config if const_defined?(:Config)
     end
     load "paypal/config.rb"
   end
   
+  describe "ipn_urls" do
+    it "should define url for :production" do
+      Paypal::Config.ipn_urls[:production].should eql("https://www.paypal.com/cgi-bin/webscr")
+    end
+    it "should define url for :sandbox" do
+      Paypal::Config.ipn_urls[:sandbox].should eql("https://www.sandbox.paypal.com/cgi-bin/webscr")
+    end
+    it "should allow changing urls" do
+      url = "https://myownsandbox.com"
+      Paypal::Config.ipn_urls[:sandbox] = url
+      Paypal::Config.ipn_urls[:sandbox].should eql(url)
+    end
+  end
+
   describe "mode" do
     it "should be :sandbox by default" do
       Paypal::Config.mode.should eql(:sandbox)
@@ -151,4 +168,15 @@ jZJTylbJQ1b5PBBjGiP0PpK48cdF
       Paypal::Config.paypal_cert.should eql("TEST")
     end
   end
+  
+  describe "in multithreaded environment" do
+    it "should not mix different thread values" do
+      t = Thread.new { 
+        Paypal::Config.mode = :production
+        Paypal::Config.mode.should eql(:production)
+      }
+      t.join
+      Paypal::Config.mode.should eql(:sandbox)
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 0pre3
-  version: 3.0.0pre3
+  - 0pre4
+  version: 3.0.0pre4
 platform: ruby
 authors: 
 - Jonathan Tron
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +02:00
+date: 2010-07-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,9 +124,11 @@ files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- jonathantron-paypal.gemspec
 - lib/paypal.rb
 - lib/paypal/certs/paypal_sandbox.pem
 - lib/paypal/config.rb