lis 0.2.2 → 0.2.3

data/features/lis.feature

@@ -7,7 +7,7 @@ Feature:
     Given LIS Interface listening for messages
     And the following requests are pending for DPC:
       | id     | patient_id | last_name | first_name | test_names                   |
-      | 123ABC | 98         | Sierra    | Rudolph    | TSH, FT3, FT4, FOO, BAR, BAZ |
+      | 123ABC | 98         | Müller    | Rudolph    | TSH, FT3, FT4, FOO, BAR, BAZ |
     When receiving data
     """
       1H|\^&||PASSWORD|DPC||Randolph^New^Jersey^07869||(201)927-2828|N81|Your System||P|1|19940407120613 51
@@ -17,7 +17,7 @@ Feature:
     Then LIS should have sent test orders to client:
     """
       1H|\^&|||LIS||||8N1|DPC||P|1|
-      2P|1||||Sierra^Rudolph||||||||
+      2P|1||||Müller^Rudolph||||||||
       3O|1|123ABC||^^^TSH
       4O|1|123ABC||^^^FT3
       5O|1|123ABC||^^^FT4

data/features/step_definitions/lis_steps.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'mocha'
 require 'yaml'
 
@@ -8,7 +10,7 @@ Given /^LIS Interface listening for messages$/ do
   @server = LIS::InterfaceServer.create(@io, "http://localhost/lis/")
 
   stub_request(:post, /http:\/\/localhost\/lis\/result\/.*/).
-    with(:body => /.*/, :headers => {'Accept'=>'*/*', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}).
+    with(:body => /.*/, :headers => {'Accept'=>'*/*', 'Content-Type'=>'application/x-www-form-urlencoded'}).
     to_return(:status => 200, :body => "", :headers => {})
 
   @t = Thread.new do
@@ -49,17 +51,14 @@ end
 #
 Given /^the following requests are pending for (\w+):$/ do |device_name, table|
   table.hashes.each do |patient|
-    p patient
-
     body = { "patient" => { "last_name" => patient["last_name"],
                             "first_name" => patient["first_name"],
                             "id" => patient["patient_id"]},
              "id" => patient["id"],
              "types" => patient["test_names"].strip.split(/\s+/) }
-    p body
 
     stub_request(:get, "http://localhost/lis/find_requests/#{device_name}-#{patient["id"]}").
-      with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+      with(:headers => {'Accept'=>'*/*'}).
       to_return(:status => 200, :body => body.to_yaml, :headers => {})
 
   end
@@ -69,11 +68,14 @@ 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]/ }
-  @packets.zip(text.lines) do |actual, expected|
+  @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)
   end
+  assert_equal(true, @called)
 end
 
 

data/lib/lis/commands/application.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'optparse'
 
 module LIS

data/lib/lis/messages/comment.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module LIS::Message
 
   # = Comment Message

data/lib/lis/messages/header.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module LIS::Message
 
   # = Header Message

data/lib/lis/messages/order.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module LIS::Message
 
   # = Order Message

data/lib/lis/messages/patient.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module LIS::Message
 
   # = Patient Message
@@ -72,7 +74,7 @@ module LIS::Message
       self.sequence_number = sequence_number
       self.practice_assigned_patient_id = patient_id
       self.patient_id = patient_id
-      self.name = [last_name.force_encoding("UTF-8"), first_name.force_encoding("UTF-8")].join("^")
+      self.name = [last_name, first_name].join("^")
     end
 
   end

data/lib/lis/messages/query.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module LIS::Message
 
   # = Query Message

data/lib/lis/messages/result.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module LIS::Message
 
   # = Result Message

data/lib/lis/messages/terminator.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module LIS::Message
 
   # = Terminator Message

data/lib/lis/messages.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'date'
 
 module LIS::Message

data/lib/lis/transfer/application_protocol.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 
 module LIS::Transfer
   class ApplicationProtocol < ::PacketIO::Base

data/lib/lis/transfer/astm_e1394.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module LIS::Transfer
 
   module ASTM
@@ -34,14 +36,14 @@ module LIS::Transfer
 
     def initialize(*args)
       super(*args)
-      @memo = ""
+      @data = StringScanner.new("")
       @inside_transmission = false
     end
 
     def receive(data)
-      scanner = StringScanner.new(@memo + data)
-      while scanner.scan_until(RX)
-        match = scanner.matched
+      @data.concat(data)
+      while @data.scan_until(RX)
+        match = @data.matched
         case match
           when ENQ then transmission_start
           when EOT then transmission_end
@@ -51,7 +53,6 @@ module LIS::Transfer
           write :ack
         end
       end
-      @memo = scanner.rest
       nil
     end
 

data/lib/lis/version.rb

@@ -1,4 +1,6 @@
+# encoding: UTF-8
+
 module LIS
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end
 

data/lib/lis/worklist_manager_interface.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'net/http'
 require 'yaml'
 

data/lis.gemspec

@@ -20,12 +20,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = %q{LIS interface to Siemens Immulite 2000XPi or other similar analyzers}
 
-  s.add_dependency "packet_io", "~> 0.4.0.rc4"
+  s.add_dependency "packet_io", "~> 0.4.0"
 
-  s.add_development_dependency("shoulda", ["~> 2.11.3"])
-  s.add_development_dependency("mocha", ["~> 0.9.12"])
-  s.add_development_dependency("yard", ["~> 0.7.1"])
-  s.add_development_dependency("cucumber", ["~> 0.10.3"])
-  s.add_development_dependency("webmock")
+  s.add_development_dependency("shoulda", "~> 2.11.3")
+  s.add_development_dependency("mocha", "~> 0.9.12")
+  s.add_development_dependency("yard", "~> 0.7.1")
+  s.add_development_dependency("cucumber", "~> 0.10.3")
+  s.add_development_dependency("webmock", "~> 1.6.4")
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lis
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Levin Alexander
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 +02:00
+date: 2011-06-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
         - 0
-        - rc4
-        version: 0.4.0.rc4
+        version: 0.4.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,6 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 37
         segments: 
         - 2
         - 11
@@ -56,6 +58,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 0
         - 9
@@ -71,6 +74,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 0
         - 7
@@ -86,6 +90,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 10
@@ -99,11 +104,14 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   type: :development
   version_requirements: *id006
 description: ""
@@ -127,7 +135,6 @@ files:
 - features/step_definitions/lis_steps.rb
 - features/support/env.rb
 - lib/lis.rb
-- lib/lis/application_protocol.rb
 - lib/lis/commands/application.rb
 - lib/lis/interface_server.rb
 - lib/lis/messages.rb
@@ -138,7 +145,6 @@ files:
 - lib/lis/messages/query.rb
 - lib/lis/messages/result.rb
 - lib/lis/messages/terminator.rb
-- lib/lis/packetized_protocol.rb
 - lib/lis/transfer/application_protocol.rb
 - lib/lis/transfer/astm_e1394.rb
 - lib/lis/version.rb
@@ -167,6 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -175,6 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"

data/lib/lis/application_protocol.rb

@@ -1,104 +0,0 @@
-
-module LIS::Transfer
-  class ApplicationProtocol < Base
-    attr_reader :device_name
-
-    def on_result(&block)
-      @on_result_callback = block
-    end
-
-    def on_request(&block)
-      @on_request_callback = block
-    end
-
-    def received_header(message)
-      @patient_information_requests ||= {} # delete the list of patients
-      @device_name = message.sender_name
-    end
-
-    def result_for(patient, order, result)
-      @on_result_callback.call(@device_name, patient, order, result)
-    end
-
-    def received_patient_information(message)
-      @last_order = nil
-      @last_patient = message
-    end
-
-    def received_order_record(message)
-      @last_order = message
-    end
-
-    def received_result(message)
-      result_for(@last_patient, @last_order, message)
-    end
-
-    def received_request_for_information(message)
-      @patient_information_requests ||= {}
-      requests = @on_request_callback.call(@device_name, message.starting_range_id)
-      @patient_information_requests[message.sequence_number] = requests if requests
-    end
-
-    def send_pending_requests
-      sending_session(@patient_information_requests) do |patient_information|
-        patient_information.each do |sequence_nr, data|
-          write :message, LIS::Message::Patient.new(sequence_nr,
-                                                    data["patient"]["number"],
-                                                    data["patient"]["last_name"],
-                                                    data["patient"]["first_name"]).to_message
-          data["types"].each do |request|
-            write :message, LIS::Message::Order.new(sequence_nr, data["id"], request).to_message
-          end
-        end
-      end
-      @patient_information_requests = {}
-    end
-
-    def initialize(*args)
-      super
-
-      @patient_information_requests = {}
-      @last_patient = nil
-      @last_order = nil
-      @handlers = {
-        LIS::Message::Header => :received_header,
-        LIS::Message::Patient => :received_patient_information,
-        LIS::Message::Order => :received_order_record,
-        LIS::Message::Result => :received_result,
-        LIS::Message::Query => :received_request_for_information
-      }
-    end
-
-    def receive(type, message = nil)
-      warn "[R] #{message}" if type == :message and $VERBOSE
-      case type
-        when :begin
-          @last_patient = nil
-          @last_order = nil
-        when :idle
-          send_pending_requests
-        when :message
-          @message = LIS::Message::Base.from_string(message)
-          handler = @handlers[@message.class]
-          send(handler, @message) if handler
-      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
-      return if data.nil? or data.empty?
-
-      write :begin
-      write :message, LIS::Message::Header.new("LIS", @device_name).to_message
-      yield data
-      write :message, LIS::Message::Terminator.new.to_message
-      write :idle
-    end
-  end
-end

data/lib/lis/packetized_protocol.rb

@@ -1,119 +0,0 @@
-
-module LIS::Transfer
-
-  # splits a stream into lis packets and only lets packets through
-  # that are inside a session delimited by ENQ .. EOT
-  #
-  # check the checksum and do acknowledgement of messages
-  #
-  # forwards the following events:
-  #
-  # - :message, String :: when a message is received
-  # - :idle            :: when a transmission is finished (after EOT is received)
-  #
-  class PacketizedProtocol < Base
-    ACK = "\006"
-    NAK = "\025"
-    ENQ = "\005"
-    EOT = "\004"
-
-    # format of a message
-    RX = /(?:
-          \005 | # ENQ - start a transaction
-          \004 | # EOT - ends a transaction
-          \005 | # ACK
-          \025 | # NAK
-          (?:\002 (.) (.*?) \015 \003 (.+?) \015 \012) # a message with a checksum
-                #  |   |               `-- checksum
-                #  |   `------------------ message
-                #  `---------------------- frame number
-          )
-        /xm
-
-    def initialize(*args)
-      super(*args)
-      @memo = ""
-      @inside_transmission = false
-    end
-
-    def receive(data)
-      scanner = StringScanner.new(@memo + data)
-      while scanner.scan_until(RX)
-        match = scanner.matched
-        case match
-          when ENQ then transmission_start
-          when EOT then transmission_end
-          when ACK, NAK then nil
-        else
-          received_message(match)
-          write :ack
-        end
-      end
-      @memo = scanner.rest
-      nil
-    end
-
-    def write(type, data = nil)
-      str = case type
-        when :ack then ACK
-        when :nak then NAK
-        when :begin then
-          @frame_number = 0
-          ENQ
-        when :idle then EOT
-        when :message then
-          @frame_number = (@frame_number + 1) % 8
-          self.class.wrap_message(data, @frame_number)
-      else
-        raise ArgumentError
-      end
-      super(str)
-    end
-
-
-    private
-
-    def self.message_from_string(string)
-      match = string.match(RX)
-
-      frame_number, data, checksum = match[1 .. 3]
-
-      expected_checksum = (frame_number + data).each_byte.inject(16) { |a,b| (a+b) % 0x100 }
-      actual_checksum   = checksum.to_i(16)
-
-      raise "checksum mismatch" unless expected_checksum == actual_checksum
-      return [frame_number.to_i, data]
-    end
-
-    def self.wrap_message(string, frame_number)
-      frame_number = (frame_number % 8).to_s
-      checksum = (frame_number + string).each_byte.inject(16) { |a,b| (a+b) % 0x100 }
-      checksum = checksum.to_s(16).upcase.rjust(2,"0")
-
-      "\002#{frame_number}#{string}\015\003#{checksum}\015\012"
-    end
-
-
-    def received_message(message)
-      return false unless @inside_transmission
-      frame_number, message = *self.class.message_from_string(message)
-      forward(:message, message)
-    end
-
-    def transmission_start
-      return false if @inside_transmission
-      write :ack
-      forward :begin
-      @inside_transmission = true
-      true
-    end
-
-    def transmission_end
-      return false unless @inside_transmission
-      forward :idle
-      @inside_transmission = false
-      true
-    end
-  end
-
-end