stripe-rails 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e690f4a7b8ea6a4c35c93f5610d7c24d674e01f346ba7efe4fde29a006f1b65c
-  data.tar.gz: 6b0630b85e0375aec712c16f838e2f72afcd5bb08e13cf14954446614815fcad
+  metadata.gz: 51f0207403afbfce8ee8b69a3f83b939cec5c1bdffbfc73e487cb3a07f6c4e10
+  data.tar.gz: 02415c95fd7dbd5cb6ef51b8536160e15f8f73e3b67edb89978dc6c326e91e70
 SHA512:
-  metadata.gz: 669a5d261e8b93f9649422203e85ed6ab4cd1a49097efcbad0820201869627ae3aa605ea3c5c6c0a7601853e951c78920841523ad6ca7c2ae44d356c6a7b9e59
-  data.tar.gz: f815812e608075b93621d38775a391704efa4c3e39e64102ae65a395670429cbbcd4048a58a6c3ff71992b5cbe33ff9cb157d3e49a16164a07d6cca58ca5a6b8
+  metadata.gz: fb22773c38887ff388f6a7e8ec92bb1ab586a9c8686e7e98f2d55d2c7214db49fb51dc9353ed34da2e9eb7e2b1d93c18c136ebf86650a9e033b18fa2c8b54363
+  data.tar.gz: 479bfa26243c4bbb04625603d7055c6baee96758e54ec8f6a5f208ba50fadab8fea9181076070d931b3591532384ee9cbd5a1c02d66ae6a995faaa1b7bb632c3

data/Changelog.md

@@ -1,3 +1,7 @@
+## 1.5.3 (2018-10-25)
+
+* Add usage_type, aggregate_usage, and billing_scheme - thanks @garrettqmartin8
+
 ## 1.5.2 (2018-10-15)
 
 * fixes undefined method `expand_path' for Stripe::File:Class - Thanks to @BitesGit for reporting this.

data/lib/generators/templates/products.rb

@@ -3,12 +3,12 @@
 # Example
 # Stripe::Products::PRIMO #=> 'primo'
 
-# Stripe.products :primo do |products|
-#   # products name as it will appear on credit card statements
-#   products.name = 'Acme as a service PRIMO'
+# Stripe.product :primo do |product|
+#   # product's name as it will appear on credit card statements
+#   product.name = 'Acme as a service PRIMO'
 #
 #   # Product, either 'service' or 'good'
-#   products.type = 'service'
+#   product.type = 'service'
 # end
 
 # Once you have your productss defined, you can run

data/lib/stripe/configuration_builder.rb

@@ -76,7 +76,7 @@ module Stripe
         if exists?
           puts "[EXISTS] - #{@stripe_class}:#{@id}" unless Stripe::Engine.testing
         else
-          object = @stripe_class.create({:id => @id}.merge create_options)
+          object = @stripe_class.create({:id => @id}.merge compact_create_options)
           puts "[CREATE] - #{@stripe_class}:#{object}" unless Stripe::Engine.testing
         end
       end
@@ -85,10 +85,14 @@ module Stripe
         if object = exists?
           object.delete
         end
-        object = @stripe_class.create({:id => @id}.merge create_options)
+        object = @stripe_class.create({:id => @id}.merge compact_create_options)
         puts "[RESET] - #{@stripe_class}:#{object}" unless Stripe::Engine.testing
       end
 
+      def compact_create_options
+        create_options.delete_if { |_, v| v.nil? }
+      end
+
       def to_s
         @id.to_s
       end

data/lib/stripe/plans.rb

@@ -69,14 +69,19 @@ module Stripe
           interval_count: interval_count,
           trial_period_days: trial_period_days,
           metadata: metadata,
+          usage_type: usage_type,
+          aggregate_usage: aggregate_usage,
+          billing_scheme: billing_scheme,
           nickname: nickname
-        }.delete_if{|_, v| v.nil? }
+        }
       end
 
       def product_options
         product_id.presence || { name: name, statement_descriptor: statement_descriptor }
       end
 
+      # Note: these options serve an older API, as such they should
+      # probably never be updated.
       def create_options_without_products
         {
           currency: currency,
@@ -87,7 +92,7 @@ module Stripe
           trial_period_days: trial_period_days,
           metadata: metadata,
           statement_descriptor: statement_descriptor
-        }.delete_if{|_, v| v.nil? }
+        }
       end
     end
   end

data/lib/stripe/products.rb

@@ -44,7 +44,7 @@ module Stripe
           shippable: shippable,
           url: url,
           statement_descriptor: statement_descriptor
-        }.delete_if{|_, v| v.nil? }
+        }
       end
     end
   end

data/lib/stripe/rails/version.rb

@@ -1,5 +1,5 @@
 module Stripe
   module Rails
-    VERSION = '1.5.2'
+    VERSION = '1.5.3'
   end
 end

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

@@ -10,3 +10,12 @@ Stripe.plan :alternative_currency do |plan|
    plan.interval = 'month'
    plan.currency = 'cad'
 end
+
+Stripe.plan :metered do |plan|
+  plan.name = 'Metered'
+  plan.amount = 699
+  plan.interval = 'month'
+  plan.usage_type = 'metered'
+  plan.aggregate_usage = 'max'
+  plan.billing_scheme = 'per_unit'
+end

data/test/plan_builder_spec.rb

@@ -256,6 +256,26 @@ describe 'building plans' do
             Stripe::Plans::GOLD.put!
           end
 
+          it 'creates a metered plan' do
+            Stripe::Plan.expects(:create).with(
+              :id => :metered,
+              :currency => 'usd',
+              :product => {
+                :name => 'Metered',
+                :statement_descriptor => nil,
+              },
+              :amount => 699,
+              :interval => 'month',
+              :interval_count => 1,
+              :trial_period_days => 0,
+              :usage_type => 'metered',
+              :aggregate_usage => 'max',
+              :billing_scheme => 'per_unit'
+            )
+            Stripe::Plans::METERED.put!
+          end
+
+
           describe 'when using a product id' do
             before do
               Stripe::Plans::GOLD.product_id = 'prod_XXXXXXXXXXXXXX'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Charles Lowell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails