cc-terminal 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82dad100cc90d5e0d2aa39f2bf957e4f39829d60
-  data.tar.gz: 99bb838690d6a384168975386b599e4702bed296
+  metadata.gz: 824b6749992e88f74e46ca0a771d3b3a5e4737a5
+  data.tar.gz: 2680c8d7ba9f1b40f58d771a28ae250b40c9da8b
 SHA512:
-  metadata.gz: 0b5c6c5288c953746f48806508aa38a2da489a4f1655a417a0df1b8cacb65a73c5ca8af56dc57ee5323c9a3d0196ba68e78e30147df84872b20291ba669f15ff
-  data.tar.gz: d3bf52bf6fde0d0b5af2e3453fa19b65f3211dc4a6d6cffc348c7c2d6a8f6ed70aeb27a9e5080a2c57e58649e5494d67522233d5b5db784ed9dc475bd2f8acd2
+  metadata.gz: 8d26804f2f147a260d9520103e7f17a050d2beada6ed5d7a14980c9a90631b7bc39f608a6b9ef05ee816f66e9c4f090b60989e6695eaeae3d467da00a302b682
+  data.tar.gz: cfbce493620884723fdf480033e24a249b5e80fe67efc1668e75d40ae4408253a1bfa19b5f5ce0ee865757c7a7c036262e275d5816082908b05d453db6b08c4e

data/lib/terminal/client.rb

@@ -29,8 +29,11 @@ module Terminal
       @connection ||= Faraday.new(API_URL, options) do | conn |
         conn.request   :encode_json
         conn.adapter   :net_http
-        conn.response  :parse_json
+
+        # This ordering is important don't change
         conn.response  :raise_error_from_json
+        conn.response  :parse_json
+
       end
     end
 

data/lib/terminal/response/raise_error_from_json.rb

@@ -9,7 +9,7 @@ module Terminal
         # Terminal.com always returns 200
         code = response.status.to_i
 
-        if code == 200 && response.body['success'] == false || !response.body['error'].nil?
+        if code == 200 && response.body[:success] == false || !response.body[:error].nil?
           fail(Terminal::APIResponseError.new(response))
         else
            # How did we get here?

data/lib/terminal/version.rb

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

data/spec/fixtures/error_response.json

@@ -1 +1 @@
-{"error":"No such user"}
+{"status": "failed", "error":"No such user"}

data/spec/helper.rb

@@ -20,3 +20,10 @@ def fixture(file)
   File.new(f_path + '/' + file)
 end
 
+# spec_helper.rb
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+    # config.raise_errors_for_deprecations!
+  end
+end

data/spec/terminal/client_spec.rb

@@ -9,7 +9,7 @@ describe Terminal::Client do
 
     context 'when bad access_token,user_token are provided' do
       it 'raises a configuration exception' do
-        expect { Terminal::Client.new(:access_token => 12121, :user_token => 12111111) }.to raise_exception(Terminal::APIConfigurationError)
+         expect { Terminal::Client.new(:access_token => 12121, :user_token => 12111111) }.to raise_exception(Terminal::APIConfigurationError)
       end
     end
     context 'when no access_token,user_token are provided' do
@@ -33,7 +33,10 @@ describe Terminal::Client do
 
     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'})
-      expect { @client.send(:request, :post, '/path')}.to raise_error(Terminal::APIResponseError)
+      expect { @client.send(:request, :post, '/path') }.to raise_error { |e|
+        e.should be_a(Terminal::APIResponseError)
+        e.response.body[:status].should equal?('failed')
+      }
     end
   end
 

metadata

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