stripe-rails 1.9.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d661efe56433d2aa86e274141263a5b4af3247a8cd52d2e73063ff69be0f98e9
-  data.tar.gz: cc7e38b9e922026ea6a0ca78554bc985782ebda75ba3782accf20f65c729b0de
+  metadata.gz: b69dd28ba0f7e285499222f566f1a3d94792a3d928c07e6f820231758a1076f2
+  data.tar.gz: 20001b39f130cf45f32b4418acd4a7b25c2f855eb4c82150af7a0efdd1761b01
 SHA512:
-  metadata.gz: 3cdd009d3999ed6cbe4ad59a5e3d4869d890dba2ed9cc5c41aa1c8928b98413ed3ef6a0b2748c72ec644963a3e20cc2110ba316cfbf0917b9c8fb46cbff15301
-  data.tar.gz: af6c42593780777428cc9f00db3b9e18e7c9bf284bb51ea8f244b9f0c641318e1df20417e7137c834b2c06690c2d55800b2ab06bc955768fa81597103bcb2e4a
+  metadata.gz: a5ca715db15caf73a7261911590c31e8155bf65769ca5d28b3c2c548ddb76f5560ce2a56e45241daf8d614de0a4bfa2fd6c9b5f45d5909cdee8ef224cf7ae727
+  data.tar.gz: 5883ebce3e32917174404c92c9114e683de9e63bde4bb8c23c8a2d5bfe13ee8586a545bcc9a5c853289cf8be4812a14db0890eff795243f2aaef55a2ee548c4c

data/.github/workflows/ruby.yml

@@ -1,6 +1,12 @@
 name: Ruby
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
@@ -8,9 +14,8 @@ jobs:
 
     strategy:
       matrix:
-        ruby: [2.3.x, 2.4.x, 2.5.x, 2.6.x]
-        gemfile: [Gemfile, gemfiles/rails4.gemfile]
-
+        ruby: [2.5.x, 2.6.x, 2.7.x]
+        gemfile: [Gemfile, gemfiles/rails51.gemfile, gemfiles/rails52.gemfile]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Ruby
@@ -28,9 +33,8 @@ jobs:
         CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         RUBY_VERSION: ${{ matrix.ruby }}
       run: |
-        gem install bundler -v 1.17.3
         bundle install --jobs 4 --retry 3
         bundle exec rake
-        if [ `basename $BUNDLE_GEMFILE` == "Gemfile" ] && [ $RUBY_VERSION == "2.6.x" ] ;
+        if [ `basename $BUNDLE_GEMFILE` == "Gemfile" ] && [ $RUBY_VERSION == "2.7.x" ] && [ ! -z ${CC_TEST_REPORTER_ID} ] ;
           then ./cc-test-reporter after-build --exit-code $? ;
         fi

data/Changelog.md

@@ -1,3 +1,29 @@
+## Unreleased
+
+## 2.0.0 (2020-09-18)
+
+- Everything from on the 2.0.0.pre release
+- includes changes from the 1.10.2 release
+
+## 1.10.2 (2020-09-18)
+
+- adds missing callback `invoice.paid`. Thanks @SyborgStudios.
+
+## 2.0.0.pre (2020-05-29)
+
+* [Breaking] Updated to work only with Rails >= 5.1
+* [Breaking] It'll only be tested on Ruby 2.7, 2.6 and 2.5.
+* [Breaking] Supports the Stripe gem => 3.15.0 (from 2 years ago)
+* [Breaking] Removes Stripe::PingsController controller.
+
+## 1.10.1 (2020-05-29)
+
+- adds missing callbacks for `payment_intent`. Thanks @klapperkopp .
+
+## 1.10.0 (2020-03-31)
+
+- Adds support for using multiple tiers in a plan, thanks @cpsoinos
+
 ## 1.9.1 (2019-10-28)
 
 - Fixes issue with `rake stripe:verify` thanks @Millariel !

data/Gemfile

@@ -11,12 +11,12 @@ end
 
 group :test do
   gem 'mocha'
-  gem 'simplecov', require: false
+  gem 'simplecov', '< 0.18', require: false
   gem 'stripe-ruby-mock'
   gem 'webmock'
-  # Required for system tests
+  # System tests
   gem 'capybara'
-  gem 'webdrivers'
   gem 'puma'
   gem 'selenium-webdriver'
-end
+  gem 'webdrivers'
+end

data/README.md

@@ -1,6 +1,6 @@
 # Stripe::Rails: A Rails Engine for use with [stripe.com](https://stripe.com)
-[![Gem Version](https://badge.fury.io/rb/stripe-rails.png)](http://badge.fury.io/rb/stripe-rails)
-[![Build Status](https://travis-ci.org/tansengming/stripe-rails.png?branch=master)](https://travis-ci.org/tansengming/stripe-rails)
+[![Gem Version](https://badge.fury.io/rb/stripe-rails.svg)](https://badge.fury.io/rb/stripe-rails)
+[![Build Status](https://travis-ci.org/tansengming/stripe-rails.svg?branch=master)](https://travis-ci.org/tansengming/stripe-rails)
 [![Code Climate](https://codeclimate.com/github/tansengming/stripe-rails/badges/gpa.svg)](https://codeclimate.com/github/tansengming/stripe-rails)
 [![Test Coverage](https://codeclimate.com/github/tansengming/stripe-rails/badges/coverage.svg)](https://codeclimate.com/github/tansengming/stripe-rails/coverage)
 [![Tidelift](https://tidelift.com/badges/github/tansengming/stripe-rails)](#)
@@ -188,6 +188,23 @@ Stripe.plan :bronze do |plan|
   plan.product_id = 'prod_XXXXXXXXXXXXXX'
   plan.amount = 999 # $9.99
   plan.interval = 'month'
+
+  # Use graduated pricing tiers
+  # ref: https://stripe.com/docs/api/plans/object#plan_object-tiers
+  plan.tiers = [
+    {
+      unit_amount: 1500,
+      up_to: 10
+    },
+    {
+      unit_amount: 1000,
+      up_to: 'inf'
+    }
+  ]
+  plan.tiers_mode = 'graduated'
+
+  # set the usage type to 'metered'
+  plan.usage_type = 'metered'
 end
 ```
 

data/gemfiles/{rails4.gemfile → rails51.gemfile}

@@ -1,9 +1,10 @@
 source :rubygems
 
-gem 'rails', '~> 4.2'
+gem 'rails', '~> 5.1.0'
 
 gem 'rake'
-gem 'responders', '~> 2.0' # to support Rails 4.2
+gem 'responders'
+gem 'sprockets', '< 4'
 gem 'stripe'
 
 group :test do
@@ -13,7 +14,7 @@ group :test do
   gem 'webmock'
   # Required for system tests
   gem 'capybara'
-  gem 'webdrivers'
-  gem 'puma'                
+  gem 'puma'
   gem 'selenium-webdriver'
-end
+  gem 'webdrivers'
+end

data/gemfiles/rails52.gemfile

@@ -0,0 +1,20 @@
+source :rubygems
+
+gem 'rails', '~> 5.2.0'
+
+gem 'rake'
+gem 'responders'
+gem 'sprockets', '< 4'
+gem 'stripe'
+
+group :test do
+  gem 'mocha'
+  gem 'simplecov', require: false
+  gem 'stripe-ruby-mock'
+  gem 'webmock'
+  # Required for system tests
+  gem 'capybara'
+  gem 'puma'
+  gem 'selenium-webdriver'
+  gem 'webdrivers'
+end

data/lib/generators/templates/products.rb

@@ -11,9 +11,9 @@
 #   product.type = 'service'
 # end
 
-# Once you have your productss defined, you can run
+# Once you have your products defined, you can run
 #
 #   rake stripe:prepare
 #
-# This will export any new plans to stripe.com so that you can
+# This will export any new products to stripe.com so that you can
 # begin using them in your API calls.

data/lib/stripe/billing_tier.rb

@@ -0,0 +1,34 @@
+module Stripe
+  module Plans
+    class BillingTier
+      include ActiveModel::Validations
+
+      validates_presence_of :up_to
+      validates_presence_of :flat_amount, if: ->(tier) { tier.unit_amount.nil? },
+        message: 'one of `flat_amount` or `unit_amount` must be specified!'
+      validates_presence_of :unit_amount, if: ->(tier) { tier.flat_amount.nil? },
+        message: 'one of `flat_amount` or `unit_amount` must be specified!'
+      validates_absence_of :flat_amount, if: ->(tier) { tier.unit_amount.present? },
+        message: 'only one of `flat_amount` or `unit_amount` should be specified!'
+      validates_absence_of :unit_amount, if: ->(tier) { tier.flat_amount.present? },
+        message: 'only one of `flat_amount` or `unit_amount` should be specified!'
+
+      attr_accessor :up_to, :flat_amount, :unit_amount
+
+      def initialize(attrs)
+        @up_to = attrs[:up_to]
+        @flat_amount = attrs[:flat_amount]
+        @unit_amount = attrs[:unit_amount]
+      end
+
+      def to_h
+        {
+          up_to: up_to,
+          flat_amount: flat_amount,
+          unit_amount: unit_amount
+        }.compact
+      end
+
+    end
+  end
+end

data/lib/stripe/callbacks.rb

@@ -47,6 +47,7 @@ module Stripe
     callback 'invoice.created'
     callback 'invoice.finalized'
     callback 'invoice.marked_uncollectible'
+    callback 'invoice.paid'
     callback 'invoice.payment_action_required'
     callback 'invoice.payment_failed'
     callback 'invoice.payment_succeeded'
@@ -63,8 +64,10 @@ module Stripe
     callback 'order.updated'
     callback 'order_return.created'
     callback 'payment_intent.amount_capturable_updated'
+    callback 'payment_intent.canceled'
     callback 'payment_intent.created'
     callback 'payment_intent.payment_failed'
+    callback 'payment_intent.processing'
     callback 'payment_intent.succeeded'
     callback 'payment_method.attached'
     callback 'payment_method.card_automatically_updated'
@@ -103,10 +106,6 @@ module Stripe
     callback 'ping'
     callback 'stripe.event'
 
-    # Deprecated
-    callback 'transfer.failed' # https://stripe.com/docs/upgrades#2017-04-06
-    callback 'transfer.paid'   # https://stripe.com/docs/upgrades#2017-04-06
-
     class << self
       def run_callbacks(evt, target)
         _run_callbacks evt.type, evt, target

data/lib/stripe/plans.rb

@@ -12,16 +12,20 @@ module Stripe
                     :interval,
                     :interval_count,
                     :metadata,
-                    :name, 
+                    :name,
                     :nickname,
                     :product_id,
                     :statement_descriptor,
+                    :tiers,
                     :tiers_mode,
+                    :transform_usage,
                     :trial_period_days,
                     :usage_type
 
-      validates_presence_of :id, :amount, :currency
-
+      validates_presence_of :id, :currency
+      validates_presence_of :amount, unless: ->(p) { p.billing_scheme == 'tiered' }
+      validates_absence_of :transform_usage, if: ->(p) { p.billing_scheme == 'tiered' }
+      validates_presence_of :tiers_mode, if: ->(p) { p.billing_scheme == 'tiered' }
       validates_inclusion_of  :interval,
                               in: %w(day week month year),
                               message: "'%{value}' is not one of 'day', 'week', 'month' or 'year'"
@@ -38,6 +42,11 @@ module Stripe
       validate :aggregate_usage_must_be_metered, if: ->(p) { p.aggregate_usage.present? }
       validate :valid_constant_name, unless: ->(p) { p.constant_name.nil? }
 
+      # validations for when using tiered billing
+      validate :tiers_must_be_array, if: ->(p) { p.tiers.present? }
+      validate :billing_scheme_must_be_tiered, if: ->(p) { p.tiers.present? }
+      validate :validate_tiers, if: ->(p) { p.billing_scheme == 'tiered' }
+
       def initialize(*args)
         super(*args)
         @currency = 'usd'
@@ -54,6 +63,22 @@ module Stripe
         errors.add(:base, 'must have a product_id or a name') unless (@product_id.present? ^ @name.present?)
       end
 
+      def billing_scheme_must_be_tiered
+        errors.add(:billing_scheme, 'must be set to `tiered` when specifying `tiers`') unless billing_scheme == 'tiered'
+      end
+
+      def tiers_must_be_array
+        errors.add(:tiers, 'must be an Array') unless tiers.is_a?(Array)
+      end
+
+      def billing_tiers
+        @billing_tiers = tiers.map { |t| Stripe::Plans::BillingTier.new(t) } if tiers
+      end
+
+      def validate_tiers
+        billing_tiers.all?(&:valid?)
+      end
+
       module ConstTester; end
       def valid_constant_name
         ConstTester.const_set(constant_name.to_s.upcase, constant_name)
@@ -82,8 +107,11 @@ module Stripe
           usage_type: usage_type,
           aggregate_usage: aggregate_usage,
           billing_scheme: billing_scheme,
-          nickname: nickname
-        }
+          nickname: nickname,
+          tiers: tiers ? tiers.map(&:to_h) : nil,
+          tiers_mode: tiers_mode,
+          transform_usage: transform_usage
+        }.compact
       end
 
       def product_options

data/lib/stripe/products.rb

@@ -11,6 +11,7 @@ module Stripe
                     :caption,
                     :metadata,
                     :shippable,
+                    :unit_label,
                     :url,
                     :statement_descriptor
 
@@ -42,6 +43,7 @@ module Stripe
           caption: caption,
           metadata: metadata,
           shippable: shippable,
+          unit_label: unit_label,
           url: url,
           statement_descriptor: statement_descriptor
         }

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/version.rb

@@ -1,5 +1,5 @@
 module Stripe
   module Rails
-    VERSION = '1.9.1'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

data/stripe-rails.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "stripe-rails"
   gem.require_paths = ["lib"]
   gem.version       = Stripe::Rails::VERSION
-  gem.add_dependency 'rails', '>= 3'
-  gem.add_dependency 'stripe', '>= 1.36.2'
+  gem.add_dependency 'rails', '>= 5.1'
+  gem.add_dependency 'stripe', '>= 3.15.0'
   gem.add_dependency 'responders'
 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