opencpu 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37fa420600c3c0b203df369157539613a264c712
-  data.tar.gz: ab9735f30154946995ac41eb95ca80ba861db227
+  metadata.gz: 34c952212689a1551ecfcb120620c509f11e8524
+  data.tar.gz: e7962d79b6ffca4407d2fb677ca8703e5ff8ed57
 SHA512:
-  metadata.gz: d19c144faef4d6ed4a4c1840056b73e103ef99e76bf433b27b98da73b40818b8f577d5fc306e93db3821e06c897b44cc4fe19919ab9288b0bd24dcd7ca0a67ae
-  data.tar.gz: b445cdb1fbf2eecb6bc2f2168be8bff03718968089c83903370743c4c4472301f2e11481f13ea6909a18fdcf467a74717bd494287b44caa3208586a22859bec9
+  metadata.gz: 813129283d4c47ef0da68327772940d2a715eeac3111e11ce97766a590cad61beb5f9e9f33b4217c5291e3155ef2952771a05fe9e266eb175746e54c5d844616
+  data.tar.gz: 5f1ee6a0a9948020c5d058cf688988cec3d4d5f71f99ca25940b063cabb5bc279332a2bc56bfbbaef7d32d003a4096102c29379af40a4940db6d17b27a66393b

data/lib/opencpu/client.rb

@@ -23,9 +23,10 @@ module OpenCPU
     private
 
     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' } }
       response  = self.class.post(url, options)
-      
+
       case response.code
       when 200..201
         return yield(response)
@@ -37,7 +38,18 @@ module OpenCPU
     end
 
     def package_url(package, function, format = nil)
-      "/library/#{package.to_s}/R/#{function.to_s}/#{format.to_s}"
+      ['', 'library', package, 'R', function, format.to_s].join('/')
+    end
+
+    def fake_response_for(url)
+      key = derive_key_from_url(url)
+      OpenCPU.configuration.fake_responses.delete key
+    end
+
+    def derive_key_from_url(url)
+      url_parts    = url.gsub!(/^\//, '').split('/')
+      remove_items = ['R', 'library', 'json']
+      (url_parts - remove_items).join('/')
     end
   end
 end

data/lib/opencpu/configuration.rb

@@ -3,5 +3,19 @@ module OpenCPU
     attr_accessor :endpoint_url
     attr_accessor :username
     attr_accessor :password
+    attr_accessor :mode
+    attr_accessor :fake_responses
+
+    def initialize
+      @fake_responses = {}
+    end
+
+    def add_fake_response(key, response)
+      @fake_responses[key] = response
+    end
+
+    def remove_fake_response(key)
+      @fake_responses.delete key
+    end
   end
 end

data/lib/opencpu/version.rb

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

data/lib/opencpu.rb

@@ -8,7 +8,6 @@ end
 
 
 module OpenCPU
-
   class << self
     attr_writer :configuration
   end
@@ -24,6 +23,25 @@ module OpenCPU
   def self.configure
     yield(configuration)
   end
+
+  def self.enable_test_mode!
+    self.configuration.fake_responses = {}
+    self.configuration.mode = 'test'
+  end
+
+  def self.disable_test_mode!
+    self.configuration.mode = nil
+    self.configuration.fake_responses = {}
+  end
+
+  def self.test_mode?
+    self.configuration.mode == 'test'
+  end
+
+  def self.set_fake_response!(package, script, response = nil)
+    key = [package, script].join('/')
+    self.configuration.add_fake_response key, response
+  end
 end
 
 

data/spec/lib/opencpu/client_spec.rb

@@ -50,6 +50,9 @@ describe OpenCPU::Client do
   end
 
   describe '#execute' do
+    after do
+      OpenCPU.disable_test_mode!
+    end
     let(:client) { described_class.new }
 
     it 'is used to quickly return JSON results' do
@@ -71,6 +74,29 @@ describe OpenCPU::Client do
         expect { client.execute(:digest, :hmac) }.to raise_error
       end
     end
+
+    context 'when in test mode' do
+      it 'has an empty fake response when just enabled' do
+        OpenCPU.enable_test_mode!
+        response = client.execute(:digest, :hmac, key: 'baz', object: 'qux')
+        expect(response).to be_nil
+      end
+
+      context 'setting fake responses' do
+        before do
+          OpenCPU.enable_test_mode!
+          OpenCPU.set_fake_response! :digest,    :hmac,       'response'
+          OpenCPU.set_fake_response! :animation, 'flip.coin', {response: 2}
+          OpenCPU.set_fake_response! :animation, 'flip.test', {response: 3}
+        end
+
+        it 'returns a fake response per R-script' do
+          expect(client.execute(:digest, :hmac)).to eq 'response'
+          expect(client.execute(:animation, 'flip.coin')).to eq({response: 2})
+          expect(client.execute(:animation, 'flip.test')).to eq({response: 3})
+        end
+      end
+    end
   end
 
 end

data/spec/lib/opencpu/configuration_spec.rb

@@ -14,6 +14,16 @@ describe OpenCPU::Configuration do
     expect(described_class.new).to respond_to :password
   end
 
+  it 'has a #mode' do
+    expect(described_class.new).to respond_to :mode
+  end
+
+  it 'defines #fake_responses Hash' do
+    config = described_class.new
+    expect(config).to respond_to :fake_responses
+    expect(config.fake_responses).to be_a Hash
+  end
+
   describe '#endpoint_url=' do
     it 'sets an url' do
       config = described_class.new
@@ -37,4 +47,29 @@ describe OpenCPU::Configuration do
       expect(config.password).to eq 'bar'
     end
   end
+
+  describe '#mode=' do
+    it 'sets the mode to test' do
+      config = described_class.new
+      config.mode = 'test'
+      expect(config.mode).to eq 'test'
+    end
+  end
+
+  describe '#fake_responses' do
+    let(:config) { described_class.new }
+    it 'sets an empty fake responses' do
+      expect(config.fake_responses).to eq({})
+    end
+
+    it 'sets fake responses for R packages' do
+      config.add_fake_response 'foo/bar', {baz: 'qux'}
+      expect(config.fake_responses).to eq({'foo/bar' => {baz: 'qux'}})
+    end
+
+    it 'removes a fake response by key' do
+      config.remove_fake_response 'foo/bar'
+      expect(config.fake_responses).to eq({})
+    end
+  end
 end

data/spec/lib/opencpu_spec.rb

@@ -14,6 +14,14 @@ describe OpenCPU do
     expect(described_class).to respond_to :configuration
   end
 
+  it "responds to #enable_test_mode" do
+    expect(described_class).to respond_to :enable_test_mode!
+  end
+
+  it "responds to #disable_test_mode" do
+    expect(described_class).to respond_to :disable_test_mode!
+  end
+
   describe '#configure' do
     before do
       described_class.configure do |config|
@@ -26,4 +34,36 @@ describe OpenCPU do
     end
   end
 
+  describe 'test mode' do
+    after do
+      described_class.disable_test_mode!
+    end
+    it 'enables test mode' do
+      expect(described_class.configuration.mode).to be_nil
+      described_class.enable_test_mode!
+      expect(described_class.configuration.mode).to eq 'test'
+    end
+
+    it 'disables test mode' do
+      described_class.enable_test_mode!
+      expect(described_class.configuration.mode).to eq 'test'
+      described_class.disable_test_mode!
+      expect(described_class.configuration.mode).to be_nil
+    end
+
+    it 'checks for a test mode' do
+      described_class.enable_test_mode!
+      expect(described_class.test_mode?).to be_true
+      described_class.disable_test_mode!
+      expect(described_class.test_mode?).to be_false
+    end
+
+    it 'can set a fake response' do
+      described_class.enable_test_mode!
+      described_class.set_fake_response!('foo', 'bar', {baz: 'qux'})
+      described_class.set_fake_response!('hoi', 'hai')
+      expect(OpenCPU.configuration.fake_responses['foo/bar']).to eq({baz: 'qux'})
+      expect(OpenCPU.configuration.fake_responses['hoi/hai']).to be_nil
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencpu
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ivan Malykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby