lis 0.4.7 → 0.4.8

data/bin/lis

@@ -21,7 +21,6 @@ Main {
       cast :uri
     end
 
-
     def run
       $VERBOSE = true if params[:verbose].given?
       portname = params[:port].value
@@ -36,8 +35,10 @@ Main {
       warn "http:         #{uri.to_s}"
 
       LIS::InterfaceServer.listen(port, uri).run!
-
-
+    rescue Exception => e
+      fatal { e.message }
+      e.backtrace.each do |l| warn l end
+      raise
     end
   end
 

data/features/step_definitions/lis_steps.rb

@@ -60,12 +60,12 @@ end
 
 Then /^LIS should have sent test orders to client:$/ do |text|
   @data = @client.read_all
-  @data.force_encoding("utf-8") if @data.respond_to?(:force_encoding)
-  @packets = @data.split("\002").select { |s| s =~ /^\d[A-Z]/ }
+  @data.force_encoding("ASCII-8BIT") if @data.respond_to?(:force_encoding)
+  @packets = @data.split("\002").select { |s| s =~ /^\d[A-Z]/n }
   @packets.zip(text.split(/\n/)) do |actual, expected|
     @called = true
-    rx =  Regexp.new("^" + Regexp.escape(expected.strip))
-    assert_match(rx, actual.gsub(/\r\003.*$/, "").strip)
+    rx =  Regexp.new("^" + Regexp.escape(expected.strip.force_encoding('ASCII-8BIT')), Regexp::NOENCODING)
+    assert_match(rx, actual.gsub(/\r\003.*$/n, "").strip)
   end
   assert_equal(true, @called)
 end

data/lib/lis/http_interface.rb

@@ -54,13 +54,7 @@ class LIS::HTTPInterface
       "raw" => result.raw_data
     }
 
-    # FIXME: WTF: should not just catch everything
-    begin
-      res = HTTP.post(uri(device_name, barcode, order.universal_test_id), :body => data.to_json)
-    rescue Exception => e
-      puts "EXCEPTION"
-      p e
-    end
+    HTTP.post(uri(device_name, barcode, order.universal_test_id), :body => data.to_json)
   end
 
 

data/lib/lis/transfer/application_protocol.rb

@@ -90,11 +90,6 @@ module LIS::Transfer
       end
     end
 
-    def write(type, message=nil)
-      warn "[S] #{message}" if type == :message and $VERBOSE
-      super
-    end
-
     # @yield data
     def sending_session(data)
       # don't send anything if there are no pending requests

data/lib/lis/transfer/astm_e1394.rb

@@ -32,7 +32,7 @@ module LIS::Transfer
                 #  |   `------------------ message
                 #  `---------------------- frame number
           )
-        /xm
+        /xmn
 
     def initialize(*args)
       super(*args)

data/lib/lis/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module LIS
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end
 

data/lis.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "httparty"
   s.add_dependency "rake"
   s.add_dependency "main"
+  s.add_dependency "json"
 
   s.add_development_dependency("shoulda", ">= 3.1.0")
   s.add_development_dependency("mocha", ">= 0.12.0")

data/test/test_astm_e1394.rb

@@ -74,7 +74,7 @@ class TestPacketizedProtocol < Test::Unit::TestCase
     end
 
     should "propagate only packet data" do
-      @str = "\0023L|1\r\0033C\r\n"
+      @str = "\0023L|1\r\0033C\r\n".force_encoding("ASCII-8BIT")
       @protocol.receive("\005")
       @protocol.receive(@str)
       @protocol.receive("\004")

data/test/test_messages.rb

@@ -1,10 +1,12 @@
+# encoding: utf-8
+
 require 'helper'
 
 class TestMessages < Test::Unit::TestCase
 
   context "parsing an order message" do
     setup do
-      @str = "O|1|8780||^^^ATA|R|||||||||||||||||||B0135"
+      @str = "O|1|8780||^^^ATA|R|||||||||||||||||||B0135".force_encoding("ASCII-8BIT")
       @message = LIS::Message::Base.from_string(@str)
     end
 
@@ -24,7 +26,7 @@ class TestMessages < Test::Unit::TestCase
 
   context "parsing a comment message" do
     setup do
-      @str = "C|1|BAD_QC|"
+      @str = "C|1|BAD_QC|".force_encoding("ASCII-8BIT")
       @message = LIS::Message::Base.from_string(@str)
     end
 
@@ -33,9 +35,26 @@ class TestMessages < Test::Unit::TestCase
     end
   end
 
+  context "parsing a patient message" do
+    setup do
+      @str = "P|1|123||123|Müller^Ulrich Peter||||||||".force_encoding("ASCII-8BIT")
+      @message = LIS::Message::Base.from_string(@str)
+    end
+
+    should "have correct type" do
+      assert_equal LIS::Message::Patient, @message.class
+      assert_equal "P", @message.type_id
+    end
+
+    should "have correct name" do
+      assert_equal "Müller^Ulrich Peter".force_encoding("ASCII-8BIT"), @message.name # FIXME, this should be utf8
+    end
+
+  end
+
   context "parsing a result message" do
     setup do
-      @str = "R|1|^^^TSH|0.902|mIU/L|0.400\\0.004^4.00\\75.0|N|N|R|||20100115105636|20100115120641|B0135"
+      @str = "R|1|^^^TSH|0.902|mIU/L|0.400\\0.004^4.00\\75.0|N|N|R|||20100115105636|20100115120641|B0135".force_encoding("ASCII-8BIT")
       @message = LIS::Message::Base.from_string(@str)
     end
 
@@ -65,7 +84,7 @@ class TestMessages < Test::Unit::TestCase
     end
 
     should "parse empty result messages without error" do
-      @message = LIS::Message::Base.from_string("R|1|^^^||||||X|||||LIAISON")
+      @message = LIS::Message::Base.from_string("R|1|^^^||||||X|||||LIAISON".force_encoding("ASCII-8BIT"))
       assert_equal LIS::Message::Result, @message.class
     end
   end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: lis
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
+  prerelease: 
 platform: ruby
 authors:
 - Levin Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packet_io
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: main
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,23 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -201,27 +238,28 @@ files:
 - vendor/lis.service
 homepage: http://github.com/levinalex/lis
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: LIS interface to Siemens Immulite 2000XPi or other similar analyzers
 test_files:
 - features/communication basics.feature

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzJkNjFkOTYxYWNlY2RiMzhkOGI5OThiOGMyYmQxZDFhNmFhNTBjZA==
-  data.tar.gz: !binary |-
-    OGQxMjljYWQ1ZmE4MzAzZTIyYjczOWYxNjFjNTVjZGI4ZGZmZWViNw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZTZlM2E4ZTcwMTE4M2EwMTY3ZjZkZDg5OWI4NTQwNDRjNGRiMGZkYTY1YTYz
-    MGMyZWU3MzQ3ZDU3MWJlMjkwMWI4M2FmMDY2MDZhYTEzMmYzMDJkZTU3OWIz
-    MmYwOGEzMTk1NDFjZTE2OTJkOTI5Y2VjM2Q3MDQxMjA4NDQyMjI=
-  data.tar.gz: !binary |-
-    NTQ5MTQxMjgwN2E2N2M2NjczM2FhMGY0MTljNjA2Mjc3ODViMDFhODAxZWIx
-    MmNiYjM1MDA3N2NlOTBkMWU4NTAxOGM5NjUzOTZkM2IyNTY3NjM0Y2QxMTAz
-    N2QxYzY0NTNmOGZjNGVjYjg1MTZmNTMwNzFkYjc1NWUxMzZhMTI=