cortex-client 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1924b4d0bb93e904774f038ad782b6cea0bbe81e
-  data.tar.gz: 3d6acf30a4ecd16adc9f5659dc040e504f8db1bd
+  metadata.gz: dbc7f3a571dbb32fcc37a005ab162f65e71e9053
+  data.tar.gz: 51eee03bbaa63c4e1cf897e1dbcc73f377f13a96
 SHA512:
-  metadata.gz: 74f73137d6c06cccab2c14e8618ca0f2e3456616b7f26b725bd3d4cfb5e9e3e4b26321f30a2b492b1638a5d872cbb597ff1fefa33d82c290c504e0a707c01494
-  data.tar.gz: f6e92c5d3a706491f230588d63e74afe20814c10b2bc6f87e0ebf1c0840ce6c40e1f5493c3d85f81a9cd81ad78bef726c89e82d86888141f20997d2b9b2166f8
+  metadata.gz: 9ffec12c8de2a7314b695f961cdc6d7d62fb395f5b832a6b39456f6f4d673c831585fa05b6f5c81842fdf022fa2a951950e3c10ea1e4219bbe62dc35d22102d9
+  data.tar.gz: c5025876bc24781fbb062dd54911098c57cb6511f3ead7f5802357aafb674bfa1db21306f5ad085791b85cc2b6ee1f58556bae2c27b1c37d12bef96d1162d9d4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cortex-client (0.1.0)
+    cortex-client (0.2.5)
       faraday (~> 0.9)
       faraday_middleware (~> 0.9.0)
       oauth2 (~> 0.9)
@@ -25,20 +25,24 @@ GEM
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
-    rake (10.2.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cortex-client!
-  rake
-  rspec
+  rake (~> 10.3.2)
+  rspec (~> 3.0)

data/cortex-client.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rake', '~> 10.3.2'
+  s.add_development_dependency 'rspec', '~> 3.0'
 
   s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'faraday_middleware', '~> 0.9.0'

data/lib/cortex/request.rb

@@ -50,9 +50,9 @@ module Cortex
 
     def parse_response(response)
       if response.status < 300 || (response.body.kind_of?(Hash) && response.body['error'])
-        OpenStruct.new({body: response.body, headers: response.headers.select { |k| ['content-range', 'x-total-items'].include? k } })
+        OpenStruct.new({body: response.body, headers: { status: response.status }.merge(response.headers.select { |k| ['content-range', 'x-total-items'].include? k })  })
       else
-        OpenStruct.new({:error => response.body, :status => response.status, :original => response})
+        OpenStruct.new({body: {error: response.body, status: response.status, original: response}, headers: { status: response.status }})
       end
     end
   end

data/lib/cortex/version.rb

@@ -1,3 +1,3 @@
 module Cortex
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/spec/client_spec.rb

@@ -9,7 +9,7 @@ describe Cortex::Client do
   end
 
   it 'should preserve settings' do
-    client.access_token.should == access_token
-    client.base_url.should == base_url
+    expect(client.access_token).to eq(access_token)
+    expect(client.base_url).to eq(base_url)
   end
 end

data/spec/posts_spec.rb

@@ -6,20 +6,20 @@ describe Cortex::Posts do
 
   describe :get do
     it 'should correctly make the request' do
-      client.should_receive(:get).with('/posts/1').and_return('response')
-      client.posts.get(1).should == 'response'
+      expect(client).to receive(:get).with('/posts/1').and_return('response')
+      expect(client.posts.get(1)).to eq('response')
     end
   end
 
   describe :feed do
     it 'should correctly make the request' do
-      client.should_receive(:get).with('/posts/feed', nil).and_return('response')
-      client.posts.feed().should == 'response'
+      expect(client).to receive(:get).with('/posts/feed', nil).and_return('response')
+      expect(client.posts.feed()).to eq('response')
     end
 
     it 'should accept parameters and send them with the request' do
-      client.should_receive(:get).with('/posts/feed', {q: "Test*"}).and_return('success')
-      client.posts.feed(q: 'Test*').should == 'success'
+      expect(client).to receive(:get).with('/posts/feed', {q: "Test*"}).and_return('success')
+      expect(client.posts.feed(q: 'Test*')).to eq('success')
     end
   end
 
@@ -27,38 +27,38 @@ describe Cortex::Posts do
     context 'with an existing post' do
       it 'should correctly make the request' do
         post = {:id => 1, :title => 'Post'}
-        client.should_receive(:put).with('/posts/1', post).and_return('response')
-        client.posts.save(post).should == 'response'
+        expect(client).to receive(:put).with('/posts/1', post).and_return('response')
+        expect(client.posts.save(post)).to eq('response')
       end
     end
 
     context 'with a new post' do
       it 'should correctly make the request' do
         post = {:title => 'Post'}
-        client.should_receive(:post).with('/posts', post).and_return('response')
-        client.posts.save(post).should == 'response'
+        expect(client).to receive(:post).with('/posts', post).and_return('response')
+        expect(client.posts.save(post)).to eq('response')
       end
     end
   end
 
   describe :filters do
     it 'should correctly make the request' do
-      client.should_receive(:get).with('/posts/filters').and_return('success')
-      client.posts.filters().should == 'success'
+      expect(client).to receive(:get).with('/posts/filters').and_return('success')
+      expect(client.posts.filters()).to eq('success')
     end
   end
 
   describe :related do
     it 'should correctly make the request' do
-      client.should_receive(:get).with('/posts/feed/1/related', nil).and_return('success')
-      client.posts.related(1).should == 'success'
+      expect(client).to receive(:get).with('/posts/feed/1/related', nil).and_return('success')
+      expect(client.posts.related(1)).to eq('success')
     end
   end
 
   describe :authors do
     it 'should correctly make the request' do
-      client.should_receive(:get).with('/posts/feed/authors').and_return('success')
-      client.posts.authors.should == 'success'
+      expect(client).to receive(:get).with('/posts/feed/authors').and_return('success')
+      expect(client.posts.authors).to eq('success')
     end
   end
 end

data/spec/request_spec.rb

@@ -6,27 +6,28 @@ describe Cortex::Request do
   context 'with a cortex error response' do
     it 'should return the error object' do
       body = {'error' => 'Validation error or something'}
-      response = OpenStruct.new(:status => 422, :body => body, :headers => { :whatever => "Whatever"})
-      client.parse_response(response).to_h.should == { :body => body, :headers => {}}
+      response = OpenStruct.new(status: 422, body: body, headers: { :whatever => "Whatever"})
+      expect(client.parse_response(response).to_h).to eq({ :body => body, :headers => {status: 422}})
     end
   end
 
   context 'with a non-cortex error response' do
     it 'should return a wrapped response' do
       body = 'Catastrophic error'
-      response = OpenStruct.new(:status => 500, :body => body, :headers => { :whatever => "Whatever" })
+      response = OpenStruct.new(status: 500, body: body, headers: { whatever: "Whatever", status: 500 } )
       parsed = client.parse_response(response)
-      parsed.error.should == body
-      parsed.status.should == 500
-      parsed.original.should == response
+      expect(parsed.body[:error]).to eq(body)
+      expect(parsed.body[:status]).to eq(500)
+      expect(parsed.body[:original]).to eq(response)
+      expect(parsed.headers[:status]).to eq(500)
     end
   end
 
   context 'with a successful response' do
     it 'should return the parsed body' do
       body = {:id => 1, title: 'A post'}
-      response = OpenStruct.new(:status => 200, :body => body, :headers => { :whatever => "Whatever" })
-      client.parse_response(response).to_h.should == { :body => body, :headers => {}}
+      response = OpenStruct.new(status: 200, body: body, headers: { :whatever => "Whatever" })
+      expect(client.parse_response(response).to_h).to eq({ body: body, headers: {status: 200}})
     end
   end
 end

data/spec/users_spec.rb

@@ -6,16 +6,16 @@ describe Cortex::Users do
 
   describe :me do
     it 'should correctly make the request' do
-      client.should_receive(:get).with('/users/me').and_return('response')
+      expect(client).to receive(:get).with('/users/me').and_return('response')
       response = client.users.me
-      response.should == 'response'
+      expect(response).to eq('response')
     end
   end
 
   describe :get do
     it 'should correctly make the request' do
-      client.should_receive(:get).with('/users/1').and_return('response')
-      client.users.get(1).should == 'response'
+      expect(client).to receive(:get).with('/users/1').and_return('response')
+      expect(client.users.get(1)).to eq('response')
     end
   end
 
@@ -23,18 +23,18 @@ describe Cortex::Users do
     context 'with an existing user' do
       it 'should correctly make the request' do
         user = {:id => 1, :email => 'user@cbcortex.com'}
-        client.should_receive(:put).with('/users/1', user).and_return('response')
+        expect(client).to receive(:put).with('/users/1', user).and_return('response')
         response = client.users.save(user)
-        response.should == 'response'
+        expect(response).to eq('response')
       end
     end
 
     context 'with a new user' do
       it 'should correctly make the request' do
         user = {:email => 'user@cbcortex.com'}
-        client.should_receive(:post).with('/users', user).and_return('response')
+        expect(client).to receive(:post).with('/users', user).and_return('response')
         response = client.users.save(user)
-        response.should == 'response'
+        expect(response).to eq('response')
       end
     end
   end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cortex-client
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Bennett Goble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement