extface 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37f9b8889693d6375eda12ef08594c25c98eb453
-  data.tar.gz: 114d8706d7eeb0b4ed151bcde9a057dbddfd8a23
+  metadata.gz: f16bc8f1e7ca869e7d047a48a537e929af5b4c47
+  data.tar.gz: 765d65dd09939aa371ed039e6b2a294a66f9de6f
 SHA512:
-  metadata.gz: 1ed1904327764ffe78fb3a8fb5511f49fc55bf582a93ff1911c47d1a98faa7abea39841162d21e24a666af0cea5a3d00058f2e157bf72517d9b83c06fb06dafc
-  data.tar.gz: d1e7fbf59ff3bdc5e2cd49ab8d63133402c6abde5f404fd1b84db4b3492d8d3f7d0b234c285cf40428bab6a7d0d1635c5b0f7322d85de309234498aa70502094
+  metadata.gz: '09bf70bedb4e4aece277206127ce886e52ff8e34d03a22b687fe1106392188ff869e2767a36f60737509a9e62d1c578260c14c22179db31e642efdc45b073a14'
+  data.tar.gz: 829d396c2765c2b7c4bd88dd552c895257da677599ee1a68a2c381f04f84725457ca4bd7dd5fae344d8517719ecb60cf60bccd70aa33aeb7a9e9a617de797755

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

@@ -209,7 +209,7 @@ module Extface
     end
     
     def build_packet(cmd, data = "")
-      String.new.tap() do |packet|
+      "".b.tap() do |packet|
         packet << STX
         packet << 0x20 + 4 + data.length
         packet << sequence_number
@@ -294,17 +294,17 @@ module Extface
    
     private
       def build_sale_data(item)
-        encoded_text1 = device.encoding.present? ? item.text1.encode(device.encoding) : item.text1
+        encoded_text1 = device.encoding.present? ? item.text1.encode(device.encoding).b : item.text1
         encoded_text1 = encoded_text1.mb_chars.limit(27).to_s + '...' if encoded_text1 && encoded_text1.b.length > 30
   
-        encoded_text2 = device.encoding.present? ? item.text2.encode(device.encoding) : item.text2
+        encoded_text2 = device.encoding.present? ? item.text2.encode(device.encoding).b : item.text2
         encoded_text2 = encoded_text1.mb_chars.limit(27).to_s + '...' if encoded_text2 && encoded_text2.b.length > 30
         
-        "".tap() do |data|
+        "".b.tap() do |data|
           data << encoded_text1 unless encoded_text1.blank?
           data << "\x0a#{encoded_text2}" unless encoded_text2.blank?
           data << "\t"
-          data << TAX_GROUPS_MAP[item.tax_group || 2]
+          data << TAX_GROUPS_MAP[item.tax_group || 2].b
           data << ("%.2f" % item.price)
           data << "*#{item.qty.to_s}" unless item.qty.blank?
           data << ",#{item.percent}" unless item.percent.blank?

data/app/models/extface/driver/datecs/dp35.rb

@@ -0,0 +1,352 @@
+module Extface
+  class Driver::Datecs::Dp35 < Extface::Driver::Base::Fiscal
+    NAME = 'Datecs DP35'.freeze
+    
+    RESPONSE_TIMEOUT = 3  #seconds
+    INVALID_FRAME_RETRIES = 6  #count (bad length, bad checksum)
+    ACKS_MAX_WAIT = 60 #count / nothing is forever
+    NAKS_MAX_COUNT = 3 #count
+    BAD_SEQ_MAX_COUNT = 3
+    NO_RESP_MAX_COUNT = 3
+    
+    TAX_GROUPS_MAP = {
+      1 => "\xc0",
+      2 => "\xc1",
+      3 => "\xc2",
+      4 => "\xc3",
+      5 => "\xc4",
+      6 => "\xc5",
+      7 => "\xc6",
+      8 => "\xc7"
+    }
+    
+    PAYMENT_TYPE_MAP = {
+      1 => "P",
+      2 => "N",
+      3 => "C",
+      4 => "D",
+      5 => "B"
+    }
+
+    include Extface::Driver::Datecs::CommandsV1
+
+    def handle(buffer)
+      #if i = buffer.index(/[\x03\x16\x15]/)   # find position of frame possible delimiter
+      if i = buffer.index("\x03") || buffer.index("\x16") || buffer.index("\x15")
+        rpush buffer[0..i]                    # this will make data available for #pull(timeout) method
+        return i+1                            # return number of bytes processed
+      end
+    end
+    
+    #tests
+    def non_fiscal_test
+      device.session("Non Fiscal Text") do |s|
+        s.notify "Printing Non Fiscal Text"
+        s.open_non_fiscal_doc
+        s.print "********************************"
+        s.print "Extface Print Test".center(32)
+        s.print "********************************"
+        s.fsend Printer::PAPER_MOVE, "1"
+        s.print "Driver: " + "#{self.class::NAME}".truncate(24)
+        s.close_non_fiscal_doc
+        s.notify "Printing finished"
+      end
+    end
+    
+    def fiscal_test
+      sale_and_pay_items_session([
+        SaleItem.new( price: 0.01, text1: "Extface Test" )
+      ])
+    end
+    
+    #reports
+    def z_report_session
+      device.session("Z Report") do |s|
+        s.notify "Z Report Start"
+        s.fsend Closure::DAY_FIN_REPORT, "0"
+        s.notify "Z Report End"
+      end
+    end
+    
+    def x_report_session
+      device.session("X Report") do |s|
+        s.notify "X Report Start"
+        s.fsend Closure::DAY_FIN_REPORT, "2"
+        s.notify "X Report End"
+      end
+    end
+    
+    def period_report_session(from, to, detailed = true)
+      device.session("Period Report #{ '(detailed)' if detailed }") do |s|
+        s.notify "Period Report Start #{ '(detailed)' if detailed }"
+        s.fsend detailed ? Reports::REPORT_FP_BY_DATE : Reports::COMPACT_REPORT_FP_BY_DATE, "#{from.strftime('%d%m%y')},#{to.strftime('%d%m%y')}"
+        s.notify "Period Report End"
+      end
+    end
+    
+    #print
+    def open_non_fiscal_doc
+      fsend Sales::START_NON_FISCAL_DOC
+      @print_session = true
+    end
+    
+    def print(text) #up to 38 sybols, TODO check
+      raise "Not in print session" unless @print_session
+      fsend Sales::PRINT_NON_FISCAL_TEXT, text
+    end
+    
+    def close_non_fiscal_doc
+      fsend Sales::END_NON_FISCAL_DOC
+      @print_session = false
+    end
+    
+    def check_status
+      flush #clear receive buffer
+      fsend(Info::GET_STATUS, 'X') # get 6 bytes status
+      errors.empty?
+    end
+    
+    #fiscal
+    def open_fiscal_doc(operator = "1", password = "0000")
+      fsend Sales::START_FISCAL_DOC, "#{operator.presence || "1"},#{password.presence || "0000"},1"
+      @fiscal_session = true
+    end
+    
+    def close_fiscal_doc
+      raise "Not in fiscal session" unless @fiscal_session
+      fsend Sales::END_FISCAL_DOC
+      @fiscal_session = false
+    end
+    
+    def add_sale(sale_item)
+      raise "Not in fiscal session" unless @fiscal_session
+      fsend Sales::SALE_AND_SHOW, build_sale_data(sale_item)
+    end
+    
+    def add_comment(text)
+      raise "Not in fiscal session" unless @fiscal_session
+    end
+    
+    def add_payment(value = nil, type_num = nil)
+      raise "Not in fiscal session" unless @fiscal_session
+      payment_data = "".tap() do |data|
+                            data << "\t"
+                            data << PAYMENT_TYPE_MAP[type_num || 1]
+                            data << ("%.2f" % value) unless value.blank?
+                          end
+      fsend(Sales::TOTAL, payment_data)
+    end
+    
+    def total_payment
+      raise "Not in fiscal session" unless @fiscal_session
+      fsend(Sales::TOTAL, "\t")
+    end
+    
+    #basket
+    def sale_and_pay_items_session(items = [], operator = "1", password = "0000")
+      device.session("Fiscal Doc") do |s|
+        s.notify "Fiscal Doc Start"
+        s.open_fiscal_doc
+        s.notify "Register Sale"
+        items.each do |item|
+          s.add_sale(item)
+        end
+        s.notify "Register Payment"
+        s.total_payment
+        s.notify "Close Fiscal Receipt"
+        s.close_fiscal_doc
+        s.notify "Fiscal Doc End"
+      end
+    end
+    
+    def cancel_doc_session
+      device.session("Doc cancel") do |s|
+        s.notify "Doc Cancel Start"
+        s.fsend Sales::CANCEL_FISCAL_DOC
+        s.paper_cut
+        s.notify "Doc Cancel End"
+      end
+    end
+    
+    #common
+    def fsend(cmd, data = "") #return data or nil
+      packet_data = build_packet(cmd, data) #store packet to be able to re-transmit it with the same sequence number
+      result = false
+      invalid_frames = 0 #counter for bad responses
+      nak_messages = 0 #counter for rejected packets (should re-transmit the packet)
+      no_resp = 0
+      flush #prevent double packet response issue like daisy driver
+      push packet_data #send packet
+      ACKS_MAX_WAIT.times do |retries|
+        errors.clear
+        if resp = frecv(RESPONSE_TIMEOUT)
+          if resp.valid?
+            human_status_errors(resp.status)
+            if errors.empty?
+              result = resp.data
+              break
+            else
+              raise errors.full_messages.join(',')
+            end
+          else #ack, nak or bad
+            if resp.nak?
+              nak_messages += 1
+              if nak_messages > NAKS_MAX_COUNT
+                errors.add :base, "#{NAKS_MAX_COUNT} NAKs Received. Abort!"
+                break
+              end
+            elsif !resp.ack?
+              invalid_frames += 1
+              if invalid_frames > INVALID_FRAME_RETRIES
+                errors.add :base, "#{INVALID_FRAME_RETRIES} Broken Packets Received. Abort!"
+                break
+              end
+            end
+            push packet_data unless resp.ack?
+          end
+        else
+          no_resp += 1
+          if no_resp > NO_RESP_MAX_COUNT
+            p "No reply in #{NO_RESP_MAX_COUNT * RESPONSE_TIMEOUT} seconds. Abort!"
+            errors.add :base, "No reply in #{NO_RESP_MAX_COUNT * RESPONSE_TIMEOUT} seconds. Abort!"
+            return result
+          end
+        end
+        errors.add :base, "#{ACKS_MAX_WAIT} ACKs Received. Abort!"
+      end
+      return result
+    end
+    
+    def frecv(timeout) # return Frame or nil
+      rframe = nil
+      BAD_SEQ_MAX_COUNT.times do
+        errors.clear
+        if frame_bytes = pull(timeout)
+          rframe = Frame.new(frame_bytes.b)
+          if rframe.seq.nil? || rframe.seq.ord == sequence_number(false) #accept only current sequence number as reply
+            break
+          else
+            errors.add :base, "Sequence mismatch"
+            p "Invalid sequence (expected: #{sequence_number(false).to_s(16)}, got: #{rframe.seq.ord.to_s(16)})"
+            rframe = nil #invalidate mismatch sequence frame for the last retry
+          end
+        else
+          errors.add :base, "No data received from device"
+          break
+        end
+      end
+      return rframe
+    end
+    
+    def build_packet(cmd, data = "")
+      "".b.tap() do |packet|
+        packet << STX                     #Preamble. 1 byte long. Value: 01H.
+        packet << 0x20 + 4 + data.b.length  #Number of bytes from <01> preamble (excluded) to <05> (included) plus the fixed offset of 20H
+        packet << sequence_number         #Sequence number of the frame. Length : 1 byte. Value: 20H – FFH.
+        packet << cmd                     #Length: 1 byte. Value: 20H - 7FH.
+        packet << data.b                  #Length: 0 - 218 bytes for Host to printer
+        packet << PA1                     #Post-amble. Length: 1 byte. Value: 05H.
+        packet << Frame.bcc(packet[1..-1])#Control sum (0000H-FFFFH). Length: 4 bytes. Value of each byte: 30H-3FH
+        packet << ETX                     #Terminator. Length: 1 byte. Value: 03H.
+      end
+    end
+    
+    def paper_cut
+      device.session('Paper Cut') do |s|
+        s.push build_packet(Printer::PAPER_CUT)
+      end
+    end
+    
+    def human_status_errors(status) #6 bytes status
+      status_0 = status[0].ord
+      errors.add :base, "Fiscal Device General Error" unless (status_0 & 0x20).zero?
+      errors.add :base, "Invalid Command" unless (status_0 & 0x02).zero?
+      errors.add :base, "Date & Time Not Set" unless (status_0 & 0x04).zero?
+      errors.add :base, "Syntax Error" unless (status_0 & 0x01).zero?
+      status_1 = status[1].ord
+      errors.add :base, "Unpermitted Command In This Mode" unless (status_1 & 0x02).zero?
+      errors.add :base, "Field Overflow" unless (status_1 & 0x01).zero?
+    end
+    
+    private
+      def build_sale_data(item)
+        "".b.tap() do |data|
+          data << item.text1.truncate(30) unless item.text1.blank?
+          data << "\x0a#{text2}" unless item.text2.blank?
+          data << "\t"
+          data << TAX_GROUPS_MAP[item.tax_group || 2]
+          data << ("%.2f" % item.price)
+          data << "*#{item.qty.to_s}" unless item.qty.blank?
+          data << ",#{item.percent}" unless item.percent.blank?
+          data << ",;#{'%.2f' % item.neto}" unless item.neto.blank?
+        end
+      end
+      
+      def sequence_number(increment = true)
+        @seq ||= 0x1f
+        @seq += 1 if increment
+        @seq = 0x1f if @seq == 0x7f
+        @seq
+      end
+      
+      class Frame
+        include ActiveModel::Validations
+        attr_reader :frame, :len, :seq, :cmd, :data, :status, :bcc
+        
+        validates_presence_of :frame#, unless: :unpacked?
+        validate :bcc_validation
+        validate :len_validation
+        
+        def initialize(buffer)
+          if match = buffer.match(/\x01(.{1})(.{1})(.{1})(.*)\x04(.{6})\x05(.{4})\x03/nm)
+            @frame = match.to_a.first
+            @len, @seq, @cmd, @data, @status, @bcc = match.captures
+          else
+            if buffer[/^\x16+$/] # only ACKs
+              @ack = true
+            elsif buffer.index("\x15")
+              @nak = true
+            end
+          end
+        end
+        
+        def ack?; !!@ack; end #should wait, response is yet to come
+        
+        def nak?; !!@nak; end #should retry command with same seq
+        
+        private
+
+          def unpacked? # is it packed or unpacked message?
+            @ack || @nak
+          end
+
+          def bcc_validation
+            unless unpacked? || frame.blank?
+              calc_bcc = self.class.bcc frame[1..-6]
+              errors.add(:bcc, I18n.t('errors.messages.invalid')) if bcc != calc_bcc
+            end
+          end
+          
+          def len_validation
+            unless unpacked? || frame.blank?
+              errors.add(:len, I18n.t('errors.messages.invalid')) if frame.nil? || len.ord != (frame[1..-6].length + 0x20)
+            end
+          end
+        
+          class << self
+            def bcc(buffer)
+              sum = 0
+              buffer.each_byte do |byte|
+                sum += byte
+              end
+              "".tap() do |bcc|
+                4.times do |halfbyte|
+                  bcc.insert 0, (0x30 + ((sum >> (halfbyte*4)) & 0x0f)).chr
+                end
+              end
+            end
+          end
+      end
+
+  end
+end

data/app/models/extface/driver/datecs/fp550.rb

@@ -269,17 +269,17 @@ module Extface
     end
     
     def build_sale_data(item)
-      encoded_text1 = device.encoding.present? ? item.text1.encode(device.encoding) : item.text1
+      encoded_text1 = device.encoding.present? ? item.text1.encode(device.encoding).b : item.text1
       encoded_text1 = encoded_text1.mb_chars.limit(27).to_s + '...' if encoded_text1 && encoded_text1.b.length > 30
 
-      encoded_text2 = device.encoding.present? ? item.text2.encode(device.encoding) : item.text2
+      encoded_text2 = device.encoding.present? ? item.text2.encode(device.encoding).b : item.text2
       encoded_text2 = encoded_text1.mb_chars.limit(27).to_s + '...' if encoded_text2 && encoded_text2.b.length > 30
       
       "".b.tap() do |data|
         data << encoded_text1 unless encoded_text1.blank?
         data << "\x0a#{encoded_text2}" unless encoded_text2.blank?
         data << "\t"
-        data << TAX_GROUPS_MAP[item.tax_group || 2]
+        data << TAX_GROUPS_MAP[item.tax_group || 2].b
         data << ("%.2f" % item.price)
         data << "*#{item.qty.to_s}" unless item.qty.blank?
         data << ",#{item.percent}" unless item.percent.blank?

data/lib/extface/version.rb

@@ -1,3 +1,3 @@
 module Extface
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/test/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy/log/test.log

@@ -18642,3 +18642,90 @@ Extface::Driver::Posiflex::Aura80Test: test_status
   Extface::Job Load (0.5ms)  SELECT "extface_jobs".* FROM "extface_jobs"  WHERE "extface_jobs"."device_id" = ?  [["device_id", 1033518405]]
   Extface::Job Load (0.5ms)  SELECT  "extface_jobs".* FROM "extface_jobs"  WHERE "extface_jobs"."device_id" = ? AND ("extface_jobs"."completed_at" IS NULL AND "extface_jobs"."failed_at" IS NULL AND "extface_jobs"."started_at" IS NOT NULL)  ORDER BY "extface_jobs"."id" ASC LIMIT 1  [["device_id", 1033518405]]
 Completed 200 OK in 10004ms (ActiveRecord: 3.2ms)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (133.3ms)  DROP TABLE IF EXISTS "extface_devices"
+   (0.3ms)  SELECT sqlite_version(*)
+   (113.7ms)  CREATE TABLE "extface_devices" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "uuid" varchar, "name" varchar, "extfaceable_id" integer, "extfaceable_type" varchar, "driver_id" integer, "created_at" datetime, "updated_at" datetime, "encoding" varchar)
+   (120.4ms)  DROP TABLE IF EXISTS "extface_drivers"
+   (155.6ms)  CREATE TABLE "extface_drivers" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "type" varchar, "settings" text, "created_at" datetime, "updated_at" datetime)
+   (167.1ms)  DROP TABLE IF EXISTS "extface_jobs"
+   (164.0ms)  CREATE TABLE "extface_jobs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "device_id" integer, "created_at" datetime, "updated_at" datetime, "description" varchar, "error" varchar, "failed_at" datetime, "completed_at" datetime, "connected_at" datetime, "started_at" datetime)
+   (229.0ms)  CREATE  INDEX "index_extface_jobs_on_device_id" ON "extface_jobs" ("device_id")
+   (172.1ms)  DROP TABLE IF EXISTS "extface_serial_configs"
+   (189.0ms)  CREATE TABLE "extface_serial_configs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "driver_id" integer, "serial_boud_rate" integer, "serial_data_length" integer, "serial_parity_check" integer, "serial_stop_bits" integer, "serial_handshake" integer, "created_at" datetime, "updated_at" datetime)
+   (226.9ms)  DROP TABLE IF EXISTS "shops"
+   (125.9ms)  CREATE TABLE "shops" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime, "updated_at" datetime)
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (186.3ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+  ActiveRecord::InternalMetadata Load (0.2ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (0.1ms)  begin transaction
+  SQL (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "test"], ["created_at", "2017-11-18 00:22:16.699389"], ["updated_at", "2017-11-18 00:22:16.699389"]]
+   (131.6ms)  commit transaction
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (3845.4ms)  DROP TABLE IF EXISTS "extface_devices"
+   (0.2ms)  SELECT sqlite_version(*)
+   (103.2ms)  CREATE TABLE "extface_devices" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "uuid" varchar, "name" varchar, "extfaceable_id" integer, "extfaceable_type" varchar, "driver_id" integer, "created_at" datetime, "updated_at" datetime, "encoding" varchar)
+   (101.1ms)  DROP TABLE IF EXISTS "extface_drivers"
+   (350.0ms)  CREATE TABLE "extface_drivers" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "type" varchar, "settings" text, "created_at" datetime, "updated_at" datetime)
+   (109.6ms)  DROP TABLE IF EXISTS "extface_jobs"
+   (131.3ms)  CREATE TABLE "extface_jobs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "device_id" integer, "created_at" datetime, "updated_at" datetime, "description" varchar, "error" varchar, "failed_at" datetime, "completed_at" datetime, "connected_at" datetime, "started_at" datetime)
+   (121.4ms)  CREATE  INDEX "index_extface_jobs_on_device_id" ON "extface_jobs" ("device_id")
+   (147.7ms)  DROP TABLE IF EXISTS "extface_serial_configs"
+   (131.3ms)  CREATE TABLE "extface_serial_configs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "driver_id" integer, "serial_boud_rate" integer, "serial_data_length" integer, "serial_parity_check" integer, "serial_stop_bits" integer, "serial_handshake" integer, "created_at" datetime, "updated_at" datetime)
+   (122.9ms)  DROP TABLE IF EXISTS "shops"
+   (111.8ms)  CREATE TABLE "shops" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime, "updated_at" datetime)
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ActiveRecord::InternalMetadata Load (0.3ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (0.1ms)  begin transaction
+   (0.1ms)  commit transaction
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (216.0ms)  DROP TABLE IF EXISTS "extface_devices"
+   (0.2ms)  SELECT sqlite_version(*)
+   (130.7ms)  CREATE TABLE "extface_devices" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "uuid" varchar, "name" varchar, "extfaceable_id" integer, "extfaceable_type" varchar, "driver_id" integer, "created_at" datetime, "updated_at" datetime, "encoding" varchar)
+   (188.6ms)  DROP TABLE IF EXISTS "extface_drivers"
+   (114.4ms)  CREATE TABLE "extface_drivers" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "type" varchar, "settings" text, "created_at" datetime, "updated_at" datetime)
+   (105.4ms)  DROP TABLE IF EXISTS "extface_jobs"
+   (114.1ms)  CREATE TABLE "extface_jobs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "device_id" integer, "created_at" datetime, "updated_at" datetime, "description" varchar, "error" varchar, "failed_at" datetime, "completed_at" datetime, "connected_at" datetime, "started_at" datetime)
+   (180.5ms)  CREATE  INDEX "index_extface_jobs_on_device_id" ON "extface_jobs" ("device_id")
+   (114.7ms)  DROP TABLE IF EXISTS "extface_serial_configs"
+   (105.8ms)  CREATE TABLE "extface_serial_configs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "driver_id" integer, "serial_boud_rate" integer, "serial_data_length" integer, "serial_parity_check" integer, "serial_stop_bits" integer, "serial_handshake" integer, "created_at" datetime, "updated_at" datetime)
+   (98.4ms)  DROP TABLE IF EXISTS "shops"
+   (106.6ms)  CREATE TABLE "shops" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime, "updated_at" datetime)
+   (0.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ActiveRecord::InternalMetadata Load (0.2ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (0.1ms)  begin transaction
+   (0.1ms)  commit transaction
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (126.0ms)  DROP TABLE IF EXISTS "extface_devices"
+   (0.3ms)  SELECT sqlite_version(*)
+   (102.4ms)  CREATE TABLE "extface_devices" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "uuid" varchar, "name" varchar, "extfaceable_id" integer, "extfaceable_type" varchar, "driver_id" integer, "created_at" datetime, "updated_at" datetime, "encoding" varchar)
+   (97.6ms)  DROP TABLE IF EXISTS "extface_drivers"
+   (89.5ms)  CREATE TABLE "extface_drivers" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "type" varchar, "settings" text, "created_at" datetime, "updated_at" datetime)
+   (101.6ms)  DROP TABLE IF EXISTS "extface_jobs"
+   (94.9ms)  CREATE TABLE "extface_jobs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "device_id" integer, "created_at" datetime, "updated_at" datetime, "description" varchar, "error" varchar, "failed_at" datetime, "completed_at" datetime, "connected_at" datetime, "started_at" datetime)
+   (97.3ms)  CREATE  INDEX "index_extface_jobs_on_device_id" ON "extface_jobs" ("device_id")
+   (108.5ms)  DROP TABLE IF EXISTS "extface_serial_configs"
+   (103.7ms)  CREATE TABLE "extface_serial_configs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "driver_id" integer, "serial_boud_rate" integer, "serial_data_length" integer, "serial_parity_check" integer, "serial_stop_bits" integer, "serial_handshake" integer, "created_at" datetime, "updated_at" datetime)
+   (93.4ms)  DROP TABLE IF EXISTS "shops"
+   (106.4ms)  CREATE TABLE "shops" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime, "updated_at" datetime)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ActiveRecord::InternalMetadata Load (0.2ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (0.1ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (70.7ms)  DROP TABLE IF EXISTS "extface_devices"
+   (0.3ms)  SELECT sqlite_version(*)
+   (63.7ms)  CREATE TABLE "extface_devices" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "uuid" varchar, "name" varchar, "extfaceable_id" integer, "extfaceable_type" varchar, "driver_id" integer, "created_at" datetime, "updated_at" datetime, "encoding" varchar)
+   (70.9ms)  DROP TABLE IF EXISTS "extface_drivers"
+   (65.5ms)  CREATE TABLE "extface_drivers" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "type" varchar, "settings" text, "created_at" datetime, "updated_at" datetime)
+   (60.4ms)  DROP TABLE IF EXISTS "extface_jobs"
+   (73.0ms)  CREATE TABLE "extface_jobs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "device_id" integer, "created_at" datetime, "updated_at" datetime, "description" varchar, "error" varchar, "failed_at" datetime, "completed_at" datetime, "connected_at" datetime, "started_at" datetime)
+   (72.2ms)  CREATE  INDEX "index_extface_jobs_on_device_id" ON "extface_jobs" ("device_id")
+   (73.2ms)  DROP TABLE IF EXISTS "extface_serial_configs"
+   (73.1ms)  CREATE TABLE "extface_serial_configs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "driver_id" integer, "serial_boud_rate" integer, "serial_data_length" integer, "serial_parity_check" integer, "serial_stop_bits" integer, "serial_handshake" integer, "created_at" datetime, "updated_at" datetime)
+   (64.6ms)  DROP TABLE IF EXISTS "shops"
+   (65.5ms)  CREATE TABLE "shops" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime, "updated_at" datetime)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (0.1ms)  begin transaction
+   (0.1ms)  commit transaction

data/test/fixtures/extface/devices.yml

@@ -23,7 +23,13 @@ datecs_dp25:
   name: Datect DP25
   extfaceable: one(Shop)
   driver: datecs_dp25
-  
+
+datecs_dp35:
+  uuid: datecs_dp35
+  name: Datect DP35
+  extfaceable: one(Shop)
+  driver: datecs_dp35
+    
 daisy_fx1200:
   uuid: daisy_fx1200
   name: Daisy Fx1200

data/test/fixtures/extface/drivers.yml

@@ -15,6 +15,9 @@ datecs_fp550:
 datecs_dp25:
   type: Extface::Driver::Datecs::Dp25
 
+datecs_dp35:
+  type: Extface::Driver::Datecs::Dp35
+  
 daisy_fx1200:
   type: Extface::Driver::DaisyFx1200
 

data/test/models/extface/driver/datecs/dp35_test.rb

@@ -0,0 +1,63 @@
+require 'test_helper'
+
+module Extface
+  class Driver::Datecs::Dp35Test < ActiveSupport::TestCase
+    setup do
+      @driver = extface_drivers(:datecs_dp35)
+      @driver.flush # clear receive buffer
+    end
+    
+    test "handle" do
+      assert_equal nil, @driver.handle('bad packet')
+      assert_equal 6, @driver.handle("\x01data\x03data"), "Frame not match"
+      assert_equal 9, @driver.handle("pre\x01data\x03data"), "Frame with preamble not match"
+      assert_equal 8, @driver.handle("\x16\x16\x01data\x03data"), "Frame with ACK preamble not match"
+      assert_equal 4, @driver.handle("pre\x15"), "NAK not match"
+    end
+    
+    test "build packet" do
+      assert_equal "\x01\x24\x20\x4a\x05\x30\x30\x39\x33\x03".b, @driver.build_packet(0x4a), "packet without data"
+      assert_equal "\x01\x25\x21\x4a\x58\x05\x30\x30\x3e\x3d\x03".b, @driver.build_packet(0x4a, 'X'), "packet with data"
+    end
+    
+    test "response frame" do
+      frame_class = @driver.class::Frame
+      assert frame_class.new("\x15").nak?, "NAK message failed"
+      assert frame_class.new("\x16\x16").ack?, "ACK message failed"
+      assert_nothing_raised do
+        assert_equal false, frame_class.new("bad data\x01\x25\x21\x4asome broken packet\x58\x05\x30\x30\x3e\x3d\x03".b).valid?
+      end
+      frame = frame_class.new("\x16\x01\x2C\x2F\x2D\x50\x04\x88\x80\xC0\x80\x80\xB0\x05\x30\x34\x35\x39\x03".b)
+      assert frame.valid?, "Vailid frame not recognized"
+      assert_equal "\x01\x2C\x2F\x2D\x50\x04\x88\x80\xC0\x80\x80\xB0\x05\x30\x34\x35\x39\x03".b, frame.frame
+      assert_equal "\x2c".b, frame.len
+      assert_equal "\x2f".b, frame.seq
+      assert_equal "\x2d".b, frame.cmd
+      assert_equal "\x50".b, frame.data
+      assert_equal "\x88\x80\xC0\x80\x80\xB0".b, frame.status
+      assert_equal "\x30\x34\x35\x39".b, frame.bcc
+      #bad check sum
+      frame = frame_class.new("\x01\x2C\x2F\x2D\x50\x04\x88\x80\xC0\x80\x80\xB0\x05\x30\x34\x35\x38\x03".b)
+      assert_equal false, frame.valid?
+      assert frame.errors.messages[:bcc]
+      #bad length
+      frame = frame_class.new("\x01\x2b\x2F\x2D\x50\x04\x88\x80\xC0\x80\x80\xB0\x05\x30\x34\x35\x38\x03".b)
+      assert_equal false, frame.valid?
+      assert frame.errors.messages[:len]
+    end
+    
+    test "fsend" do
+      job = extface_jobs(:one)
+      job_thread = Thread.new do
+        @driver.set_job(job)
+        result = @driver.fsend(0x2C) # paper move command
+      end
+      simulate_device_pull(job)
+      @driver.handle("\x01\x31\x20\x4A\x88\x80\xC0\x80\x80\xB8\x04\x88\x80\xC0\x80\x80\xB8\x05\x30\x37\x3A\x34\x03".b)
+      simulate_device_pull(job)
+      @driver.handle("\x01\x38\x21\x30\x30\x30\x30\x30\x35\x30\x2C\x30\x30\x30\x30\x34\x39\x04\x80\x80\x88\x80\x80\xB8\x05\x30\x36\x35\x30\x03".b)
+      job_thread.join
+      assert @driver.errors.empty?
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extface
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -105,6 +105,7 @@ files:
 - app/models/extface/driver/daisy_fx1200.rb
 - app/models/extface/driver/datecs/commands_v1.rb
 - app/models/extface/driver/datecs/dp25.rb
+- app/models/extface/driver/datecs/dp35.rb
 - app/models/extface/driver/datecs/fp550.rb
 - app/models/extface/driver/eltrade/commands_fp4.rb
 - app/models/extface/driver/eltrade_tm_u220.rb
@@ -259,6 +260,7 @@ files:
 - test/models/extface/device_test.rb
 - test/models/extface/driver/daisy_fx1200_test.rb
 - test/models/extface/driver/datecs/dp25_test.rb
+- test/models/extface/driver/datecs/dp35_test.rb
 - test/models/extface/driver/datecs/fp550_test.rb
 - test/models/extface/driver/generic_pos_test.rb
 - test/models/extface/driver/posiflex/aura80_test.rb
@@ -287,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: External Interfaces for Cloud-Based Applications (Rails 4)
@@ -387,6 +389,7 @@ test_files:
 - test/models/extface/driver/posiflex/aura80_test.rb
 - test/models/extface/driver/daisy_fx1200_test.rb
 - test/models/extface/driver/star_tsp200_test.rb
+- test/models/extface/driver/datecs/dp35_test.rb
 - test/models/extface/driver/datecs/fp550_test.rb
 - test/models/extface/driver/datecs/dp25_test.rb
 - test/models/extface/serial_config_test.rb