payola-payments 1.2.2 → 1.2.3

data/spec/factories/subscription_plan.rb

@@ -8,8 +8,8 @@ FactoryGirl.define do
   end
 
   factory :subscription_plan_without_interval_count do
-    sequence(:name) { |n| "Foo #{n}" }
-    sequence(:stripe_id) { |n| "foo-#{n}" }
+    sequence(:name) { |n| "Foo Without Interval #{n}" }
+    sequence(:stripe_id) { |n| "foo-without-interval-#{n}" }
     amount 100
     interval "month"
   end

data/spec/mailers/payola/receipt_mailer_spec.rb

@@ -1,18 +1,23 @@
 require 'spec_helper'
+require 'docverter'
 
 module Payola
   describe ReceiptMailer do
     let(:sale) { create(:sale) }
 
+    before do
+      Payola.pdf_receipt = false
+    end
+
     describe '#receipt' do
       it 'should send a receipt' do
-        Payola.pdf_receipt = false
         mail = Payola::ReceiptMailer.receipt(sale.guid)
         expect(mail.subject).to eq 'Purchase Receipt'
       end
 
       it 'should send a receipt with a pdf' do
         Payola.pdf_receipt = true
+        expect(Docverter::Conversion).to receive(:run).and_return('pdf')
         mail = Payola::ReceiptMailer.receipt(sale.guid)
         expect(mail.attachments["receipt-#{sale.guid}.pdf"]).to_not be nil
       end

data/spec/models/payola/coupon_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+module Payola
+  describe Coupon do
+    describe "validations" do
+      it "should validate uniqueness of coupon code" do
+        c1 = Coupon.create(code: 'abc')
+        expect(c1.valid?).to be_truthy
+
+        c2 = Coupon.new(code: 'abc')
+        expect(c2.valid?).to be_falsey
+      end
+    end
+
+    describe "active" do
+      it "should allow active flag" do
+        c1 = Coupon.create(code: 'abc', active: false)
+        expect(c1.active?).to be_falsey
+      end
+
+      it "should be true by default" do
+        c1 = Coupon.create(code: 'abc')
+        expect(c1.active?).to be_truthy
+      end
+    end
+  end
+end

data/spec/payola_spec.rb

@@ -13,13 +13,13 @@ module Payola
     it "should set publishable key from env" do
       ENV['STRIPE_PUBLISHABLE_KEY'] = 'some_key'
       Payola.reset!
-      expect(Payola.publishable_key).to eq 'some_key'
+      expect(Payola.publishable_key.call).to eq 'some_key'
     end
 
     it "should set secret key from env" do
       ENV['STRIPE_SECRET_KEY'] = 'some_secret'
       Payola.reset!
-      expect(Payola.secret_key).to eq 'some_secret'
+      expect(Payola.secret_key.call).to eq 'some_secret'
     end
   end
 

data/spec/services/payola/change_subscription_plan_spec.rb

@@ -23,7 +23,6 @@ module Payola
       end
 
       it "should change the plan on the payola subscription" do
-        Payola::ChangeSubscriptionPlan.call(@subscription, @plan2)
         expect(@subscription.reload.plan).to eq @plan2
       end
     end

data/spec/services/payola/change_subscription_quantity_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+module Payola
+  describe ChangeSubscriptionQuantity do
+    let(:stripe_helper) { StripeMock.create_test_helper }
+
+    describe "#call" do
+      before do
+        @plan = create(:subscription_plan)
+
+        token = StripeMock.generate_card_token({})
+        @subscription = create(:subscription, quantity: 1, stripe_token: token)
+        StartSubscription.call(@subscription)
+        Payola::ChangeSubscriptionQuantity.call(@subscription, 2)
+      end
+
+      it "should change the quantity on the stripe subscription" do
+        customer = Stripe::Customer.retrieve(@subscription.stripe_customer_id)
+        sub = customer.subscriptions.retrieve(@subscription.stripe_id)
+
+        expect(sub.quantity).to eq 2
+      end
+
+      it "should change the quantity on the payola subscription" do
+        expect(@subscription.reload.quantity).to eq 2
+      end
+    end
+  end
+end

