stripe-rails 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d661efe56433d2aa86e274141263a5b4af3247a8cd52d2e73063ff69be0f98e9
-  data.tar.gz: cc7e38b9e922026ea6a0ca78554bc985782ebda75ba3782accf20f65c729b0de
+  metadata.gz: 95873fe1e4c135546d576191494250facd47172be4b3a91f7325ff69c3ec5723
+  data.tar.gz: a16c59f3cdf162b62103a89332fb749a4f2c44ff45665576e4c00cc7f0637d16
 SHA512:
-  metadata.gz: 3cdd009d3999ed6cbe4ad59a5e3d4869d890dba2ed9cc5c41aa1c8928b98413ed3ef6a0b2748c72ec644963a3e20cc2110ba316cfbf0917b9c8fb46cbff15301
-  data.tar.gz: af6c42593780777428cc9f00db3b9e18e7c9bf284bb51ea8f244b9f0c641318e1df20417e7137c834b2c06690c2d55800b2ab06bc955768fa81597103bcb2e4a
+  metadata.gz: eb222107648581b675d6a1348d4e7773ed93f0f4326dd6a708a66753d08fcad6a5e2a131375d397c48480570772532d0ec3ccf242739ada5d08417c18a9fb9d7
+  data.tar.gz: dab6fd8cae0e0a23dca3281b63f2734c3252dff6f9b3bd3dc431e75ab425a7ef1418087234493b950f2e0d303777a03f24911a539815890422a525cab0418998

data/.github/workflows/ruby.yml

@@ -1,6 +1,6 @@
 name: Ruby
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: [2.3.x, 2.4.x, 2.5.x, 2.6.x]
+        ruby: [2.4.x, 2.5.x, 2.6.x]
         gemfile: [Gemfile, gemfiles/rails4.gemfile]
 
     steps:
@@ -28,6 +28,7 @@ jobs:
         CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         RUBY_VERSION: ${{ matrix.ruby }}
       run: |
+        gem uninstall bundler
         gem install bundler -v 1.17.3
         bundle install --jobs 4 --retry 3
         bundle exec rake

data/Changelog.md

@@ -1,3 +1,7 @@
+## 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,7 +11,7 @@ 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

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

@@ -1,6 +1,7 @@
 source :rubygems
 
 gem 'rails', '~> 4.2'
+gem 'sprockets', '< 4'
 
 gem 'rake'
 gem 'responders', '~> 2.0' # to support Rails 4.2

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/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 = '1.10.0'.freeze
   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/plan_builder_spec.rb

@@ -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
@@ -346,7 +422,7 @@ describe 'building plans' do
       proc {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|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe-rails
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Charles Lowell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -93,6 +93,7 @@ files:
 - lib/generators/templates/plans.rb
 - lib/generators/templates/products.rb
 - lib/stripe-rails.rb
+- lib/stripe/billing_tier.rb
 - lib/stripe/callbacks.rb
 - lib/stripe/callbacks/builder.rb
 - lib/stripe/configuration_builder.rb