stripe-rails 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bf8cbe43d20c035c706373d6b7c1c243ecbbbc1f413b566d873fae9233ec99b
-  data.tar.gz: 614d54926d8eab719fc561e93d09936b11230da6fcb92aa409c6f5d296de1ce5
+  metadata.gz: cc77c2742f14d5d7042f2a3ed06af604144c2d956e0fd5a627f45c01e82a9461
+  data.tar.gz: 570149b8d68d0429d5257e45099739ba9da0c52fe1c5432251207e98edc2f9e8
 SHA512:
-  metadata.gz: 7c38b50e62b9ffb78e267d9f7d7149d3e9abd745a71075ce0bb6ef9297f70a8be2c345d9decfe08de1e38c16a8ca6ea83873ed7cb1e9ccad4875fae76c1fd6bc
-  data.tar.gz: 5ff91f2d49f04e30cd3332764873faed47a8e3b46f2ac98f02e067e5f900db2202438f59543571a4e9bd5be5a830ed112d477092b2679f55c1808b160db75586
+  metadata.gz: f5eb46629a7af4564ce45f3bb4f219f93413c88bc46773b2546fb8032d40441c164d62ac207e868ac2efb46622df0cb1a1256e6b9915bd9cfd3675e6d88d8a1b
+  data.tar.gz: f865412f3696550203443d037b26fb8472a818049014622b67391b7565c0fe97116391129378734cf7e422c110b0c8a740d1c75e913cf229b203a3315e6647c0

data/Changelog.md

@@ -1,3 +1,7 @@
+## 1.4.2 (2018-08-06)
+
+* New attributes for Stripe Billing Plans.
+
 ## 1.4.1 (2018-08-03)
 
 * Fixes ActionController::UnknownFormat errors - Thanks to @ndbroadbent !

data/lib/stripe/plans.rb

@@ -3,15 +3,21 @@ module Stripe
     include ConfigurationBuilder
 
     configuration_for :plan do
-      attr_accessor :name, 
+      attr_accessor :active,
+                    :aggregate_usage,
                     :amount,
+                    :billing_scheme,
+                    :currency,
                     :interval,
                     :interval_count,
-                    :trial_period_days,
-                    :currency,
                     :metadata,
+                    :name, 
+                    :nickname,
+                    :product_id,
                     :statement_descriptor,
-                    :product_id
+                    :tiers_mode,
+                    :trial_period_days,
+                    :usage_type
 
       validates_presence_of :id, :amount, :currency
 
@@ -21,7 +27,14 @@ module Stripe
 
       validates :statement_descriptor, :length => { :maximum => 22 }
 
+      validates :active,          inclusion: { in: [true, false] }, allow_nil: true
+      validates :usage_type,      inclusion: { in: %w{ metered licensed } }, allow_nil: true
+      validates :billing_scheme,  inclusion: { in: %w{ per_unit tiered } }, allow_nil: true
+      validates :aggregate_usage, inclusion: { in: %w{ sum last_during_period last_ever max } }, allow_nil: true
+      validates :tiers_mode,      inclusion: { in: %w{ graduated volume } }, allow_nil: true
+
       validate :name_or_product_id
+      validate :aggregate_usage_must_be_metered, if: ->(p) { p.aggregate_usage.present? }
 
       def initialize(*args)
         super(*args)
@@ -31,6 +44,10 @@ module Stripe
       end
 
       private
+      def aggregate_usage_must_be_metered
+        errors.add(:aggregate_usage, 'usage_type must be metered') unless (usage_type == 'metered')
+      end
+
       def name_or_product_id
         errors.add(:base, 'must have a product_id or a name') unless (@product_id.present? ^ @name.present?)
       end

data/lib/stripe/rails/version.rb

@@ -1,5 +1,5 @@
 module Stripe
   module Rails
-    VERSION = '1.4.1'
+    VERSION = '1.4.2'
   end
 end

data/test/events_controller_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Stripe::EventsController do
+  parallelize_me!
+  include Rack::Test::Methods
+
+  let(:app) { Rails.application }
+  before do
+    header 'Accept', 'application/json'
+    header 'Content-Type', 'application/json'
+  end
+
+  describe 'the events interface' do
+    let(:params) { 
+      {
+        id: 'evt_00000000000000',
+        type: 'customer.updated',
+        data: {object: 'customer'},
+      }
+    }
+    subject { post '/stripe/events', params.to_json }
+
+    it { subject.must_be :ok? }
+  end
+end

data/test/plan_builder_spec.rb

@@ -11,6 +11,12 @@ describe 'building plans' do
         plan.trial_period_days = 30
         plan.metadata = {:number_of_awesome_things => 5}
         plan.statement_descriptor = 'Acme Primo'
+        plan.active = true
+        plan.nickname = 'primo'
+        plan.usage_type = 'metered'
+        plan.billing_scheme = 'per_unit'
+        plan.aggregate_usage = 'sum'
+        plan.tiers_mode = 'graduated'
       end
     end
 
@@ -101,6 +107,74 @@ describe 'building plans' do
       }.must_raise Stripe::InvalidConfigurationError
     end
 
+    it 'denies invalid values for active' do
+      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
+    end
+
+    it 'denies invalid values for usage_type' do
+      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
+    end
+
+    it 'denies invalid values for aggregate_usage' do
+      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
+    end
+
+    it 'denies aggregate_usage if usage type is liecensed' do
+      lambda {
+        Stripe.plan :broken do |plan|
+          plan.name = 'Acme as a service'
+          plan.amount = 999
+          plan.interval = 'month'
+          plan.usage_type = 'licensed'
+          plan.aggregate_usage = 'sum'
+        end
+      }.must_raise Stripe::InvalidConfigurationError
+    end
+
+
+    it 'denies invalid values for billing_scheme' do
+      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
+    end
+
+    it 'denies invalid values for tiers_mode' do
+      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
+    end
+
     describe 'name and product id validation' do
       it 'should be valid when using just the product id' do
         Stripe.plan :prodded do |plan|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Charles Lowell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,6 +142,7 @@ files:
 - test/dummy_apis_controller_spec.rb
 - test/dummy_stripes_controller_spec.rb
 - test/event.json
+- test/events_controller_spec.rb
 - test/fixtures/stripe_plans.json
 - test/fixtures/stripe_plans_headers.json
 - test/fixtures/stripe_plans_headers_2017.json
@@ -226,6 +227,7 @@ test_files:
 - test/dummy_apis_controller_spec.rb
 - test/dummy_stripes_controller_spec.rb
 - test/event.json
+- test/events_controller_spec.rb
 - test/fixtures/stripe_plans.json
 - test/fixtures/stripe_plans_headers.json
 - test/fixtures/stripe_plans_headers_2017.json