data/spec/services/payola/charge_card_spec.rb

@@ -10,6 +10,15 @@ module Payola
         expect(sale.reload.stripe_customer_id).to_not be_nil
       end
 
+      it "should not create a customer if one already exists" do
+        customer = Stripe::Customer.create
+        sale = create(:sale, state: 'processing', stripe_customer_id: customer.id)
+        expect(Stripe::Customer).to receive(:retrieve).and_return(customer)
+        ChargeCard.call(sale)
+        expect(sale.reload.stripe_customer_id).to eq customer.id
+        expect(sale.state).to eq 'finished'
+      end
+
       it "should create a charge" do
         sale = create(:sale, state: 'processing', stripe_token: stripe_helper.generate_card_token)
         ChargeCard.call(sale)

data/spec/services/payola/start_subscription_spec.rb

@@ -4,6 +4,8 @@ module Payola
   describe StartSubscription do
     let(:stripe_helper) { StripeMock.create_test_helper }
     let(:token){ StripeMock.generate_card_token({}) }
+    let(:user){ User.create }
+
     describe "#call" do
       it "should create a customer" do
         plan = create(:subscription_plan)
@@ -31,6 +33,41 @@ module Payola
         end
       end
 
+      it "should re-use an existing customer" do
+        plan = create(:subscription_plan)
+        subscription = create(:subscription, state: 'processing', plan: plan, stripe_token: token, owner: user)
+        StartSubscription.call(subscription)
+        CancelSubscription.call(subscription)
+
+        subscription2 = create(:subscription, state: 'processing', plan: plan, owner: user)
+        StartSubscription.call(subscription2)
+        expect(subscription2.reload.stripe_customer_id).to_not be_nil
+        expect(subscription2.reload.stripe_customer_id).to eq subscription.reload.stripe_customer_id
+      end
+
+      it "should create an invoice item with a setup fee" do
+        plan = create(:subscription_plan)
+        subscription = create(:subscription, state: 'processing', plan: plan, stripe_token: token, owner: user, setup_fee: 100)
+        StartSubscription.call(subscription)
+
+        ii = Stripe::InvoiceItem.all(customer: subscription.stripe_customer_id).first
+        expect(ii).to_not be_nil
+        expect(ii.amount).to eq 100
+        expect(ii.description).to eq "Setup Fee"
+      end
+
+      it "should allow the plan to override the setup fee description" do
+        plan = create(:subscription_plan)
+        subscription = create(:subscription, state: 'processing', plan: plan, stripe_token: token, owner: user, setup_fee: 100)
+
+        expect(plan).to receive(:setup_fee_description).with(subscription).and_return('Random Mystery Fee')
+        StartSubscription.call(subscription)
+
+        ii = Stripe::InvoiceItem.all(customer: subscription.stripe_customer_id).first
+        expect(ii).to_not be_nil
+        expect(ii.amount).to eq 100
+        expect(ii.description).to eq 'Random Mystery Fee'        
+      end
     end
   end
 end

data/spec/worker_spec.rb

@@ -26,7 +26,7 @@ module Payola
         expect(Payola::Worker::Sidekiq).to receive(:can_run?).and_return(false)
         expect(Payola::Worker::SuckerPunch).to receive(:can_run?).and_return(false)
 
-        expect { Payola::Worker.autofind }.to raise_error("No eligable background worker systems found.")
+        expect { Payola::Worker.autofind }.to raise_error("No eligible background worker systems found.")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: payola-payments
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Pete Keen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.7
 - !ruby/object:Gem::Dependency
   name: stripe_event
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +199,7 @@ files:
 - app/models/payola/subscription.rb
 - app/services/payola/cancel_subscription.rb
 - app/services/payola/change_subscription_plan.rb
+- app/services/payola/change_subscription_quantity.rb
 - app/services/payola/charge_card.rb
 - app/services/payola/create_plan.rb
 - app/services/payola/create_sale.rb
@@ -231,6 +232,7 @@ files:
 - app/views/payola/transactions/new.html.erb
 - app/views/payola/transactions/show.html.erb
 - app/views/payola/transactions/wait.html.erb
+- config/database.yml.ci
 - config/routes.rb
 - db/migrate/20141001170138_create_payola_sales.rb
 - db/migrate/20141001203541_create_payola_stripe_webhooks.rb
@@ -250,6 +252,7 @@ files:
 - db/migrate/20141114154223_add_signed_custom_fields_to_payola_subscription.rb
 - db/migrate/20141114163841_add_addresses_to_payola_subscription.rb
 - db/migrate/20141122020755_add_setup_fee_to_payola_subscriptions.rb
+- db/migrate/20141213205847_add_active_to_payola_coupon.rb
 - lib/generators/payola/install_generator.rb
 - lib/generators/payola/templates/initializer.rb
 - lib/payola-payments.rb
@@ -282,6 +285,7 @@ files:
 - spec/dummy/app/models/product.rb
 - spec/dummy/app/models/subscription_plan.rb
 - spec/dummy/app/models/subscription_plan_without_interval_count.rb
+- spec/dummy/app/models/user.rb
 - spec/dummy/app/views/buy/index.html.erb
 - spec/dummy/app/views/home/index.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -316,6 +320,7 @@ files:
 - spec/dummy/db/migrate/20141029140518_create_owners.rb
 - spec/dummy/db/migrate/20141105010234_create_subscription_plans.rb
 - spec/dummy/db/migrate/20141120170744_create_subscription_plan_without_interval_counts.rb
+- spec/dummy/db/migrate/20141204170622_create_users.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
@@ -362,12 +367,14 @@ files:
 - spec/helpers/payola/price_helper_spec.rb
 - spec/mailers/payola/admin_mailer_spec.rb
 - spec/mailers/payola/receipt_mailer_spec.rb
+- spec/models/payola/coupon_spec.rb
 - spec/models/payola/sale_spec.rb
 - spec/models/payola/stripe_webhook_spec.rb
 - spec/models/payola/subscription_spec.rb
 - spec/payola_spec.rb
 - spec/services/payola/cancel_subscription_spec.rb
 - spec/services/payola/change_subscription_plan_spec.rb
+- spec/services/payola/change_subscription_quantity_spec.rb
 - spec/services/payola/charge_card_spec.rb
 - spec/services/payola/create_plan_spec.rb
 - spec/services/payola/create_sale_spec.rb
@@ -426,6 +433,7 @@ test_files:
 - spec/dummy/app/models/product.rb
 - spec/dummy/app/models/subscription_plan.rb
 - spec/dummy/app/models/subscription_plan_without_interval_count.rb
+- spec/dummy/app/models/user.rb
 - spec/dummy/app/views/buy/index.html.erb
 - spec/dummy/app/views/home/index.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -460,6 +468,7 @@ test_files:
 - spec/dummy/db/migrate/20141029140518_create_owners.rb
 - spec/dummy/db/migrate/20141105010234_create_subscription_plans.rb
 - spec/dummy/db/migrate/20141120170744_create_subscription_plan_without_interval_counts.rb
+- spec/dummy/db/migrate/20141204170622_create_users.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
@@ -508,12 +517,14 @@ test_files:
 - spec/helpers/payola/price_helper_spec.rb
 - spec/mailers/payola/admin_mailer_spec.rb
 - spec/mailers/payola/receipt_mailer_spec.rb
+- spec/models/payola/coupon_spec.rb
 - spec/models/payola/sale_spec.rb
 - spec/models/payola/stripe_webhook_spec.rb
 - spec/models/payola/subscription_spec.rb
 - spec/payola_spec.rb
 - spec/services/payola/cancel_subscription_spec.rb
 - spec/services/payola/change_subscription_plan_spec.rb
+- spec/services/payola/change_subscription_quantity_spec.rb
 - spec/services/payola/charge_card_spec.rb
 - spec/services/payola/create_plan_spec.rb
 - spec/services/payola/create_sale_spec.rb