lis 0.4.9 → 0.4.10

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("ASCII-8BIT") if @data.respond_to?(:force_encoding)
-  @packets = @data.split("\002").select { |s| s =~ /^\d[A-Z]/n }
+  @data.force_encoding("utf-8") if @data.respond_to?(:force_encoding)
+  @packets = @data.split("\002").select { |s| s =~ /^\d[A-Z]/ }
   @packets.zip(text.split(/\n/)) do |actual, expected|
     @called = true
-    rx =  Regexp.new("^" + Regexp.escape(expected.strip.force_encoding('ASCII-8BIT')), Regexp::NOENCODING)
-    assert_match(rx, actual.gsub(/\r\003.*$/n, "").strip)
+    rx =  Regexp.new("^" + Regexp.escape(expected.strip))
+    assert_match(rx, actual.gsub(/\r\003.*$/, "").strip)
   end
   assert_equal(true, @called)
 end

data/lib/lis/transfer/astm_e1394.rb

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

data/lib/lis/version.rb

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

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".force_encoding("ASCII-8BIT")
+      @str = "\0023L|1\r\0033C\r\n"
       @protocol.receive("\005")
       @protocol.receive(@str)
       @protocol.receive("\004")

data/test/test_messages.rb

@@ -1,12 +1,10 @@
-# 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".force_encoding("ASCII-8BIT")
+      @str = "O|1|8780||^^^ATA|R|||||||||||||||||||B0135"
       @message = LIS::Message::Base.from_string(@str)
     end
 
@@ -26,7 +24,7 @@ class TestMessages < Test::Unit::TestCase
 
   context "parsing a comment message" do
     setup do
-      @str = "C|1|BAD_QC|".force_encoding("ASCII-8BIT")
+      @str = "C|1|BAD_QC|"
       @message = LIS::Message::Base.from_string(@str)
     end
 
@@ -35,26 +33,9 @@ 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".force_encoding("ASCII-8BIT")
+      @str = "R|1|^^^TSH|0.902|mIU/L|0.400\\0.004^4.00\\75.0|N|N|R|||20100115105636|20100115120641|B0135"
       @message = LIS::Message::Base.from_string(@str)
     end
 
@@ -84,7 +65,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".force_encoding("ASCII-8BIT"))
+      @message = LIS::Message::Base.from_string("R|1|^^^||||||X|||||LIAISON")
       assert_equal LIS::Message::Result, @message.class
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lis
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packet_io