stripe-rails 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b07e6ff640777c2280d2dd29d46ddb72f8412ffb
-  data.tar.gz: 952adfc0b8538e40e53b0eaf59b1c6620c7c418e
+  metadata.gz: d7064822cbaf76623c55cdb77ca09fc0024ad995
+  data.tar.gz: c431f805019acf8b747078e464219936bd105ab2
 SHA512:
-  metadata.gz: caeda4e7f70ed9b564abaf7f065dd25591aaedf8cf57f7b95a71274b5a10bd269c6a55ab60ebe0487de8ed6941b7dd5f154981f4e7d4b7b87b4ba8f4c42112c5
-  data.tar.gz: c2f965d400379c69d80c02055f30d288630793142aa02736fad46ba4cf33dd201b6f546248301e6d6bd43b361aff613ddae81b1b7a22e13b6b321783813ff30b
+  metadata.gz: da180772c4e9efa49b565cefcdc9b81328cac4ed8d8afdde59f1313734c0df76b64f014520914f118a908341b0e239fd224e4e0d988cd1290bf179fc1574ba31
+  data.tar.gz: 073db41216f36f6041f1844ebe58413850dc4f3bb75bfc9cefe6305f9c6dec6aa233eb58164b1a515f0be88b1a33a61908bb8de6c9006799abfb917dac3468ed

data/Changelog.md

@@ -1,3 +1,7 @@
+## 1.0.1 (2017-08-08)
+
+* Fixes a bug with Stripe JS V3, i.e. `Stripe.setPublishableKey` is no longer a function. Thanks to @kartikluke for reporting this.
+
 ## 1.0.0 (2017-07-24 - Breaky McBreakface)
 
 * [BREAKING] Update to latest stripe events (thanks @hopsoft). Note that if you are using the `after_customer_card_created`, `after_customer_card_updated` or `after_customer_card_deleted` callbacks, you MUST update them to `after_customer_source_created`, `after_customer_source_updated` or `after_customer_source_deleted` respectively. You also need to start using [Stripe API Version > 2015-02-18](https://stripe.com/docs/upgrades#2015-02-18) or else the webhook might not work as expected.

data/Gemfile

@@ -12,4 +12,7 @@ gem 'responders', '~> 2.0' # to support Rails 4.2
 
 group :test do
   gem 'simplecov', require: false
+  gem 'poltergeist' # required for system tests
+  gem 'phantomjs'   # ditto
+  gem 'puma'        # ditto
 end

data/app/views/stripe/_js.html.erb

@@ -1,13 +1,16 @@
-<%- case (stripe_js_version || 'v1') %>
+<%- case (stripe_js_version || 'v3') %>
 <%- when 'v1', 'v2' %>
-<%- if ::Rails.application.config.stripe.debug_js %>
-<script type="text/javascript" src="https://js.stripe.com/<%=stripe_js_version%>/stripe-debug.js"></script>
-<%- else %>
-<script type="text/javascript" src="https://js.stripe.com/<%=stripe_js_version%>/"></script>
-<%- end %>
+  <%- if ::Rails.application.config.stripe.debug_js %>
+    <script type="text/javascript" src="https://js.stripe.com/<%=stripe_js_version%>/stripe-debug.js"></script>
+  <%- else %>
+    <script type="text/javascript" src="https://js.stripe.com/<%=stripe_js_version%>/"></script>
+  <%- end %>
+  <script type="text/javascript">
+    Stripe.setPublishableKey("<%= Rails.application.config.stripe.publishable_key or fail 'No stripe.com publishable key found. Please set config.stripe.publishable_key in config/application.rb to one of your publishable keys, which can be found here: https://manage.stripe.com/#account/apikeys' %>")
+  </script>
 <%- when 'v3' # the debug js for v3 isn't available %>
-<script type="text/javascript" src="https://js.stripe.com/<%=stripe_js_version%>/"></script>
-<%- end %>
-<script type="text/javascript">
-Stripe.setPublishableKey("<%= Rails.application.config.stripe.publishable_key or fail 'No stripe.com publishable key found. Please set config.stripe.publishable_key in config/application.rb to one of your publishable keys, which can be found here: https://manage.stripe.com/#account/apikeys' %>")
-</script>
+  <script type="text/javascript" src="https://js.stripe.com/<%=stripe_js_version%>/"></script>
+  <script type="text/javascript">
+    var stripe = Stripe("<%= Rails.application.config.stripe.publishable_key or fail 'No stripe.com publishable key found. Please set config.stripe.publishable_key in config/application.rb to one of your publishable keys, which can be found here: https://manage.stripe.com/#account/apikeys' %>");
+  </script>
+<%- end %>

data/gemfiles/rails4.gemfile

@@ -12,4 +12,7 @@ gem 'stripe'
 
 group :test do
   gem 'simplecov', require: false
+  gem 'poltergeist'
+  gem 'phantomjs', :require => 'phantomjs/poltergeist'
+  gem 'puma'
 end

data/gemfiles/rails5.gemfile

@@ -12,4 +12,7 @@ gem 'stripe'
 
 group :test do
   gem 'simplecov', require: false
+  gem 'poltergeist'
+  gem 'phantomjs', :require => 'phantomjs/poltergeist'
+  gem 'puma'
 end

data/lib/stripe/rails/version.rb

@@ -1,5 +1,5 @@
 module Stripe
   module Rails
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/test/callbacks_spec.rb

@@ -3,114 +3,90 @@ require 'spec_helper'
 
 describe Stripe::Callbacks do
   include Rack::Test::Methods
+  include CallbackHelpers
 
-  def app
-    Rails.application
-  end
+  let(:app)       { Rails.application }
+  let(:event)     { JSON.parse(File.read File.expand_path('../event.json', __FILE__)) }
+  let(:invoice)   { JSON.parse(File.read File.expand_path('../invoice.json', __FILE__)) }
+  let(:content)   { event }
+  let(:observer)  { Class.new }
 
   before do
     header 'Accept', 'application/json'
     header 'Content-Type', 'application/json'
-    @observer = Class.new.tap do |cls|
-      cls.class_eval do
-        include Stripe::Callbacks
-      end
-    end
 
-    event                   = JSON.parse(File.read File.expand_path('../event.json', __FILE__))
-    invoice                 = JSON.parse(File.read File.expand_path('../invoice.json', __FILE__))
-    event['data']['object'] = invoice
+    observer.include Stripe::Callbacks
 
-    @content = event
-    self.type = @content['type']
-  end
-
-  def type=(type)
-    @content['type'] = type
-    @stubbed_event = Stripe::Event.construct_from(@content)
-    Stripe::Event.stubs(:retrieve).returns(@stubbed_event)
-  end
-
-  after do
-    ::Stripe::Callbacks.clear_callbacks!
-  end
+    event['data']['object'] = invoice
 
-  it 'has eager loaded the callbacks listed in the configuration' do
-    assert Dummy.const_defined?(:ModelWithCallbacks), 'should have eager loaded'
-    assert Dummy.const_defined?(:ModuleWithCallbacks), 'should have eager loaded'
+    self.type = content['type']
   end
+  after { ::Stripe::Callbacks.clear_callbacks! }
 
-  it 'has a ping interface just to make sure that everything is working just fine' do
-    get '/stripe/ping'
-    assert last_response.ok?
-  end
+  subject { post 'stripe/events', JSON.pretty_generate(content) }
 
   describe 'defined with a bang' do
-    code = nil
-    before do
-      code = proc {|target, e| @event = e; @target = target}
-      @observer.class_eval do
-        after_invoice_payment_succeeded! do |evt, target|
-          code.call(evt, target)
-        end
+    let(:callback) { :after_invoice_payment_succeeded! }
+    before { run_callback_with(callback) {|target, e| @event = e; @target = target} }
+
+    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
       end
     end
-    it 'is invoked for the invoice.payment_succeeded event' do
-      post 'stripe/events', JSON.pretty_generate(@content)
-      @event.wont_be_nil
-      @event.type.must_equal 'invoice.payment_succeeded'
-      @target.total.must_equal 6999
-    end
-    it 'is not invoked for other types of events' do
-      self.type = 'invoked.payment_failed'
-      post 'stripe/events/', JSON.pretty_generate(@content)
+
+    describe 'when the invoked.payment_failed webhook is called' do
+      before { self.type = 'invoked.payment_failed' }
+
+      it 'the invoice.payment_succeeded callback is not invoked' do
+        subject
+        @event.must_be_nil
+      end
     end
+
     describe 'if it raises an exception' do
-      before do
-        code = proc {fail 'boom!'}
-      end
+      before { run_callback_with(callback) { fail } }
+
       it 'causes the whole webhook to fail' do
-        proc {post 'stripe/events', JSON.pretty_generate(@content)}.must_raise RuntimeError
+        ->{ subject }.must_raise RuntimeError
       end
     end
   end
 
   describe 'defined without a bang and raising an exception' do
-    before do
-      @observer.class_eval do
-        after_invoice_payment_succeeded do |evt|
-          fail 'boom!'
-        end
-      end
-    end
+    let(:callback) { :after_invoice_payment_succeeded }
+    before { run_callback_with(callback) { fail } }
 
     it 'does not cause the webhook to fail' do
-      post 'stripe/events', JSON.pretty_generate(@content)
+      subject
       last_response.status.must_be :>=, 200
       last_response.status.must_be :<, 300
     end
   end
 
-  describe 'designed to catch any event' do
-    events = nil
-    before do
-      events = []
-      @observer.class_eval do
-        after_stripe_event do |target, evt|
-          events << evt
-        end
+  describe 'the after_stripe_event callback to catch any event' do
+    let(:events) { [] }
+    before { run_callback_with(:after_stripe_event) { |_, evt| events << evt } }
+
+    describe 'when it gets invoked for a standard event' do
+      before { self.type = 'invoice.payment_failed' }
+
+      it 'it will be run' do
+        subject
+        events.first.type.must_equal 'invoice.payment_failed'
       end
     end
-    it 'gets invoked for any standard event' do
-      self.type = 'invoice.payment_failed'
-      post 'stripe/events/', JSON.pretty_generate(@content)
-      events.first.type.must_equal 'invoice.payment_failed'
-    end
 
-    it 'gets invoked for any event whatsoever' do
-      self.type = 'foo.bar.baz'
-      post 'stripe/events/', JSON.pretty_generate(@content)
-      events.first.type.must_equal 'foo.bar.baz'
+    describe 'when it gets invoked for an arbitrary event' do
+      before { self.type = 'foo.bar.baz' }
+
+      it 'it will be run' do
+        subject
+        events.first.type.must_equal 'foo.bar.baz'
+      end
     end
   end
 
@@ -121,60 +97,87 @@ describe Stripe::Callbacks do
       self.type = 'invoice.updated'
       @stubbed_event.data.previous_attributes = {}
     end
+
     describe 'specified as an single symbol' do
       before do
-        @observer.class_eval do
+        observer.class_eval do
           after_invoice_updated! :only => :closed do |invoice, evt|
             events << evt
           end
         end
       end
-      it 'does not fire events for with a prior attribute was specified' do
-        post 'stripe/events', JSON.pretty_generate(@content)
-        events.length.must_equal 0
+
+      describe 'when a prior attribute was not specified' do
+        it 'does not fire events' do
+          subject
+          events.length.must_equal 0
+        end
       end
-      it 'does fire events for which the prior attribute was specified' do
-        @stubbed_event.data.previous_attributes['closed'] = true
-        post 'stripe/events', JSON.pretty_generate(@content)
-        events.length.must_equal 1
+
+      describe 'when a prior attribute was specified' do
+        before { @stubbed_event.data.previous_attributes['closed'] = true }
+        it 'fires events' do
+          subject
+          events.length.must_equal 1
+        end
       end
     end
+
     describe 'specified as an array' do
       before do
-        @observer.class_eval do
+        observer.class_eval do
           after_invoice_updated! :only => [:currency, :subtotal] do |invoice, evt|
             events << evt
           end
         end
       end
-      it 'does not fire events for which prior attributes were not specified' do
-        post 'stripe/events', JSON.pretty_generate(@content)
-        events.length.must_equal 0
+
+      describe 'when a prior attribute was not specified' do
+        it 'does not fire events' do
+          subject
+          events.length.must_equal 0
+        end
       end
-      it 'does fire events for which prior attributes were specified' do
-        @stubbed_event.data.previous_attributes['subtotal'] = 699
-        post 'stripe/events', JSON.pretty_generate(@content)
-        events.length.must_equal 1
+
+      describe 'when prior attributes were specified' do
+        before { @stubbed_event.data.previous_attributes['subtotal'] = 699 }
+        it 'fire events' do
+          subject
+          events.length.must_equal 1
+        end
       end
     end
+
     describe 'specified as a lambda' do
       before do
-        @observer.class_eval do
+        observer.class_eval do
           after_invoice_updated :only => proc {|target, evt| evt.data.previous_attributes.to_hash.has_key? :closed} do |i,e|
             events << e
           end
         end
       end
-      it 'does not fire events for which the lambda is not true' do
-        post 'stripe/events', JSON.pretty_generate(@content)
-        events.length.must_equal 0
+
+      describe 'when the lambda is not true' do
+        it 'does not fire events' do
+          subject
+          events.length.must_equal 0
+        end
       end
 
-      it 'does fire events for when the lambda is true' do
-        @stubbed_event.data.previous_attributes['closed'] = 'false'
-        post 'stripe/events', JSON.pretty_generate(@content)
-        events.length.must_equal 1
+      describe 'when the lambda is not true' do
+        before { @stubbed_event.data.previous_attributes['closed'] = 'false' }
+        it 'fires events' do
+          subject
+          events.length.must_equal 1
+        end
       end
     end
   end
+
+  describe 'when there are eager loaded callbacks in the configuration (config/environment/test.rb)' do
+    it 'should be eager loaded' do
+      Dummy.const_defined?(:ModelWithCallbacks).must_equal true
+      Dummy.const_defined?(:ModuleWithCallbacks).must_equal true
+    end
+  end
 end

data/test/dummy/app/controllers/stripes_controller.rb

@@ -0,0 +1,4 @@
+class StripesController < ApplicationController
+  def new
+  end
+end

data/test/dummy/app/views/layouts/application.html.erb

@@ -2,8 +2,6 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
 <body>

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

@@ -0,0 +1,3 @@
+<%= stripe_javascript_tag (params[:version] || :v3) %>
+
+<p>This page tests the loading and initialization of Stripe JS</p>

data/test/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Dummy::Application.routes.draw do
+  resources :stripes, only: :new
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

data/test/dummy_stripes_controller_spec.rb

@@ -0,0 +1,17 @@
+class DummyStripesControllerSpec < ApplicationSystemTestCase
+  setup do
+    Dummy::Application.configure do
+      config.stripe.publishable_key = 'pk_test_XXXYYYZZZ'
+    end
+  end
+
+  test "loading the default javascript helper" do
+    visit new_stripe_url
+    assert_text 'This page tests the loading and initialization of Stripe JS'
+  end
+
+  test "loading the v2 version of the javascript helper" do
+    visit new_stripe_url(version: 'v2')
+    assert_text 'This page tests the loading and initialization of Stripe JS'
+  end
+end

data/test/pings_controller_spec.rb

@@ -0,0 +1,18 @@
+require 'minitest/autorun'
+require 'spec_helper'
+
+describe Stripe::PingsController do
+  include Rack::Test::Methods
+
+  let(:app) { Rails.application }
+  before do
+    header 'Accept', 'application/json'
+    header 'Content-Type', 'application/json'
+  end
+
+  describe 'the ping interface' do
+    subject { get '/stripe/ping' }
+
+    it { subject.must_be :ok? }
+  end
+end

data/test/spec_helper.rb

@@ -20,3 +20,5 @@ end
 
 Stripe::Engine.testing = true
 require 'mocha/setup'
+
+require 'irb'

data/test/support/application_system_test_case.rb

@@ -0,0 +1,11 @@
+require File.expand_path("../null_system_test_case",  __FILE__)
+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 }
+end

