opencpu 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f069794c0f3a81cd0b450e272d420a6492e47483
-  data.tar.gz: 98eb45b503ce28cb028afb7ea35ae02df3e70e58
+  metadata.gz: 692156fd560c99e19bc184df8acbcabf7b23610c
+  data.tar.gz: 5119dc3829d33cf321f9a9c59dd93b7671120053
 SHA512:
-  metadata.gz: 91bfef43f724e63b13012ac748b2121fa62bbb106debbe77a63086fff869ac2ef1bceb577b23692fd816ae85e95e3de7664d7ccb69d2bece38e43ee1b768cd1f
-  data.tar.gz: f385b0c5c4fc23811305397319b4ab3f42504ceecffc487e15a4d4c6b7611ac3fe5566e2aaff18b48c88d67a84567c7633242d4e4b9163674a77d2e3f8535dc6
+  metadata.gz: 0c63135c6eb7a4e80d4212975445bb3a6180fc57fa062ac6dadf8661b0a7f07b29195df8c1e1770f32ee876d12f58710f6eba25b663021c1741ac95a5797ccfe
+  data.tar.gz: f51be79f860c06b6e9109c15a4637b8913d92059a24116c4039c9f8cf64d5425b159a0800ee3d65edd34b948aa990c13aad63c94c92a28e2befcebe237a7498c

data/lib/opencpu.rb

@@ -42,6 +42,10 @@ module OpenCPU
     key = [package, script].join('/')
     self.configuration.add_fake_response key, response
   end
+
+  def self.reset_configuration!
+    self.configuration.reset!
+  end
 end
 
 

data/lib/opencpu/client.rb

@@ -25,7 +25,16 @@ module OpenCPU
 
     def process_query(url, data, &block)
       return fake_response_for(url) if OpenCPU.test_mode?
-      options   = { body: data.to_json, headers: { "Content-Type" => 'application/json' } }
+      options   = {
+        body: data.to_json,
+        headers: {"Content-Type" => 'application/json'}
+      }
+
+      if OpenCPU.configuration.username && OpenCPU.configuration.password
+        options[:basic_auth] = {
+          username: OpenCPU.configuration.username, password: OpenCPU.configuration.password
+        }
+      end
       response  = self.class.post(url, options)
 
       case response.code

data/lib/opencpu/configuration.rb

@@ -18,5 +18,14 @@ module OpenCPU
     def remove_fake_response(key)
       @fake_responses.delete key
     end
+
+    def reset!
+      @endpoint_url   = nil
+      @timeout        = nil
+      @username       = nil
+      @password       = nil
+      @mode           = nil
+      @fake_responses = {}
+    end
   end
 end

data/lib/opencpu/version.rb

@@ -1,6 +1,6 @@
 module OpenCPU
   MAJOR = 0
   MINOR = 7
-  TINY  = 3
+  TINY  = 4
   VERSION = [MAJOR, MINOR, TINY].join('.')
 end

data/spec/fixtures/vcr_cassettes/user_digest_hmac.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://staging.opencpu.roqua.nl/ocpu/user/deploy/library/digest/R/hmac/json
+    uri: https://foo:bar@staging.opencpu.roqua.nl/ocpu/user/deploy/library/digest/R/hmac/json
     body:
       encoding: UTF-8
       string: '{"key":"foo","object":"bar"}'

data/spec/lib/opencpu/client_spec.rb

@@ -36,11 +36,11 @@ describe OpenCPU::Client do
         end
       end
 
-      it 'sets the base uri' do
+      it 'sets base uri' do
         expect(described_class.new.class.base_uri).to eq 'https://public.opencpu.org/ocpu'
       end
 
-      it 'sets the default_timeout' do
+      it 'sets default_timeout' do
         expect(described_class.new.class.default_options[:timeout]).to eq 123
       end
     end
@@ -70,14 +70,14 @@ describe OpenCPU::Client do
     let(:client) { described_class.new }
 
     it 'is used to quickly return JSON results' do
-      VCR.use_cassette :animation_flip_coin, record: :new_episodes do
+      VCR.use_cassette :animation_flip_coin do
         response = client.execute(:animation, 'flip.coin')
         expect(response).to eq "freq" => [0.56, 0.44], "nmax" => [50]
       end
     end
 
     it 'accepts R-function parameters as data' do
-      VCR.use_cassette :digest_hmac, record: :new_episodes do
+      VCR.use_cassette :digest_hmac do
         response = client.execute(:digest, :hmac, data: { key: 'baz', object: 'qux' })
         expect(response).to eq ["22e2a7a268bf076801eefe7cd0119bb9"]
       end
@@ -93,12 +93,15 @@ describe OpenCPU::Client do
       before do
         OpenCPU.configure do |config|
           config.endpoint_url = 'https://staging.opencpu.roqua.nl/ocpu'
+          config.username     = 'foo'
+          config.password     = 'bar'
+          config.timeout      = 123
         end
       end
       let(:client) { described_class.new }
 
       it "can access user packages" do
-        VCR.use_cassette :user_digest_hmac, record: :new_episodes do
+        VCR.use_cassette :user_digest_hmac do
           response = client.execute(:digest, :hmac, user: 'deploy', data: { key: 'foo', object: 'bar' })
           expect(response).to eq ["0c7a250281315ab863549f66cd8a3a53"]
         end
@@ -128,5 +131,4 @@ describe OpenCPU::Client do
       end
     end
   end
-
 end

data/spec/lib/opencpu/configuration_spec.rb

@@ -72,4 +72,21 @@ describe OpenCPU::Configuration do
       expect(config.fake_responses).to eq({})
     end
   end
+
+  describe "#reset!" do
+    let(:config) do
+      described_class.new.tap do |config|
+        config.endpoint_url = 'http://example.com'
+        config.username = 'foo'
+        config.password = 'bar'
+      end
+    end
+    it "resets already set configuration" do
+      config.reset!
+      expect(config.endpoint_url).to be_nil
+      expect(config.username).to be_nil
+      expect(config.password).to be_nil
+      expect(config.fake_responses).to eq({})
+    end
+  end
 end

data/spec/lib/opencpu/delayed_calculation_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe OpenCPU::DelayedCalculation do
 
   let(:delayed_calculation) { described_class.new 'foo' }
-  
+
   describe "initializes" do
     it "without resources" do
       delayed_calculation = described_class.new 'foo'
@@ -25,7 +25,7 @@ describe OpenCPU::DelayedCalculation do
     it "with resources" do
       delayed_calculation = described_class.new 'https://opencpu.org/foo/', resources
       expect(delayed_calculation.available_resources).to eq parsed_resources
-    end    
+    end
   end
 
   let(:location) { "https://public.opencpu.org/ocpu/tmp/x09dd995a16/" }
@@ -42,30 +42,30 @@ describe OpenCPU::DelayedCalculation do
     ]
   end
   let(:delayed_calculation) { described_class.new location, resources }
-  
+
   describe "#graphics" do
 
     it 'defines methods to access graphic functions' do
-      VCR.use_cassette :animation_flip_coin, record: :new_episodes do
+      VCR.use_cassette :animation_flip_coin 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, record: :new_episodes do
+      VCR.use_cassette :animation_flip_coin do
         expect(delayed_calculation.graphics).to include 'svg xmlns'
       end
     end
 
     it "can return a PNG" do
-      VCR.use_cassette :animation_flip_coin, record: :new_episodes do
+      VCR.use_cassette :animation_flip_coin 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, record: :new_episodes do
+      VCR.use_cassette :animation_flip_coin 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
@@ -74,14 +74,14 @@ describe OpenCPU::DelayedCalculation do
     end
 
     it 'can handle multiple graphic output' do
-      
+
     end
   end
 
   describe 'standard getters' do
     describe '#value' do
       it "returns raw R calculation result" do
-        VCR.use_cassette :animation_flip_coin, record: :new_episodes 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"
         end
       end
@@ -89,7 +89,7 @@ describe OpenCPU::DelayedCalculation do
 
     describe '#stdout' do
       it "returns cached stdout" do
-        VCR.use_cassette :animation_flip_coin, record: :new_episodes do
+        VCR.use_cassette :animation_flip_coin do
           expect { delayed_calculation.stdout }.to raise_error OpenCPU::ResponseNotAvailableError
         end
       end
@@ -97,15 +97,15 @@ describe OpenCPU::DelayedCalculation do
 
     describe '#warnings' do
       it 'returns cached warnings' do
-        VCR.use_cassette :animation_flip_coin, record: :new_episodes do
+        VCR.use_cassette :animation_flip_coin do
           expect { delayed_calculation.warnings }.to raise_error OpenCPU::ResponseNotAvailableError
         end
-      end      
+      end
     end
 
     describe '#info' do
       it 'returns cached info' do
-        VCR.use_cassette :animation_flip_coin, record: :new_episodes do
+        VCR.use_cassette :animation_flip_coin do
           expect(delayed_calculation.info).to include("R version")
         end
       end
@@ -113,7 +113,7 @@ describe OpenCPU::DelayedCalculation do
 
     # describe "#console" do
     #   it 'returns cached console input' do
-    #     VCR.use_cassette :animation_flip_coin, record: :new_episodes do
+    #     VCR.use_cassette :animation_flip_coin do
     #       expect(delayed_calculation.console).to include("hmac(key = \"baz\", object = \"qux\"")
     #     end
     #   end

data/spec/lib/opencpu_spec.rb

@@ -14,14 +14,18 @@ describe OpenCPU do
     expect(described_class).to respond_to :configuration
   end
 
-  it "responds to #enable_test_mode" do
+  it "responds to #enable_test_mode!" do
     expect(described_class).to respond_to :enable_test_mode!
   end
 
-  it "responds to #disable_test_mode" do
+  it "responds to #disable_test_mode!" do
     expect(described_class).to respond_to :disable_test_mode!
   end
 
+  it "responds to #reset_configuration!" do
+    expect(described_class).to respond_to :reset_configuration!
+  end
+
   describe '#configure' do
     before do
       described_class.configure do |config|
@@ -66,4 +70,16 @@ describe OpenCPU do
       expect(OpenCPU.configuration.fake_responses['hoi/hai']).to be_nil
     end
   end
+
+  describe 'resetting configuration' do
+    before do
+      described_class.configure do |config|
+        config.endpoint_url = 'http://example.com/opencpu'
+      end
+    end
+    it "can reset configuration" do
+      described_class.reset_configuration!
+      expect(described_class.configuration.endpoint_url).to be_nil
+    end
+  end
 end

metadata

@@ -1,187 +1,187 @@
 --- !ruby/object:Gem::Specification
 name: opencpu
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Ivan Malykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.4
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.8
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: This gem wraps the OpenCPU REST API.
@@ -191,7 +191,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -224,17 +224,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Wrapper around OpenCPU REST API