stripe-ruby-mock 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a861480c10df772899ac63e55dbc97d84ff3eb2c
-  data.tar.gz: 3d44f183f03df9af022be2b36b49fe45a01ed1e6
+  metadata.gz: ce6d1ae38721fc9f43fa69e3d82217593b0789d9
+  data.tar.gz: abbbfb0dd70438e23ac276215602a3d3a77705b1
 SHA512:
-  metadata.gz: 38a0c8592b9dc4181fdd8730e9b2d2496f852911a480eddc3621a7061d7cd0e1a6e6268a4f722be98483b58b32dd03eb7664135caaa99a638fce5dc70d20d10c
-  data.tar.gz: 44f924ab949f7101b1854f413b7120a0cafc5432c83ae23ab993c4cde6e879445f33ef8fa863a066d24bc06c14d3f9c299a5d6917f58890fd32a76a07ed72be9
+  metadata.gz: 49d92a3efee46c78cd157fd84de5e8eb456b6686b06c00a23262648395b0dd2cb647620304de703e52e5919102ce6c782a4947b50c39aef90428a02af9cfe9b0
+  data.tar.gz: c87d09dd495bdca773e0ea39169f04900e7467f315f220ca556d907e9c0f294ddad399a73c2765e27e9ebe319b42f1b68b9ef825a02707c4877096777154a8c4

data/.travis.yml

@@ -1,12 +1,14 @@
 dist: trusty
+group: deprecated-2017Q2
 sudo: required
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.6
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
 before_install:
-  - rvm 1.9.3 do gem install mime-types -v 2.6.2
+  - rvm 2.1.10 do gem install mime-types -v 2.6.2
   - gem install bundler
 before_script:
   - "sudo touch /var/log/stripe-mock-server.log"
@@ -15,7 +17,7 @@ script: "bundle exec rspec && bundle exec rspec -t live"
 
 env:
   global:
-    - IS_TRAVIS=true STRIPE_TEST_SECRET_KEY_A=sk_test_sXdhUWu3NhrB7r1tkK0zZfMW STRIPE_TEST_SECRET_KEY_B=sk_test_v2K2hV9VJ8AoRKTeDRkQ3rG3 STRIPE_TEST_SECRET_KEY_C=sk_test_QNgKQJhW4fWYT63be2AUSVjJ
+    - IS_TRAVIS=true STRIPE_TEST_SECRET_KEY_A=sk_test_sXdhUWu3NhrB7r1tkK0zZfMW STRIPE_TEST_SECRET_KEY_B=sk_test_uPfIX9ziFNloXwtSdDPJTdnh STRIPE_TEST_SECRET_KEY_C=sk_test_waSy1TaP2RNEpoz9t2pFCysm STRIPE_TEST_SECRET_KEY_D=sk_test_Z1mQZNehRFmI3EN9mHnMafnq
 
 notifications:
   webhooks:

data/README.md

@@ -12,7 +12,7 @@ This gem has unexpectedly grown in popularity and I've gotten pretty busy, so I'
 
 In your gemfile:
 
-    gem 'stripe-ruby-mock', '~> 2.4.1', :require => 'stripe_mock'
+    gem 'stripe-ruby-mock', '~> 2.5.0', :require => 'stripe_mock'
 
 ## Features
 
@@ -21,12 +21,18 @@ In your gemfile:
 * Mock and customize stripe webhooks
 * Flip a switch to run your tests against Stripe's **live test servers**
 
+### Requirements
+
+* ruby >= 2.0.0
+* stripe >= 2.0.3
+
 ### Specifications
 
-**STRIPE API TARGET VERSION:** 2015-09-08 (master)
+**STRIPE API TARGET VERSION:** 2017-06-05 (master)
 
 Older API version branches:
 
+- api-2015-09-08 - use gem version 2.4.1
 - [api-2014-06-17](https://github.com/rebelidealist/stripe-ruby-mock/tree/api-2014-06-17)
 
 ### Versioning System
@@ -294,9 +300,9 @@ it "mocks a stripe webhook" do
 end
 
 it "mocks stripe connect webhooks" do
-  event = StripeMock.mock_webhook_event('customer.created', user_id: 'acc_123123')
+  event = StripeMock.mock_webhook_event('customer.created', account: 'acc_123123')
 
-  expect(event.user_id).to eq('acc_123123')
+  expect(event.account).to eq('acc_123123')
 end
 ```
 

data/lib/stripe_mock/api/client.rb

@@ -8,7 +8,7 @@ module StripeMock
     return false if @state == 'live'
     return @client unless @client.nil?
 
-    alias_stripe_method :request, StripeMock.method(:redirect_to_mock_server)
+    alias_stripe_method :execute_request, StripeMock.method(:redirect_to_mock_server)
     @client = StripeMock::Client.new(port)
     @state = 'remote'
     @client
@@ -27,7 +27,7 @@ module StripeMock
 
   private
 
-  def self.redirect_to_mock_server(method, url, api_key, params={}, headers={}, api_base_url=nil)
+  def self.redirect_to_mock_server(method, url, api_key: nil, api_base: nil, params: {}, headers: {})
     handler = Instance.handler_for_method_url("#{method} #{url}")
 
     if mock_error = client.error_queue.error_for_handler_name(handler[:name])
@@ -35,7 +35,7 @@ module StripeMock
       raise mock_error
     end
 
-    Stripe::Util.symbolize_names client.mock_request(method, url, api_key, params, headers)
+    Stripe::Util.symbolize_names client.mock_request(method, url, api_key: api_key, params: params, headers: headers)
   end
 
 end

data/lib/stripe_mock/api/errors.rb

@@ -24,29 +24,40 @@ module StripeMock
 
     def self.argument_map
       @__map ||= {
-        incorrect_number: add_json_body(["The card number is incorrect", 'number', 'incorrect_number', 402]),
-        invalid_number: add_json_body(["The card number is not a valid credit card number", 'number', 'invalid_number', 402]),
-        invalid_expiry_month: add_json_body(["The card's expiration month is invalid", 'exp_month', 'invalid_expiry_month', 402]),
-        invalid_expiry_year: add_json_body(["The card's expiration year is invalid", 'exp_year', 'invalid_expiry_year', 402]),
-        invalid_cvc: add_json_body(["The card's security code is invalid", 'cvc', 'invalid_cvc', 402]),
-        expired_card: add_json_body(["The card has expired", 'exp_month', 'expired_card', 402]),
-        incorrect_cvc: add_json_body(["The card's security code is incorrect", 'cvc', 'incorrect_cvc', 402]),
-        card_declined: add_json_body(["The card was declined", nil, 'card_declined', 402]),
-        missing: add_json_body(["There is no card on a customer that is being charged.", nil, 'missing', 402]),
-        processing_error: add_json_body(["An error occurred while processing the card", nil, 'processing_error', 402]),
-        card_error: add_json_body(['The card number is not a valid credit card number.', 'number', 'invalid_number', 402]), 
-        incorrect_zip: add_json_body(['The zip code you supplied failed validation.', 'address_zip', 'incorrect_zip', 402])
+        incorrect_number: add_json_body(["The card number is incorrect", 'number', 'incorrect_number', http_status: 402]),
+        invalid_number: add_json_body(["The card number is not a valid credit card number", 'number', 'invalid_number', http_status: 402]),
+        invalid_expiry_month: add_json_body(["The card's expiration month is invalid", 'exp_month', 'invalid_expiry_month', http_status: 402]),
+        invalid_expiry_year: add_json_body(["The card's expiration year is invalid", 'exp_year', 'invalid_expiry_year', http_status: 402]),
+        invalid_cvc: add_json_body(["The card's security code is invalid", 'cvc', 'invalid_cvc', http_status: 402]),
+        expired_card: add_json_body(["The card has expired", 'exp_month', 'expired_card', http_status: 402]),
+        incorrect_cvc: add_json_body(["The card's security code is incorrect", 'cvc', 'incorrect_cvc', http_status: 402]),
+        card_declined: add_json_body(["The card was declined", nil, 'card_declined', http_status: 402]),
+        missing: add_json_body(["There is no card on a customer that is being charged.", nil, 'missing', http_status: 402]),
+        processing_error: add_json_body(["An error occurred while processing the card", nil, 'processing_error', http_status: 402]),
+        card_error: add_json_body(['The card number is not a valid credit card number.', 'number', 'invalid_number', http_status: 402]),
+        incorrect_zip: add_json_body(['The zip code you supplied failed validation.', 'address_zip', 'incorrect_zip', http_status: 402])
       }
     end
 
+    def self.get_decline_code(code)
+      decline_code_map = {
+        card_declined: 'do_not_honor',
+        missing: nil
+      }
+      decline_code_map.default = code.to_s
+
+      code_key = code.to_sym
+      decline_code_map[code_key]
+    end
+
     def self.add_json_body(error_values)
       error_keys = [:message, :param, :code]
 
       json_hash = Hash[error_keys.zip error_values]
       json_hash[:type] = 'card_error'
+      json_hash[:decline_code] = get_decline_code(json_hash[:code])
 
-      error_values.push(error: json_hash) # http_body
-      error_values.push(error: json_hash) # json_body
+      error_values.last.merge!(json_body: { error: json_hash }, http_body: { error: json_hash })
 
       error_values
     end

data/lib/stripe_mock/api/instance.rb

@@ -2,18 +2,18 @@ module StripeMock
 
   @state = 'ready'
   @instance = nil
-  @original_request_method = Stripe.method(:request)
+  @original_request_method = Stripe::StripeClient.active_client.method(:execute_request)
 
   def self.start
     return false if @state == 'live'
     @instance = Instance.new
-    alias_stripe_method :request, @instance.method(:mock_request)
+    alias_stripe_method :execute_request, @instance.method(:mock_request)
     @state = 'local'
   end
 
   def self.stop
     return unless @state == 'local'
-    alias_stripe_method :request, @original_request_method
+    alias_stripe_method :execute_request, @original_request_method
     @instance = nil
     @state = 'ready'
   end
@@ -29,7 +29,7 @@ module StripeMock
   end
 
   def self.alias_stripe_method(new_name, method_object)
-    Stripe.define_singleton_method(new_name) {|*args| method_object.call(*args) }
+    Stripe::StripeClient.active_client.define_singleton_method(new_name) {|*args| method_object.call(*args) }
   end
 
   def self.instance; @instance; end

data/lib/stripe_mock/api/webhooks.rb

@@ -15,7 +15,7 @@ module StripeMock
 
     json = Stripe::Util.symbolize_names(json)
     params = Stripe::Util.symbolize_names(params)
-    json[:user_id] = params.delete(:user_id) if params.key?(:user_id)
+    json[:account] = params.delete(:account) if params.key?(:account)
     json[:data][:object] = Util.rmerge(json[:data][:object], params)
     json.delete(:id)
 

data/lib/stripe_mock/client.rb

@@ -13,9 +13,9 @@ module StripeMock
       @state = 'ready'
     end
 
-    def mock_request(method, url, api_key, params={}, headers={})
+    def mock_request(method, url, api_key: nil, params: {}, headers: {})
       timeout_wrap do
-        @pipe.mock_request(method, url, api_key, params, headers).tap {|result|
+        @pipe.mock_request(method, url, api_key: api_key, params: params, headers: headers).tap {|result|
           response, api_key = result
           if response.is_a?(Hash) && response[:error_raised] == 'invalid_request'
             raise Stripe::InvalidRequestError.new(*response[:error_params])

data/lib/stripe_mock/data.rb

@@ -283,29 +283,44 @@ module StripeMock
     #FIXME nested overrides would be better than hardcoding plan_id
     def self.mock_subscription(params={})
       StripeMock::Util.rmerge({
-        :created => 1478204116,
-        :current_period_start => 1308595038,
-        :current_period_end => 1308681468,
-        :status => "trialing",
-        :plan => {
-          :interval => "month",
-          :amount => 7500,
-          :trial_period_days => 30,
-          :object => "plan",
-          :id => '__test_plan_id__'
+        created: 1478204116,
+        current_period_start: 1308595038,
+        current_period_end: 1308681468,
+        status: 'trialing',
+        plan: {
+          interval: 'month',
+          amount: 7500,
+          trial_period_days: 30,
+          object: 'plan',
+          id: '__test_plan_id__'
         },
-        :cancel_at_period_end => false,
-        :canceled_at => nil,
-        :ended_at => nil,
-        :start => 1308595038,
-        :object => "subscription",
-        :trial_start => 1308595038,
-        :trial_end => 1308681468,
-        :customer => "c_test_customer",
-        :quantity => 1,
-        :tax_percent => nil,
-        :discount => nil,
-        :metadata => {}
+        items: {
+          object: 'list',
+          data: [{
+            id: 'si_1AwFf62eZvKYlo2C9u6Dhf9',
+            created: 1504035973,
+            metadata: {},
+            object: 'subscription_item',
+            plan: {
+              amount: 999,
+              created: 1504035972,
+              currency: 'usd'
+            },
+            quantity: 1
+          }]
+        },
+        cancel_at_period_end: false,
+        canceled_at: nil,
+        ended_at: nil,
+        start: 1308595038,
+        object: 'subscription',
+        trial_start: 1308595038,
+        trial_end: 1308681468,
+        customer: 'c_test_customer',
+        quantity: 1,
+        tax_percent: nil,
+        discount: nil,
+        metadata: {}
       }, params)
     end
 
@@ -313,7 +328,7 @@ module StripeMock
       in_id = params[:id] || "test_in_default"
       currency = params[:currency] || 'usd'
       lines << Data.mock_line_item() if lines.empty?
-      {
+      invoice = {
         id: 'in_test_invoice',
         date: 1349738950,
         period_end: 1349738950,
@@ -325,7 +340,6 @@ module StripeMock
           data: lines
         },
         subtotal: lines.map {|line| line[:amount]}.reduce(0, :+),
-        total: lines.map {|line| line[:amount]}.reduce(0, :+),
         customer: "test_customer",
         object: 'invoice',
         attempted: false,
@@ -342,7 +356,7 @@ module StripeMock
         webhooks_delivered_at: 1349825350,
         livemode: false,
         attempt_count: 0,
-        amount_due: lines.map {|line| line[:amount]}.reduce(0, :+),
+        amount_due: nil,
         currency: currency,
         starting_balance: 0,
         ending_balance: nil,
@@ -351,6 +365,15 @@ module StripeMock
         discount: nil,
         subscription: nil
       }.merge(params)
+      if invoice[:discount]
+        invoice[:total] = [0, invoice[:subtotal] - invoice[:discount][:coupon][:amount_off]].max if invoice[:discount][:coupon][:amount_off]
+        invoice[:total] = invoice[:subtotal] * invoice[:discount][:coupon][:percent_off] / 100 if invoice[:discount][:coupon][:percent_off]
+      else
+        invoice[:total] = invoice[:subtotal]
+      end
+      due = invoice[:total] + invoice[:starting_balance]
+      invoice[:amount_due] = due < 0 ? 0 : due
+      invoice
     end
 
     def self.mock_line_item(params = {})
@@ -582,6 +605,7 @@ module StripeMock
         :fee_details => [],
         :id => id,
         :livemode => false,
+        :metadata => {},
         :currency => currency,
         :object => "transfer",
         :date => 1304114826,
@@ -605,6 +629,7 @@ module StripeMock
     end
 
     def self.mock_dispute(params={})
+      @timestamp ||= Time.now.to_i
       currency = params[:currency] || 'usd'
       id = params[:id] || "dp_test_dispute"
       {
@@ -613,7 +638,7 @@ module StripeMock
         :amount => 195,
         :balance_transactions => [],
         :charge => "ch_15RsQR2eZvKYlo2CA8IfzCX0",
-        :created => 1422915137,
+        :created => @timestamp += 1,
         :currency => currency,
         :evidence => self.mock_dispute_evidence,
         :evidence_details => self.mock_dispute_evidence_details,

data/lib/stripe_mock/instance.rb

@@ -77,7 +77,7 @@ module StripeMock
       @base_strategy = TestStrategies::Base.new
     end
 
-    def mock_request(method, url, api_key, params={}, headers={}, api_base_url=nil)
+    def mock_request(method, url, api_key: nil, api_base: nil, params: {}, headers: {})
       return {} if method == :xtest
 
       api_key ||= (Stripe.api_key || DUMMY_API_KEY)
@@ -100,7 +100,7 @@ module StripeMock
         else
           res = self.send(handler[:name], handler[:route], method_url, params, headers)
           puts "           [res]  #{res}" if @debug == true
-          [res, api_key]
+          [to_faraday_hash(res), api_key]
         end
       else
         puts "[StripeMock] Warning : Unrecognized endpoint + method : [#{method} #{url}]"
@@ -146,7 +146,7 @@ module StripeMock
     def assert_existence(type, id, obj, message=nil)
       if obj.nil?
         msg = message || "No such #{type}: #{id}"
-        raise Stripe::InvalidRequestError.new(msg, type.to_s, 404)
+        raise Stripe::InvalidRequestError.new(msg, type.to_s, http_status: 404)
       end
       obj
     end
@@ -173,5 +173,9 @@ module StripeMock
       Stripe::Util.symbolize_names(hash)
     end
 
+    def to_faraday_hash(hash)
+      response = Struct.new(:data)
+      response.new(hash)
+    end
   end
 end

data/lib/stripe_mock/request_handlers/charges.rb

@@ -31,7 +31,7 @@ module StripeMock
               params[:source] = get_card_or_bank_by_token(params[:source])
             end
           elsif params[:source][:id]
-            raise Stripe::InvalidRequestError.new("Invalid token id: #{params[:source]}", 'card', 400)
+            raise Stripe::InvalidRequestError.new("Invalid token id: #{params[:source]}", 'card', http_status: 400)
           end
         elsif params[:customer]
           customer = customers[params[:customer]]
@@ -66,7 +66,7 @@ module StripeMock
         allowed = allowed_params(params)
         disallowed = params.keys - allowed
         if disallowed.count > 0
-          raise Stripe::InvalidRequestError.new("Received unknown parameters: #{disallowed.join(', ')}" , '', 400)
+          raise Stripe::InvalidRequestError.new("Received unknown parameters: #{disallowed.join(', ')}" , '', http_status: 400)
         end
 
         charges[id] = Util.rmerge(charge, params)
@@ -139,11 +139,11 @@ module StripeMock
         elsif params[:currency].nil?
           require_param(:currency)
         elsif non_integer_charge_amount?(params)
-          raise Stripe::InvalidRequestError.new("Invalid integer: #{params[:amount]}", 'amount', 400)
+          raise Stripe::InvalidRequestError.new("Invalid integer: #{params[:amount]}", 'amount', http_status: 400)
         elsif non_positive_charge_amount?(params)
-          raise Stripe::InvalidRequestError.new('Invalid positive integer', 'amount', 400)
+          raise Stripe::InvalidRequestError.new('Invalid positive integer', 'amount', http_status: 400)
         elsif params[:source].nil? && params[:customer].nil?
-          raise Stripe::InvalidRequestError.new('Must provide source or customer.', nil)
+          raise Stripe::InvalidRequestError.new('Must provide source or customer.', http_status: nil)
         end
       end
 
@@ -156,7 +156,7 @@ module StripeMock
       end
 
       def require_param(param)
-        raise Stripe::InvalidRequestError.new("Missing required param: #{param}", param.to_s, 400)
+        raise Stripe::InvalidRequestError.new("Missing required param: #{param}", param.to_s, http_status: 400)
       end
 
       def allowed_params(params)

data/lib/stripe_mock/request_handlers/coupons.rb

@@ -11,8 +11,9 @@ module StripeMock
 
       def new_coupon(route, method_url, params, headers)
         params[:id] ||= new_id('coupon')
-        raise Stripe::InvalidRequestError.new('Missing required param: duration', 'coupon', 400) unless params[:duration]
-        coupons[ params[:id] ] = Data.mock_coupon(params)
+        raise Stripe::InvalidRequestError.new('Missing required param: duration', 'coupon', http_status: 400) unless params[:duration]
+        raise Stripe::InvalidRequestError.new('You must pass currency when passing amount_off', 'coupon', http_status: 400) if params[:amount_off] && !params[:currency]
+        coupons[ params[:id] ] = Data.mock_coupon({amount_off: nil, percent_off:nil}.merge(params))
       end
 
       def get_coupon(route, method_url, params, headers)

data/lib/stripe_mock/request_handlers/customers.rb

@@ -19,7 +19,7 @@ module StripeMock
           new_card =
             if params[:source].is_a?(Hash)
               unless params[:source][:object] && params[:source][:number] && params[:source][:exp_month] && params[:source][:exp_year]
-                raise Stripe::InvalidRequestError.new('You must supply a valid card', nil, 400)
+                raise Stripe::InvalidRequestError.new('You must supply a valid card', nil, http_status: 400)
               end
               card_from_params(params[:source])
             else
@@ -36,7 +36,7 @@ module StripeMock
           plan = assert_existence :plan, plan_id, plans[plan_id]
 
           if params[:default_source].nil? && params[:trial_end].nil? && plan[:trial_period_days].nil? && plan[:amount] != 0
-            raise Stripe::InvalidRequestError.new('You must supply a valid card', nil, 400)
+            raise Stripe::InvalidRequestError.new('You must supply a valid card', nil, http_status: 400)
           end
 
           subscription = Data.mock_subscription({ id: new_id('su') })
@@ -44,7 +44,7 @@ module StripeMock
           add_subscription_to_customer(customers[ params[:id] ], subscription)
           subscriptions[subscription[:id]] = subscription
         elsif params[:trial_end]
-          raise Stripe::InvalidRequestError.new('Received unknown parameter: trial_end', nil, 400)
+          raise Stripe::InvalidRequestError.new('Received unknown parameter: trial_end', nil, http_status: 400)
         end
 
         if params[:coupon]
@@ -78,7 +78,7 @@ module StripeMock
             new_card = get_card_or_bank_by_token(params.delete(:source))
           elsif params[:source].is_a?(Hash)
             unless params[:source][:object] && params[:source][:number] && params[:source][:exp_month] && params[:source][:exp_year]
-              raise Stripe::InvalidRequestError.new('You must supply a valid card', nil, 400)
+              raise Stripe::InvalidRequestError.new('You must supply a valid card', nil, http_status: 400)
             end
             new_card = card_from_params(params.delete(:source))
           end
@@ -108,7 +108,16 @@ module StripeMock
 
       def get_customer(route, method_url, params, headers)
         route =~ method_url
-        assert_existence :customer, $1, customers[$1]
+        customer = assert_existence :customer, $1, customers[$1]
+
+        customer = customer.clone
+        if params[:expand] == ['default_source']
+          customer[:default_source] = customer[:sources][:data].detect do |source|
+            source[:id] == customer[:default_source]
+          end
+        end
+
+        customer
       end
 
       def list_customers(route, method_url, params, headers)
@@ -118,9 +127,9 @@ module StripeMock
       def delete_customer_discount(route, method_url, params, headers)
         route =~ method_url
         cus = assert_existence :customer, $1, customers[$1]
-      
+
         cus[:discount] = nil
-        
+
         cus
       end
     end