opencpu 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4dd7cd2e25675a883669dcc7b2dff60c3bed910
-  data.tar.gz: fb2c04876cdf97dc4c0656a5c24fd79718a22ffd
+  metadata.gz: 5070269fee0cea90489369a6c10b7df8f9a4d946
+  data.tar.gz: 2f4c0996615c1febdf2f69af2f3a3e88fb3e0d30
 SHA512:
-  metadata.gz: f3dcee9fba66c0e432feda4bb27e9b7b39f9453507dc5d26412d74fcfe576891bf09d82b8a0012b0df4d13646a529509248e72735108bcb0168c6ffdc1de9707
-  data.tar.gz: 490fac6cde42a5a53020c0b87d5029f24a2ee0b648608aed69b67090624a1da0c0c64b530cd41d1ff15cc56b0271b5544be7e92bff86b6b167e07afdf5a32896
+  metadata.gz: b9e5ef651e28801b06f0df1aaf4a55c716425f67c7f850915a3bbb4f98621f72a70c22af851ca0cec2c1e5fe95595a485420b22879aa0d97178e4c92a66fc06c
+  data.tar.gz: a15e61815b1e2803704c77768359e9b3376575c321615bc983136dd85b44c7e76e163b26bb0adc97207a31a1a5ab91b472d97e9f659f7927b645db403247c43d

data/.gitignore

@@ -17,5 +17,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.byebug-history
 
 .ruby-version

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.10.0
+
+* BREAKING CHANGE: on request failure, it raises a specific error (BadRequest, InternalServerError or Unknown Error)
+  instead of StandardError
+
 # 0.9.2
 
 * Added `OpenCPU::Client#description` to retrieve a packages' description file

data/lib/opencpu/client.rb

@@ -1,5 +1,8 @@
+require 'opencpu/errors'
+
 module OpenCPU
   class Client
+    include Errors
     include HTTMultiParty
 
     def initialize
@@ -64,10 +67,21 @@ module OpenCPU
       case response.code
       when 200..201
         return yield(response)
-      when 400
-        fail '400: Bad Request\n' + response.body
       else
-        fail "#{response.code}:\n #{response.body}"
+        fail error_class_for(response.code), "#{response.code}:\n #{response.body}"
+      end
+    end
+
+    def error_class_for(response_code)
+      case response_code
+      when 403
+        AccessDenied
+      when 400..499
+        BadRequest
+      when 500..599
+        InternalServerError
+      else
+        UnknownError
       end
     end
 

data/lib/opencpu/errors.rb

@@ -0,0 +1,9 @@
+module OpenCPU
+  module Errors
+    class OpenCPUError < StandardError; end
+    class BadRequest < OpenCPUError; end
+    class InternalServerError < OpenCPUError; end
+    class AccessDenied < OpenCPUError; end
+    class UnknownError < OpenCPUError; end
+  end
+end

data/lib/opencpu/version.rb

@@ -1,6 +1,6 @@
 module OpenCPU
   MAJOR = 0
-  MINOR = 9
-  TINY  = 2
+  MINOR = 10
+  TINY  = 0
   VERSION = [MAJOR, MINOR, TINY].join('.')
 end

data/spec/fixtures/vcr_cassettes/bad_request.yml

@@ -0,0 +1,56 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://public.opencpu.org/ocpu/library/base/R/identity/json
+    body:
+      encoding: UTF-8
+      string: '{"some":"data"}'
+    headers:
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
+      Server:
+      - nginx/1.10.0 (Ubuntu)
+      Date:
+      - Thu, 30 Jun 2016 10:16:58 GMT
+      Content-Type:
+      - text/plain; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Location, X-ocpu-session, Content-Type, Cache-Control
+      Access-Control-Allow-Headers:
+      - Origin, Content-Type, Accept, Accept-Encoding, Cache-Control, Authorization
+      Access-Control-Allow-Credentials:
+      - 'true'
+      X-Ocpu-R:
+      - R version 3.3.1 (2016-06-21)
+      X-Ocpu-Locale:
+      - en_US.UTF-8
+      X-Ocpu-Time:
+      - 2016-06-30 06:16:58 EDT
+      X-Ocpu-Version:
+      - 1.6.3
+      X-Ocpu-Server:
+      - rApache
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: UTF-8
+      string: |
+        unused argument (some = "data")
+
+        In call:
+        identity(some = "data")
+    http_version: 
+  recorded_at: Thu, 30 Jun 2016 10:16:58 GMT
+recorded_with: VCR 2.9.3

data/spec/lib/opencpu/client_spec.rb

@@ -21,6 +21,34 @@ describe OpenCPU::Client do
     expect(described_class.new).to respond_to :prepare
   end
 
+  describe '#process_query' do
+    let(:client) { described_class.new}
+    let(:url) { '/library/base/R/identity/json' }
+    let(:data) { { some: 'data' } }
+    let(:format) { :json }
+    let(:response_handler) { -> { nil } }
+
+    subject { client.send(:process_query, url, data, format) { |response| response_handler(response) } }
+
+    context 'test mode' do
+      it 'calls fake_response_for(url)' do
+        allow(OpenCPU).to receive(:test_mode?).and_return true
+        expect(client).to receive(:fake_response_for)
+        subject
+      end
+    end
+
+    context 'no test mode' do
+      context 'HTTP failure' do
+        it 'returns the appropiate status code' do
+          VCR.use_cassette :bad_request do
+            expect { subject }.to raise_error OpenCPU::Errors::BadRequest
+          end
+        end
+      end
+    end
+  end
+
   describe 'initializes' do
 
     describe 'without configured attributes' do
@@ -167,7 +195,7 @@ describe OpenCPU::Client do
         VCR.use_cassette :github_animation_flip_coin_error do
           expect {
             client.execute(:foo, :bar, {user: "baz", github_remote: true})
-          }.to raise_error RuntimeError, /400: Bad Request/
+          }.to raise_error OpenCPU::Errors::BadRequest, /400/
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencpu
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Ivan Malykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -164,10 +164,12 @@ files:
 - lib/opencpu/client.rb
 - lib/opencpu/configuration.rb
 - lib/opencpu/delayed_calculation.rb
+- lib/opencpu/errors.rb
 - lib/opencpu/version.rb
 - opencpu.gemspec
 - spec/fixtures/test.csv
 - spec/fixtures/vcr_cassettes/animation_flip_coin.yml
+- spec/fixtures/vcr_cassettes/bad_request.yml
 - spec/fixtures/vcr_cassettes/description.yml
 - spec/fixtures/vcr_cassettes/digest_hmac.yml
 - spec/fixtures/vcr_cassettes/digest_hmac_no_parameters.yml
@@ -202,13 +204,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Wrapper around OpenCPU REST API
 test_files:
 - spec/fixtures/test.csv
 - spec/fixtures/vcr_cassettes/animation_flip_coin.yml
+- spec/fixtures/vcr_cassettes/bad_request.yml
 - spec/fixtures/vcr_cassettes/description.yml
 - spec/fixtures/vcr_cassettes/digest_hmac.yml
 - spec/fixtures/vcr_cassettes/digest_hmac_no_parameters.yml
@@ -223,3 +226,4 @@ test_files:
 - spec/lib/opencpu/delayed_calculation_spec.rb
 - spec/lib/opencpu_spec.rb
 - spec/spec_helper.rb
+has_rdoc: