thecore_print_commons 2.1.2 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d1b92c4037ed26563a1e1d0e5f25f227031ff4c0a8e53dc10f17eedb99b10f5
-  data.tar.gz: deacf2f9bbcd581b3b333aac24ed4e70dd257f86f5dad91adad804be6a9e245b
+  metadata.gz: 9ea66f408d04dee9a18484a617f170c16ca1e74ce5011b87b2063b25cfd86c0b
+  data.tar.gz: 85566448eaa20b0601a4b82e17f5d668bfefdb1e3b565c099d91bf066e463228
 SHA512:
-  metadata.gz: b0b8a1316816c8f56fc18b7e16044c97ae191c98f5f269c5839bf273e7ac6e031caf04e18b212184269f7511ff907759903d4b28f595b0bc10d86fe812e84497
-  data.tar.gz: 07e92ae60c6d391b40220e21e349bf14635b45e1fb2344c8008ac0c1dae72a5ddc4abd8407c5f2107ab3bf0d15b2c45389d5d24db2eea3382686f66c4e1ca4c5
+  metadata.gz: a4ee226bad981af3220ba0eb1dda3a4699c1967c45278a2e18fccfdca5494bbcced4a0f6f0cedaa608badb5702db4164bbddc9cfd23989c80df9a2ac9c84606a
+  data.tar.gz: 4abcbc5eea0f199b71696b2075ef3b23c4af111c1d9d51bb2c636fa7928f302f860c4494212dbb74def14d89e50713fb33c6cbd09d738dd73a3c3af78aaf4d43

data/app/models/concerns/api/printer.rb

@@ -41,5 +41,37 @@ module Api::Printer
             ::PrintWorker.perform_async(printer.ip, printer.port, text)
             { info: "Print job sent in background to #{printer.ip} on port #{printer.port}" }
         end
+
+        def self.custom_action_printer_status params
+            printer = Printer.find(params[:id])
+            ip = printer.ip
+            port = printer.port
+            begin
+                s = Socket.tcp ip, port, connect_timeout: 0.5
+                # Must create intepolation between item and template
+                # Printer.template può essere anche
+                # una parola di comando epr chiedere lo stato della stampante, solo nel caso sia ok,
+                # Allora mando la stampa
+                s.puts("~hs")
+                # Attende per la risposta (si mette in wait)
+                response = []
+                while (response_text = s.gets)
+                    response << response_text
+                    break if response.count == 3
+                end
+                s.close
+                # Rails.logger.info "PrintIt: RESPONSE: #{response.inspect}"
+                first = response[0].split(",")
+                second = response[1].split(",")
+                return "HEAD UP" if second[2].to_i == 1
+                return "RIBBON OUT" if second[3].to_i == 1
+                return "PAPER OUT" if first[1].to_i == 1
+                return "PAUSE" if first[2].to_i == 1
+                return "OK"
+            rescue
+                Rails.logger.info "PrintIt: STATUS: UNREACHABLE"
+                return "UNREACHABLE"
+            end
+        end
     end
 end

data/app/models/printer.rb

@@ -1,52 +1,8 @@
 class Printer < ApplicationRecord
   include Api::Printer
   include RailsAdmin::Printer
-  #serialize :translation, Hash
-  
-  # before_save :check_if_unique_default
-  # validates :qty, presence: true, numericality: { only_integer: true, greater_than: 0 }
-  # validates :translation, presence: true
-  
-  # def template_enum
-  #   PrintTemplate.descendants
-  # end
-  #
-  # # Array holding all the roles
-  # USED = %i[
-  #   bundle
-  #   commission
-  # ]
-  #
-  # def used_in_enum
-  #   # Do not EDIT below this line
-  #   USED.each_with_index.map {|a,i| [I18n.t("used_in.#{a.to_sym}"), (i+1).to_s]}
-  # end
-  # def has_section? section
-  #     # example called from cancan's app/models/ability.rb
-  #     # if user.has_role? :admin
-  #
-  #     # for roles array stored in db... take each value, see if it matches the second column in the roles_enum array, if so, retu the 1st col of the enum as a uprcase,space_to_underscore,symbol .
-  #     USED[self.used_in.to_i - 1].to_s == section.to_s
-  # end
-  #
-  # def self.assigned_to section
-  #   where(used_in: (USED.index(section.to_sym) + 1))
-  # end
-  
-  # Usable with CUPS (STUB)
-  # def ip_enum
-  #   # Getting from CUPS the list of configured printers
-  #   if Settings.ns(:printer_commons).cups_server.blank? || ['127.0.0.1', 'localhost'].include?(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
   
   belongs_to :print_template, inverse_of: :printers
-  has_many :print_jobs, dependent: :destroy, inverse_of: :printer
   
   validates :name, presence: true
   validates :ip, presence: true
@@ -55,18 +11,11 @@ class Printer < ApplicationRecord
   
   def online?
     begin
-      Socket.tcp(self.ip, 9100, connect_timeout: 0.5).close
+      Socket.tcp(self.ip, self.port, connect_timeout: 0.5).close
     rescue
       return false
     end
     true
   end
-  
-  
-  # private
-  # def check_if_unique_default
-  #   if self.default?
-  #     Printer.where.not(id: self.id)
-  #   end
-  # end
+
 end

data/app/workers/print_worker.rb

@@ -2,78 +2,12 @@ require 'ipaddr'
 require 'socket'
 class PrintWorker
     include Sidekiq::Worker
-    sidekiq_options retry: false
+    sidekiq_options retry: false, queue: "#{ENV["COMPOSE_PROJECT_NAME"]}_default"
     
     # ZPL print
     def perform ip, port, text
-        @pjob = PrintJob.create(printer_id: Printer.find_by(ip: ip), finished: false, iserror: false, total: 0, printed: 0)
-        status = check_status(ip)
-        print_job_status = false
-        if status == "OK"
-            begin
-                streamSock = TCPSocket.new ip, port
-                streamSock.send text, 0
-                streamSock.close
-                print_job_status = true
-            rescue
-                @pjob.update(iserror: true, description: "PRINTER ERROR: TIMEOUT")
-                print_job_status = false
-            end
-        else
-            @pjob.update(iserror: true, description: "PRINTER ERROR: #{status}")
-            print_job_status = false
-        end
-        # '~hs alla posizione 56 per 8 caratteri la quantità di etichette rimaste'
-        total = text.scan(/~PQ(\d+)/).last.first.to_i rescue 0
-        @pjob.update(printed: (print_job_status ? total : 0)) # Se risultato true, allora ha stampato tutto, altrimenti non ha stampato nulla
-        @pjob.update(total: total) # In realtà è inutile, ora manda tutto quello che può alla stampante, solo lei può andare storta
-        @pjob.update(finished: print_job_status)
+        streamSock = Socket.tcp ip, port, connect_timeout: 0.5
+        streamSock.send text, 0
+        streamSock.close
     end
-    
-    def check_status printer
-        begin
-            s = TCPSocket.new(printer, 9100)
-            # Must create intepolation between item and template
-            # Printer.template può essere anche
-            # una parola di comando epr chiedere lo stato della stampante, solo nel caso sia ok,
-            # Allora mando la stampa
-            s.puts("~hs")
-            # Attende per la risposta (si mette in wait)
-            response = []
-            while (response_text = s.gets)
-                response << response_text
-                break if response.count == 3
-            end
-            s.close
-            Rails.logger.info "PrintIt: RESPONSE: #{response.inspect}"
-            first = response[0].split(",")
-            second = response[1].split(",")
-            return "HEAD UP" if second[2].to_i == 1
-            return "RIBBON OUT" if second[3].to_i == 1
-            return "PAPER OUT" if first[1].to_i == 1
-            return "PAUSE" if first[2].to_i == 1
-            return "OK"
-        rescue
-            Rails.logger.info "PrintIt: STATUS: UNREACHABLE"
-            return "UNREACHABLE"
-        end
-    end
-    
-    # This is for cups only
-    # def perform printer_cups_name, text
-    #     # if Settings.ns(:printer_commons).cups_server.blank? || ['127.0.0.1', 'localhost'].contains(Settings.ns(:printer_commons).cups_server)
-    #     #     printer = CupsPrinter.new printer_cups_name
-    #     #     printer.print_data text, 'text/plain'
-    #     #     printer.close
-    #     # else
-    #     print_file = "/tmp/print-#{printer_cups_name}-#{Time.now.strftime '%Y%m%d%H%M%S%L'}"
-    #     puts "Creating temp file: #{print_file}"
-    #     IO.write(print_file, text)
-    #     # CupsPrinter.new printer_cups_name, hostname: Settings.ns(:printer_commons).cups_server
-    #     # printer.print_data text, 'text/plain', hostname: Settings.ns(:printer_commons).cups_server
-    #     puts "Printing with lp command on #{printer_cups_name} of #{Settings.ns(:printer_commons).cups_server} "
-    #     `cupsenable "#{printer_cups_name}";lp -d "#{printer_cups_name}" -h "#{Settings.ns(:printer_commons).cups_server}" -o raw "#{print_file}"`
-    #     File.delete print_file
-    #     # end
-    # end
 end

data/config/initializers/abilities_thecore_print_commons_concern.rb

@@ -2,21 +2,7 @@ module Abilities
     class ThecorePrintCommon
         include CanCan::Ability
         def initialize user
-            cannot [:destroy, :create, :update, :show], [PrintJob]
-            # if user
-            #     cannot :edi
-            #     # if the user is logged in, it can do certain tasks regardless his role
-            #     if user.admin?
-            #         # if the user is an admin, it can do a lot of things, usually
-            #     end
-
-            #     if user.has_role? :role
-            #         # a specific role, brings specific powers
-            #     end
-            # end
         end
     end
 end
 
-# # include the extension
-# TheCoreAbilities.send(:include, ThecorePrintCommonAbilitiesConcern)

data/db/seeds.rb

@@ -1,2 +1 @@
 puts "Loading ThecorePrintCommons seeds"
-Settings.ns(:printer_commons).cups_server = 'localhost'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_print_commons
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.6
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_background_jobs
@@ -35,13 +35,10 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/thecore_print_commons_manifest.js
-- app/models/concerns/api/print_job.rb
 - app/models/concerns/api/print_template.rb
 - app/models/concerns/api/printer.rb
-- app/models/concerns/rails_admin/print_job.rb
 - app/models/concerns/rails_admin/print_template.rb
 - app/models/concerns/rails_admin/printer.rb
-- app/models/print_job.rb
 - app/models/print_template.rb
 - app/models/printer.rb
 - app/workers/print_worker.rb
@@ -53,8 +50,6 @@ files:
 - config/locales/telnet_print.it.yml
 - config/routes.rb
 - db/migrate/20160323152041_create_printers.rb
-- db/migrate/20160407141529_create_print_jobs.rb
-- db/migrate/20160407152547_add_fields_to_print_job.rb
 - db/migrate/20160413115407_add_temperature_to_printer.rb
 - db/migrate/20160519093702_create_print_templates.rb
 - db/migrate/20160519124051_add_print_template_id_to_printer.rb

data/app/models/concerns/api/print_job.rb

@@ -1,30 +0,0 @@
-module Api::PrintJob
-    extend ActiveSupport::Concern
-    
-    included do
-        # Use @@json_attrs to drive json rendering for 
-        # API model responses (index, show and update ones).
-        # For reference:
-        # https://api.rubyonrails.org/classes/ActiveModel/Serializers/JSON.html
-        # The object passed accepts only these keys:
-        # - only: list [] of model fields to be shown in JSON serialization
-        # - except: exclude these fields from the JSON serialization, is a list []
-        # - methods: include the result of some method defined in the model
-        # - include: include associated models, it's an object {} which also accepts the keys described here
-        cattr_accessor :json_attrs
-        @@json_attrs = ::ModelDrivenApi.smart_merge (json_attrs || {}), {}
-        
-        # Here you can add custom actions to be called from the API
-        # The action must return an serializable (JSON) object.
-        # Here you can find an example, in the API could be called like:
-        # 
-        # GET /api/v2/:model/:id?do=test&custom_parameter=hello
-        #
-        # Please uncomment it to test with a REST client.
-        # Please take note on the fact that, if the do params is test, the custom
-        # action definition must be, like below self.custom_action_test.
-        # def self.custom_action_test id=nil, params=nil
-        #     { test: [ :first, :second, :third ], id: id, params: params}
-        # end
-    end
-end

data/app/models/concerns/rails_admin/print_job.rb

@@ -1,19 +0,0 @@
-module RailsAdmin::PrintJob
-    extend ActiveSupport::Concern
-    included do
-        # Here You can define the RailsAdmin DSL
-        rails_admin do
-            # rails_admin do
-            navigation_label I18n.t("admin.settings.label")
-            navigation_icon 'fa fa-check-square'
-            parent Printer
-            
-            field :printer
-            field :created_at
-            field :description
-            list do
-                field :printed_on_total
-            end
-        end
-    end
-end

data/app/models/print_job.rb

@@ -1,10 +0,0 @@
-class PrintJob < ApplicationRecord
-    include Api::PrintJob
-    include RailsAdmin::PrintJob
-
-    belongs_to :printer, inverse_of: :print_jobs
-    
-    def printed_on_total
-        "#{printed}/#{total}"
-    end
-end

data/db/migrate/20160407141529_create_print_jobs.rb

@@ -1,10 +0,0 @@
-class CreatePrintJobs < ActiveRecord::Migration[4.2]
-    def change
-      create_table :print_jobs do |t|
-        t.boolean :finished, default: false
-        t.references :printer, index: true, foreign_key: true
-  
-        t.timestamps null: false
-      end
-    end
-  end

data/db/migrate/20160407152547_add_fields_to_print_job.rb

@@ -1,9 +0,0 @@
-class AddFieldsToPrintJob < ActiveRecord::Migration[4.2]
-    def change
-        add_column :print_jobs, :iserror, :boolean, default: false
-        add_column :print_jobs, :description, :string
-        add_index :print_jobs, :description
-        add_column :print_jobs, :printed, :integer
-        add_column :print_jobs, :total, :integer
-    end
-end