data/test/support/callback_helpers.rb

@@ -0,0 +1,15 @@
+module CallbackHelpers
+  def type=(type)
+    content['type'] = type
+    @stubbed_event = Stripe::Event.construct_from(content)
+    Stripe::Event.stubs(:retrieve).returns(@stubbed_event)
+  end
+
+  def run_callback_with(callback)
+    observer.class_eval do
+      send(callback) do |evt, target|
+        yield evt, target
+      end
+    end
+  end
+end

data/test/support/null_system_test_case.rb

@@ -0,0 +1,11 @@
+class NullSystemTestCase
+  def self.driven_by(_, _)
+  end
+
+  def self.setup
+  end
+
+  def self.test(_)
+    warn 'WARNING: Skipping system test because this version of Rails does not support it!'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Charles Lowell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,11 +100,13 @@ files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/stripes_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/mailers/.gitkeep
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/dummy/model_with_callbacks.rb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/stripes/new.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -130,12 +132,17 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
+- test/dummy_stripes_controller_spec.rb
 - test/event.json
 - test/invoice.json
 - test/javascript_helper_spec.rb
+- test/pings_controller_spec.rb
 - test/plan_builder_spec.rb
 - test/spec_helper.rb
 - test/stripe_rails_spec.rb
+- test/support/application_system_test_case.rb
+- test/support/callback_helpers.rb
+- test/support/null_system_test_case.rb
 homepage: https://github.com/Everapps/stripe-rails
 licenses:
 - MIT
@@ -169,11 +176,13 @@ test_files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/stripes_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/mailers/.gitkeep
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/dummy/model_with_callbacks.rb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/stripes/new.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -199,9 +208,14 @@ test_files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
+- test/dummy_stripes_controller_spec.rb
 - test/event.json
 - test/invoice.json
 - test/javascript_helper_spec.rb
+- test/pings_controller_spec.rb
 - test/plan_builder_spec.rb
 - test/spec_helper.rb
 - test/stripe_rails_spec.rb
+- test/support/application_system_test_case.rb
+- test/support/callback_helpers.rb
+- test/support/null_system_test_case.rb