boutique 0.0.5 → 0.0.6

data/README.md

@@ -25,6 +25,7 @@ can configure what products you sell here:
 
     Boutique.configure do |c|
       c.dev_email      'dev@mailinator.com'
+      c.pem_cert_id    'LONGCERTID'
       c.pem_private    '/path/to/private.pem'
       c.pem_public     '/path/to/public.pem'
       c.pem_paypal     '/path/to/paypal.pem'
@@ -36,7 +37,7 @@ can configure what products you sell here:
       c.db_password    'secret'
       c.db_database    'boutique'
       c.pp_email       'paypal_biz@mailinator.com'
-      c.pp_url         'http://https://www.sandbox.paypal.com/cgi-bin/webscr'
+      c.pp_url         'https://www.sandbox.paypal.com/cgi-bin/webscr'
     end
 
     Boutique.product('icon-set') do |p|
@@ -59,11 +60,11 @@ credentials):
 
 With the settings above, a normal flow would look like:
 
-1. On your site, link the user to `/boutique/buy/icon-set/` to purchase
+1. On your site, link the user to `/buy/icon-set/` to purchase
 2. User is redirected to paypal
 3. After completing paypal, user is redirected to 
    `http://zincmade.com/thankyou?b=order-id`
-4. On this page, issue an AJAX request to `/boutique/purchases/order-id`.
+4. On this page, issue an AJAX request to `/purchases/order-id`.
    The `downloads` field of the JSON will include the download URLs.
 
 Usage

data/config.ru

@@ -2,6 +2,7 @@ require File.expand_path('lib/boutique', File.dirname(__FILE__))
 
 Boutique.configure(!ENV['BOUTIQUE_CMD'].nil?) do |c|
   c.dev_email     'dev@localhost'
+  c.pem_cert_id   'LONGCERTID'
   c.pem_private   File.expand_path('certs/private.pem', File.dirname(__FILE__))
   c.pem_public    File.expand_path('certs/public.pem', File.dirname(__FILE__))
   c.pem_paypal    File.expand_path('certs/paypal.pem', File.dirname(__FILE__))

data/lib/boutique.rb

@@ -11,7 +11,7 @@ require 'openssl'
 require 'pony'
 
 module Boutique
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 
   class << self
     def configure(setup_db=true)
@@ -45,6 +45,11 @@ module Boutique
       @dev_email
     end
 
+    def self.pem_cert_id(value=nil)
+      @pem_cert_id = value if !value.nil?
+      @pem_cert_id
+    end
+
     def self.pem_private(value=nil)
       @pem_private = value if !value.nil?
       @pem_private
@@ -258,7 +263,8 @@ module Boutique
         :amount => product.price,
         :currency_code => 'USD',
         :notify_url => "#{notify_url}/#{boutique_id}",
-        :return => "#{product.return_url}?b=#{boutique_id}"
+        :return => "#{product.return_url}?b=#{boutique_id}",
+        :cert_id => Boutique.config.pem_cert_id
       }
       {'action' => Boutique.config.pp_url,
        'cmd' => '_s-xclick',
@@ -296,7 +302,7 @@ module Boutique
       ) if Boutique.config.dev_email
     end
 
-    post '/boutique/buy/:code' do
+    post '/buy/:code' do
       product = Boutique::Product.first(:code => params[:code])
       if product.nil?
         halt(404, "product #{params[:code]} not found")
@@ -314,7 +320,7 @@ module Boutique
       "</form><script>document.paypal.submit();</script></body></html>"
     end
 
-    post '/boutique/notify/:boutique_id' do
+    post '/notify/:boutique_id' do
       purchase = get_purchase(params[:boutique_id])
       if !purchase.completed? &&
          params['txn_id'] &&
@@ -327,7 +333,7 @@ module Boutique
       ''
     end
 
-    post '/boutique/recover/:code' do
+    post '/recover/:code' do
       product = Boutique::Product.first(:code => params[:code])
       purchase = product.purchases.first(:email => params['email']) if product
       if product.nil? || purchase.nil? || !purchase.completed?
@@ -337,7 +343,7 @@ module Boutique
       purchase.boutique_id
     end
 
-    get '/boutique/record/:boutique_id' do
+    get '/record/:boutique_id' do
       purchase = get_purchase(params[:boutique_id])
       purchase.maybe_refresh_downloads!
       params['jsonp'].nil? ?

data/test/app_test.rb

@@ -5,7 +5,7 @@ class AppTest < BoutiqueTest
 
   def test_redirect_to_paypal
     ebook_product.save
-    post '/boutique/buy/ebook'
+    post '/buy/ebook'
 
     purchase = Boutique::Purchase.first
     refute(purchase.nil?)
@@ -13,7 +13,7 @@ class AppTest < BoutiqueTest
   end
 
   def test_purchase_non_existing_product
-    post '/boutique/buy/non-existing-product'
+    post '/buy/non-existing-product'
     assert(last_response.not_found?)
   end
 
@@ -25,7 +25,7 @@ class AppTest < BoutiqueTest
     refute(purchase.completed?)
     assert_nil(Pony.last_mail)
 
-    post "/boutique/notify/#{purchase.boutique_id}?payment_status=Completed&txn_id=1337&receiver_email=#{Boutique.config.pp_email}"
+    post "/notify/#{purchase.boutique_id}?payment_status=Completed&txn_id=1337&receiver_email=#{Boutique.config.pp_email}"
     assert(last_response.ok?)
 
     purchase.reload
@@ -35,7 +35,7 @@ class AppTest < BoutiqueTest
   end
 
   def test_notify_not_found
-    post "/boutique/notify/99-notfound"
+    post "/notify/99-notfound"
     assert(last_response.not_found?)
   end
 
@@ -45,20 +45,20 @@ class AppTest < BoutiqueTest
     purchase.save
     assert_nil(Pony.last_mail)
 
-    post "/boutique/recover/ebook", 'email' => 'john@mailinator.com'
+    post "/recover/ebook", 'email' => 'john@mailinator.com'
     assert(last_response.ok?)
     assert_equal(purchase.boutique_id, last_response.body)
     refute_nil(Pony.last_mail)
   end
 
   def test_recover_not_found
-    post "/boutique/recover/99-notfound"
+    post "/recover/99-notfound"
     assert(last_response.not_found?)
   end
 
   def test_record
     purchase = ebook_purchase
-    get "/boutique/record/#{purchase.boutique_id}"
+    get "/record/#{purchase.boutique_id}"
     assert(last_response.ok?)
 
     json = JSON.parse(last_response.body)
@@ -70,7 +70,7 @@ class AppTest < BoutiqueTest
   end
 
   def test_record_not_found
-    get "/boutique/record/99-notfound"
+    get "/record/99-notfound"
     assert(last_response.not_found?)
   end
 

data/test/config_test.rb

@@ -3,6 +3,7 @@ require File.expand_path('helper', File.dirname(__FILE__))
 class ConfigTest < BoutiqueTest
   def test_db
     assert_equal('dev@localhost', Boutique.config.dev_email)
+    assert_equal('LONGCERTID', Boutique.config.pem_cert_id)
     assert_equal(File.expand_path('../certs/private.pem', File.dirname(__FILE__)), Boutique.config.pem_private)
     assert_equal(File.expand_path('../certs/public.pem', File.dirname(__FILE__)), Boutique.config.pem_public)
     assert_equal(File.expand_path('../certs/private.pem', File.dirname(__FILE__)), Boutique.config.pem_private)

data/test/helper.rb

@@ -25,6 +25,7 @@ class BoutiqueTest < MiniTest::Unit::TestCase
     Boutique::Product.all.destroy
     Boutique.configure(false) do |c|
       c.dev_email     'dev@localhost'
+      c.pem_cert_id   'LONGCERTID'
       c.pem_private   File.expand_path('../certs/private.pem', File.dirname(__FILE__))
       c.pem_public    File.expand_path('../certs/public.pem', File.dirname(__FILE__))
       c.pem_paypal    File.expand_path('../certs/paypal.pem', File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boutique
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: .
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70264060063880 !ruby/object:Gem::Requirement
+  requirement: &70290588702720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70264060063880
+  version_requirements: *70290588702720
 - !ruby/object:Gem::Dependency
   name: data_mapper
-  requirement: &70264060063020 !ruby/object:Gem::Requirement
+  requirement: &70290588702180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70264060063020
+  version_requirements: *70290588702180
 - !ruby/object:Gem::Dependency
   name: pony
-  requirement: &70264060061720 !ruby/object:Gem::Requirement
+  requirement: &70290588743100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70264060061720
+  version_requirements: *70290588743100
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70264059953620 !ruby/object:Gem::Requirement
+  requirement: &70290588742600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264059953620
+  version_requirements: *70290588742600
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70264059973400 !ruby/object:Gem::Requirement
+  requirement: &70290588742140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70264059973400
+  version_requirements: *70290588742140
 description: A Sinatra module which accepts payments via PayPal and gives customers
   a secret URL to download your product.
 email: