levinalex-liaison_labor 0.1.9 → 0.1.10

data/liaison_labor.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{liaison_labor}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Levin Alexander"]

data/lib/liaison_labor.rb

@@ -4,5 +4,5 @@ require File.join(File.dirname(__FILE__),'liaison_labor','interface.rb')
 require File.join(File.dirname(__FILE__),'liaison_labor','packets.rb')
 
 class LiaisonLabor
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

data/lib/liaison_server.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
+
 require 'optparse'
 require 'net/http'
 require 'yaml'
 
-require 'rubygems'
-
 require File.join(File.dirname(__FILE__),'liaison_labor.rb')
 
 class Hash
@@ -24,6 +24,20 @@ class Hash
   end
 end
 
+class WorklistManager
+  def fetch(uri_str, limit = 10)
+    # You should choose better exception.
+    raise ArgumentError, 'HTTP redirect too deep' if limit == 0
+
+    response = Net::HTTP.get_response(URI.parse(uri_str))
+    case response
+    when Net::HTTPSuccess     then response
+    when Net::HTTPRedirection then fetch(response['location'], limit - 1)
+    else
+      response.error!
+    end
+  end
+end
 
 module Diasorin
   ConfigFilename = ".liaison_server"
@@ -114,7 +128,10 @@ module Diasorin
         liaison.on_order_request do |barcode|
           begin
             uri = URI.join(@options[:endpoint],"find_requests/",barcode) 
-            data = YAML.load(::Net::HTTP.get(uri)) 
+	    result = WorklistManager.new.fetch(uri.to_s)
+
+            data = YAML.load(result.body) 
+	    data["id"] = barcode
           rescue Exception => e
             puts e
             puts e.backtrace

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: levinalex-liaison_labor
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - Levin Alexander