thecore_print_commons 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7aceabc46aadca29eed42ab86b302a444311a6
-  data.tar.gz: 0ef5ee3eede6a4257a82907831d53c2782e3f757
+  metadata.gz: 42f426c2cd6981fa5951db86546e0424c138871f
+  data.tar.gz: 204f3ecbe1f081d61fa7d738f782042ee263ae17
 SHA512:
-  metadata.gz: 335fcfe28866f97c7a3ac67989c15c37c6c426bdb7bcdfd00343e0084870e8537c4f19689807973c243f6111c7bd335fa1f32d38f06342b14e18c40efd955b69
-  data.tar.gz: 82bf01902631384e717ffffb437625760b5cede8f7493b1c7c7e1f421ce84acea34e8f695cc482445d74469dbbcfa5798edfb0b110281d8502c317fa4b7cb47f
+  metadata.gz: 5be928b5d4d53d5407de3068d7056cb4cfeef0e5cae14cf2196843bf15035b93ba2ddde84f61b6d869b9998d2a81703e5e47c09ea840668171a2cd0243e3af11
+  data.tar.gz: 73765e891970d72d3257157314ea3b4dce667ec3b0cb3d506b21c957effb409952d21f998505d9e92da3d7b48c3c9582fcc7e38ab7f4b1044bcaceef10235a91

data/app/models/printer.rb

@@ -36,7 +36,13 @@ class Printer < ApplicationRecord
 
   def ip_enum
     # Getting from CUPS the list of configured printers
-    CupsPrinter.get_all_printer_names
+    if Settings.ns(:printer_commons).cups_server.blank? || ['127.0.0.1', 'localhost'].contains(Settings.ns(:printer_commons).cups_server)
+      # Local Cups server
+      CupsPrinter.get_all_printer_names
+    else
+      # Remote Cups server
+      CupsPrinter.get_all_printer_names hostname: Settings.ns(:printer_commons).cups_server
+    end 
   end
 
   RailsAdmin.config do |config|

data/app/workers/print_worker.rb

@@ -3,7 +3,11 @@ class PrintWorker
     include Sidekiq::Worker
     def perform printer_cups_name, text
         begin
-            printer = CupsPrinter.new printer_cups_name
+            printer = if Settings.ns(:printer_commons).cups_server.blank? || ['127.0.0.1', 'localhost'].contains(Settings.ns(:printer_commons).cups_server)
+                CupsPrinter.new printer_cups_name
+            else
+                CupsPrinter.new printer_cups_name, hostname: Settings.ns(:printer_commons).cups_server
+            end
             printer.print_data text, 'text/plain'
         rescue
             Rails.logger.debug("PRINTER #{printer_cups_name} ERROR: TIMEOUT")

data/db/migrate/20181106141858_add_remote_server_setting.rb

@@ -0,0 +1,6 @@
+class AddRemoteServerSetting < ActiveRecord::Migration[5.2]
+    def up
+        Settings.ns(:printer_commons).cups_server = 'localhost'
+    end
+  end
+  

data/lib/thecore_print_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecorePrintCommons
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_print_commons
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore
@@ -75,6 +75,7 @@ files:
 - db/migrate/20160323152041_create_printers.rb
 - db/migrate/20160413115407_add_temperature_to_printer.rb
 - db/migrate/20160629140729_add_default_to_printer.rb
+- db/migrate/20181106141858_add_remote_server_setting.rb
 - lib/tasks/thecore_print_commons_tasks.rake
 - lib/thecore_print_commons.rb
 - lib/thecore_print_commons/engine.rb