opencpu 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbb9764556950e5363db24b68730302e89477bc4
-  data.tar.gz: abf75257f06aebab9fe92771cebeb10a9b95efdc
+  metadata.gz: cc821de62d9d3981b61ed2c4a501c9c67fd14335
+  data.tar.gz: 2257ce6bd32d940475aab7063b9c8f0812a38a75
 SHA512:
-  metadata.gz: 1dc272309ba0ddf5499a091b2b20e7fc9d6e44a2f3771cba3b9c5032ae867d58508e79afe5671a5ed19331099cf460c01bdd31271ab9b20e0a4add6bb203da65
-  data.tar.gz: a218aa27d872242c6cb5c2ffba00bada8bf44aba65380c0bb4f73a21c1a08d93c26040657fac813e56f107a5064416e89fe6dc414038c81e4c642b5bac609cb4
+  metadata.gz: 326ddd1a403277239f0e9ba3ba8e860ecf50ef960b03efbd65dc596dccac401f68dfa5d878ea414f3a1477ea806b55f265abf25cf5f98c8a5e0406f81da09a14
+  data.tar.gz: b2f0770627b0663321cd710b1bff62148ba6c123c1ab76c0ec96473e4ce79d7d434d699cc97b781c64ca2c216c2e7a1258cd72750659fdb3cf3055974c063bd0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.9.0
+
+* Added support for Github R repos through OpenCPU
+
+# 0.8.2
+
+* Added uri.port 
+
 # 0.8.1
 
 * Better error messages

data/Guardfile

@@ -3,7 +3,7 @@ guard :bundler do
   watch(/^.+\.gemspec/)
 end
 
-guard :rspec do
+guard :rspec, cmd: 'bundle exec rspec --color --format=documentation' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/lib/opencpu/client.rb

@@ -11,7 +11,8 @@ module OpenCPU
       user   = options.fetch :user, :system
       data   = options.fetch :data, {}
       format = options.fetch :format, :json
-      process_query package_url(package, function, user, :json), data, format do |response|
+      github_remote = options.fetch :github_remote, false
+      process_query package_url(package, function, user, github_remote, :json), data, format do |response|
         JSON.parse(response.body)
       end
     end
@@ -20,7 +21,8 @@ module OpenCPU
       user = options.fetch :user, :system
       data = options.fetch :data, {}
       format = options.fetch :format, :json
-      process_query package_url(package, function, user), data, format do |response|
+      github_remote = options.fetch :github_remote, false
+      process_query package_url(package, function, user, github_remote), data, format do |response|
         location  = response.headers['location']
         resources = response.body.split(/\n/)
         OpenCPU::DelayedCalculation.new(location, resources)
@@ -65,8 +67,9 @@ module OpenCPU
       options
     end
 
-    def package_url(package, function, user = :system, format = nil)
+    def package_url(package, function, user = :system, github_remote = false, format = nil)
       return ['', 'library', package, 'R', function, format.to_s].join('/') if user == :system
+      return ['', 'github', user, package, 'R', function, format.to_s].join('/') if github_remote
       return ['', 'user', user, 'library', package, 'R', function, format.to_s].join('/')
     end
 

data/lib/opencpu/version.rb

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

data/spec/fixtures/vcr_cassettes/github_animation_flip_coin.yml

@@ -0,0 +1,64 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://public.opencpu.org/ocpu/github/yihui/animation/R/flip.coin/json
+    body:
+      encoding: UTF-8
+      string: "{}"
+    headers:
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.4.6 (Ubuntu)
+      Date:
+      - Mon, 08 Jun 2015 13:15:43 GMT
+      Content-Type:
+      - application/json
+      Location:
+      - https://public.opencpu.org/ocpu/tmp/x028f930180/
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - max-age=300, public
+      X-Ocpu-Session:
+      - x028f930180
+      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.2.0 Patched (2015-05-24 r68404)
+      X-Ocpu-Locale:
+      - en_US.UTF-8
+      X-Ocpu-Time:
+      - 2015-06-08 06:15:04 PDT
+      X-Ocpu-Version:
+      - 1.5.0
+      X-Ocpu-Server:
+      - rApache
+      Vary:
+      - Accept-Encoding
+      X-Ocpu-Cache:
+      - HIT
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "freq": [0.34, 0.66],
+          "nmax": [50]
+        }
+    http_version: 
+  recorded_at: Mon, 08 Jun 2015 13:15:43 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/github_animation_flip_coin_error.yml

@@ -0,0 +1,58 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://public.opencpu.org/ocpu/github/baz/foo/R/bar/json
+    body:
+      encoding: UTF-8
+      string: "{}"
+    headers:
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
+      Server:
+      - nginx/1.4.6 (Ubuntu)
+      Date:
+      - Mon, 08 Jun 2015 13:17:01 GMT
+      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.2.0 Patched (2015-05-24 r68404)
+      X-Ocpu-Locale:
+      - en_US.UTF-8
+      X-Ocpu-Time:
+      - 2015-06-08 06:17:01 PDT
+      X-Ocpu-Version:
+      - 1.5.0
+      X-Ocpu-Server:
+      - rApache
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: UTF-8
+      string: |
+        Package' foo ' did not successfully install.
+        Either installation failed or github repository name does not match package name.
+
+
+        Downloading github repo baz/foo@master
+        Error in download(dest, src, auth) : client error: (404) Not Found
+        Calls: do.call ... remote_download.github_remote -> download -> <Anonymous>
+        Execution halted
+    http_version: 
+  recorded_at: Mon, 08 Jun 2015 13:17:01 GMT
+recorded_with: VCR 2.9.3

data/spec/lib/opencpu/client_spec.rb

@@ -139,6 +139,33 @@ describe OpenCPU::Client do
       end
     end
 
+    context 'GitHub package' do
+      before do
+        OpenCPU.configure do |config|
+          config.endpoint_url = 'https://public.opencpu.org/ocpu'
+        end
+      end
+      after { OpenCPU.reset_configuration! }
+      let(:client) { described_class.new }
+
+      it "can access github packages" do
+        VCR.use_cassette :github_animation_flip_coin do
+          response = client.execute(:animation, :'flip.coin', {user: "yihui", github_remote: true, data: {}})
+          expect(response['nmax']).to eq [50]
+          expect(response['freq'][0]).to satisfy { |result| result >= 0.0 && result <= 1.0 }
+          expect(response['freq'][1]).to satisfy { |result| result >= 0.0 && result <= 1.0 }
+        end
+      end
+
+      it "what happens when package is not available on GitHub" 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/
+        end
+      end
+    end
+
     context 'when in test mode' do
       it 'has an empty fake response when just enabled' do
         OpenCPU.enable_test_mode!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencpu
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Ivan Malykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -210,6 +210,8 @@ files:
 - spec/fixtures/vcr_cassettes/animation_flip_coin.yml
 - spec/fixtures/vcr_cassettes/digest_hmac.yml
 - spec/fixtures/vcr_cassettes/digest_hmac_no_parameters.yml
+- spec/fixtures/vcr_cassettes/github_animation_flip_coin.yml
+- spec/fixtures/vcr_cassettes/github_animation_flip_coin_error.yml
 - spec/fixtures/vcr_cassettes/prepare.yml
 - spec/fixtures/vcr_cassettes/url_encoded_request.yml
 - spec/fixtures/vcr_cassettes/user_digest_hmac.yml
@@ -247,6 +249,8 @@ test_files:
 - spec/fixtures/vcr_cassettes/animation_flip_coin.yml
 - spec/fixtures/vcr_cassettes/digest_hmac.yml
 - spec/fixtures/vcr_cassettes/digest_hmac_no_parameters.yml
+- spec/fixtures/vcr_cassettes/github_animation_flip_coin.yml
+- spec/fixtures/vcr_cassettes/github_animation_flip_coin_error.yml
 - spec/fixtures/vcr_cassettes/prepare.yml
 - spec/fixtures/vcr_cassettes/url_encoded_request.yml
 - spec/fixtures/vcr_cassettes/user_digest_hmac.yml