payola-payments 1.2.2 → 1.2.3

data/lib/payola/version.rb

@@ -1,3 +1,3 @@
 module Payola
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/lib/payola/worker.rb

@@ -28,7 +28,7 @@ module Payola
           end
         end
 
-        raise "No eligable background worker systems found."
+        raise "No eligible background worker systems found."
       end
     end
 

data/spec/concerns/plan_spec.rb

@@ -34,5 +34,14 @@ module Payola
       subscription_plan.save!
     end
 
+    it "should not try to create the plan at stripe before the model is updated" do
+      subscription_plan = build(:subscription_plan)
+      subscription_plan.save!
+      subscription_plan.name = "new name"
+
+      Payola::CreatePlan.should_not_receive(:call)
+      subscription_plan.save!
+    end
+
   end
 end

data/spec/concerns/sellable_spec.rb

@@ -12,7 +12,7 @@ module Payola
         expect(product.valid?).to be false
       end
       it "should validate permalink" do
-        product = build(:product, permalink: false)
+        product = build(:product, permalink: nil)
         expect(product.valid?).to be false
       end
     end

data/spec/controllers/payola/subscriptions_controller_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 module Payola
   describe SubscriptionsController do
+    routes { Payola::Engine.routes }
+
     before do
       @plan = create(:subscription_plan)
       Payola.register_subscribable(@plan.class)
@@ -25,10 +27,11 @@ module Payola
           'action' => 'create',
           'plan' => @plan,
           'coupon' => nil,
+          'quantity' => 1,
           'affiliate' => nil          
         ).and_return(subscription)
 
-        post :create, plan_class: @plan.plan_class, plan_id: @plan.id, use_route: :payola
+        post :create, plan_class: @plan.plan_class, plan_id: @plan.id
 
         expect(response.status).to eq 200
         parsed_body = JSON.load(response.body)
@@ -50,7 +53,7 @@ module Payola
           CreateSubscription.should_receive(:call).and_return(subscription)
           Payola.should_not_receive(:queue!)
 
-          post :create, plan_class: @plan.plan_class, plan_id: @plan.id, use_route: :payola
+          post :create, plan_class: @plan.plan_class, plan_id: @plan.id
 
           expect(response.status).to eq 400
           parsed_body = JSON.load(response.body)
@@ -61,12 +64,12 @@ module Payola
 
     describe '#status' do
       it "should return 404 if it can't find the subscription" do
-        get :status, guid: 'doesnotexist', use_route: :payola
+        get :status, guid: 'doesnotexist'
         expect(response.status).to eq 404
       end
       it "should return json with properties" do
         subscription = create(:subscription)
-        get :status, guid: subscription.guid, use_route: :payola
+        get :status, guid: subscription.guid
 
         expect(response.status).to eq 200
 
@@ -82,7 +85,7 @@ module Payola
       it "should redirect to the product's redirect path" do
         plan = create(:subscription_plan)
         subscription = create(:subscription, :plan => plan)
-        get :show, guid: subscription.guid, use_route: :payola
+        get :show, guid: subscription.guid
 
         expect(response).to redirect_to '/'
       end
@@ -94,7 +97,7 @@ module Payola
       end
       it "call Payola::CancelSubscription and redirect" do
         Payola::CancelSubscription.should_receive(:call)
-        delete :destroy, :guid => @subscription.guid, use_route: :payola
+        delete :destroy, guid: @subscription.guid
         # TODO : Figure out why this needs to be a hardcoded path.
         # Why doesn't subscription_path(@subscription) work?
         expect(response).to redirect_to "/subdir/payola/confirm_subscription/#{@subscription.guid}"
@@ -104,7 +107,7 @@ module Payola
         expect(Payola::CancelSubscription).to_not receive(:call)
         expect_any_instance_of(::ApplicationController).to receive(:payola_can_modify_subscription?).and_return(false)
 
-        delete :destroy, :guid => @subscription.guid, use_route: :payola
+        delete :destroy, guid: @subscription.guid
         expect(response).to redirect_to "/subdir/payola/confirm_subscription/#{@subscription.guid}"
         expect(request.flash[:alert]).to eq 'You cannot modify this subscription.'
       end
@@ -119,17 +122,42 @@ module Payola
       it "should call Payola::ChangeSubscriptionPlan and redirect" do
         expect(Payola::ChangeSubscriptionPlan).to receive(:call).with(@subscription, @plan)
 
-        post :change_plan, guid: @subscription.guid, plan_class: @plan.plan_class, plan_id: @plan.id, use_route: :payola
+        post :change_plan, guid: @subscription.guid, plan_class: @plan.plan_class, plan_id: @plan.id
 
         expect(response).to redirect_to "/subdir/payola/confirm_subscription/#{@subscription.guid}"
         expect(request.flash[:notice]).to eq 'Subscription plan updated'
       end
 
-      it "should redirect with an error if it can't cancel the subscription" do
-        expect(Payola::CancelSubscription).to_not receive(:call)
+      it "should redirect with an error if it can't update the subscription" do
+        expect(Payola::ChangeSubscriptionPlan).to_not receive(:call)
+        expect_any_instance_of(::ApplicationController).to receive(:payola_can_modify_subscription?).and_return(false)
+
+        post :change_plan, guid: @subscription.guid, plan_class: @plan.plan_class, plan_id: @plan.id
+        expect(response).to redirect_to "/subdir/payola/confirm_subscription/#{@subscription.guid}"
+        expect(request.flash[:alert]).to eq 'You cannot modify this subscription.'
+      end
+    end
+
+    describe '#change_quantity' do
+      before :each do
+        @subscription = create(:subscription, state: :active)
+        @plan = create(:subscription_plan)
+      end
+
+      it "should call Payola::ChangeSubscriptionQuantity and redirect" do
+        expect(Payola::ChangeSubscriptionQuantity).to receive(:call).with(@subscription, 5)
+
+        post :change_quantity, guid: @subscription.guid, quantity: 5
+
+        expect(response).to redirect_to "/subdir/payola/confirm_subscription/#{@subscription.guid}"
+        expect(request.flash[:notice]).to eq 'Subscription quantity updated'
+      end
+
+      it "should redirect with an error if it can't update the subscription" do
+        expect(Payola::ChangeSubscriptionQuantity).to_not receive(:call)
         expect_any_instance_of(::ApplicationController).to receive(:payola_can_modify_subscription?).and_return(false)
 
-        delete :destroy, :guid => @subscription.guid, use_route: :payola
+        post :change_quantity, guid: @subscription.guid, quantity: 5
         expect(response).to redirect_to "/subdir/payola/confirm_subscription/#{@subscription.guid}"
         expect(request.flash[:alert]).to eq 'You cannot modify this subscription.'
       end
@@ -144,7 +172,7 @@ module Payola
       it "should call UpdateCard and redirect" do
         expect(Payola::UpdateCard).to receive(:call).with(@subscription, 'tok_1234')
 
-        post :update_card, guid: @subscription.guid, stripeToken: 'tok_1234', use_route: :payola
+        post :update_card, guid: @subscription.guid, stripeToken: 'tok_1234'
 
         expect(response).to redirect_to "/subdir/payola/confirm_subscription/#{@subscription.guid}"
         expect(request.flash[:notice]).to eq 'Card updated'
@@ -154,7 +182,7 @@ module Payola
         expect(Payola::UpdateCard).to receive(:call).never
         expect_any_instance_of(::ApplicationController).to receive(:payola_can_modify_subscription?).and_return(false)
 
-        post :update_card, guid: @subscription.guid, stripeToken: 'tok_1234', use_route: :payola
+        post :update_card, guid: @subscription.guid, stripeToken: 'tok_1234'
 
         expect(response).to redirect_to "/subdir/payola/confirm_subscription/#{@subscription.guid}"
         expect(request.flash[:alert]).to eq 'You cannot modify this subscription.'

data/spec/controllers/payola/transactions_controller_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 module Payola
   describe TransactionsController do
+    routes { Payola::Engine.routes }
+
     before do
       @product = create(:product)
       Payola.register_sellable(@product.class)
@@ -29,7 +31,7 @@ module Payola
         ).and_return(sale)
 
         Payola.should_receive(:queue!)
-        post :create, product_class: @product.product_class, permalink: @product.permalink, use_route: :payola
+        post :create, product_class: @product.product_class, permalink: @product.permalink
 
         expect(response.status).to eq 200
         parsed_body = JSON.load(response.body)
@@ -50,7 +52,7 @@ module Payola
           CreateSale.should_receive(:call).and_return(sale)          
           Payola.should_not_receive(:queue!)
 
-          post :create, product_class: @product.product_class, permalink: @product.permalink, use_route: :payola
+          post :create, product_class: @product.product_class, permalink: @product.permalink
 
           expect(response.status).to eq 400
           parsed_body = JSON.load(response.body)
@@ -61,12 +63,12 @@ module Payola
 
     describe '#status' do
       it "should return 404 if it can't find the sale" do
-        get :status, guid: 'doesnotexist', use_route: :payola
+        get :status, guid: 'doesnotexist'
         expect(response.status).to eq 404
       end
       it "should return json with properties" do
         sale = create(:sale)
-        get :status, guid: sale.guid, use_route: :payola
+        get :status, guid: sale.guid
 
         expect(response.status).to eq 200
 
@@ -81,7 +83,7 @@ module Payola
     describe '#show' do
       it "should redirect to the product's redirect path" do
         sale = create(:sale)
-        get :show, guid: sale.guid, use_route: :payola
+        get :show, guid: sale.guid
 
         expect(response).to redirect_to '/'
       end

data/spec/dummy/app/models/user.rb

@@ -0,0 +1,2 @@
+class User < ActiveRecord::Base
+end

data/spec/dummy/app/views/subscribe/index.html.erb

@@ -16,6 +16,8 @@
   <input type="text" data-stripe="cvc"></input><br>
   Coupon Code<br>
   <input type="text" name="coupon" data-payola="coupon"></input><br>
