stripe-rails 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4c623892c4bdfc60f16d8835a62c2e6f948f3e01be9831e453abd5d237b30fe
-  data.tar.gz: 88531135d52fc3a941949c335de18d0dc6731316eb4fd58a34d8d6ee34637078
+  metadata.gz: 4a48f7cd53408976274d19e00765d59c76aa0e4ae69e7accaf4b0e58de6737db
+  data.tar.gz: 0cdb70b8481b375c043ed622082376da4342712ed1a389170eccbc944a668713
 SHA512:
-  metadata.gz: 2f82e72f5d0c3179c3af7c6fabd10213eb75c0bd7cacd5b80db5ad8e1b4e96ae33749777b30ef35d20c5f58ba466d242025ce35d1fd1b2baf8e68d80a510804e
-  data.tar.gz: dba57aec52d0ebfab2cfe72d5e369ec8e45110ab9758546121a21f340b0db20894bf09ffedee10af030182f9f6e1f0e36be875dd77104bb6f3a2301fd89aa394
+  metadata.gz: fe441c8ddb0f65fea0b8ae401609c8dc9ea3f24b8426168fc2b93f830fa895911e2f1649ef570d73b48f6f73dd80eb6b3fbd68f687561d5fd613424c97e558a9
+  data.tar.gz: e8451147cfcb761affc302a442da37ad0311ce09201a515d4c29205724463e301d9c63e5998df2af7481d9c38e33955fd24654837b88e7fda7a53e2878eebade

data/.github/release-drafter.yml

@@ -0,0 +1,4 @@
+template: |
+  ## What's Changed
+
+  $CHANGES

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-- 2.5.0
-- 2.4.3
-- 2.3.6
-- 2.2.9
-- 2.1.10
+- 2.5.1
+- 2.4.4
+- 2.3.7
+addons:
+  chrome: stable
 env:
   global:
   - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct;
@@ -22,13 +22,6 @@ script:
 gemfile:
 - Gemfile
 - gemfiles/rails4.gemfile
-- gemfiles/rails5.gemfile
-matrix:
-  exclude:
-  - rvm: 2.1.10
-    gemfile: Gemfile
-  - rvm: 2.1.10
-    gemfile: gemfiles/rails5.gemfile
 notifications:
   slack:
     secure: csciM073msTrOOdVYVXdAsrx2sR3Y1BKL0VvlSsYxBJawDa8BFNl6Fw8Uz1V2n4OfnkMvMCME4I3EXsCb4Kl5omnK+7ibeCzzzkCR5VwUs5/vLY7awUfCiihSCqg5ULAp2T1whQJUl5HY9Ot62sujIUX/FUhPzdbCqaKQ7cVkUo=

data/Changelog.md

@@ -1,3 +1,9 @@
+## 1.3.0 (2018-07-23)
+
+* do not create new product when product id is provided (#115) - Thanks to @renchap for reporting this
+* updates travis to latest rubies (#112) - Note that after this change we will only run tests on Ruby 2.5, 2.4 and 2.3
+
+
 ## 1.2.2 (2018-04-16)
 
 * adds callback form `customer.source.expiring`. Thanks @Japestrale!

data/Gemfile

@@ -3,23 +3,20 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in stripe-rails.gemspec
 gemspec
 
-gem "bundler", ">= 1.3.0"
-gem "rake"
-gem 'tzinfo'
-gem 'mocha'
-gem 'pry'
+gem 'rake'
 
 group :development, :test do
   gem 'm'
 end
 
 group :test do
+  gem 'mocha'
   gem 'simplecov', require: false
-  # NOTE: tracking master temporarily until they
-  # release https://github.com/rebelidealist/stripe-ruby-mock/pull/433
-  gem 'stripe-ruby-mock', github: 'rebelidealist/stripe-ruby-mock'
-  gem 'poltergeist' # required for system tests
-  gem 'phantomjs'   # ditto
-  gem 'puma'        # ditto
+  gem 'stripe-ruby-mock'
   gem 'webmock'
+  # Required for system tests
+  gem 'capybara'
+  gem 'chromedriver-helper'
+  gem 'puma'
+  gem 'selenium-webdriver'
 end

data/README.md

@@ -145,6 +145,14 @@ Stripe.plan :gold do |plan|
   plan.amount = 999 # $9.99
   plan.interval = 'month'
 end
+
+Stripe.plan :bronze do |plan|
+  # Use an existing product id to prevent a new plan from
+  # getting created
+  plan.product_id = 'prod_XXXXXXXXXXXXXX'
+  plan.amount = 999 # $9.99
+  plan.interval = 'month'
+end
 ```
 
 This will define constants for these plans in the Stripe::Plans module so that you

data/gemfiles/rails4.gemfile

@@ -1,20 +1,19 @@
 source :rubygems
 
-gem 'rails', '~> 4'
+gem 'rails', '~> 4.2'
 
-gem "bundler", ">= 1.3.0"
-gem "rake"
-gem 'tzinfo'
-gem 'mocha'
-gem 'pry'
+gem 'rake'
 gem 'responders', '~> 2.0' # to support Rails 4.2
 gem 'stripe'
-gem 'stripe-ruby-mock', '~> 2.4'
 
 group :test do
+  gem 'mocha'
   gem 'simplecov', require: false
-  gem 'poltergeist'
-  gem 'phantomjs', :require => 'phantomjs/poltergeist'
-  gem 'puma'
+  gem 'stripe-ruby-mock'
   gem 'webmock'
+  # Required for system tests
+  gem 'capybara'
+  gem 'chromedriver-helper'
+  gem 'puma'                
+  gem 'selenium-webdriver'
 end

data/lib/stripe/plans.rb

@@ -3,16 +3,26 @@ module Stripe
     include ConfigurationBuilder
 
     configuration_for :plan do
-      attr_accessor :name, :amount, :interval, :interval_count, :trial_period_days,
-                    :currency, :metadata, :statement_descriptor
+      attr_accessor :name, 
+                    :amount,
+                    :interval,
+                    :interval_count,
+                    :trial_period_days,
+                    :currency,
+                    :metadata,
+                    :statement_descriptor,
+                    :product_id
 
-      validates_presence_of :id, :amount, :currency, :name
+      validates_presence_of :id, :amount, :currency
 
-      validates_inclusion_of :interval, :in => %w(day week month year),
-        :message => "'%{value}' is not one of 'day', 'week', 'month' or 'year'"
+      validates_inclusion_of  :interval,
+                              :in => %w(day week month year),
+                              :message => "'%{value}' is not one of 'day', 'week', 'month' or 'year'"
 
       validates :statement_descriptor, :length => { :maximum => 22 }
 
+      validate :name_or_product_id
+
       def initialize(*args)
         super(*args)
         @currency = 'usd'
@@ -21,6 +31,9 @@ module Stripe
       end
 
       private
+      def name_or_product_id
+        errors.add(:base, 'must have a product_id or a name') unless (@product_id.present? ^ @name.present?)
+      end
 
       def create_options
         if api_version_after_switch_to_products_in_plans
@@ -44,10 +57,7 @@ module Stripe
       def default_create_options
         {
           :currency => @currency,
-          product: {
-            :name => @name,
-            :statement_descriptor => @statement_descriptor,
-          },
+          product: product_options,
           :amount => @amount,
           :interval => @interval,
           :interval_count => @interval_count,
@@ -56,6 +66,10 @@ module Stripe
         }
       end
 
+      def product_options
+        @product_id.presence || { :name => @name, :statement_descriptor => @statement_descriptor }
+      end
+
       def create_options_without_products
         {
           :currency => @currency,

data/lib/stripe/rails/version.rb

@@ -1,5 +1,5 @@
 module Stripe
   module Rails
-    VERSION = '1.2.2'
+    VERSION = '1.3.0'
   end
 end

data/test/coupon_builder_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe 'building coupons' do
+  parallelize_me!
+
   before do
     Stripe::Coupons.configurations.clear
   end

data/test/dummy/app/views/stripes/new.html.erb

@@ -1,3 +1,7 @@
 <%= stripe_javascript_tag (params[:version] || :v3) %>
 
-<p>This page tests the loading and initialization of Stripe JS</p>
+<script>
+  if (typeof(Stripe) != 'undefined') {
+    document.write("<p>This page tests the loading and initialization of Stripe JS</p>");    
+  }
+</script>

data/test/dummy/config/application.rb

@@ -10,6 +10,8 @@ require "stripe-rails"
 
 module Dummy
   class Application < Rails::Application
+    config.stripe.publishable_key = 'pk_test_XXXYYYZZZ'
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.

data/test/dummy/config/environments/development.rb

@@ -14,7 +14,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
+  # config.action_mailer.raise_delivery_errors = false
 
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
@@ -23,15 +23,15 @@ Dummy::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # config.active_record.mass_assignment_sanitizer = :strict
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
-  config.assets.compress = false
+  # config.assets.compress = false
 
   # Expands the lines which load the assets
-  config.assets.debug = true
+  # config.assets.debug = true
 end

data/test/pings_controller_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Stripe::PingsController do
+  parallelize_me!
   include Rack::Test::Methods
 
   let(:app) { Rails.application }

data/test/plan_builder_spec.rb

@@ -14,9 +14,7 @@ describe 'building plans' do
       end
     end
 
-    after do
-      Stripe::Plans.send(:remove_const, :PRIMO)
-    end
+    after { Stripe::Plans.send(:remove_const, :PRIMO) }
 
     it 'is accessible via id' do
       Stripe::Plans::PRIMO.wont_be_nil
@@ -103,6 +101,28 @@ describe 'building plans' do
       }.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|
+          plan.product_id = 'acme'
+          plan.amount = 999
+          plan.interval = 'month'
+        end
+        Stripe::Plans::PRODDED.wont_be_nil
+      end
+
+      it 'should be invalid when using both name and product id' do
+        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
+      end
+    end
+
     describe 'uploading' do
       include FixtureLoader
 
@@ -166,6 +186,31 @@ describe 'building plans' do
             )
             Stripe::Plans::GOLD.put!
           end
+
+          describe 'when using a product id' do
+            before do
+              Stripe::Plans::GOLD.product_id = 'prod_XXXXXXXXXXXXXX'
+              Stripe::Plans::GOLD.name = nil
+            end
+            after do
+              Stripe::Plans::GOLD.product_id = nil
+              Stripe::Plans::GOLD.name = 'Solid Gold'
+            end
+
+            it 'creates the plan online with the product id' do
+              Stripe::Plan.expects(:create).with(
+                :id => :gold,
+                :currency => 'usd',
+                :product => 'prod_XXXXXXXXXXXXXX',
+                :amount => 699,
+                :interval => 'month',
+                :interval_count => 1,
+                :trial_period_days => 0,
+                :metadata => nil,
+              )
+              Stripe::Plans::GOLD.put!
+            end
+          end
         end
 
         describe 'when api_version is not set for api versions that support products' do

data/test/spec_helper.rb

@@ -8,6 +8,8 @@ require 'minitest/autorun'
 require 'webmock/minitest'
 WebMock.disable_net_connect!(allow_localhost: true)
 
+require 'selenium-webdriver'
+
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 ENV['STRIPE_SECRET_KEY'] = 'XYZ'
@@ -28,4 +30,4 @@ end
 Stripe::Engine.testing = true
 require 'mocha/setup'
 
-require 'irb'
+require 'irb'

data/test/support/application_system_test_case.rb

@@ -1,11 +1,8 @@
 require File.expand_path("null_system_test_case", __dir__)
-require "capybara/poltergeist"
-require 'phantomjs/poltergeist'
 
 # For Rails 4 compat
 SystemTestCaseKlass = defined?(ActionDispatch::SystemTestCase) ? ActionDispatch::SystemTestCase : NullSystemTestCase
 
 class ApplicationSystemTestCase < SystemTestCaseKlass
-  # Note: errors only show up with BOTH js_errors: true, inspector: true
-  driven_by :poltergeist, options: { js_errors: true, inspector: true, phantomjs: Phantomjs.path }
+  driven_by :selenium_chrome_headless
 end

data/test/support/null_system_test_case.rb

@@ -1,5 +1,5 @@
 class NullSystemTestCase
-  def self.driven_by(_, _)
+  def self.driven_by(*_)
   end
 
   def self.setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Charles Lowell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/release-drafter.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -80,7 +81,6 @@ files:
 - app/views/stripe/_js.html.erb
 - config/routes.rb
 - gemfiles/rails4.gemfile
-- gemfiles/rails5.gemfile
 - lib/generators/stripe/install_generator.rb
 - lib/generators/templates/coupons.rb
 - lib/generators/templates/plans.rb

data/gemfiles/rails5.gemfile

@@ -1,20 +0,0 @@
-source :rubygems
-
-gem 'rails', '~> 5'
-
-gem "bundler", ">= 1.3.0"
-gem "rake"
-gem 'tzinfo'
-gem 'mocha'
-gem 'pry'
-gem 'responders', '~> 2.0' # to support Rails 4.2
-gem 'stripe'
-gem 'stripe-ruby-mock', '~> 2.4'
-
-group :test do
-  gem 'simplecov', require: false
-  gem 'poltergeist'
-  gem 'phantomjs', :require => 'phantomjs/poltergeist'
-  gem 'puma'
-  gem 'webmock'
-end