lis 0.1.0 → 0.2.1

data/.gitignore

@@ -21,3 +21,4 @@ pkg
 doc
 
 ## PROJECT::SPECIFIC
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Rakefile

@@ -1,23 +1,9 @@
-require 'rubygems'
-require 'rake'
+$LOAD_PATH.unshift './lib'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "lis"
-    gem.summary = %Q{LIS interface to Siemens Immulite 2000XPi or other similar analyzers}
-    gem.description = %Q{}
-    gem.email = "mail@levinalex.net"
-    gem.homepage = "http://github.com/levinalex/lis"
-    gem.authors = ["Levin Alexander"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_development_dependency "yard", ">= 0"
-    gem.add_development_dependency "cucumber", ">= 0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'lis'
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -26,39 +12,8 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features)
 
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
+task :default => [:test, :features]
 
-  task :features => :check_dependencies
-rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-  end
-end
-
-task :default => :test
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
-end

data/lib/lis/messages/comment.rb

@@ -0,0 +1,6 @@
+module LIS::Message
+  class Comment < Base
+    type_id "C"
+    has_field 3, :message
+  end
+end

data/lib/lis/messages/header.rb

@@ -1,7 +1,7 @@
 module LIS::Message
   class Header < Base
     type_id "H"
-    has_field  2, :delimiter_definition, :default => "^&"
+    has_field  2, :delimiter_definition, :default => "\\^&"
     has_field  4, :access_password
     has_field  5, :sender_name
     has_field  6, :sender_address

data/lib/lis/messages/patient.rb

@@ -15,7 +15,8 @@ module LIS::Message
     def initialize(sequence_number, patient_id, last_name = "", first_name = "")
       self.sequence_number = sequence_number
       self.practice_assigned_patient_id = patient_id
-      self.name = [last_name, first_name].join("^")
+      self.patient_id = patient_id
+      self.name = [last_name.force_encoding("UTF-8"), first_name.force_encoding("UTF-8")].join("^")
     end
 
   end

data/lib/lis/messages.rb

@@ -5,7 +5,7 @@ module LIS::Message
     CONVERSION_WRITER = {
       :string => lambda { |s| s },
       :int => lambda { |s| s.to_i },
-      :timestamp => lambda { |s| DateTime.strptime(s, "%Y%m%d%H%M%S") }
+      :timestamp => lambda { |s| DateTime.strptime(s, "%Y%m%d%H%M%S") rescue nil }
     }
 
     def field_count(val = nil)

data/lib/lis.rb

@@ -1,6 +1,7 @@
 $:.unshift File.dirname(__FILE__)
 
 module LIS
+  VERSION = "0.2.1"
 end
 
 require 'lis/io_listener.rb'
@@ -12,3 +13,4 @@ require 'lis/packetized_protocol.rb'
 require 'lis/application_protocol.rb'
 require 'lis/worklist_manager_interface.rb'
 require 'lis/interface_server.rb'
+

data/lis.gemspec

@@ -1,97 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require 'lis'
 
 Gem::Specification.new do |s|
   s.name = %q{lis}
-  s.version = "0.1.0"
+  s.version = LIS::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Levin Alexander"]
-  s.date = %q{2010-02-14}
-  s.default_executable = %q{lis2http}
   s.description = %q{}
   s.email = %q{mail@levinalex.net}
-  s.executables = ["lis2http"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.markdown"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     ".yardopts",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "bin/lis2http",
-     "features/communication basics.feature",
-     "features/lis.feature",
-     "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/io_listener.rb",
-     "lib/lis/messages.rb",
-     "lib/lis/messages/header.rb",
-     "lib/lis/messages/order.rb",
-     "lib/lis/messages/patient.rb",
-     "lib/lis/messages/query.rb",
-     "lib/lis/messages/result.rb",
-     "lib/lis/messages/terminator.rb",
-     "lib/lis/packetized_protocol.rb",
-     "lib/lis/worklist_manager_interface.rb",
-     "lis.gemspec",
-     "test/helper.rb",
-     "test/lib/mock_server.rb",
-     "test/messages/test_header.rb",
-     "test/messages/test_order.rb",
-     "test/messages/test_patients.rb",
-     "test/messages/test_terminator.rb",
-     "test/test_application_protocol.rb",
-     "test/test_io_listener.rb",
-     "test/test_messages.rb",
-     "test/test_packetized_protocol.rb"
-  ]
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+
   s.homepage = %q{http://github.com/levinalex/lis}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
   s.summary = %q{LIS interface to Siemens Immulite 2000XPi or other similar analyzers}
-  s.test_files = [
-    "test/helper.rb",
-     "test/lib/mock_server.rb",
-     "test/messages/test_header.rb",
-     "test/messages/test_order.rb",
-     "test/messages/test_patients.rb",
-     "test/messages/test_terminator.rb",
-     "test/test_application_protocol.rb",
-     "test/test_io_listener.rb",
-     "test/test_messages.rb",
-     "test/test_packetized_protocol.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-  end
+  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"])
 end
 

data/test/messages/test_header.rb

@@ -8,12 +8,12 @@ class TestHeaderMessages < Test::Unit::TestCase
 
     should "have sane defaults" do
       @message = LIS::Message::Header.new()
-      assert_equal "H|\^&|||SenderID||||8N1|ReceiverID||P|1|20100215172832", @message.to_message
+      assert_equal "H|\\^&|||SenderID||||8N1|ReceiverID||P|1|20100215172832", @message.to_message
     end
 
     should "have overridable sender and receiver IDs" do
       @message = LIS::Message::Header.new("SEND", "RECV", "PASSWORD")
-      assert_equal "H|\^&||PASSWORD|SEND||||8N1|RECV||P|1|20100215172832", @message.to_message
+      assert_equal "H|\\^&||PASSWORD|SEND||||8N1|RECV||P|1|20100215172832", @message.to_message
     end
   end
 end

data/test/messages/test_patients.rb

@@ -4,7 +4,7 @@ class TestPatientMessages < Test::Unit::TestCase
   context "order message" do
     should "have sane defaults" do
       @message = LIS::Message::Patient.new(1, 101, "Riker", "Al")
-      assert_equal "P|1|101|||Riker^Al||||||||", @message.to_message
+      assert_equal "P|1|101||101|Riker^Al||||||||", @message.to_message
     end
   end
 end

data/test/test_messages.rb

@@ -22,6 +22,17 @@ class TestMessages < Test::Unit::TestCase
     end
   end
 
+  context "parsing a comment message" do
+    setup do
+      @str = "C|1|BAD_QC|"
+      @message = LIS::Message::Base.from_string(@str)
+    end
+
+    should "create a comment message" do
+      assert_equal LIS::Message::Comment, @message.class
+    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"
@@ -52,6 +63,11 @@ class TestMessages < Test::Unit::TestCase
     should "return message itself on #to_message" do
       assert_equal @str, @message.to_message
     end
+
+    should "parse empty result messages without error" do
+      @message = LIS::Message::Base.from_string("R|1|^^^||||||X|||||LIAISON")
+      assert_equal LIS::Message::Result, @message.class
+    end
   end
 
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: lis
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Levin Alexander
@@ -9,52 +14,82 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 +01:00
-default_executable: lis2http
+date: 2011-05-30 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 0
+        - 9
+        - 12
+        version: 0.9.12
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 0
+        - 7
+        - 1
+        version: 0.7.1
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 0
+        - 10
+        - 3
+        version: 0.10.3
+  type: :development
+  version_requirements: *id004
 description: ""
 email: mail@levinalex.net
 executables: 
 - lis2http
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
 - .yardopts
+- Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
@@ -70,6 +105,7 @@ files:
 - lib/lis/interface_server.rb
 - lib/lis/io_listener.rb
 - lib/lis/messages.rb
+- lib/lis/messages/comment.rb
 - lib/lis/messages/header.rb
 - lib/lis/messages/order.rb
 - lib/lis/messages/patient.rb
@@ -99,25 +135,33 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: LIS interface to Siemens Immulite 2000XPi or other similar analyzers
 test_files: 
+- features/communication basics.feature
+- features/lis.feature
+- features/step_definitions/lis_steps.rb
+- features/support/env.rb
 - test/helper.rb
 - test/lib/mock_server.rb
 - test/messages/test_header.rb