+  Quantity<br>
+  <input type="text" name="quantity" data-payola="quantity"></input><br>
   <input type="submit"></input>
 <% end %>
 

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,11 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  if Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 2
+    config.serve_static_files  = true
+  else
+    config.serve_static_asses  = true
+  end
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/spec/dummy/db/migrate/20141204170622_create_users.rb

@@ -0,0 +1,8 @@
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,14 +11,14 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141122020755) do
+ActiveRecord::Schema.define(version: 20141213205847) do
 
-  create_table "owners", force: true do |t|
+  create_table "owners", force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "payola_affiliates", force: true do |t|
+  create_table "payola_affiliates", force: :cascade do |t|
     t.string   "code"
     t.string   "email"
     t.integer  "percent"
@@ -26,14 +26,15 @@ ActiveRecord::Schema.define(version: 20141122020755) do
     t.datetime "updated_at"
   end
 
-  create_table "payola_coupons", force: true do |t|
+  create_table "payola_coupons", force: :cascade do |t|
     t.string   "code"
     t.integer  "percent_off"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "active",      default: true
   end
 
-  create_table "payola_sales", force: true do |t|
+  create_table "payola_sales", force: :cascade do |t|
     t.string   "email"
     t.string   "guid"
     t.integer  "product_id"
@@ -69,13 +70,13 @@ ActiveRecord::Schema.define(version: 20141122020755) do
   add_index "payola_sales", ["product_id", "product_type"], name: "index_payola_sales_on_product"
   add_index "payola_sales", ["stripe_customer_id"], name: "index_payola_sales_on_stripe_customer_id"
 
-  create_table "payola_stripe_webhooks", force: true do |t|
+  create_table "payola_stripe_webhooks", force: :cascade do |t|
     t.string   "stripe_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "payola_subscriptions", force: true do |t|
+  create_table "payola_subscriptions", force: :cascade do |t|
     t.string   "plan_type"
     t.integer  "plan_id"
     t.datetime "start"
@@ -115,7 +116,7 @@ ActiveRecord::Schema.define(version: 20141122020755) do
 
   add_index "payola_subscriptions", ["guid"], name: "index_payola_subscriptions_on_guid"
 
-  create_table "products", force: true do |t|
+  create_table "products", force: :cascade do |t|
     t.string   "name"
     t.string   "permalink"
     t.integer  "price"
@@ -123,7 +124,7 @@ ActiveRecord::Schema.define(version: 20141122020755) do
     t.datetime "updated_at"
   end
 
-  create_table "subscription_plan_without_interval_counts", force: true do |t|
+  create_table "subscription_plan_without_interval_counts", force: :cascade do |t|
     t.string   "name"
     t.string   "stripe_id"
     t.integer  "amount"
@@ -132,7 +133,7 @@ ActiveRecord::Schema.define(version: 20141122020755) do
     t.datetime "updated_at"
   end
 
-  create_table "subscription_plans", force: true do |t|
+  create_table "subscription_plans", force: :cascade do |t|
     t.integer  "amount"
     t.string   "interval"
     t.integer  "interval_count"
@@ -143,4 +144,9 @@ ActiveRecord::Schema.define(version: 20141122020755) do
     t.datetime "updated_at"
   end
 
+  create_table "users", force: :cascade do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
 end

data/spec/dummy/log/development.log

@@ -6210,3 +6210,134 @@ Started GET "/assets/payola.js?body=1" for 127.0.0.1 at 2014-11-25 16:56:14 -050
 Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-11-25 16:56:14 -0500
 Terminating 3 actors...
 Terminating task: type=:finalizer, meta={:method_name=>:__shutdown__}, status=:callwait
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddSetupFeeToPayolaSubscriptions (20141122020755)
+   (0.2ms)  begin transaction
+   (0.5ms)  ALTER TABLE "payola_subscriptions" ADD "setup_fee" integer
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141122020755"]]
+   (1.1ms)  commit transaction
+Migrating to CreateUsers (20141204170622)
+   (0.1ms)  begin transaction
+   (0.3ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141204170622"]]
+   (0.8ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_sales_on_owner_id_and_owner_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_sales_on_owner_id_and_owner_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_sales_on_stripe_customer_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_sales_on_stripe_customer_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_sales_on_product' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_sales_on_product' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_sales_on_guid' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_sales_on_guid' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_sales_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_sales_on_email' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_sales_on_coupon_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_sales_on_coupon_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_subscriptions_on_guid' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_subscriptions_on_guid' AND type='index'
+
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddActiveToPayolaCoupon (20141213205847)
+   (0.1ms)  begin transaction
+   (1.0ms)  ALTER TABLE "payola_coupons" ADD "active" boolean DEFAULT 't'
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141213205847"]]
+   (1.4ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_sales_on_owner_id_and_owner_type' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_sales_on_owner_id_and_owner_type' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_sales_on_stripe_customer_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_sales_on_stripe_customer_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_sales_on_product' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_sales_on_product' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_sales_on_guid' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_sales_on_guid' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_sales_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_sales_on_email' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_sales_on_coupon_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_sales_on_coupon_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_payola_subscriptions_on_guid' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_payola_subscriptions_on_guid' AND type='index'
+