lis 0.4.6 → 0.4.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzMwYzc5MjBhMGU1NjRkMjY3ZjAwNDIxNjYwZTZmMDRlODU0ZTE5Ng==
+    YzJkNjFkOTYxYWNlY2RiMzhkOGI5OThiOGMyYmQxZDFhNmFhNTBjZA==
   data.tar.gz: !binary |-
-    NTcyYmJjMWU3ZjMwNzk0MTNhNGY3OTFkMWY3NWE2ZmE5NmFiNDIyNw==
+    OGQxMjljYWQ1ZmE4MzAzZTIyYjczOWYxNjFjNTVjZGI4ZGZmZWViNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGE4ZmZmMzQ1MGM4NTg3ZTI3MzI4MjVhZjdmODBjODU5Y2Y2NzIxZjI4Mjcz
-    NDg4OTc1M2Y1Mjk2ZjZhMDgzYzA4YjEyMjNiOTkzNjZkYTBmNmZmYWE3Y2Ey
-    YzJkYmZkNGNmNjBjYjZlOWMwOTRhMWEwODdhNmVjYmU5ODJhNWE=
+    ZTZlM2E4ZTcwMTE4M2EwMTY3ZjZkZDg5OWI4NTQwNDRjNGRiMGZkYTY1YTYz
+    MGMyZWU3MzQ3ZDU3MWJlMjkwMWI4M2FmMDY2MDZhYTEzMmYzMDJkZTU3OWIz
+    MmYwOGEzMTk1NDFjZTE2OTJkOTI5Y2VjM2Q3MDQxMjA4NDQyMjI=
   data.tar.gz: !binary |-
-    NWExYzhmMmY0Y2U4ZjZlYTM2OTY3NmFiYzlhMmJkZmIxODkzNzM4MGY0Mjdm
-    NTE4NjM4OTllNTUxOWNlNmNjZTg0MzBjMjQxOTYzMTYzNDA3OTM2NzY4NDA4
-    MzI5ZWU3MGQ5OWMxZjY4Zjc1N2NhM2Y1M2IyMTQxYzliYWRhMDc=
+    NTQ5MTQxMjgwN2E2N2M2NjczM2FhMGY0MTljNjA2Mjc3ODViMDFhODAxZWIx
+    MmNiYjM1MDA3N2NlOTBkMWU4NTAxOGM5NjUzOTZkM2IyNTY3NjM0Y2QxMTAz
+    N2QxYzY0NTNmOGZjNGVjYjg1MTZmNTMwNzFkYjc1NWUxMzZhMTI=

data/features/step_definitions/lis_steps.rb

@@ -1,8 +1,5 @@
 # encoding: UTF-8
 
-
-
-
 Given /^LIS Interface listening for messages$/ do
   @client, @r, @w = PacketIO::Test::MockServer.build
   @io = PacketIO::IOListener.new(@r, @w)

data/features/support/env.rb

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 
 require 'lis'
 
-require 'mocha'
+require 'mocha/setup'
 require 'yaml'
 require 'aruba/cucumber'
 

data/lib/lis.rb

@@ -1,5 +1,7 @@
 require 'packet_io'
 require 'yaml'
+require 'json'
+require 'base64'
 
 require 'lis/version'
 require 'lis/messages.rb'

data/lib/lis/http_interface.rb

@@ -3,6 +3,13 @@
 require 'httparty'
 
 class LIS::HTTPInterface
+  class HTTP
+    include HTTParty
+    format :json
+    headers 'Accept' => 'application/json', 'Content-Type' => 'application/json'
+  end
+
+
   def initialize(endpoint)
     @endpoint = endpoint
   end
@@ -17,7 +24,7 @@ class LIS::HTTPInterface
   #
   def load_requests(device_name, barcode)
     begin
-      result = HTTParty.get(uri(device_name, barcode))
+      result = HTTP.get(uri(device_name, barcode))
       data = LIS::Data::Request.from_yaml(result.body, barcode)
     rescue Exception => e
       puts e
@@ -25,8 +32,6 @@ class LIS::HTTPInterface
       data = nil
     end
 
-    warn "data: #{data.inspect}" if $VERBOSE
-
     data
   end
 
@@ -51,7 +56,7 @@ class LIS::HTTPInterface
 
     # FIXME: WTF: should not just catch everything
     begin
-      res = HTTParty.post(uri(device_name, barcode, order.universal_test_id), :body => data)
+      res = HTTP.post(uri(device_name, barcode, order.universal_test_id), :body => data.to_json)
     rescue Exception => e
       puts "EXCEPTION"
       p e
@@ -65,7 +70,6 @@ class LIS::HTTPInterface
     id = [device_name, barcode].join("-")
 
     s = [@endpoint, id, test_name].compact.join("/")
-    warn "uri: #{s}" if $VERBOSE
 
     s
   end

data/lib/lis/messages/result.rb

@@ -39,7 +39,7 @@ module LIS::Message
     has_field 13, :test_completed_at, :type => :timestamp
 
     def raw_data
-      to_message
+      Base64.encode64(to_message)
     end
 
     def universal_test_id

data/lib/lis/transfer/astm_e1394.rb

@@ -16,16 +16,16 @@ module LIS::Transfer
   # - :idle            :: when a transmission is finished (after EOT is received)
   #
   class ASTM::E1394 < ::PacketIO::Base
+    EOT = "\004"
+    ENQ = "\005"
     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
+          \005 | # ENQ - start a transaction
+          \006 | # ACK
           \025 | # NAK
           (?:\002 (.) (.*?) \015 \003 (.+?) \015 \012) # a message with a checksum
                 #  |   |               `-- checksum

data/lib/lis/version.rb

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

data/test/helper.rb

@@ -6,6 +6,8 @@ require 'mocha/setup'
 
 require 'lis'
 
+$VERBOSE = true
+
 WebMock.disable_net_connect!
 
 class Test::Unit::TestCase

data/test/test_http_interface.rb

@@ -23,7 +23,10 @@ class TestHTTPInterface < Test::Unit::TestCase
                         "test_name"=>"TSTID",
                         "unit"=>"mIU/mL",
                         "value"=>"8.2",
-                        "raw"=>@string}).
+                        "raw" => Base64.encode64(@string)
+                      },
+              :headers => { 'Accept' => 'application/json',
+                            'Content-Type' => 'application/json' }).
         to_return(:status => 200, :body => "", :headers => {})
 
       @interface.send_result(@device_name, @order, @result)

data/vendor/lis.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=LIS
+ConditionPathExists=/dev/ttyUSB0
+After=network.target
+
+[Service]
+ExecStart=lis server -v /dev/ttyUSB0 http://lis.example/lis
+Restart=always
+User=user
+
+[Install]
+WantedBy=multi-user.target

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lis
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Levin Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packet_io
@@ -198,6 +198,7 @@ files:
 - test/test_astm_e1394.rb
 - test/test_http_interface.rb
 - test/test_messages.rb
+- vendor/lis.service
 homepage: http://github.com/levinalex/lis
 licenses: []
 metadata: {}