extface 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d73beadf8f078541c3eda757559021bdec72b60e
-  data.tar.gz: 32bce976446f80e102c7249b5929aaddd6bf62f6
+  metadata.gz: 36f9d70cc32fe36b5ed65874e2f4fa2b77e1266e
+  data.tar.gz: 1d3ab540044049237f9f132ffee4724e9bef397e
 SHA512:
-  metadata.gz: f5916727153234700bcc3153e9887612c9fdc3d8b56350049e75f41b89b4994a6bf1062b31dd57d8bea11fbcbc997236ac1db0932942b889e974c12bf1232699
-  data.tar.gz: 8b8ea3fd5c2bf0d3f1de9bdaab44a8916f193ec994bd770e24c65b43aa785e14daa249d4380234a9ccc7baae753ea7e493274d2fcbaafd9267374b990026aab3
+  metadata.gz: 38e4217a2cb50ca418eda7e302cd6efb2f31ddcf2aedb3f7fa5b149854114b44b966b897f598ac418e46b75aa1787d54adf1a6664ce06d0725ad3a1f49ee60e4
+  data.tar.gz: df47ff4efadae51d7d283a1c00183b6dffae6d1f93008425cc97740d266873b71d878efe769d9d30bc6800e4e3c2047c18e92f5554f1e9cb86f9b5a6e4cddf14

data/app/controllers/extface/handler_controller.rb

@@ -1,7 +1,6 @@
 require_dependency "extface/application_controller"
 # while RESULT=$(curl -u extface:extface -c extface -b extface -s localhost:3003/parking/demo/park_extface/d894db672bc916676d3d004394343031); do if [ -z "$RESULT" ]; then sleep 5; else echo -e "$RESULT"; sleep 1; fi  done
 # while true; do RESULT=$(curl -u extface:extface -c extface -b extface -s localhost:3003/parking/demo/park_extface/d894db672bc916676d3d004394343031); if [ -z "$RESULT" ]; then sleep 5; else echo -e "$RESULT"; sleep 1; fi  done
-require "timeout"
 module Extface
   class HandlerController < ApplicationController
     include ActionController::Live
@@ -10,34 +9,33 @@ module Extface
     before_action :require_device
     
     def pull
-      # request.body.read usable?
+      # request.body.read usable? : YES! return number of bytes received by device
       unless device.present?
         render nothing: true, status: :not_found
       else
         response.headers['Content-Type'] = 'text/event-stream'
         # find current job or get new one
         Extface.redis_block do |r|
-          Timeout.timeout(2) do
+            start = Time.now
             if job = device.jobs.active.find_by(id: cookies[:extface]) || device.jobs.active.try(:first)
               cookies.permanent[:extface] = job.id
               p "Processing job #{job.id}"
               list, data = r.blpop(job.id, timeout: 1)
-              #TODO rescue here will loose data
               while data
                 response.stream.write data
                 r.publish(job.id, "OK")
+                if (Time.now - start) > 3.seconds
+                  p "Will continue next time"
+                  #break
+                end
                 list, data = r.blpop(job.id, timeout: 1)
               end
             end
-          end #timeout 
         end #redis block
       end
     rescue => e
-      if e.instance_of? Timeout::Error
-        p "will continue next time #{e.message}"
-      else
-        render nothing: true, status: :internal_server_error
-      end
+      p e.message
+      render nothing: true, status: :internal_server_error
     ensure
       response.stream.close
     end

data/app/models/extface/pos_print_driver.rb

@@ -9,9 +9,9 @@ module Extface
       device.session("Print Test Page") do |s|
         times.times do |t|
         s.notify "Printing Test Page #{t}"
-        s.print "******************************\r\n"
-        s.print "*  Extface Print Test Page   *\r\n"
-        s.print "******************************\r\n"
+        s.print "******************************\r\n*"
+        s.print "Extface Print Test #{t}".center(28)
+        s.print "*\r\n******************************\r\n"
 
         s.notify "Printing driver information"
         s.print "\r\nDriver:\r\n"

data/lib/extface/version.rb

@@ -1,3 +1,3 @@
 module Extface
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extface
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails