stripe-rails 1.8.1 → 1.10.1

data/lib/stripe/rails.rb

@@ -4,6 +4,7 @@ require 'stripe/engine'
 require 'stripe/configuration_builder'
 require 'stripe/current_api_version'
 require 'stripe/plans'
+require 'stripe/billing_tier'
 require 'stripe/coupons'
 require 'stripe/products'
 require 'stripe/callbacks'

data/lib/stripe/rails/tasks.rake

@@ -2,7 +2,7 @@ namespace :stripe do
   desc 'verify your stripe.com authentication configuration'
   task 'verify' => :environment do
     begin
-      Stripe::Plan.all
+      Stripe::Plan.list
       puts "[OK] - connection to stripe.com is functioning properly"
     rescue Stripe::AuthenticationError => e
       puts "[FAIL] - authentication failed"
@@ -32,4 +32,4 @@ namespace :stripe do
 
   desc "create all plans and coupons defined in config/stripe/{products|plans|coupons}.rb"
   task 'prepare' => ['products:prepare', 'plans:prepare', 'coupons:prepare']
-end
+end

data/lib/stripe/rails/version.rb

@@ -1,5 +1,5 @@
 module Stripe
   module Rails
-    VERSION = '1.8.1'.freeze
+    VERSION = '1.10.1'.freeze
   end
 end

data/test/callbacks_spec.rb

@@ -31,9 +31,9 @@ describe Stripe::Callbacks do
     describe 'when it is invoked for the invoice.payment_succeeded event' do
       it 'is invoked for the invoice.payment_succeeded event' do
         subject
-        @event.wont_be_nil
-        @event.type.must_equal 'invoice.payment_succeeded'
-        @target.total.must_equal 6999
+        _(@event).wont_be_nil
+        _(@event.type).must_equal 'invoice.payment_succeeded'
+        _(@target.total).must_equal 6999
       end
     end
 
@@ -42,7 +42,7 @@ describe Stripe::Callbacks do
 
       it 'the invoice.payment_succeeded callback is not invoked' do
         subject
-        @event.must_be_nil
+        _(@event).must_be_nil
       end
     end
 
@@ -50,7 +50,7 @@ describe Stripe::Callbacks do
       before { run_callback_with(callback) { fail } }
 
       it 'causes the whole webhook to fail' do
-        ->{ subject }.must_raise RuntimeError
+        _(-> { subject }).must_raise RuntimeError
       end
     end
   end
@@ -61,8 +61,8 @@ describe Stripe::Callbacks do
 
     it 'does not cause the webhook to fail' do
       subject
-      last_response.status.must_be :>=, 200
-      last_response.status.must_be :<, 300
+      _(last_response.status).must_be :>=, 200
+      _(last_response.status).must_be :<, 300
     end
   end
 
@@ -75,7 +75,7 @@ describe Stripe::Callbacks do
 
       it 'it will be run' do
         subject
-        events.first.type.must_equal 'invoice.payment_failed'
+        _(events.first.type).must_equal 'invoice.payment_failed'
       end
     end
 
@@ -84,7 +84,7 @@ describe Stripe::Callbacks do
 
       it 'it will be run' do
         subject
-        events.first.type.must_equal 'foo.bar.baz'
+        _(events.first.type).must_equal 'foo.bar.baz'
       end
     end
   end
@@ -109,7 +109,7 @@ describe Stripe::Callbacks do
       describe 'when a prior attribute was not specified' do
         it 'does not fire events' do
           subject
-          events.length.must_equal 0
+          _(events.length).must_equal 0
         end
       end
 
@@ -117,7 +117,7 @@ describe Stripe::Callbacks do
         before { @stubbed_event.data.previous_attributes['closed'] = true }
         it 'fires events' do
           subject
-          events.length.must_equal 1
+          _(events.length).must_equal 1
         end
       end
     end
@@ -134,7 +134,7 @@ describe Stripe::Callbacks do
       describe 'when a prior attribute was not specified' do
         it 'does not fire events' do
           subject
-          events.length.must_equal 0
+          _(events.length).must_equal 0
         end
       end
 
@@ -142,7 +142,7 @@ describe Stripe::Callbacks do
         before { @stubbed_event.data.previous_attributes['subtotal'] = 699 }
         it 'fire events' do
           subject
-          events.length.must_equal 1
+          _(events.length).must_equal 1
         end
       end
     end
@@ -159,7 +159,7 @@ describe Stripe::Callbacks do
       describe 'when the lambda is not true' do
         it 'does not fire events' do
           subject
-          events.length.must_equal 0
+          _(events.length).must_equal 0
         end
       end
 
@@ -167,7 +167,7 @@ describe Stripe::Callbacks do
         before { @stubbed_event.data.previous_attributes['closed'] = 'false' }
         it 'fires events' do
           subject
-          events.length.must_equal 1
+          _(events.length).must_equal 1
         end
       end
     end

data/test/coupon_builder_spec.rb

@@ -13,7 +13,7 @@ describe 'building coupons' do
       end
     end
     it "allows a single redemption by default" do
-      @coupon.max_redemptions.must_equal 1
+      _(@coupon.max_redemptions).must_equal 1
     end
   end
 
@@ -33,8 +33,8 @@ describe 'building coupons' do
     after {Stripe::Coupons.send(:remove_const, :GOLD25)}
 
     it 'is accessible via hash lookup (symbol/string agnostic)' do
-      Stripe::Coupons[:gold25].must_equal Stripe::Coupons::GOLD25
-      Stripe::Coupons['gold25'].must_equal Stripe::Coupons::GOLD25
+      _(Stripe::Coupons[:gold25]).must_equal Stripe::Coupons::GOLD25
+      _(Stripe::Coupons['gold25']).must_equal Stripe::Coupons::GOLD25
     end
 
     describe 'uploading' do
@@ -116,7 +116,7 @@ describe 'building coupons' do
   end
   describe 'with missing mandatory values' do
     it 'raises an exception after configuring it' do
-      proc {Stripe.coupon(:bad) {}}.must_raise Stripe::InvalidConfigurationError
+      _(proc {Stripe.coupon(:bad) {}}).must_raise Stripe::InvalidConfigurationError
     end
   end
 end

data/test/dummy/config/stripe/plans.rb

@@ -26,3 +26,24 @@ Stripe.plan :metered do |plan|
   plan.aggregate_usage = 'max'
   plan.billing_scheme = 'per_unit'
 end
+
+Stripe.plan :tiered do |plan|
+  plan.name = 'Tiered'
+  plan.aggregate_usage = 'max'
+  plan.billing_scheme = 'tiered'
+  # interval must be either 'day', 'week', 'month' or 'year'
+  plan.interval = 'month'
+  plan.interval_count = 1
+  plan.tiers = [
+    {
+      unit_amount: 1500,
+      up_to: 10
+    },
+    {
+      unit_amount: 1000,
+      up_to: 'inf'
+    }
+  ]
+  plan.tiers_mode = 'graduated'
+  plan.usage_type = 'metered'
+end

data/test/dummy_apis_controller_spec.rb

@@ -12,6 +12,6 @@ describe ApisController do
   describe 'the ping interface' do
     subject { get '/apis/' }
 
-    it { subject.must_be :ok? }
+    it { _(subject).must_be :ok? }
   end
 end

data/test/events_controller_spec.rb

@@ -24,7 +24,7 @@ describe Stripe::EventsController do
     end
     subject { post '/stripe/events', params.to_json }
 
-    it { subject.must_be :ok? }
+    it { _(subject).must_be :ok? }
   end
 
   describe 'signed webhooks' do
@@ -50,12 +50,44 @@ describe Stripe::EventsController do
 
     it 'returns bad_request when invalid' do
       Stripe::Webhook.expects(:construct_event).raises(Stripe::SignatureVerificationError.new('msg', 'sig_header'))
-      subject.must_be :bad_request?
+      _(subject).must_be :bad_request?
     end
 
     it 'returns ok when valid' do
       Stripe::Webhook.expects(:construct_event).returns(Stripe::Event.construct_from(params))
-      subject.must_be :ok?
+      _(subject).must_be :ok?
+    end
+  end
+
+  describe 'multiple signed webhooks' do
+    before do
+      header 'Stripe-Signature', 't=1537832721,v1=123,v0=123'
+      app.config.stripe.signing_secrets = ['SECRET1', 'SECRET2']
+    end
+
+    after { app.config.stripe.signing_secrets = nil }
+
+    let(:params) {
+      {
+        id: 'evt_00000000000001',
+        type: 'customer.updated',
+        data: {
+          object: 'customer',
+          fingerprint: 'xxxyyyzzz'
+        },
+      }
+    }
+
+    subject { post '/stripe/events', params.to_json }
+
+    it 'returns bad_request when invalid' do
+      Stripe::Webhook.expects(:construct_event).twice.raises(Stripe::SignatureVerificationError.new('msg', 'sig_header'))
+      _(subject).must_be :bad_request?
+    end
+
+    it 'returns ok when valid' do
+      Stripe::Webhook.expects(:construct_event).returns(Stripe::Event.construct_from(params))
+      _(subject).must_be :ok?
     end
   end
 end

data/test/javascript_helper_spec.rb

@@ -8,13 +8,13 @@ describe Stripe::JavascriptHelper do
   describe '#stripe_javascript_tag' do
     describe 'when no options are passed' do
       it 'should default to v3' do
-        view.stripe_javascript_tag.must_include 'https://js.stripe.com/v3/'
+        _(view.stripe_javascript_tag).must_include 'https://js.stripe.com/v3/'
       end
     end
 
     describe 'when the v2 option is passed' do
       it 'should default to v2' do
-        view.stripe_javascript_tag(:v2).must_include 'https://js.stripe.com/v2/'
+        _(view.stripe_javascript_tag(:v2)).must_include 'https://js.stripe.com/v2/'
       end
     end
 
@@ -22,12 +22,12 @@ describe Stripe::JavascriptHelper do
       before { Rails.application.config.stripe.debug_js = true }
       after  { Rails.application.config.stripe.debug_js = false }
       it 'should render the debug js' do
-        view.stripe_javascript_tag(:v1).must_include 'https://js.stripe.com/v1/stripe-debug.js'
+        _(view.stripe_javascript_tag(:v1)).must_include 'https://js.stripe.com/v1/stripe-debug.js'
       end
 
       describe 'when v3 is selected' do
         it 'should not render debug js' do
-          view.stripe_javascript_tag(:v3).wont_include 'https://js.stripe.com/v1/stripe-debug.js'
+          _(view.stripe_javascript_tag(:v3)).wont_include 'https://js.stripe.com/v1/stripe-debug.js'
         end
       end
     end
@@ -37,7 +37,7 @@ describe Stripe::JavascriptHelper do
     subject { view.render :partial => 'stripe/js' }
 
     it 'should render correctly' do
-      subject.must_include 'https://js.stripe.com/v3/'
+      _(subject).must_include 'https://js.stripe.com/v3/'
     end
   end
 
@@ -45,35 +45,35 @@ describe Stripe::JavascriptHelper do
     subject { view.render :partial => 'stripe/js', locals: {stripe_js_version: 'v2'} }
 
     it 'should render correctly' do
-      subject.must_include 'https://js.stripe.com/v2/'
+      _(subject).must_include 'https://js.stripe.com/v2/'
     end
   end
 
   describe '#stripe_elements_tag' do
     describe 'when no options are passed' do
       it 'should display the form' do
-        view.stripe_elements_tag(
+        _(view.stripe_elements_tag(
           submit_path: '/charge',
-        ).must_include 'Credit or debit card'
+        )).must_include 'Credit or debit card'
       end
     end
 
     describe 'with options' do
       describe 'without default js' do
         it 'wont include the default script tag' do
-          view.stripe_elements_tag(
+          _(view.stripe_elements_tag(
             submit_path: '/charge',
             js_path: 'another/path'
-          ).wont_include '<script id="stripe_elements_js">'
+          )).wont_include '<script id="stripe_elements_js">'
         end
       end
 
       describe 'without default css' do
         it 'wont include the default style tag' do
-          view.stripe_elements_tag(
+          _(view.stripe_elements_tag(
             submit_path: '/charge',
             css_path: 'another/path'
-          ).wont_include '<style>'
+          )).wont_include '<style>'
         end
       end
     end

data/test/pings_controller_spec.rb

@@ -13,6 +13,6 @@ describe Stripe::PingsController do
   describe 'the ping interface' do
     subject { get '/stripe/ping' }
 
-    it { subject.must_be :ok? }
+    it { _(subject).must_be :ok? }
   end
 end

data/test/plan_builder_spec.rb

@@ -23,16 +23,16 @@ describe 'building plans' do
     after { Stripe::Plans.send(:remove_const, :PRIMO) }
 
     it 'is accessible via id' do
-      Stripe::Plans::PRIMO.wont_be_nil
+      _(Stripe::Plans::PRIMO).wont_be_nil
     end
 
     it 'is accessible via collection' do
-      Stripe::Plans.all.must_include Stripe::Plans::PRIMO
+      _(Stripe::Plans.all).must_include Stripe::Plans::PRIMO
     end
 
     it 'is accessible via hash lookup (symbol/string agnostic)' do
-      Stripe::Plans[:primo].must_equal Stripe::Plans::PRIMO
-      Stripe::Plans['primo'].must_equal Stripe::Plans::PRIMO
+      _(Stripe::Plans[:primo]).must_equal Stripe::Plans::PRIMO
+      _(Stripe::Plans['primo']).must_equal Stripe::Plans::PRIMO
     end
 
     it 'accepts a billing interval of a day' do
@@ -42,7 +42,7 @@ describe 'building plans' do
         plan.interval = 'day'
       end
 
-      Stripe::Plans::DAILY.wont_be_nil
+      _(Stripe::Plans::DAILY).wont_be_nil
     end
 
     it 'accepts a billing interval of a week' do
@@ -52,7 +52,7 @@ describe 'building plans' do
         plan.interval = 'week'
       end
 
-      Stripe::Plans::WEEKLY.wont_be_nil
+      _(Stripe::Plans::WEEKLY).wont_be_nil
     end
 
     it 'accepts a billing interval of a month' do
@@ -62,7 +62,7 @@ describe 'building plans' do
         plan.interval = 'month'
       end
 
-      Stripe::Plans::MONTHLY.wont_be_nil
+      _(Stripe::Plans::MONTHLY).wont_be_nil
     end
 
     it 'accepts a billing interval of a year' do
@@ -72,17 +72,17 @@ describe 'building plans' do
         plan.interval = 'year'
       end
 
-      Stripe::Plans::YEARLY.wont_be_nil
+      _(Stripe::Plans::YEARLY).wont_be_nil
     end
 
     it 'denies arbitrary billing intervals' do
-      lambda {
+      _(lambda {
         Stripe.plan :broken do |plan|
           plan.name = 'Acme as a service BROKEN'
           plan.amount = 999
           plan.interval = 'anything'
         end
-      }.must_raise Stripe::InvalidConfigurationError
+      }).must_raise Stripe::InvalidConfigurationError
     end
 
     it 'accepts a statement descriptor' do
@@ -93,55 +93,55 @@ describe 'building plans' do
         plan.statement_descriptor = 'ACME Monthly'
       end
 
-      Stripe::Plans::DESCRIBED.wont_be_nil
+      _(Stripe::Plans::DESCRIBED).wont_be_nil
     end
 
     it 'denies statement descriptors that are too long' do
-      lambda {
+      _(lambda {
         Stripe.plan :described do |plan|
           plan.name = 'Acme as a service'
           plan.amount = 999
           plan.interval = 'month'
           plan.statement_descriptor = 'ACME as a Service Monthly'
         end
-      }.must_raise Stripe::InvalidConfigurationError
+      }).must_raise Stripe::InvalidConfigurationError
     end
 
     it 'denies invalid values for active' do
-      lambda {
+      _(lambda {
         Stripe.plan :broken do |plan|
           plan.name = 'Acme as a service'
           plan.amount = 999
           plan.interval = 'month'
           plan.active = 'whatever'
         end
-      }.must_raise Stripe::InvalidConfigurationError
+      }).must_raise Stripe::InvalidConfigurationError
     end
 
     it 'denies invalid values for usage_type' do
-      lambda {
+      _(lambda {
         Stripe.plan :broken do |plan|
           plan.name = 'Acme as a service'
           plan.amount = 999
           plan.interval = 'month'
           plan.usage_type = 'whatever'
         end
-      }.must_raise Stripe::InvalidConfigurationError
+      }).must_raise Stripe::InvalidConfigurationError
     end
 
     it 'denies invalid values for aggregate_usage' do
-      lambda {
+      _(lambda {
         Stripe.plan :broken do |plan|
           plan.name = 'Acme as a service'
           plan.amount = 999
           plan.interval = 'month'
           plan.aggregate_usage = 'whatever'
         end
-      }.must_raise Stripe::InvalidConfigurationError
+      }).must_raise Stripe::InvalidConfigurationError
     end
 
     it 'denies aggregate_usage if usage type is liecensed' do
-      lambda {
+      _(lambda {
         Stripe.plan :broken do |plan|
           plan.name = 'Acme as a service'
           plan.amount = 999
@@ -149,30 +149,30 @@ describe 'building plans' do
           plan.usage_type = 'licensed'
           plan.aggregate_usage = 'sum'
         end
-      }.must_raise Stripe::InvalidConfigurationError
+      }).must_raise Stripe::InvalidConfigurationError
     end
 
 
     it 'denies invalid values for billing_scheme' do
-      lambda {
+      _(lambda {
         Stripe.plan :broken do |plan|
           plan.name = 'Acme as a service'
           plan.amount = 999
           plan.interval = 'month'
           plan.billing_scheme = 'whatever'
         end
-      }.must_raise Stripe::InvalidConfigurationError
+      }).must_raise Stripe::InvalidConfigurationError
     end
 
     it 'denies invalid values for tiers_mode' do
-      lambda {
+      _(lambda {
         Stripe.plan :broken do |plan|
           plan.name = 'Acme as a service'
           plan.amount = 999
           plan.interval = 'month'
           plan.tiers_mode = 'whatever'
         end
-      }.must_raise Stripe::InvalidConfigurationError
+      }).must_raise Stripe::InvalidConfigurationError
     end
 
     describe 'name and product id validation' do
@@ -182,18 +182,18 @@ describe 'building plans' do
           plan.amount = 999
           plan.interval = 'month'
         end
-        Stripe::Plans::PRODDED.wont_be_nil
+        _(Stripe::Plans::PRODDED).wont_be_nil
       end
 
       it 'should be invalid when using both name and product id' do
-        lambda {
+        _(lambda {
           Stripe.plan :broken do |plan|
             plan.name = 'Acme as a service'
             plan.product_id = 'acme'
             plan.amount = 999
             plan.interval = 'month'
           end
-        }.must_raise Stripe::InvalidConfigurationError
+        }).must_raise Stripe::InvalidConfigurationError
       end
     end
 
@@ -275,6 +275,82 @@ describe 'building plans' do
             Stripe::Plans::METERED.put!
           end
 
+          it 'creates a tiered plan' do
+            Stripe::Plan.expects(:create).with(
+              :id => :tiered,
+              :currency => 'usd',
+              :product => {
+                :name => 'Tiered',
+                :statement_descriptor => nil,
+              },
+              :interval => 'month',
+              :interval_count => 1,
+              :trial_period_days => 0,
+              :usage_type => 'metered',
+              :aggregate_usage => 'max',
+              :billing_scheme => 'tiered',
+              :tiers => [
+                {
+                  :unit_amount => 1500,
+                  :up_to => 10
+                },
+                {
+                  :unit_amount => 1000,
+                  :up_to => 'inf'
+                }
+              ],
+              :tiers_mode => 'graduated'
+            )
+            plan = Stripe::Plans::TIERED
+            Stripe::Plans::TIERED.put!
+          end
+
+          describe 'when passed invalid arguments for tiered pricing' do
+            it 'raises a Stripe::InvalidConfigurationError when billing tiers are invalid' do
+              lambda {
+                Stripe.plan "Bad Tiers".to_sym do |plan|
+                  plan.name = 'Acme as a service BAD TIERS'
+                  plan.constant_name = 'BAD_TIERS'
+                  plan.interval = 'month'
+                  plan.interval_count = 1
+                  plan.trial_period_days = 30
+                  plan.usage_type = 'metered'
+                  plan.tiers_mode = 'graduated'
+                  plan.billing_scheme = 'per_unit'
+                  plan.aggregate_usage = 'sum'
+                  plan.tiers = [
+                    {
+                      unit_amount: 1500,
+                      up_to: 10
+                    },
+                    {
+                      unit_amount: 1000,
+                    }
+                  ]
+                end
+              }.must_raise Stripe::InvalidConfigurationError
+            end
+
+            it 'raises a Stripe::InvalidConfigurationError when billing tiers is not an array' do
+              lambda {
+                Stripe.plan "Bad Tiers".to_sym do |plan|
+                  plan.name = 'Acme as a service BAD TIERS'
+                  plan.constant_name = 'BAD_TIERS'
+                  plan.interval = 'month'
+                  plan.interval_count = 1
+                  plan.trial_period_days = 30
+                  plan.usage_type = 'metered'
+                  plan.tiers_mode = 'graduated'
+                  plan.billing_scheme = 'per_unit'
+                  plan.aggregate_usage = 'sum'
+                  plan.tiers = {
+                    unit_amount: 1500,
+                    up_to: 10
+                  }
+                end
+              }.must_raise Stripe::InvalidConfigurationError
+            end
+          end
 
           describe 'when using a product id' do
             before do
@@ -343,10 +419,10 @@ describe 'building plans' do
 
   describe 'with missing mandatory values' do
     it 'raises an exception after configuring it' do
-      proc {Stripe.plan(:bad) {}}.must_raise Stripe::InvalidConfigurationError
+      _(-> { Stripe.plan(:bad) {} }).must_raise Stripe::InvalidConfigurationError
     end
   end
-  
+
   describe 'with custom constant name' do
     before do
       Stripe.plan "Primo Plan".to_sym do |plan|
@@ -370,28 +446,28 @@ describe 'building plans' do
     after { Stripe::Plans.send(:remove_const, :PRIMO_PLAN) }
 
     it 'is accessible via upcased constant_name' do
-      Stripe::Plans::PRIMO_PLAN.wont_be_nil
+      _(Stripe::Plans::PRIMO_PLAN).wont_be_nil
     end
 
     it 'is accessible via collection' do
-      Stripe::Plans.all.must_include Stripe::Plans::PRIMO_PLAN
+      _(Stripe::Plans.all).must_include Stripe::Plans::PRIMO_PLAN
     end
 
     it 'is accessible via hash lookup (symbol/string agnostic)' do
-      Stripe::Plans[:primo_plan].must_equal Stripe::Plans::PRIMO_PLAN
-      Stripe::Plans['primo_plan'].must_equal Stripe::Plans::PRIMO_PLAN
+      _(Stripe::Plans[:primo_plan]).must_equal Stripe::Plans::PRIMO_PLAN
+      _(Stripe::Plans['primo_plan']).must_equal Stripe::Plans::PRIMO_PLAN
     end
 
     describe 'constant name validation' do
       it 'should be invalid when providing a constant name that can not be used for Ruby constant' do
-        lambda {
+        _(lambda {
           Stripe.plan "Primo Plan".to_sym do |plan|
             plan.name = 'Acme as a service PRIMO'
             plan.constant_name = 'PRIMO PLAN'
             plan.amount = 999
             plan.interval = 'month'
           end
-        }.must_raise Stripe::InvalidConfigurationError
+        }).must_raise Stripe::InvalidConfigurationError
       end
     end