stripe-ruby-mock 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e17b14c466a95e28e23f56859b0f20ce0fc0e6f2
-  data.tar.gz: 14b2121916a871814374262884df72a0501c32d9
+  metadata.gz: c7c2b8715ff3b25f019be501ef40f6d246448d39
+  data.tar.gz: bbb68394eeb61334c49ce3f86d37ea44b513e516
 SHA512:
-  metadata.gz: 1cf3ee166d1a5e9cac2b1c61bf50822568986b84fdaff85166739137d936bfe34f0cdf08ddc25ee6781412cb8a84dd55b4b4beae2a440fecf4966f6c042a7316
-  data.tar.gz: 8237f3fbfbc338f16e64ac7671acf8715254fd35fd6ab992e55c34c68dd79bc15c4526831694e954df9327428c55cca9d32394d1d3b7fa89e2e7d4846e69f5e1
+  metadata.gz: 14dc5c186dc169b310d38e5639ee801863d3f856d36c7f9522c62608cd8d8667c8a69b7ddc6c80023537cb6b65866904fa2f5660c5f59e6c8290f5f3d918d4d3
+  data.tar.gz: 1c8f4d5fcb31c4e8f1716e379b2aed29538a59d43ec2bc96e52751bae4c21a14e5265a6003fca7b12768c61061ad200d122a930461b04b1863d6c8c61cab2d30

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.0.0
   - 2.1.6
 before_install:
+  - rvm 1.9.3 do gem install mime-types -v 2.6.2
   - gem install bundler
 before_script:
   - "sudo touch /var/log/stripe-mock-server.log"

data/Gemfile

@@ -1,5 +1,10 @@
 source 'https://rubygems.org'
 
+platforms :ruby_19 do
+  gem 'mime-types', '~> 2.6'
+  gem 'rest-client', '~> 1.8'
+end
+
 group :test do
   gem 'rake'
 end

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.3.0', :require => 'stripe_mock'
+    gem 'stripe-ruby-mock', '~> 2.3.1', :require => 'stripe_mock'
 
 ## Features
 

data/lib/stripe_mock/data.rb

@@ -444,14 +444,17 @@ module StripeMock
 
     def self.mock_plan(params={})
       {
-        interval: "month",
-        name: "The Basic Plan",
-        amount: 2300,
-        currency: "usd",
         id: "2",
         object: "plan",
-        livemode: false,
+        amount: 2300,
+        created: 1466698898,
+        currency: "usd",
+        interval: "month",
         interval_count: 1,
+        livemode: false,
+        metadata: {},
+        name: "The Basic Plan",
+        statement_descriptor: nil,
         trial_period_days: nil
       }.merge(params)
     end

data/lib/stripe_mock/request_handlers/charges.rb

@@ -13,6 +13,11 @@ module StripeMock
       end
 
       def new_charge(route, method_url, params, headers)
+        if params[:idempotency_key] && charges.any?
+          original_charge = charges.values.find { |c| c[:idempotency_key] == params[:idempotency_key]}
+          return charges[original_charge[:id]] if original_charge
+        end
+
         id = new_id('ch')
 
         if params[:source]

data/lib/stripe_mock/request_handlers/subscriptions.rb

@@ -12,12 +12,14 @@ module StripeMock
         klass.add_handler 'post /v1/customers/(.*)/subscriptions', :create_customer_subscription
         klass.add_handler 'get /v1/customers/(.*)/subscriptions/(.*)', :retrieve_customer_subscription
         klass.add_handler 'get /v1/customers/(.*)/subscriptions', :retrieve_customer_subscriptions
+        klass.add_handler 'post /v1/customers/(.*)subscriptions/(.*)', :update_subscription
+        klass.add_handler 'delete /v1/customers/(.*)/subscriptions/(.*)', :cancel_subscription
       end
 
       def retrieve_customer_subscription(route, method_url, params, headers)
         route =~ method_url
 
-        customer = :customer, $1, customers[$1]
+        customer = assert_existence :customer, $1, customers[$1]
         subscription = get_customer_subscription(customer, $2)
 
         assert_existence :subscription, $2, subscription
@@ -53,14 +55,16 @@ module StripeMock
         if params[:coupon]
           coupon_id = params[:coupon]
 
-          raise Stripe::InvalidRequestError.new("No such coupon: #{coupon_id}", 'coupon', 400) unless coupons[coupon_id]
-
-          # FIXME assert_existence returns 404 error code but Stripe returns 400
+          # assert_existence returns 404 error code but Stripe returns 400
           # coupon = assert_existence :coupon, coupon_id, coupons[coupon_id]
 
-          coupon = Data.mock_coupon({ id: coupon_id })
+          coupon = coupons[coupon_id]
 
-          subscription[:discount] = Stripe::Util.convert_to_stripe_object({ coupon: coupon }, {})
+          if coupon
+            subscription[:discount] = Stripe::Util.convert_to_stripe_object({ coupon: coupon }, {})
+          else
+            raise Stripe::InvalidRequestError.new("No such coupon: #{coupon_id}", 'coupon', 400)
+          end
         end
 
         subscriptions[subscription[:id]] = subscription
@@ -93,14 +97,16 @@ module StripeMock
         if params[:coupon]
           coupon_id = params[:coupon]
 
-          raise Stripe::InvalidRequestError.new("No such coupon: #{coupon_id}", 'coupon', 400) unless coupons[coupon_id]
-
-          # FIXME assert_existence returns 404 error code but Stripe returns 400
+          # assert_existence returns 404 error code but Stripe returns 400
           # coupon = assert_existence :coupon, coupon_id, coupons[coupon_id]
 
-          coupon = Data.mock_coupon({ id: coupon_id })
+          coupon = coupons[coupon_id]
 
-          subscription[:discount] = Stripe::Util.convert_to_stripe_object({ coupon: coupon }, {})
+          if coupon
+            subscription[:discount] = Stripe::Util.convert_to_stripe_object({ coupon: coupon }, {})
+          else
+            raise Stripe::InvalidRequestError.new("No such coupon: #{coupon_id}", 'coupon', 400)
+          end
         end
 
         subscriptions[subscription[:id]] = subscription
@@ -125,7 +131,10 @@ module StripeMock
 
       def update_subscription(route, method_url, params, headers)
         route =~ method_url
-        subscription = assert_existence :subscription, $1, subscriptions[$1]
+
+        subscription_id = $2 ? $2 : $1
+        subscription = assert_existence :subscription, subscription_id, subscriptions[subscription_id]
+        verify_active_status(subscription)
 
         customer_id = subscription[:customer]
         customer = assert_existence :customer, customer_id, customers[customer_id]
@@ -137,19 +146,24 @@ module StripeMock
         end
 
         # expand the plan for addition to the customer object
-        plan_name = params[:plan] if params[:plan] && params[:plan] != {}
-        plan_name ||= subscription[:plan][:id]
+        plan_name =
+          params[:plan].is_a?(String) ? params[:plan] : subscription[:plan][:id]
+
         plan = plans[plan_name]
 
         if params[:coupon]
           coupon_id = params[:coupon]
-          raise Stripe::InvalidRequestError.new("No such coupon: #{coupon_id}", 'coupon', 400) unless coupons[coupon_id]
 
-          # FIXME assert_existence returns 404 error code but Stripe returns 400
+          # assert_existence returns 404 error code but Stripe returns 400
           # coupon = assert_existence :coupon, coupon_id, coupons[coupon_id]
 
-          coupon = Data.mock_coupon({ id: coupon_id })
-          subscription[:discount] = Stripe::Util.convert_to_stripe_object({ coupon: coupon }, {})
+          coupon = coupons[coupon_id]
+
+          if coupon
+            subscription[:discount] = Stripe::Util.convert_to_stripe_object({ coupon: coupon }, {})
+          else
+            raise Stripe::InvalidRequestError.new("No such coupon: #{coupon_id}", 'coupon', 400)
+          end
         end
 
         assert_existence :plan, plan_name, plan
@@ -161,6 +175,7 @@ module StripeMock
           subscription[:canceled_at] = nil
         end
 
+        params[:current_period_start] = subscription[:current_period_start]
         subscription.merge!(custom_subscription_params(plan, customer, params))
 
         # delete the old subscription, replace with the new subscription
@@ -173,7 +188,8 @@ module StripeMock
       def cancel_subscription(route, method_url, params, headers)
         route =~ method_url
 
-        subscription = assert_existence :subscription, $1, subscriptions[$1]
+        subscription_id = $2 ? $2 : $1
+        subscription = assert_existence :subscription, subscription_id, subscriptions[subscription_id]
 
         customer_id = subscription[:customer]
         customer = assert_existence :customer, customer_id, customers[customer_id]
@@ -183,7 +199,7 @@ module StripeMock
         if cancelled_at_period_end
           cancel_params[:cancel_at_period_end] = true
         else
-          cancel_params[:status] = "canceled"
+          cancel_params[:status] = 'canceled'
           cancel_params[:cancel_at_period_end] = false
           cancel_params[:ended_at] = Time.now.utc.to_i
         end
@@ -206,6 +222,14 @@ module StripeMock
         end
       end
 
+      def verify_active_status(subscription)
+        id, status = subscription.values_at(:id, :status)
+
+        if status == 'canceled'
+          message = "No such subscription: #{id}"
+          raise Stripe::InvalidRequestError.new(message, 'subscription', 404)
+        end
+      end
     end
   end
 end

data/lib/stripe_mock/version.rb

@@ -1,4 +1,4 @@
 module StripeMock
   # stripe-ruby-mock version
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/spec/shared_stripe_examples/charge_examples.rb

@@ -375,4 +375,31 @@ shared_examples 'Charge API' do
     end
   end
 
+  describe "idempotency" do
+    let(:idempotent_charge_params) {{
+      amount: 777,
+      currency: 'USD',
+      card: stripe_helper.generate_card_token,
+      capture: true,
+      idempotency_key: 'onceisenough'
+    }}
+
+    it "returns the original charge if the same idempotency_key is passed in" do
+      charge1 = Stripe::Charge.create(idempotent_charge_params)
+      charge2 = Stripe::Charge.create(idempotent_charge_params)
+
+      expect(charge1).to eq(charge2)
+    end
+
+    it "returns different charges if different idempotency_keys are used for each charge" do
+      idempotent_charge_params2 = idempotent_charge_params.clone
+      idempotent_charge_params2[:idempotency_key] = 'thisoneisdifferent'
+
+      charge1 = Stripe::Charge.create(idempotent_charge_params)
+      charge2 = Stripe::Charge.create(idempotent_charge_params2)
+
+      expect(charge1).not_to eq(charge2)
+    end
+  end
+
 end

data/spec/shared_stripe_examples/plan_examples.rb

@@ -9,6 +9,10 @@ shared_examples 'Plan API' do
       :amount => 9900,
       :currency => 'USD',
       :interval => 1,
+      :metadata => {
+        :description => "desc text",
+        :info => "info text"
+      },
       :trial_period_days => 30
     )
 
@@ -18,6 +22,10 @@ shared_examples 'Plan API' do
 
     expect(plan.currency).to eq('USD')
     expect(plan.interval).to eq(1)
+
+    expect(plan.metadata.description).to eq('desc text')
+    expect(plan.metadata.info).to eq('info text')
+
     expect(plan.trial_period_days).to eq(30)
   end
 

data/spec/shared_stripe_examples/subscription_examples.rb

@@ -288,6 +288,19 @@ shared_examples 'Customer Subscriptions' do
   end
 
   context "updating a subscription" do
+    it 'raises invalid request exception when subscription is cancelled' do
+      stripe_helper.create_plan(id: 'the truth')
+      customer = Stripe::Customer.create(source: gen_card_tk, plan: 'the truth')
+
+      subscription = Stripe::Subscription.retrieve(customer.subscriptions.data.first.id)
+      subscription.delete
+
+      expect { subscription.save }.to raise_error { |e|
+        expect(e).to be_a(Stripe::InvalidRequestError)
+        expect(e.http_status).to eq(404)
+        expect(e.message).to eq("No such subscription: #{subscription.id}")
+      }
+    end
 
     it "updates a stripe customer's existing subscription" do
       silver = stripe_helper.create_plan(id: 'silver')

data/stripe-ruby-mock.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'stripe', ['>= 1.31.0', '<= 1.43']
-  gem.add_dependency 'multi_json', '>= 1.0.0'
+  gem.add_dependency 'stripe', '~> 1.31'
+  gem.add_dependency 'multi_json', '~> 1.0'
   gem.add_dependency 'dante', '>= 0.2.0'
 
   gem.add_development_dependency 'rspec', '~> 3.1.0'
   gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
-  gem.add_development_dependency 'thin'
+  gem.add_development_dependency 'thin', '~> 1.6.4'
 end

metadata

@@ -1,49 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: stripe-ruby-mock
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stripe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.31.0
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.43'
+        version: '1.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.31.0
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.43'
+        version: '1.31'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dante
   requirement: !ruby/object:Gem::Requirement
@@ -90,16 +84,16 @@ dependencies:
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.4
 description: A drop-in library to test stripe without hitting their servers
 email: gilbertbgarza@gmail.com
 executables: