stripe_webhooks 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0592b945f0b8f6dcc22b465338e266edb8e1da4
-  data.tar.gz: 7f35b9a9f565afb154351f6486319f79ba398e41
+  metadata.gz: f069c998280e950ef58ee9cf8e78bf94f44cc458
+  data.tar.gz: 3fabcf9db7389bb00ebfce7cbbd689094b78c949
 SHA512:
-  metadata.gz: 31e2ee5f45feb89438cfc0d866b2022fa115c6bb9ccfefcde9a038c334fb63f601fc2cabba118547d1fa9809ee09907123f65e47d976ad71d10865f45f445853
-  data.tar.gz: aca513f030fac3f13cc4d800cd65fa8c6df60920d35307002d6fd3ee6f65fa2084291f601400a321a952d8d0d61187aba55ab20df1b447d5fd69d928fe3e461b
+  metadata.gz: 261e7691366f50ae94e5a8613ef18ebd685c66a6c37136cbf71ca29a31c9a2975a3dc4ec1f574d0ba6211f89989d5390b15c4546e957956fee25f9aebfcc9fe4
+  data.tar.gz: 1cdeb62697cbfa7765dbddc14eae12252c5aed2bdcc3f3dff4acdcb7e52cd316d32b020b6fb906f03d24151ce47585955b276ea7a427a6ecd0242e865bca82e3

data/app/controllers/stripe_webhooks/events_controller.rb

@@ -8,17 +8,20 @@ module StripeWebhooks
       begin
         raw_data = JSON.parse(request.body.read)
       rescue JSON::ParserError => e
-        render text: e.message, status: 400
+        render plain: e.message, status: 400
         return
       end
 
       @event = StripeWebhooks::Event.find_or_initialize_by(stripe_event_id: raw_data['id'])
+      @event.stripe_event_type = raw_data['type']
+      @event.livemode = raw_data['livemode']
+      @event.user_id = raw_data['user_id']
 
       if @event.save()
         StripeWebhooks::ProcessorJob.perform_later(@event)
-        render nothing: true, status: 200
+        head :ok
       else
-        render text: @event.errors.full_messages.first, status: 422
+        render plain: @event.errors.full_messages.first, status: 422
       end
     end
 

data/app/models/stripe_webhooks/event.rb

@@ -8,7 +8,7 @@ module StripeWebhooks
         Rails.logger.warn('The event you requested was created over 30 days ago,
                           which means it may no longer be available via the Stripe Events API.')
       end
-      @_stripe_event ||= Stripe::Event.retrieve(stripe_event_id)
+      @_stripe_event ||= fetch_event
       return @_stripe_event
     end
 
@@ -32,5 +32,15 @@ module StripeWebhooks
       return true
     end
 
+    private
+
+    def fetch_event
+      if user_id
+        Stripe::Event.retrieve(stripe_event_id, stripe_account: user_id)
+      else
+        Stripe::Event.retrieve(stripe_event_id)
+      end
+    end
+
   end
 end

data/db/migrate/20170201175643_add_user_id_to_stripe_webhook_events.rb

@@ -0,0 +1,8 @@
+class AddUserIdToStripeWebhookEvents < ActiveRecord::Migration[5.0]
+  def change
+    change_table :stripe_webhooks_events do |t|
+      t.string :user_id
+      t.boolean :livemode, default: false
+    end
+  end
+end

data/lib/generators/stripe_webhooks/callback_generator.rb

@@ -15,9 +15,9 @@ module StripeWebhooks
         end
         template 'callback.rb.erb', "app/callbacks/#{name.underscore}_callback.rb"
 
-        if defined?(RSpec)
+        if defined?(RSpec) && Dir.exist?(Rails.root.join('spec'))
           template 'callback_spec.rb.erb',
-            "#{RSpec.configuration.default_path}/callbacks/#{name.underscore}_callback_spec.rb"
+            Rails.root.join('spec', 'callbacks', "#{name.underscore}_callback_spec.rb")
         end
       end
 

data/lib/stripe_webhooks/version.rb

@@ -1,3 +1,3 @@
 module StripeWebhooks
-  VERSION = '0.3'.freeze
+  VERSION = '0.4'.freeze
 end

data/spec/controllers/stripe_webhooks/events_controller_spec.rb

@@ -11,33 +11,37 @@ module StripeWebhooks
     describe 'POST #create' do
       it 'should create the event' do
         expect do
-          post :create, customer_created
+          post :create, body: customer_created, format: :json
         end.to change(StripeWebhooks::Event, :count).by(1)
         expect(response).to have_http_status(:success)
       end
 
       it 'should not create a duplicate event' do
-        post :create, customer_created
+        post :create, body: customer_created, format: :json
         expect do
-          post :create, customer_created
+          post :create, body: customer_created, format: :json
         end.to_not change(StripeWebhooks::Event, :count)
         expect(response).to have_http_status(:success)
       end
 
       it 'should queue an active job' do
         expect do
-          post :create, customer_created
+          post :create, body: customer_created, format: :json
         end.to change(ActiveJob::Base.queue_adapter.enqueued_jobs, :length).by(1)
         expect(ActiveJob::Base.queue_adapter.enqueued_jobs.last[:job]).to eq(StripeWebhooks::ProcessorJob)
       end
 
       it 'should return an 400 error when the JSON is poorly formed' do
-        post :create, File.read(StripeWebhooks::Engine.root.join('spec', 'data', 'parse_error.json'))
+        post :create,
+          body: File.read(StripeWebhooks::Engine.root.join('spec', 'data', 'parse_error.json')),
+          format: :json
         expect(response).to have_http_status(400)
       end
 
       it 'should return a 422 error when the provided data is not valid' do
-        post :create, File.read(StripeWebhooks::Engine.root.join('spec', 'data', 'invalid_data.json'))
+        post :create,
+          body: File.read(StripeWebhooks::Engine.root.join('spec', 'data', 'invalid_data.json')),
+          format: :json
         expect(response).to have_http_status(422)
       end
     end

data/spec/dummy/config/application.rb

@@ -19,8 +19,5 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end

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

@@ -13,8 +13,8 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,27 +10,27 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150716195741) do
+ActiveRecord::Schema.define(version: 20170201180822) do
 
-  create_table "stripe_webhooks_events", force: :cascade do |t|
-    t.string   "stripe_event_id",   limit: 255
-    t.string   "stripe_event_type", limit: 255
+  create_table "stripe_webhooks_events", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string   "stripe_event_id"
+    t.string   "stripe_event_type"
     t.datetime "stripe_created_at"
-    t.boolean  "is_processed",                  default: false
-    t.boolean  "is_authentic",                  default: false
-    t.datetime "created_at",                                    null: false
-    t.datetime "updated_at",                                    null: false
+    t.boolean  "is_processed",      default: false
+    t.boolean  "is_authentic",      default: false
+    t.datetime "created_at",                        null: false
+    t.datetime "updated_at",                        null: false
+    t.string   "user_id"
+    t.boolean  "livemode",          default: false
+    t.index ["stripe_event_id"], name: "index_stripe_webhooks_events_on_stripe_event_id", unique: true, using: :btree
   end
 
-  add_index "stripe_webhooks_events", ["stripe_event_id"], name: "index_stripe_webhooks_events_on_stripe_event_id", unique: true, using: :btree
-
-  create_table "stripe_webhooks_performed_callbacks", force: :cascade do |t|
-    t.string   "stripe_event_id", limit: 255, null: false
-    t.string   "label",           limit: 255, null: false
-    t.datetime "created_at",                  null: false
-    t.datetime "updated_at",                  null: false
+  create_table "stripe_webhooks_performed_callbacks", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string   "stripe_event_id", null: false
+    t.string   "label",           null: false
+    t.datetime "created_at",      null: false
+    t.datetime "updated_at",      null: false
+    t.index ["stripe_event_id", "label"], name: "index_stripe_webhooks_performed_callbacks_event_id_label", using: :btree
   end
 
-  add_index "stripe_webhooks_performed_callbacks", ["stripe_event_id", "label"], name: "index_stripe_webhooks_performed_callbacks_event_id_label", using: :btree
-
 end

data/spec/rails_helper.rb

@@ -11,9 +11,6 @@ require 'stripe_mock'
 require 'simplecov'
 SimpleCov.start 'rails'
 
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
-
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
 # run as spec files by default. This means that files in spec/support that end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: stripe_webhooks
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Moser Consulting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: stripe
   requirement: !ruby/object:Gem::Requirement
@@ -58,56 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: stripe-ruby-mock
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +173,7 @@ files:
 - config/routes.rb
 - db/migrate/20150715152905_create_stripe_webhooks_events.rb
 - db/migrate/20150716195741_create_stripe_webhooks_performed_callbacks.rb
+- db/migrate/20170201175643_add_user_id_to_stripe_webhook_events.rb
 - lib/generators/stripe_webhooks.rb
 - lib/generators/stripe_webhooks/callback_generator.rb
 - lib/generators/stripe_webhooks/templates/application_callback.rb.erb
@@ -253,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Stripe Webhook event capture and processing engine.