cc-terminal 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 824b6749992e88f74e46ca0a771d3b3a5e4737a5
-  data.tar.gz: 2680c8d7ba9f1b40f58d771a28ae250b40c9da8b
+  metadata.gz: c71d0775cae380647cc20dce33fd9c1fe2beec53
+  data.tar.gz: c1a4e0d4b11f552df0c942d4d263193db27869f9
 SHA512:
-  metadata.gz: 8d26804f2f147a260d9520103e7f17a050d2beada6ed5d7a14980c9a90631b7bc39f608a6b9ef05ee816f66e9c4f090b60989e6695eaeae3d467da00a302b682
-  data.tar.gz: cfbce493620884723fdf480033e24a249b5e80fe67efc1668e75d40ae4408253a1bfa19b5f5ce0ee865757c7a7c036262e275d5816082908b05d453db6b08c4e
+  metadata.gz: 01757889515a571efdf93ff738f0ed4747ea582d251d6619a6ddb1eb3655c8d4b5df1d43bf84f3b2c762d89da7cb2b23c53988fe2c83ac3913ab551dff76354f
+  data.tar.gz: 89e6830f988afe96d4d7da7943f65ed6668664cbb7bbfe1b9f4efc6e570d7ee634e121fb3be961eadae60d592ece04cd0d5eb150f6719dea5af0207fcb3e34ad

data/lib/terminal/client.rb

@@ -4,12 +4,10 @@ module Terminal
     include Terminal::API
 
     API_VERSION = "v0.1"
-    API_URL = 'https://api.terminal.com'
-    API_PREFIX = API_URL + "/" + API_VERSION + "/"
 
-    attr_accessor :user_token, :access_token
+    attr_accessor :user_token, :access_token, :api_url, :api_prefix
 
-    def initialize( options = {})
+    def initialize(options = {})
       options.each do | k, v |
         if v.is_a?(Integer)
           raise Terminal::APIConfigurationError
@@ -17,6 +15,8 @@ module Terminal
         send(:"#{k}=", v)
       end
       yield(self) if block_given?
+
+      @api_prefix = options[:api_url] + "/" + API_VERSION + "/"
     end
 
     def post(path, params = {} )
@@ -26,7 +26,7 @@ module Terminal
   private
 
     def connection(options = {} )
-      @connection ||= Faraday.new(API_URL, options) do | conn |
+      @connection ||= Faraday.new(@api_url, options) do | conn |
         conn.request   :encode_json
         conn.adapter   :net_http
 
@@ -40,7 +40,7 @@ module Terminal
     def request(method, path, params = {})
       auth = params.delete(:auth)
       params = params.merge(auth_params) if auth
-      connection.send(method.to_sym, API_PREFIX + path, params)
+      connection.send(method.to_sym, @api_prefix + path, params)
     rescue Faraday::Error::TimeoutError, Timeout::Error => error
       raise(Terminal::APITimeoutError.new(error))
     end

data/lib/terminal/version.rb

@@ -1,3 +1,3 @@
 module Terminal
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/spec/helper.rb

@@ -8,11 +8,11 @@ if ENV['CIRCLE_ARTIFACTS']
 end
 
 def a_post(path)
-  a_request(:post, Terminal::Client::API_PREFIX + path)
+  a_request(:post, path)
 end
 
 def stub_post(path)
-  stub_request(:post, Terminal::Client::API_PREFIX + path)
+  stub_request(:post, path)
 end
 
 def fixture(file)

data/spec/terminal/client_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 describe Terminal::Client do
   before do
-    @client = Terminal::Client.new(:access_token => 'blah', :user_token => 'blah2')
+    @client = Terminal::Client.new(:access_token => 'blah', :user_token => 'blah2', :api_url => "https://localhost")
   end
 
   describe 'new instance of the client is defined' do
@@ -14,7 +14,7 @@ describe Terminal::Client do
     end
     context 'when no access_token,user_token are provided' do
       it 'does not raise an exception' do
-        expect { Terminal::Client.new }.not_to raise_error
+        expect { Terminal::Client.new(:api_url => "https://localhost") }.not_to raise_error
       end
     end
   end
@@ -32,7 +32,7 @@ describe Terminal::Client do
     end
 
     it 'raises an API error from a response containing error JSON' do
-      stub_post('/path').to_return(:body => fixture('error_response.json'), :headers => {:content_type => 'application/json'})
+      stub_post(@client.api_prefix + '/path').to_return(:body => fixture('error_response.json'), :headers => {:content_type => 'application/json'})
       expect { @client.send(:request, :post, '/path') }.to raise_error { |e|
         e.should be_a(Terminal::APIResponseError)
         e.response.body[:status].should equal?('failed')

data/spec/terminal/modules/browse_snapshots_and_users_spec.rb

@@ -2,17 +2,17 @@ require 'helper'
 
 describe Terminal::Modules::BrowseSnapshotsAndUsers do
   before do
-    @client = Terminal::Client.new(:access_token => 'blah', :user_token => 'blah2')
+    @client = Terminal::Client.new(:access_token => 'blah', :user_token => 'blah2', :api_url => "https://localhost")
   end
 
   describe "get_snapshot" do
     before do
-      stub_post('get_snapshot').to_return(:body => fixture('get_snapshot.json'), :headers => {:content_type => 'application/json'})
+      stub_post(@client.api_prefix + 'get_snapshot').to_return(:body => fixture('get_snapshot.json'), :headers => {:content_type => 'application/json'})
     end
 
     it 'calls the proper endpoint' do
       @client.get_snapshot('some_id')
-      expect(a_post('get_snapshot')).to have_been_made
+      expect(a_post(@client.api_prefix + 'get_snapshot')).to have_been_made
     end
 
     it 'returns a hash with some snapshot information' do

data/spec/terminal/modules/create_and_manage_snapshots_spec.rb

@@ -2,17 +2,17 @@ require 'helper'
 
 describe Terminal::Modules::CreateAndManageSnapshots do
   before do
-    @client = Terminal::Client.new(:access_token => 'blah', :user_token => 'blah2')
+    @client = Terminal::Client.new(:access_token => 'blah', :user_token => 'blah2', :api_url => "https://localhost")
   end
 
   describe "get a list of snapshots" do
     before do
-      stub_post('list_snapshots').to_return(:body => fixture('list_snapshots.json'), :headers => {:content_type => 'application/json'})
+      stub_post(@client.api_prefix + 'list_snapshots').to_return(:body => fixture('list_snapshots.json'), :headers => {:content_type => 'application/json'})
     end
 
     it 'posts to the proper endpoint' do
       @client.list_snapshots
-      expect(a_post('list_snapshots')).to have_been_made
+      expect(a_post(@client.api_prefix + 'list_snapshots')).to have_been_made
     end
 
     it 'contains a response that has some snapshots' do

data/spec/terminal/modules/create_and_manage_terminals_spec.rb

@@ -2,17 +2,17 @@ require 'helper'
 
 describe Terminal::Modules::CreateAndManageTerminals do
   before do
-    @client = Terminal::Client.new(:access_token => 'blah', :user_token => 'blah2')
+    @client = Terminal::Client.new(:access_token => 'blah', :user_token => 'blah2', :api_url => "https://localhost")
   end
 
   describe "get a list of terminals" do
     before do
-      stub_post('list_terminals').to_return(:body => fixture('list_terminals.json'), :headers => {:content_type => 'application/json'})
+      stub_post(@client.api_prefix + 'list_terminals').to_return(:body => fixture('list_terminals.json'), :headers => {:content_type => 'application/json'})
     end
 
     it 'posts to the proper endpoint' do
       @client.list_terminals
-      expect(a_post('list_terminals')).to have_been_made
+      expect(a_post(@client.api_prefix + 'list_terminals')).to have_been_made
     end
 
     it 'contains a response that has some terminals' do

data/spec/terminal/modules/request_progress_spec.rb

@@ -2,17 +2,17 @@ require 'helper'
 
 describe Terminal::Modules::RequestProgress do
   before do
-    @client = Terminal::Client.new(:access_token => 'blah', :user_token => 'blah2')
+    @client = Terminal::Client.new(:access_token => 'blah', :user_token => 'blah2', :api_url => "https://localhost")
   end
 
   describe "Request progress endpoint called" do
     before do
-      stub_post('request_progress').to_return(:body => fixture('request_progress.json'), :headers => {:content_type => 'application/json'})
+      stub_post(@client.api_prefix + 'request_progress').to_return(:body => fixture('request_progress.json'), :headers => {:content_type => 'application/json'})
     end
 
     it 'posts to the proper endpoint' do
       @client.request_progress(:request_id => "testestest")
-      expect(a_post('request_progress')).to have_been_made
+      expect(a_post(@client.api_prefix + 'request_progress')).to have_been_made
     end
 
     it 'returns a hash that is properly formed' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cc-terminal
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Timor Tsentsiper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json