levinalex-liaison_labor 0.1.8 → 0.1.9

data/liaison_labor.gemspec

@@ -1,12 +1,10 @@
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = %q{liaison_labor}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Levin Alexander"]
-  s.date = %q{2009-06-11}
+  s.date = %q{2009-06-12}
   s.default_executable = %q{liaison_server}
   s.description = %q{An interface to the LIAISON® analyser by DiaSorin  <http://www.diasorin.com/en/productsandsystems/liaison>}
   s.email = ["mail@levinalex.net"]
@@ -18,19 +16,19 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{liaison_labor}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.2.0}
   s.summary = %q{interfaces Liaison device to worklist_manager}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<hoe>, [">= 1.12.1"])
+    if current_version >= 3 then
+      s.add_development_dependency(%q<hoe>, [">= 1.12.2"])
     else
-      s.add_dependency(%q<hoe>, [">= 1.12.1"])
+      s.add_dependency(%q<hoe>, [">= 1.12.2"])
     end
   else
-    s.add_dependency(%q<hoe>, [">= 1.12.1"])
+    s.add_dependency(%q<hoe>, [">= 1.12.2"])
   end
 end

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.8'
+  VERSION = '0.1.9'
 end

data/lib/liaison_server.rb

@@ -12,6 +12,7 @@ class Hash
   def symbolize_keys
     inject({}) do |options, (key, value)|
       options[(key.to_sym rescue key) || key] = value
+      options
     end
   end
 
@@ -21,7 +22,6 @@ class Hash
       options
     end
   end
-
 end
 
 
@@ -35,7 +35,7 @@ module Diasorin
   DefaultConfig = {
     :serial_port => "/dev/ttyUSB0",
     :baudrate => 9600,
-    :uri => "http://localhost/liaison/"
+    :endpoint => "http://localhost/liaison/"
   }
 
   class LiaisonServer
@@ -50,7 +50,7 @@ module Diasorin
 
       # if an option is not given on the command line
       # it is taken from the config file, or the default is used
-      @options = Hash.new() { |h,k| @options_from_file[k] || DefaultConfig[k] }
+      @options = DefaultConfig.merge(@options_from_file)
     end
 
     # parse command line options
@@ -113,7 +113,8 @@ module Diasorin
         #
         liaison.on_order_request do |barcode|
           begin
-            data = YAML.load(::Net::HTTP.get( URI.join(@options[:endpoint],"find_requests/",barcode) ))
+            uri = URI.join(@options[:endpoint],"find_requests/",barcode) 
+            data = YAML.load(::Net::HTTP.get(uri)) 
           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.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Levin Alexander
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-11 00:00:00 -07:00
+date: 2009-06-12 00:00:00 -07:00
 default_executable: liaison_server
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.1
+        version: 1.12.2
     version: 
 description: "An interface to the LIAISON\xC2\xAE analyser by DiaSorin  <http://www.diasorin.com/en/productsandsystems/liaison>"
 email: