roozer_client 0.1 → 0.2

data/CHANGELOG

@@ -1,2 +1,3 @@
+v0.2. Testing/refactoring
 v0.1. Proof of concept
 

data/Manifest

@@ -1,7 +1,7 @@
 CHANGELOG
+Manifest
 README
 Rakefile
 lib/roozer_client.rb
 test/test_all.rb
 test/test_helper.rb
-Manifest

data/README

@@ -1,7 +1,12 @@
 
 require 'roozer_client'
 
-rc = RoozerClient.new(url: 'http://orch1:2988;http://orch1:2987', path: 'rootpath')
+# Connect to a roozer server.  Multiple servers can be listed seperated by
+# semicolons.  Client uses round robin until it finds a server that responds
+# to its requests.
+
+rc = RoozerClient.new(url: 'http://orch1:2987;http://orch2:2987', path: 'rootpath')
+
 rc['subpath'] = { data: "abc" }
 
 rc.list
@@ -11,4 +16,3 @@ rc['subpath']
 => { "data" => "abc" }
 
 rc.request(:delete, 'subpath/data')
-

data/lib/roozer_client.rb

@@ -6,26 +6,25 @@ class RoozerClient
   def initialize(options={})
     opts = options.dup
     @urls = (opts.delete(:url) || ENV['ROOZER_URL'] || 'http://127.0.0.1:2987/').split(/;/).map(&:strip)
-    @path = "#{opts.delete(:path) || ''}/"
+    @path = opts.delete(:path)
     @timeout = opts.delete(:timeout) || 10
     @opts = {timeout: @timeout, open_timeout: @timeout}.merge(opts)
   end
-  
 
   def get(path)
     begin
       res = request(:get, path)
-      res['path'] && res['path']['type'] == 'file' ?  res['path']['value'] : nil
+      res['value'] if res['type'] == 'file' 
     rescue RestClient::Exception => e
       raise unless e.http_code == 404
     end
   end
   alias :[] :get
 
-  def list(path='')
+  def list(path=nil)
     begin
       res = request(:get, path)
-      res['path'] && res['path']['type'] == 'dir' ?  res['path']['value'] : nil
+      res['value'] if res['type'] == 'dir' 
     rescue RestClient::Exception => e
       raise unless e.http_code == 404
     end
@@ -37,13 +36,14 @@ class RoozerClient
   alias :[]= :put
   
   def request(method, path, data=nil)
-
     begin
       url = @urls.first
       resource = RestClient::Resource.new(url, @opts)
-      response = resource["#{@path}#{path}"].send(method, *[({value: data}.to_json if data), {content_type: :json, accept: :json}].compact)
+      fullpath = [@path,path].compact.map(&:to_s).join('/')
+      response = resource["/#{fullpath}"].send(method, *[({value: data}.to_json if data), {content_type: :json, accept: :json}].compact)
       JSON.parse(response) rescue {}
     rescue Errno::ECONNREFUSED, RestClient::RequestTimeout
+      puts "#{$!.class}, retrying..."
       @urls.rotate!
       sleep 5
       retry
@@ -52,14 +52,3 @@ class RoozerClient
   
 end
 
-
-=begin
-
-  rc = RoozerClient.new(url: 'http://orch1:2988;http://orch1:2987', path: 'bigcloud')
-  rc.list
-  rc['x'] = { a: 'b' }
-  rc['x']
-  rc.request(:delete, 'x')
-    
-  
-=end

data/roozer_client.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "roozer_client"
-  s.version = "0.1"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
-  s.date = "2012-12-20"
+  s.date = "2013-01-03"
   s.description = "Ruby client for Roozer server"
   s.email = "andrew@modulus.org"
   s.extra_rdoc_files = ["CHANGELOG", "README", "lib/roozer_client.rb"]
-  s.files = ["CHANGELOG", "README", "Rakefile", "lib/roozer_client.rb", "test/test_all.rb", "test/test_helper.rb", "Manifest", "roozer_client.gemspec"]
+  s.files = ["CHANGELOG", "Manifest", "README", "Rakefile", "lib/roozer_client.rb", "test/test_all.rb", "test/test_helper.rb", "roozer_client.gemspec"]
   s.homepage = "https://github.com/andys/roozer-client"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Roozer_client", "--main", "README"]
   s.require_paths = ["lib"]

data/test/test_all.rb

@@ -1,19 +1,60 @@
-require "#{File.dirname(__FILE__)}/../lib/restinator"
+require "#{File.dirname(__FILE__)}/../lib/roozer_client"
 require 'test/unit'
 require "#{File.dirname(__FILE__)}/test_helper"
 
 class TestRoozerClient < Test::Unit::TestCase
 
   def setup
-    setup_webserver
+    @url = setup_webserver
+    @client = RoozerClient.new(url: @url, path: 'test')
   end
  
- def test_get
-   resp = accept_request(200, 'test') do
-     `( echo GET /test/123 HTTP/1.0 ; echo ) | nc 127.0.0.1 7999`
-   end
-   assert_equal 'GET', resp.request_method
-   assert_equal '/test/123', resp.path
- end
- 
+  def test_list
+    result = nil
+    response = accept_request(200, {name:"/test",type:"dir",value:["sub1","sub2"]}.to_json) do
+      result = @client.list
+    end
+    assert response
+    assert_equal 'GET', response.request_method
+    assert_equal '/test', response.path
+    assert_equal ["sub1","sub2"], result
+  end
+
+  def test_get
+    result = nil
+    datahash = {'a' => 'b'}
+    response = accept_request(200, {name:"/test/sub1",type:"file",value:datahash}.to_json) do
+      result = @client.get('sub1')
+    end
+    assert response
+    assert_equal 'GET', response.request_method
+    assert_equal '/test/sub1', response.path
+    assert_equal datahash, result
+  end
+
+  def test_put
+    response = accept_request(204, '') do
+      @client.put('sub2', x1: 'x2')
+    end
+    assert response
+    assert_equal 'PUT', response.request_method
+    assert_equal '/test/sub2', response.path
+    assert_equal '{"value":{"x1":"x2"}}', response.body
+  end
+
+  def test_get_404
+    result = nil
+    response = accept_request(404, {error: 'not found'}.to_json) do
+      result = @client.get('xxx')
+    end
+    assert response
+    assert_equal '/test/xxx', response.path
+    assert_nil result
+  end
+
+#  def test_failover
+#    @client = RoozerClient.new(url: "http://127.0.0.1:7997;#{@url}", path: 'test')
+#    test_list
+#  end
+  
 end

data/test/test_helper.rb

@@ -1,37 +1,40 @@
 require 'webrick'
 
-class NewRequestException < Exception
-end
-
 class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   class << self
-    attr_accessor :request, :response, :wakeupthread
+    attr_accessor :request, :response #, :wakeupthread
   end
   def service(request, response)
+    # Save the request
+    body = request.body # this is needed to read the chunks from the other side before duping
     self.class.request = request.dup
+    
+    # return the canned response
     response.status = self.class.response.first
     response.body = self.class.response.last
-    TestServlet.wakeupthread.raise NewRequestException.new
   end
 end
 
 def accept_request(*response)
   TestServlet.request = nil
   TestServlet.response = response
-  begin
-    TestServlet.wakeupthread = Thread.current
-    yield
-    $webserver_timeout.times { sleep 1 }
-  rescue NewRequestException
-  end
+  yield
   TestServlet.request
 end
 
-def setup_webserver(timeout=3)
+def setup_webserver(timeout=5)
+  port = 7999
   $webserver_timeout = timeout
-  $webserverthread ||= Thread.new do
-     $webserver ||= WEBrick::HTTPServer.new :BindAddress => '127.0.0.1', :Port => 7999, :DocumentRoot => File.dirname(__FILE__), :Logger => WEBrick::Log.new("/dev/null"), :AccessLog => [nil, nil]
-     $webserver.mount '/test', TestServlet
-     $webserver.start
+  Thread.abort_on_exception = true
+  
+  if !$webserver
+    newflag = true 
+    $webserver = WEBrick::HTTPServer.new :BindAddress => '127.0.0.1', :Port => port, :DocumentRoot => File.dirname(__FILE__), :Logger => WEBrick::Log.new("/dev/null"), :AccessLog => [nil, nil]
+    $webserver.mount '/', TestServlet
+    $webserverthread ||= Thread.new do
+       $webserver.start
+    end
   end
+  sleep 3 if newflag
+  "http://127.0.0.1:#{port}/"
 end

metadata

@@ -2,14 +2,14 @@
 name: roozer_client
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Andrew Snow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -53,12 +53,12 @@ extra_rdoc_files:
 - lib/roozer_client.rb
 files:
 - CHANGELOG
+- Manifest
 - README
 - Rakefile
 - lib/roozer_client.rb
 - test/test_all.rb
 - test/test_helper.rb
-- Manifest
 - roozer_client.gemspec
 homepage: https://github.com/andys/roozer-client
 licenses: []