payola-payments 1.0.6 → 1.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWU3ZGI3MzEwZTI1YzY5OGNhNTc0ODEyMTNjZjlhNWIzMTg3YThiOQ==
+    Nzc3ZTZjYjM5M2I0MGZlMDMxYjI0Mzc2ZjU2ZjM1NjU0ZDVmZDA3Ng==
   data.tar.gz: !binary |-
-    N2YzYzY0ZmY4ODE2MzhlN2I5OTk1MjZjYzg3NGQ4OGNlYTdkYzMwYQ==
+    MTY0MzBlYTM1NjNlYmU3OGFiMTQyN2ZiNjZjYmQzYzc3ZTI0YzEwNg==
 SHA512:
   metadata.gz: !binary |-
-    NDFiNjM2NGMyNmI5N2Q3NzA5NGFlNWZlZDYzOWE5ZWVkY2I1ZGRkNjZkZjVj
-    ZDUwNzY1OGY3Y2IyZDk2YzE2OWNjY2E0MTc5MWExOTE2MThjODg4NjZmZTFj
-    MzIyYjNmOGYwNmQzNWUxOWFmZGEyY2QyMmY2MTU4MDUyYzc3NGE=
+    ODcxYzEwYmYzYjJhMjUyMjhiYjk2ODdiMzM4NTNiZjY1M2JiMjNmNTE5YjE5
+    YzRjZWRmNjAwZThhZTgxNGE5ZDQ4ZTFmNTQwZmYwMDg1ZjhmYzBmMzdkYWYz
+    ZjNjZTk2MjRkYTZlN2E5NzlkNmFiYTVjZTRiMzg3YTdjYjgwNTg=
   data.tar.gz: !binary |-
-    Yjg5ZmQzZTFiNWFlYzdiNDEzZGE4NzExYmRkMWI5NTBkZmEyOTg3MTZlYTkx
-    YWJmMTZkZTMyYjJiMWU0M2VlMWI1NTVmOTc0M2E1ZWI2MTE5MjcwNDdhMzRi
-    NTZmNTY4YzBhZmIwZjZhZjgzYmYzZDAzYTAxYzdlNGJiNzliMGE=
+    N2VjMjFkMmI2YjAyYzgxNTBhZTYxOGI0ZTE1NzY2Y2M1OWFiMWM4ZTIxN2Ey
+    NDUwYWIwY2UxNzY0ODFjNTYwOGQzNDQ3NmY5MjUxMjMwMjRiYzhlMTQ3ZDI2
+    NjQ2YjJkMGFjNTJiMmFmY2FhNTlmN2IyNGU4NDBjN2U0MmZjNDc=

data/app/assets/javascripts/payola/checkout_button.js

@@ -30,17 +30,15 @@ var Payola = {
         $(".payola-checkout-button-spinner").show();
         $.ajax({
             type: "POST",
-            url: "/payola/buy/" + options.product_class + "/" + options.product_permalink,
+            url: options.base_path + "/buy/" + options.product_class + "/" + options.product_permalink,
             data: form.serialize(),
-            success: function(data) { Payola.poll(data.guid, 60, options.error_div_id) },
-            error: function(data) { Payola.showError(data.responseJSON.error, options.error_div_id) }
+            success: function(data) { Payola.poll(data.guid, 60, options) },
+            error: function(data) { Payola.showError(data.responseJSON.error, options) }
         });
     },
 
-    showError: function(error, error_div_id) {
-        console.log(error);
-        console.log(error_div_id);
-        var error_div = $("#" + error_div_id);
+    showError: function(error, options) {
+        var error_div = $("#" + options.error_div_id);
         error_div.html(error);
         error_div.show();
         $(".payola-checkout-button").prop("disabled", false);
@@ -48,20 +46,19 @@ var Payola = {
         $(".payola-checkout-button-text").show();
     },
 
-    poll: function(guid, num_retries_left, error_div_id) {
-        console.log(error_div_id);
+    poll: function(guid, num_retries_left, options) {
         if (num_retries_left == 0) {
-            Payola.showError("This seems to be taking too long. Please contact support and give them transaction ID: " + guid, error_div_id);
+            Payola.showError("This seems to be taking too long. Please contact support and give them transaction ID: " + guid, options);
             return;
         }
 
-        $.get("/payola/status/" + guid, function(data) {
+        $.get(options.base_path + "/status/" + guid, function(data) {
             if (data.status === "finished") {
-                window.location = "/payola/confirm/" + guid;
+                window.location = options.base_path + "/confirm/" + guid;
             } else if (data.status === "errored") {
-                Payola.showError(data.error, error_div_id);
+                Payola.showError(data.error, options);
             } else {
-                setTimeout(function() { Payola.poll(guid, num_retries_left - 1, error_div_id) }, 500);
+                setTimeout(function() { Payola.poll(guid, num_retries_left - 1, options) }, 500);
             }
         });
     }

data/app/views/payola/transactions/_checkout.html.erb

@@ -9,7 +9,8 @@
   allow_remember_me = local_assigns.fetch :allow_remember_me, true
   email = local_assigns.fetch :email, ''
   verify_zip_code = local_assigns.fetch :verify_zip_code, false
-    
+
+  sale = Payola::Sale.new(product: sellable)
 
   button_id = "payola-button-#{sellable.product_class}-#{sellable.permalink}"
 
@@ -38,6 +39,7 @@
 <% end %>
 <script type="text/javascript">
   Payola.setUpStripeCheckoutButton({
+    base_path: "<%= main_app.payola_path %>",
     form_id: "<%= form_id %>",
     button_id: "<%= button_id %>",
     error_div_id: "<%= error_div_id %>",
@@ -47,7 +49,7 @@
     name: "<%= name %>",
     description: "<%= description %>",
     product_image_path: "<%= product_image_path %>",
-    publishable_key: "<%= Payola.publishable_key %>",
+    publishable_key: "<%= Payola.publishable_key_for_sale(sale) %>",
     panel_label: "<%= panel_label %>",
     allow_remember_me: <%= allow_remember_me %>,
     email: "<%= email %>",

data/lib/generators/payola/install_generator.rb

@@ -14,7 +14,7 @@ module Payola
     end
 
     def install_route
-      route "mount Payola::Engine => '/payola'"
+      route "mount Payola::Engine => '/payola', as: :payola"
     end
   end
 end

data/lib/payola/version.rb

@@ -1,3 +1,3 @@
 module Payola
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/lib/payola/worker/active_job.rb

@@ -0,0 +1,21 @@
+module ::ActiveJob
+  class Base; end
+end
+
+module Payola
+  module Worker
+    class ActiveJob < ::ActiveJob::Base
+      def self.can_run?
+        defined?(::ActiveJob::Core)
+      end
+
+      def self.call(sale)
+        perform_later(sale.guid)
+      end
+  
+      def perform(guid)
+        Sale.where(guid: guid).first.process!
+      end
+    end
+  end
+end

data/lib/payola/worker/base.rb

@@ -0,0 +1,9 @@
+module Payola
+  module Worker
+    class BaseWorker
+      def perform(guid)
+        Sale.where(guid: guid).first.process!
+      end
+    end
+  end
+end

data/lib/payola/worker/sidekiq.rb

@@ -0,0 +1,20 @@
+begin
+  require 'sidekiq'
+rescue LoadError
+end
+
+module Payola
+  module Worker
+    class Sidekiq < BaseWorker
+      include ::Sidekiq::Worker if defined? ::Sidekiq::Worker
+
+      def self.can_run?
+        defined?(::Sidekiq::Worker)
+      end
+
+      def self.call(sale)
+        perform_async(sale.guid)
+      end
+    end
+  end
+end

data/lib/payola/worker/sucker_punch.rb

@@ -0,0 +1,20 @@
+begin
+  require 'sucker_punch'
+rescue LoadError
+end
+
+module Payola
+  module Worker
+    class SuckerPunch < BaseWorker
+      include ::SuckerPunch::Job  if defined? ::SuckerPunch::Job
+
+      def self.can_run?
+        defined?(::SuckerPunch::Job)
+      end
+
+      def self.call(sale)
+        new.async.perform(sale.guid)
+      end
+    end
+  end
+end

data/lib/payola/worker.rb

@@ -1,12 +1,7 @@
-begin
-  require 'sidekiq'
-rescue LoadError
-end
-
-begin
-  require 'sucker_punch'
-rescue LoadError
-end
+require 'payola/worker/base'
+require 'payola/worker/active_job'
+require 'payola/worker/sidekiq'
+require 'payola/worker/sucker_punch'
 
 module Payola
   module Worker
@@ -22,6 +17,11 @@ module Payola
       end
 
       def autofind
+        # prefer ActiveJob over the other workers
+        if Payola::Worker::ActiveJob.can_run?
+          return Payola::Worker::ActiveJob
+        end
+        
         registry.values.each do |worker|
           if worker.can_run?
             return worker
@@ -32,39 +32,10 @@ module Payola
       end
     end
 
-    class BaseWorker
-      def perform(guid)
-        Sale.where(guid: guid).first.process!
-      end
-    end
-
-    class Sidekiq < BaseWorker
-      include ::Sidekiq::Worker if defined? ::Sidekiq::Worker
-
-      def self.can_run?
-        defined?(::Sidekiq::Worker)
-      end
-
-      def self.call(sale)
-        perform_async(sale.guid)
-      end
-    end
-
-    class SuckerPunch < BaseWorker
-      include ::SuckerPunch::Job  if defined? ::SuckerPunch::Job
-
-      def self.can_run?
-        defined?(::SuckerPunch::Job)
-      end
-
-      def self.call(sale)
-        new.async.perform(sale.guid)
-      end
-    end
-
     self.registry = {
-      sidekiq: Payola::Worker::Sidekiq,
-      sucker_punch: Payola::Worker::SuckerPunch
+      sidekiq:      Payola::Worker::Sidekiq,
+      sucker_punch: Payola::Worker::SuckerPunch,
+      active_job:   Payola::Worker::ActiveJob
     }
   end
 end

data/lib/payola.rb

@@ -6,6 +6,7 @@ require 'jquery-rails'
 module Payola
   class << self
     attr_accessor :publishable_key,
+      :publishable_key_retriever,
       :secret_key,
       :secret_key_retriever,
       :background_worker,
@@ -23,6 +24,10 @@ module Payola
       return secret_key_retriever.call(sale)
     end
 
+    def publishable_key_for_sale(sale)
+      return publishable_key_retriever.call(sale)
+    end
+
     def subscribe(name, callable = Proc.new)
       StripeEvent.subscribe(name, callable)
     end
@@ -54,6 +59,7 @@ module Payola
       self.publishable_key = ENV['STRIPE_PUBLISHABLE_KEY']
       self.secret_key = ENV['STRIPE_SECRET_KEY']
       self.secret_key_retriever = lambda { |sale| Payola.secret_key }
+      self.publishable_key_retriever = lambda { |sale| Payola.publishable_key }
       self.support_email = 'sales@example.com'
       self.sellables = {}
     end

data/spec/dummy/config/routes.rb

@@ -1,4 +1,4 @@
 Rails.application.routes.draw do
   resources :buy
-  mount Payola::Engine => "/payola"
+  mount Payola::Engine => "/subdir/payola", as: :payola
 end