opencpu 0.7.8 → 0.8.0

data/spec/fixtures/vcr_cassettes/url_encoded_request.yml

@@ -0,0 +1,61 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://public.opencpu.org/ocpu/library/base/R/identity/json
+    body:
+      encoding: UTF-8
+      string: x=data.frame(x%3D1%2Cy%3D1)
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.4.6 (Ubuntu)
+      Date:
+      - Tue, 14 Oct 2014 19:01:39 GMT
+      Content-Type:
+      - application/json
+      Location:
+      - https://public.opencpu.org/ocpu/tmp/x0c19f32080/
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - max-age=300, public
+      X-Ocpu-Session:
+      - x0c19f32080
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Headers:
+      - Origin, Content-Type, Accept, Accept-Encoding, Cache-Control
+      Access-Control-Expose-Headers:
+      - Location, X-ocpu-session, Content-Type, Cache-Control
+      X-Ocpu-R:
+      - R version 3.1.1 (2014-07-10)
+      X-Ocpu-Locale:
+      - en_US.UTF-8
+      X-Ocpu-Time:
+      - 2014-10-14 12:01:39 PDT
+      X-Ocpu-Version:
+      - 1.4.4
+      X-Ocpu-Server:
+      - rApache
+      X-Ocpu-Cache:
+      - MISS
+    body:
+      encoding: UTF-8
+      string: |+
+        [
+            {
+                "x": 1,
+                "y": 1
+            }
+        ]
+
+    http_version: 
+  recorded_at: Tue, 14 Oct 2014 19:01:39 GMT
+recorded_with: VCR 2.9.3

data/spec/lib/opencpu/client_spec.rb

@@ -58,7 +58,7 @@ describe OpenCPU::Client do
 
     it 'returns a DelayedCalculation with correct path' do
       VCR.use_cassette :prepare do
-        expect(delayed_calculation.location).to eq "https://public.opencpu.org/ocpu/tmp/x0a79915480/"
+        expect(delayed_calculation.location).to match "https://public.opencpu.org/ocpu/tmp/x[0-9a-f]+/"
       end
     end
   end
@@ -70,9 +70,9 @@ describe OpenCPU::Client do
     let(:client) { described_class.new }
 
     it 'is used to quickly return JSON results' do
-      VCR.use_cassette :animation_flip_coin do
+      VCR.use_cassette :animation_flip_coin, record: :new_episodes do
         response = client.execute(:animation, 'flip.coin')
-        expect(response).to eq "freq" => [0.56, 0.44], "nmax" => [50]
+        expect(response).to include('freq', 'nmax')
       end
     end
 
@@ -89,6 +89,36 @@ describe OpenCPU::Client do
       end
     end
 
+    context 'url encoded request' do
+      it 'sends the parameters url_encoded' do
+        VCR.use_cassette :url_encoded_request do |cassette|
+          response = client.execute(:base, :identity, format: nil, data: { x: 'data.frame(x=1,y=1)' })
+          params = cassette.serializable_hash['http_interactions'][0]['request']['body']['string']
+          expect(params).to eq "x=data.frame(x%3D1%2Cy%3D1)"
+        end
+      end
+      it 'accepts R-code as parameters' do
+        VCR.use_cassette :url_encoded_request do |cassette|
+          response = client.execute(:base, :identity, format: nil, data: { x: 'data.frame(x=1,y=1)' })
+          expect(response).to eq [{"x"=>1, "y"=>1}]
+        end
+      end
+    end
+
+    context 'multipart form / file uploads' do
+      it "works" do
+        skip # vcr is broken for file uploads https://github.com/vcr/vcr/issues/441
+        VCR.use_cassette :multi_part_request do |cassette|
+          # VCR.turn_off!
+          # WebMock.disable!
+          response = client.execute(:utils, 'read.csv', format: nil, data: { file: File.new('spec/fixtures/test.csv') })
+          # WebMock.enable!
+          # VCR.turn_on!
+          expect(response).to eq [{"head1"=>1, "head2"=>2, "head3"=>3}, {"head1"=>4, "head2"=>5, "head3"=>6}]
+        end
+      end
+    end
+
     context 'user packages' do
       before do
         OpenCPU.configure do |config|
@@ -98,6 +128,7 @@ describe OpenCPU::Client do
           config.timeout      = 123
         end
       end
+      after { OpenCPU.reset_configuration! }
       let(:client) { described_class.new }
 
       it "can access user packages" do
@@ -131,4 +162,14 @@ describe OpenCPU::Client do
       end
     end
   end
+
+  describe '#request_options' do
+    it 'uses verify_ssl setting' do
+      expect(described_class.new.send(:request_options, {}, nil)[:verify]).to be_truthy
+      OpenCPU.configure do |config|
+        config.verify_ssl = false
+      end
+      expect(described_class.new.send(:request_options, {}, nil)[:verify]).to be_falsy
+    end
+  end
 end

data/spec/lib/opencpu/configuration_spec.rb

@@ -89,4 +89,16 @@ describe OpenCPU::Configuration do
       expect(config.fake_responses).to eq({})
     end
   end
+
+  describe "#verify_ssl" do
+    let(:config) { described_class.new }
+    it "defaults to true" do
+      expect(config.verify_ssl).to be_truthy
+    end
+
+    it 'can be changed' do
+      config.verify_ssl = false
+      expect(config.verify_ssl).to be_falsy
+    end
+  end
 end

data/spec/lib/opencpu/delayed_calculation_spec.rb

@@ -29,43 +29,31 @@ describe OpenCPU::DelayedCalculation do
   end
 
   let(:location) { "https://public.opencpu.org/ocpu/tmp/x09dd995a16/" }
-  let(:resources) do
-    [
-      "/ocpu/tmp/x09dd995a16/R/.val",
-      "/ocpu/tmp/x09dd995a16/graphics/1",
-      "/ocpu/tmp/x09dd995a16/graphics/2",
-      "/ocpu/tmp/x09dd995a16/graphics/3",
-      "/ocpu/tmp/x09dd995a16/graphics/4",
-      "/ocpu/tmp/x09dd995a16/source",
-      "/ocpu/tmp/x09dd995a16/console",
-      "/ocpu/tmp/x09dd995a16/info"
-    ]
-  end
-  let(:delayed_calculation) { described_class.new location, resources }
+  let(:delayed_calculation) { OpenCPU::client.prepare('animation', 'flip.coin') }
 
   describe "#graphics" do
 
     it 'defines methods to access graphic functions' do
-      VCR.use_cassette :animation_flip_coin do
+      VCR.use_cassette :animation_flip_coin, record: :new_episodes do
         expect { delayed_calculation.graphics }.not_to raise_error
         expect { delayed_calculation.stdout }.to raise_error OpenCPU::ResponseNotAvailableError
       end
     end
 
     it "returns a SVG by default" do
-      VCR.use_cassette :animation_flip_coin do
+      VCR.use_cassette :animation_flip_coin, record: :new_episodes do
         expect(delayed_calculation.graphics).to include 'svg xmlns'
       end
     end
 
     it "can return a PNG" do
-      VCR.use_cassette :animation_flip_coin do
+      VCR.use_cassette :animation_flip_coin, record: :new_episodes do
         expect(delayed_calculation.graphics(0, :png)).to include 'PNG'
       end
     end
 
     it "does not support formats except PNG and SVG" do
-      VCR.use_cassette :animation_flip_coin do
+      VCR.use_cassette :animation_flip_coin, record: :new_episodes do
         expect { delayed_calculation.graphics(0, :svg) }.not_to raise_error
         expect { delayed_calculation.graphics(0, :png) }.not_to raise_error
         expect { delayed_calculation.graphics(0, :foo) }.to raise_error OpenCPU::UnsupportedFormatError
@@ -81,15 +69,15 @@ describe OpenCPU::DelayedCalculation do
   describe 'standard getters' do
     describe '#value' do
       it "returns raw R calculation result" do
-        VCR.use_cassette :animation_flip_coin do
-          expect(delayed_calculation.value).to eq "$freq\n   1    2 \n0.52 0.48 \n\n$nmax\n[1] 50"
+        VCR.use_cassette :animation_flip_coin, record: :new_episodes do
+          expect(delayed_calculation.value).to include "$freq"
         end
       end
     end
 
     describe '#stdout' do
       it "returns cached stdout" do
-        VCR.use_cassette :animation_flip_coin do
+        VCR.use_cassette :animation_flip_coin, record: :new_episodes do
           expect { delayed_calculation.stdout }.to raise_error OpenCPU::ResponseNotAvailableError
         end
       end
@@ -97,7 +85,7 @@ describe OpenCPU::DelayedCalculation do
 
     describe '#warnings' do
       it 'returns cached warnings' do
-        VCR.use_cassette :animation_flip_coin do
+        VCR.use_cassette :animation_flip_coin, record: :new_episodes do
           expect { delayed_calculation.warnings }.to raise_error OpenCPU::ResponseNotAvailableError
         end
       end
@@ -105,7 +93,7 @@ describe OpenCPU::DelayedCalculation do
 
     describe '#info' do
       it 'returns cached info' do
-        VCR.use_cassette :animation_flip_coin do
+        VCR.use_cassette :animation_flip_coin, record: :new_episodes do
           expect(delayed_calculation.info).to include("R version")
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencpu
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.8.0
 platform: ruby
 authors:
 - Ivan Malykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -206,10 +206,12 @@ files:
 - lib/opencpu/delayed_calculation.rb
 - lib/opencpu/version.rb
 - opencpu.gemspec
+- spec/fixtures/test.csv
 - 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/prepare.yml
+- spec/fixtures/vcr_cassettes/url_encoded_request.yml
 - spec/fixtures/vcr_cassettes/user_digest_hmac.yml
 - spec/lib/opencpu/client_spec.rb
 - spec/lib/opencpu/configuration_spec.rb
@@ -241,10 +243,12 @@ 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/digest_hmac.yml
 - spec/fixtures/vcr_cassettes/digest_hmac_no_parameters.yml
 - spec/fixtures/vcr_cassettes/prepare.yml
+- spec/fixtures/vcr_cassettes/url_encoded_request.yml
 - spec/fixtures/vcr_cassettes/user_digest_hmac.yml
 - spec/lib/opencpu/client_spec.rb
 - spec/lib/opencpu/configuration_spec.rb