extface 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 900544046448abb9c9c713e46a328fb7024a6d7b
-  data.tar.gz: bb25d5f73e3cc268ee61178863c9a40768afa006
+  metadata.gz: fc59569d61b550e245d115c0542d9803bc9ded4c
+  data.tar.gz: 16607248a89cc5776e47a9145eed8a4a68389509
 SHA512:
-  metadata.gz: f8e3ab792ef789a4a5ae4999ce42837b53b1c898a8f588306f660bf8f59a9707427177b962932800ead930d957f30df9ad0ed1c628cddc40ce16b82cab1d95b1
-  data.tar.gz: 77251dc8768f3ad7645a46d740a8d0b89cbc5082e97129116a59fa47f62de4822f7a51228fd6612ccd838577ab339dfe10c655f0a445bb76b1700d393d7f4857
+  metadata.gz: 981cd2238ba9611ea66f5375af2e34d4f33272bdc303109910e8407c979c59946881a17c234150b2275ad878e0b77df4104a6abf52b3ca6a4722870e9af3b700
+  data.tar.gz: a11e17b3b21d4600915fc7181898258a0eb28961da58d5c0bffaeb8b0d571e0819fca358037a90f573e61bbe5e0e03a6d26e3aa3f135dbd578896646e07fd538

data/app/controllers/extface/handler_controller.rb

@@ -21,7 +21,7 @@ module Extface
     ensure
       response.stream.close
     end
-    
+
     def push
       # get  request.body.read
       # if it is push message, process it
@@ -35,10 +35,10 @@ module Extface
         end
         if bytes_porcessed = device.driver.handle(@full_buffer.b)
           Extface.redis_block do |r|
-            r.set device.uuid, r.get(device.uuid)[bytes_porcessed]
+            r.set device.uuid, @full_buffer.b[bytes_porcessed..-1]
           end
         end
-        stream_job # stream right now :)
+        #stream_job # stream right now :)
         status = :ok
       end
     rescue => e

data/app/models/extface/driver/daisy_fx1200.rb

@@ -23,7 +23,7 @@ module Extface
     FISCAL = true #cash registers, fiscal printers
     REPORT = false #only transmit data that must be parsed by handler, CDR, report devices  
     
-    RESPONSE_TIMEOUT = 6  #seconds
+    RESPONSE_TIMEOUT = 3  #seconds
     INVALID_FRAME_RETRIES = 6  #seconds
     
     TAX_GROUPS_MAP = {
@@ -53,7 +53,6 @@ module Extface
           return 0 #no bytes processed
         end
       end
-      return buffer.length 
     end
     
     def autocut(partial = true) # return "P" - success, "F" - failed
@@ -70,7 +69,7 @@ module Extface
         s.fsend Sales::PRINT_NON_FISCAL_TEXT, "********************************"
         s.fsend Printer::MOVE, "1"
         s.fsend Sales::PRINT_NON_FISCAL_TEXT, "Driver: " + "#{self.class::NAME}".truncate(24)
-        s.fsend(Sales::END_NON_FISCAL_DOC)
+        s.fsend Sales::END_NON_FISCAL_DOC
         s.notify "Printing finished"
       end
     end
@@ -97,7 +96,7 @@ module Extface
     def sale_and_pay_items_session(items = [], operator = "1", password = "1")
       device.session("Fiscal Doc") do |s|
         s.notify "Fiscal Doc Start"
-        s.fsend Sales::START_FISCAL_DOC, "#{operator},#{password},00001"
+        s.fsend Sales::START_FISCAL_DOC, "#{operator || "1"},#{password || "1"},00001"
         items.each do |item|
           s.fsend Sales::SALE_AND_SHOW, build_sale_data(item[:price], item[:text1], item[:text2], item[:tax_group], item[:qty], item[:percent], item[:neto])
         end
@@ -185,7 +184,7 @@ module Extface
       end
     end
    
-    #private 
+    private 
       def bcc(buffer)
         sum = 0
         buffer.each_byte do |byte|
@@ -264,15 +263,17 @@ module Extface
         attr_reader :frame, :len, :seq, :cmd, :data, :status, :bcc
         
         validates_presence_of :frame
-        #validate :bcc_validation
-        #validate :len_validation
+        validate :bcc_validation
+        validate :len_validation
         
         def initialize(buffer)
           # test Extface::Driver::DaisyFx1200::RespFrame.new("\x16\x16\x01\x2c\x20\x2dP\x04SSSSSS\x05\BBBB\x03")
           #                              LEN   SEQ   CMD DATA    STATUS      BCC
           if match = buffer.match(/\x01(.{1})(.{1})(.{1})(.*)\x04(.{6})\x05(.{4})\x03/n)
-            @frame = match.string[match.pre_match.length..-1]
+            @frame = match.to_a.first
             @len, @seq, @cmd, @data, @status, @bcc = match.captures
+          else
+            #TODO look for NAK
           end
         end
         

data/app/models/extface/driver/epson/fiscal.rb

@@ -42,6 +42,16 @@ module Extface
       OPEN_DRAWER_1   = 0x7b
       OPEN_DRAWER_2   = 0x7c
     end
+    
+    def handle(buffer)
+      bytes_processed = 0
+      if frame_match = buffer.match(/\x02.*\x03.{4}/n)
+        frame_data = frame_match.to_s
+        rpush frame_data
+        bytes_processed = frame_match.pre_match.length + frame_data.length
+      end
+      return bytes_processed
+    end
 
     def build_packet(cmd, fields = [])
       String.new.tap() do |frame|
@@ -71,6 +81,19 @@ module Extface
         @seq += 1 if increment
         @seq = 0x20 if @seq == 0x7f
         @seq
-      end 
+      end
+      
+      class Frame
+        include ActiveModel::Validations
+        attr_reader :frame, :seq, :cmd, :fields_data, :fields, :bcc
+
+        def initialize(buffer)
+          if match = buffer.match(/\x02([\x20-\x7F])([\x30-\xaf])\x1c(.*)\x03(.{4})/n)
+            @frame = match.to_a.first
+            @seq, @cmd, @fileds_data, @bcc = match.captures
+            @fields = @fields_data.split("\x1c")
+          end
+        end
+      end
   end
 end

data/lib/extface/version.rb

@@ -1,3 +1,3 @@
 module Extface
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extface
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails