nuorder 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82d37e7d4377f396ca1f47291784e66a8076a714
-  data.tar.gz: 306ff612b42231526622dfcc91ae286f6ed73927
+  metadata.gz: 9c9905d128b4337115539c618b22c2ab5dd3509a
+  data.tar.gz: 96474ad261bdf5de1c0b69873ae9d5e57f98b002
 SHA512:
-  metadata.gz: ae864fd4c94248c4075ddc346b313c6dd9b6f3a15125272e1556dcdfe1093c6a6ff6ac31a84d2ee85b93da0abdd71d6930bd9a428ce4760a835c3cfa4c765bf1
-  data.tar.gz: 37e775c988f9f7f0e7bb464a9c2abb75891582be319d0e0afdc35e702125966bd6cb63ffb55ab99ff8468cc7a66e4366bb18ea30a086486cbf702c2b656751a6
+  metadata.gz: 9ee768824c8f394b75663d190253690f7c807ef2bc16839e6a0fa1c5345b2537e7cd83b01152befc917efd07b135a8fbaf7df6878f49dc6d48ccec02f0dca6d0
+  data.tar.gz: 9824264e27139b65bf95227590f9010b31bbf787078d1866405e47045baed6b7eced36b142c7648f137bc43174d563cf405db6cf0167d8b781e2409a396fbb65

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.1.0
+
+* Allow multiple clients to be used simultaneously
+
 ## v1.0.0
 
 * Initial release

data/README.md

@@ -37,7 +37,7 @@ The following options are available when configuring NuORDER:
 6. `oauth_token_secret`
 7. `oauth_callback` Default: `'oob'`
     * NuORDER will POST the callback the `oauth_verifier` token.
-    * If the callback is set to `'oob'`, the `oauth_verifier` token must be supplied manually by the user. 
+    * If the callback is set to `'oob'`, the `oauth_verifier` token must be supplied manually by the user.
 
 #### Example
 
@@ -66,7 +66,7 @@ To get the oauth tokens the following methods must be called:
   * An inital call will be made in order to get the temporary tokens.
 2. `Nuorder.get_oauth_token(oauth_verifier)`
   * Call for getting the permanent tokens.
-  * `oauth_verifier` must be supplied. 
+  * `oauth_verifier` must be supplied.
 
 Retrieve tokens:
 

data/lib/nuorder.rb

@@ -8,6 +8,10 @@ module Nuorder
   extend Nuorder::Configurable
 
   class << self
+    def new(options = {})
+      Nuorder::Client.new(options)
+    end
+
     def client
       @client = Nuorder::Client.new(options) unless defined?(@client) && @client.same_options?(options)
       @client
@@ -21,7 +25,4 @@ module Nuorder
       client.send(method_name, *args, &block)
     end
   end
-
 end
-
-Nuorder.setup

data/lib/nuorder/client.rb

@@ -11,6 +11,7 @@ module Nuorder
     include Nuorder::Client::Oauth
 
     def initialize(options = {})
+      options = Nuorder::Default.options.merge(options)
       set_instance_variables(options)
     end
 
@@ -23,8 +24,8 @@ module Nuorder
       headers = oauth_headers('GET', '/api/initiate', addons)
       response = connection.get '/api/initiate', {}, headers
 
-      Nuorder.oauth_token = response.body['oauth_token']
-      Nuorder.oauth_token_secret = response.body['oauth_token_secret']
+      @oauth_token = response.body['oauth_token']
+      @oauth_token_secret = response.body['oauth_token_secret']
 
       response
     end
@@ -35,8 +36,8 @@ module Nuorder
       headers = oauth_headers('GET', '/api/token', { 'oauth_verifier' => oauth_verifier })
       response = connection.get '/api/token', {}, headers
 
-      Nuorder.oauth_token = response.body['oauth_token']
-      Nuorder.oauth_token_secret = response.body['oauth_token_secret']
+      @oauth_token = response.body['oauth_token']
+      @oauth_token_secret = response.body['oauth_token_secret']
 
       response
     end
@@ -65,10 +66,10 @@ module Nuorder
 
     private
 
-    # Set instance variables passed in options, but fallback to module defaults
+    # Set instance variables passed in options
     def set_instance_variables(options)
       Nuorder::Configurable.keys.each do |key|
-        instance_variable_set(:"@#{key}", options[key] || Nuorder.instance_variable_get(:"@#{key}"))
+        instance_variable_set(:"@#{key}", options[key])
       end
     end
 

data/lib/nuorder/version.rb

@@ -1,3 +1,3 @@
 module Nuorder
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/spec/nuorder/client_spec.rb

@@ -1,54 +1,48 @@
 require 'spec_helper'
 
 describe Nuorder::Client do
-  before do
-    Nuorder.reset!
-  end
-
-  after do
-    Nuorder.reset!
-  end
-
   include_examples 'options client'
 
   specify { expect { described_class.new }.not_to raise_error }
-  
+
   subject(:client) do
     described_class.new(options_client)
   end
 
   describe 'module configuration' do
-    before do
-      Nuorder.reset!
-      Nuorder.configure do |config|
-        Nuorder::Configurable.keys.each do |key|
-          config.send("#{key}=", "Some #{key}")
-        end
-      end
+    let (:opts) do
+      {
+        app_name: 'My APP',
+        oauth_callback: 'app.example.com/callback',
+        oauth_consumer_key: 'asdfa232042sdafal'
+      }
     end
 
-    after do
-      Nuorder.reset!
-    end
+    describe 'with options' do
+      it "doesn't share state with global options" do
+        client = Nuorder::Client.new(opts)
 
-    it 'inherits the module configuration' do
-      client = Nuorder::Client.new
-      Nuorder::Configurable.keys.each do |key|
-        expect(client.instance_variable_get(:"@#{key}")).to eq("Some #{key}")
+        Nuorder.configure do |config|
+          config.app_name = 'Nuorder app'
+        end
+        expect(client.app_name).to eq('My APP')
       end
-    end
 
-    describe 'with options' do
-      let (:opts) do
-        {
-            app_name: 'My APP',
-            oauth_callback: 'app.example.com/callback',
-            oauth_consumer_key: 'asdfa232042sdafal'
-        }
+      it 'overrides module configuration' do
+        client = Nuorder::Client.new(opts)
+        expect(client.app_name).to eq('My APP')
+        expect(client.oauth_callback).to eq('app.example.com/callback')
+        expect(client.oauth_consumer_key).to eq('asdfa232042sdafal')
       end
+    end
 
+    describe '#configure' do
       it 'overrides module configuration' do
-        client = Nuorder::Client.new(opts)
+        client.configure do |config|
+          config.app_name = opts[:app_name]
+          config.oauth_callback = opts[:oauth_callback]
+          config.oauth_consumer_key = opts[:oauth_consumer_key]
+        end
         expect(client.app_name).to eq('My APP')
         expect(client.oauth_callback).to eq('app.example.com/callback')
         expect(client.oauth_consumer_key).to eq('asdfa232042sdafal')
@@ -57,30 +51,29 @@ describe Nuorder::Client do
   end
 
   describe '#api_initiate' do
-    before do
-      Nuorder.configure do |config|
-        config.oauth_token = nil
-        config.oauth_token_secret = nil
-      end
+    let(:client) do
+      described_class.new(
+        options_client.merge(oauth_token: nil, oauth_token_secret: nil)
+      )
     end
 
     it 'returns temp oauth_token and oauth_token_secret from API', :vcr do
       client.api_initiate
 
-      expect(Nuorder.oauth_token).not_to be_nil
-      expect(Nuorder.oauth_token_secret).not_to be_nil
+      expect(client.oauth_token).not_to be_nil
+      expect(client.oauth_token_secret).not_to be_nil
     end
   end
-  
+
   describe '#get_oauth_token' do
     it 'returns real oauth_token and oauth_token_secret from API', :vcr do
       oauth_verifier = 'aKRzurszYEA9mpun'
-      Nuorder.oauth_token = 'p5UzX46KqwdB5Bj3'
-      Nuorder.oauth_token_secret = 'YaRS2Vy9uSEDVhwu95NaCDPQ'
-      
+      client.oauth_token = 'p5UzX46KqwdB5Bj3'
+      client.oauth_token_secret = 'YaRS2Vy9uSEDVhwu95NaCDPQ'
+
       client.get_oauth_token(oauth_verifier)
-      expect(Nuorder.oauth_token).not_to be_nil
-      expect(Nuorder.oauth_token_secret).not_to be_nil
+      expect(client.oauth_token).not_to be_nil
+      expect(client.oauth_token_secret).not_to be_nil
     end
 
     context 'no oauth_verifier provided' do

data/spec/nuorder_spec.rb

@@ -1,17 +1,9 @@
 require 'spec_helper'
 
 describe Nuorder do
-  before do
-    Nuorder.reset!
-  end
-
-  after do
-    Nuorder.reset!
-  end
-
-  it 'sets defaults' do
-    Nuorder::Configurable.keys.each do |key|
-      expect(Nuorder.instance_variable_get(:"@#{key}")).to eq(Nuorder::Default.options[key])
+  describe '#new' do
+    it 'creates a Nuorder::Client' do
+      expect(Nuorder.new).to be_kind_of Nuorder::Client
     end
   end
 
@@ -44,5 +36,4 @@ describe Nuorder do
       end
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuorder
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Springboard Retail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler