stripe-ruby-mock 1.8.3.5 → 1.8.3.6

data/lib/stripe_mock/api/client.rb

@@ -25,6 +25,10 @@ module StripeMock
   private
 
   def self.redirect_to_mock_server(method, url, api_key, params={}, headers={})
+    if @remote_state_pending_error
+      raise @remote_state_pending_error
+      @remote_state_pending_error = nil
+    end
     Stripe::Util.symbolize_names @client.mock_request(method, url, api_key, params, headers)
   end
 

data/lib/stripe_mock/api/errors.rb

@@ -1,8 +1,13 @@
 module StripeMock
 
   def self.prepare_error(stripe_error)
-    raise UninitializedInstanceError if instance.nil?
-    instance.pending_error = stripe_error
+    if @state == 'local'
+      instance.pending_error = stripe_error
+    elsif @state == 'remote'
+      @remote_state_pending_error = stripe_error
+    else
+      raise UnstartedStateError
+    end
   end
 
   def self.prepare_card_error(code)

data/lib/stripe_mock/client.rb

@@ -16,7 +16,12 @@ module StripeMock
     end
 
     def get_server_data(key)
-      timeout_wrap { @pipe.get_data(key) }
+      timeout_wrap {
+        # Massage the data make this behave the same as the local StripeMock.start
+        result = {}
+        @pipe.get_data(key).each {|k,v| result[k] = Stripe::Util.symbolize_names(v) }
+        result
+      }
     end
 
     def set_server_debug(toggle)

data/lib/stripe_mock/errors/unstarted_state_error.rb

@@ -0,0 +1,9 @@
+module StripeMock
+  class UnstartedStateError < StripeMockError
+
+    def initialize
+      super("StripeMock has not been started. Please call StripeMock.start or StripeMock.start_client")
+    end
+
+  end
+end

data/lib/stripe_mock/version.rb

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

data/lib/stripe_mock.rb

@@ -9,6 +9,7 @@ require 'stripe_mock/data'
 
 require 'stripe_mock/errors/stripe_mock_error'
 require 'stripe_mock/errors/uninitialized_instance_error'
+require 'stripe_mock/errors/unstarted_state_error'
 require 'stripe_mock/errors/server_timeout_error'
 require 'stripe_mock/errors/closed_client_connection_error'
 

data/spec/instance_spec.rb

@@ -1,7 +1,12 @@
 require 'spec_helper'
+require_stripe_examples
 
 describe StripeMock::Instance do
 
+  it_behaves_like_stripe do
+    def test_data_source(type); StripeMock.instance.send(type); end
+  end
+
   before { StripeMock.start }
   after { StripeMock.stop }
 

data/spec/server_spec.rb

@@ -1,7 +1,12 @@
 require 'spec_helper'
+require_stripe_examples
 
 describe 'StripeMock Server' do
 
+  it_behaves_like_stripe do
+    def test_data_source(type); StripeMock.client.get_server_data(type); end
+  end
+
   before(:all) do
     StripeMock.spawn_server
   end
@@ -37,14 +42,14 @@ describe 'StripeMock Server' do
 
     server_customer_data = StripeMock.client.get_server_data(:customers)[customer.id]
     expect(server_customer_data).to_not be_nil
-    expect(server_customer_data['email']).to eq('johnny@appleseed.com')
+    expect(server_customer_data[:email]).to eq('johnny@appleseed.com')
 
     StripeMock.stop_client
     StripeMock.start_client
 
     server_customer_data = StripeMock.client.get_server_data(:customers)[customer.id]
     expect(server_customer_data).to_not be_nil
-    expect(server_customer_data['email']).to eq('johnny@appleseed.com')
+    expect(server_customer_data[:email]).to eq('johnny@appleseed.com')
   end
 
 

data/spec/{stripe/charge_spec.rb → shared_stripe_examples/charges.rb}

@@ -1,9 +1,6 @@
 require 'spec_helper'
 
-describe 'Charge API' do
-
-  before { StripeMock.start }
-  after  { StripeMock.stop }
+shared_examples 'Charge API' do
 
   it "creates a stripe charge item with a card token" do
     charge = Stripe::Charge.create(
@@ -30,7 +27,7 @@ describe 'Charge API' do
       currency: 'USD',
       card: 'card_token_777'
     })
-    data = StripeMock.instance.charges
+    data = test_data_source(:charges)
     expect(data[charge.id]).to_not be_nil
     expect(data[charge.id][:amount]).to eq(333)
 

data/spec/{stripe/customer_spec.rb → shared_stripe_examples/customers.rb}

@@ -1,9 +1,6 @@
 require 'spec_helper'
 
-describe 'Customer API' do
-
-  before { StripeMock.start }
-  after  { StripeMock.stop }
+shared_examples 'Customer API' do
 
   it "creates a stripe customer" do
     customer = Stripe::Customer.create({
@@ -25,7 +22,7 @@ describe 'Customer API' do
       email: 'bob@bobbers.com',
       card: 'another_card_token'
     })
-    data = StripeMock.instance.customers
+    data = test_data_source(:customers)
     expect(data[customer.id]).to_not be_nil
     expect(data[customer.id][:email]).to eq('johnny@appleseed.com')
 

data/spec/{stripe/error_mock_spec.rb → shared_stripe_examples/error_mocks.rb}

@@ -9,10 +9,7 @@ def expect_card_error(code, param)
   }
 end
 
-describe 'Stripe Error Mocking' do
-
-  before { StripeMock.start }
-  after  { StripeMock.stop }
+shared_examples 'Stripe Error Mocking' do
 
   it "mocks a manually gives stripe card error" do
 

data/spec/{stripe/invoice_item_spec.rb → shared_stripe_examples/invoice_items.rb}

@@ -1,9 +1,6 @@
 require 'spec_helper'
 
-describe 'Invoice Item API' do
-
-  before { StripeMock.start }
-  after  { StripeMock.stop }
+shared_examples 'Invoice Item API' do
 
   it "creates a stripe invoice item" do
     invoice_item = Stripe::InvoiceItem.create({

data/spec/{stripe/plan_spec.rb → shared_stripe_examples/plans.rb}

@@ -1,9 +1,6 @@
 require 'spec_helper'
 
-describe 'Plan API' do
-
-  before { StripeMock.start }
-  after  { StripeMock.stop }
+shared_examples 'Plan API' do
 
   it "creates a stripe plan" do
     plan = Stripe::Plan.create(
@@ -40,7 +37,7 @@ describe 'Plan API' do
       :currency => 'USD',
       :interval => 1
     )
-    data = StripeMock.instance.plans
+    data = test_data_source(:plans)
     expect(data[plan.id]).to_not be_nil
     expect(data[plan.id][:amount]).to eq(1100)
 

data/spec/spec_helper.rb

@@ -3,3 +3,7 @@ require 'rspec'
 require 'stripe'
 require 'stripe_mock'
 require 'stripe_mock/server'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir["./spec/support/**/*.rb"].each {|f| require f}

data/spec/stripe_mock_spec.rb

@@ -29,11 +29,11 @@ describe StripeMock do
 
   it "throws an error when trying to prepare an error before starting" do
     expect { StripeMock.prepare_error(StandardError.new) }.to raise_error {|e|
-      expect(e).to be_a(StripeMock::UninitializedInstanceError)
+      expect(e).to be_a(StripeMock::UnstartedStateError)
     }
 
     expect { StripeMock.prepare_card_error(:card_declined) }.to raise_error {|e|
-      expect(e).to be_a(StripeMock::UninitializedInstanceError)
+      expect(e).to be_a(StripeMock::UnstartedStateError)
     }
   end
 

data/spec/support/stripe_examples.rb

@@ -0,0 +1,16 @@
+
+def require_stripe_examples
+  require 'shared_stripe_examples/charges'
+  require 'shared_stripe_examples/customers'
+  require 'shared_stripe_examples/error_mocks'
+  require 'shared_stripe_examples/invoice_items'
+  require 'shared_stripe_examples/plans'
+end
+
+def it_behaves_like_stripe(&block)
+  it_behaves_like 'Charge API', &block
+  it_behaves_like 'Customer API', &block
+  it_behaves_like 'Invoice Item API', &block
+  it_behaves_like 'Plan API', &block
+  it_behaves_like 'Stripe Error Mocking', &block
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe-ruby-mock
 version: !ruby/object:Gem::Version
-  version: 1.8.3.5
+  version: 1.8.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stripe
@@ -116,6 +116,7 @@ files:
 - lib/stripe_mock/errors/server_timeout_error.rb
 - lib/stripe_mock/errors/stripe_mock_error.rb
 - lib/stripe_mock/errors/uninitialized_instance_error.rb
+- lib/stripe_mock/errors/unstarted_state_error.rb
 - lib/stripe_mock/instance.rb
 - lib/stripe_mock/request_handlers/charges.rb
 - lib/stripe_mock/request_handlers/customers.rb
@@ -127,14 +128,14 @@ files:
 - spec/instance_spec.rb
 - spec/readme_spec.rb
 - spec/server_spec.rb
+- spec/shared_stripe_examples/charges.rb
+- spec/shared_stripe_examples/customers.rb
+- spec/shared_stripe_examples/error_mocks.rb
+- spec/shared_stripe_examples/invoice_items.rb
+- spec/shared_stripe_examples/plans.rb
 - spec/spec_helper.rb
-- spec/stripe/charge_spec.rb
-- spec/stripe/customer_spec.rb
-- spec/stripe/error_mock_spec.rb
-- spec/stripe/invoice_item_spec.rb
-- spec/stripe/plan_spec.rb
 - spec/stripe_mock_spec.rb
-- spec/support/server_daemon.rb
+- spec/support/stripe_examples.rb
 - stripe-ruby-mock.gemspec
 homepage: https://github.com/mindeavor/stripe-ruby-mock
 licenses:
@@ -165,11 +166,11 @@ test_files:
 - spec/instance_spec.rb
 - spec/readme_spec.rb
 - spec/server_spec.rb
+- spec/shared_stripe_examples/charges.rb
+- spec/shared_stripe_examples/customers.rb
+- spec/shared_stripe_examples/error_mocks.rb
+- spec/shared_stripe_examples/invoice_items.rb
+- spec/shared_stripe_examples/plans.rb
 - spec/spec_helper.rb
-- spec/stripe/charge_spec.rb
-- spec/stripe/customer_spec.rb
-- spec/stripe/error_mock_spec.rb
-- spec/stripe/invoice_item_spec.rb
-- spec/stripe/plan_spec.rb
 - spec/stripe_mock_spec.rb
-- spec/support/server_daemon.rb
+- spec/support/stripe_examples.rb