cubits 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4773f39e2f12ee25f1bbb2ac028cb60a998c9168
-  data.tar.gz: cc3da9ea18047f888b9d6c40090778aeda046454
+  metadata.gz: 5f2978ac613f0cf68c3b4f7df8034d0899af48ee
+  data.tar.gz: dddd910c78caded6f60d9f9676ce7f8ff9038403
 SHA512:
-  metadata.gz: 6836e10c834ee5479f834a35f617f5ae9efc7dcae03c402e5b55da38d92ea77aad46e790df06776d0557505b3cf9625478dd2f14409455ef13937d24ad067458
-  data.tar.gz: d7a1182726a2119748c057c6993cc62812c3d73d87f9505d09cb2ce87645b4363fe39a9f2bb64ff1ad34e7d595c6ecf4adf86487c10814d045092f306e527f5d
+  metadata.gz: 9f404caa09bcd22b99e09f32702a4ece7f7dc7764248c9549cd3649557dca2fdc98b719cb84dbb6fcb5dd8b0eead2cf4fbac03050b6366591721de58a28b66d8
+  data.tar.gz: 674bc505e2cb6614d7751d85558934c001b9621ea21304ffaaa29d383fbd51aa96753bfbffd1182a4acdb42d3c115ed741feca490c41273946ee0a03616c4d61

data/CHANGES.md

@@ -1,3 +1,10 @@
+# 0.7.0
+
+* Added support of concurrent connections. Use `Cubits.active_connection_key()`,
+`Cubits.active_connection_key=()` and `Cubits.with_connection_key() { ... }`
+to manipulate the connections. 
+* The last configured connection is being used by default now.
+
 # 0.6.0
 
 * Added Cubits::ResourceCollection, which implements Ruby [Enumerable](http://ruby-doc.org/core-2.2.1/Enumerable.html)

data/README.md

@@ -40,6 +40,8 @@ Cubits.configure(key: '***', secret: '***')
 Cubits.available? # => true
 ```
 
+If you configured multiple connections the last one will be used by default. You can get the current active connection key with `Cubits.active_connection_key` and switch between connections with `Cubits.active_connection_key=`. There is also a possibility to temporary switch the connection for a block: `Cubits.with_connection_key() { ... }`
+
 ## Invoices
 
 Using the `cubits` Ruby client you can create and retrieve invoices.

data/lib/cubits.rb

@@ -33,16 +33,46 @@ module Cubits
   #
   # @param key [String] (optional) Cubits API key of the configured connection
   #
-  # @return [Connection] Connection object matching the requested Cubits API key or first
-  #                      configured connection
+  # @return [Connection] Connection object matching the requested Cubits API key
+  #                      or Connection object matching Cubits.active_connection_key
   #
-  def self.connection(key = nil)
-    @connections ||= {}
-    c = key ? @connections[key] : @connections.values.first
-    unless c
+  def self.connection(key = active_connection_key)
+    if @connections.nil? || @connections[key].nil?
       fail ConnectionError, "Cubits connection is not configured for key #{key || '(default)'}"
     end
-    c
+    @connections[key]
+  end
+
+  # Returns current Cubits connection key (Cubits API key)
+  #
+  # @return [String] current thread-local active connection key
+  #                  or the last configured connection key
+  #
+  def self.active_connection_key
+    Thread.current[:cubits_active_connection_key] || @connections&.keys&.last
+  end
+
+  # Sets current Cubits connection to given Cubits API key
+  #
+  # @param key [String] Cubits API key of the configured connection
+  #
+  def self.active_connection_key=(key)
+    if @connections.nil? || @connections[key].nil?
+      fail ConnectionError, "Cubits connection is not configured for key #{key}"
+    end
+    Thread.current[:cubits_active_connection_key] = key
+  end
+
+  # Sets current Cubits connection to given Cubits API key and yields given block
+  #
+  # @param key [String] Cubits API key of the configured connection
+  #
+  def self.with_connection_key(key)
+    connection_key_was = active_connection_key
+    self.active_connection_key = key
+    yield if block_given?
+  ensure
+    self.active_connection_key = connection_key_was
   end
 
   # Returns current Logger object

data/lib/cubits/version.rb

@@ -1,3 +1,3 @@
 module Cubits
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

data/spec/lib/cubits_spec.rb

@@ -4,13 +4,22 @@ describe Cubits do
   let(:key) { 'blablakey' }
   let(:secret) { 'blablasecret' }
 
+  let(:another_key) { 'another_cubits_api_key' }
+  let(:another_secret) { 'another_cubits_api_secret' }
+
+  after { Thread.current[:cubits_active_connection_key] = nil }
+
   context '.configure' do
     it 'fails if key is missing' do
-      expect { Cubits.configure(secret: secret) }.to raise_error
+      expect { Cubits.configure(secret: secret) }.to raise_error(
+        ArgumentError, 'String is expected as :key'
+      )
     end
 
     it 'fails if secret is missing' do
-      expect { Cubits.configure(key: key) }.to raise_error
+      expect { Cubits.configure(key: key) }.to raise_error(
+        ArgumentError, 'String is expected as :secret'
+      )
     end
 
     it 'runs without errors if key and secret are present' do
@@ -22,13 +31,23 @@ describe Cubits do
     subject { Cubits.connection }
 
     it 'fails when connection is not configured' do
-      expect { subject }.to raise_error
+      expect { subject }.to raise_error(
+        Cubits::ConnectionError, 'Cubits connection is not configured for key (default)'
+      )
     end
 
-    it 'returns Connection object when connection is configured' do
+    it 'returns Connection object when connection is configured', :aggregate_failures do
       Cubits.configure(key: key, secret: secret)
       expect { subject }.to_not raise_error
       expect(subject).to be_a Cubits::Connection
+      expect(subject.instance_variable_get(:@key)).to eql(key)
+    end
+
+    it 'returns Connection object by active connection key', :aggregate_failures do
+      Cubits.configure(key: another_key, secret: another_secret)
+      expect(Cubits).to receive(:active_connection_key).and_return(another_key)
+      expect(subject).to be_a Cubits::Connection
+      expect(subject.instance_variable_get(:@key)).to eql(another_key)
     end
   end # .connection
 
@@ -38,4 +57,65 @@ describe Cubits do
     it { is_expected.to be_a Logger }
   end # .logger
 
+  describe '.active_connection_key=' do
+    it 'does not allow to set the key when there are no configured connections' do
+      expect { Cubits.active_connection_key = '123' }.to raise_exception(
+        Cubits::ConnectionError, 'Cubits connection is not configured for key 123'
+      )
+    end
+
+    it 'does not allow to set the key of non-existent connection' do
+      Cubits.configure(key: key, secret: secret)
+      expect { Cubits.active_connection_key = '123' }.to raise_exception(
+        Cubits::ConnectionError, 'Cubits connection is not configured for key 123'
+      )
+    end
+
+    it 'allows to set the key of the existing connection', :aggregate_failures do
+      Cubits.configure(key: key, secret: secret)
+      Cubits.configure(key: another_key, secret: another_secret)
+      expect { Cubits.active_connection_key = key }.to_not raise_exception
+      expect { Cubits.active_connection_key = another_key }.to_not raise_exception
+    end
+
+    it 'sets cubits_active_connection_key thread variable' do
+      Cubits.configure(key: key, secret: secret)
+      Cubits.active_connection_key = key
+      expect(Thread.current[:cubits_active_connection_key]).to eql(key)
+    end
+  end # .active_connection_key=
+
+  describe '.active_connection_key' do
+    it 'returns thread-local connection key if exists' do
+      Cubits.configure(key: key, secret: secret)
+      Cubits.configure(key: another_key, secret: another_secret)
+      Cubits.active_connection_key = key
+      expect(Cubits.active_connection_key).to eql(key)
+    end
+
+    it 'returns the last configured connection key otherwise' do
+      Cubits.configure(key: key, secret: secret)
+      Cubits.configure(key: another_key, secret: another_secret)
+      expect(Cubits.active_connection_key).to eql(another_key)
+    end
+
+    it 'returns nil if there are no configured connections' do
+      expect(Cubits.active_connection_key).to be_nil
+    end
+  end # .active_connection_key
+
+  describe '.with_connection_key' do
+    it 'toggles active connection key' do
+      Cubits.configure(key: key, secret: secret)
+      Cubits.configure(key: another_key, secret: another_secret)
+
+      Cubits.active_connection_key = key
+
+      Cubits.with_connection_key(another_key) do
+        expect(Cubits.active_connection_key).to eql(another_key)
+      end
+
+      expect(Cubits.active_connection_key).to eql(key)
+    end
+  end # .with_connection_key
 end # describe Cubits

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cubits
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby client for Cubits Merchant API