extface 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6649c38c68097bd3139b52d76cd71fb9e6c5aa8
-  data.tar.gz: d990d58d8584459b9b8f6c412f8419c69f579c44
+  metadata.gz: 620cf1cae6f685a39efb3726ba1474369c1aa605
+  data.tar.gz: aedfc5fa2883237c560248fb3a36131e7673e5c5
 SHA512:
-  metadata.gz: 9f5f8c0ee1ef326ca941f7c6f9e69a97ed514262ad706ebf6921c2d8dead109aea6799472ff45a16ed07a672c4c5221965944051eefecab1157508b45614116c
-  data.tar.gz: b62354f3c6bbfe8a0e2602134dc75438cc381febf81706f17de82f13d4a70720587b27ecae55d4f5896c058e2fb662a920efc6a6d6905268edf296e9bdf9e1a1
+  metadata.gz: 7c40d300bc4137822f75ab451e727a98f8b191f872c6ba0b2c3f93198b9d4e1860ca54e39b90749651cf32f15a186dc141a5743cfee51d22314936dba3b45a1c
+  data.tar.gz: 24177763e1a4e467be1bb10577103036625d29b2034dad8bc36a164491c277a7c1ef900768784647116f6822e6fd3ee7de65287844bc0d2fe549e3bb03ea82a7

data/app/controllers/extface/devices_controller.rb

@@ -100,7 +100,7 @@ module Extface
 
       # Only allow a trusted parameter "white list" through.
       def device_params
-        params.require(:device).permit(:uuid, :name, :driver_class, :driver_id)
+        params.require(:device).permit(:uuid, :name, :driver_class, :driver_id, :encoding)
       end
   end
 end

data/app/models/extface/driver/base/print.rb

@@ -13,7 +13,14 @@ module Extface
     FISCAL = false #cash registers, fiscal printers
     REPORT = false #only transmit data that must be parsed by handler, CDR, report devices
     
-    alias_method :print, :push
+    #alias_method :print, :push
+    def print(text)
+      if device.encoding.present?
+        push text.encode(device.encoding)
+      else
+        push text
+      end
+    end
     
     def print_test_page(times = 1)
       device.session("Print Test Page") do |s|

data/app/views/extface/devices/form.html.erb

@@ -17,6 +17,12 @@
   <%= render 'object_errors', object: f.object %>
 
   <%= form_group f, :name, :text_field %>
+  <div class='form-group'>
+    <%= f.label(:encoding, class: 'col-sm-2 control-label') %>
+    <div class='col-sm-6 col-md-4'>
+      <%= f.select :encoding, Encoding.aliases.collect{ |k,v| ["#{v} (#{k})", k]}.sort, { include_blank: true }, class: "form-control" %>
+    </div>
+  </div>
 
   <div class="form-group">
     <%= f.label :driver, class: 'col-sm-2 control-label' %>

data/app/views/extface/devices/show.html.erb

@@ -31,6 +31,9 @@
       
       <dt><%= t('.driver') %></dt>
       <dd><%= @device.driver_name %></dd>
+      
+      <dt><%= t('.encoding') %></dt>
+      <dd><%= @device.encoding %></dd>
     </dl>
   </div>
   <div class='col-sm-6'>

data/db/migrate/20160828052036_add_encoding_to_extface_device.rb

@@ -0,0 +1,5 @@
+class AddEncodingToExtfaceDevice < ActiveRecord::Migration
+  def change
+    add_column :extface_devices, :encoding, :string
+  end
+end

data/lib/extface/version.rb

@@ -1,3 +1,3 @@
 module Extface
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extface
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -149,6 +149,7 @@ files:
 - db/migrate/20140303122506_change_driver_polymorphic_to_belongs_to_extface_devices.rb
 - db/migrate/20140303123022_change_polymorphic_to_has_one_to_extface_serial_configs.rb
 - db/migrate/20160103154233_add_started_at_to_extface_job.rb
+- db/migrate/20160828052036_add_encoding_to_extface_device.rb
 - lib/extface.rb
 - lib/extface/engine.rb
 - lib/extface/extfaceable.rb