smartware 0.2.1 → 0.2.2

data/lib/smartware/clients/printer.rb

@@ -10,46 +10,31 @@ module Smartware
 
       def self.error
         @device.error
-      rescue => e
-        'No device'
       end
 
       def self.model
         @device.model
-      rescue => e
-        'No device'
       end
 
       def self.version
         @device.version
-      rescue => e
-        'No device'
       end
 
       def self.test
         @device.test
-      rescue => e
-        'No device'
       end
 
       def self.print(text, max_time = 30)
         @device.print text, max_time
-      rescue => e
-        'No device'
       end
 
       def self.print_text(text, max_time = 30)
         @device.print_text text, max_time
-      rescue => e
-        'No device'
       end
 
       def self.print_markdown(text, max_time = 30)
         @device.print_markdown text, max_time
-      rescue => e
-        'No device'
       end
-
     end
   end
 end

data/lib/smartware/clients/watchdog.rb

@@ -10,26 +10,18 @@ module Smartware
 
       def self.error
         @device.error
-      rescue => e
-        'No device'
       end
 
       def self.model
         @device.model
-      rescue => e
-        'No device'
       end
 
       def self.version
         @device.version
-      rescue => e
-        'No device'
       end
 
       def self.reboot_modem
         @device.reboot_modem
-      rescue => e
-        'No device'
       end
     end
   end

data/lib/smartware/drivers/printer/esc_pos.rb

@@ -229,8 +229,14 @@ module Smartware
           styled(UNDERLINE) { text }
         end
 
-        def normal_text(text)
-          text.encode("CP866").gsub "\n", " "
+        def normal_text(text, keep_newlines = false)
+          text.encode!("CP866")
+
+          unless keep_newlines
+            text.gsub! "\n", " "
+          end
+
+          text
         end
 
         def doc_header

data/lib/smartware/interfaces/printer.rb

@@ -12,7 +12,8 @@ module Smartware
 
         @printer_mutex = Mutex.new
         Thread.new &method(:poll)
-        @markdown = Redcarpet::Markdown.new(@device.new_render)
+        @render = @device.new_render
+        @markdown = Redcarpet::Markdown.new(@render)
       end
 
       def test
@@ -35,10 +36,20 @@ EOS
       end
 
       def print_markdown(text, max_time = 30)
-        print_text @markdown.render(text), max_time
+        do_print @markdown.render(text), max_time
       end
 
       def print_text(text, max_time = 30)
+        data = "".force_encoding("BINARY")
+        data << @render.doc_header.force_encoding("BINARY")
+        data << @render.normal_text(text, true).force_encoding("BINARY")
+        data << @render.doc_footer.force_encoding("BINARY")
+
+        do_print data, max_time
+      end
+
+      private
+      def do_print(text, max_time)
         Smartware::Logging.logger.info "Started printing"
 
         started = Time.now
@@ -75,8 +86,6 @@ EOS
         self.error.nil? || self.error >= 1000
       end
 
-      private
-
       def query_printer
         @device.query
         update_status do

data/lib/smartware/version.rb

@@ -1,3 +1,3 @@
 module Smartware
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: