thecore_print_commons 2.1.3 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3d14d2d7122107560e3483a45aaab2f69efb513fae2f2c4368f996e79b61067
-  data.tar.gz: 69c327df788227be6659c6a6dd7ddcfda0af077bc18b82fb177b20ae3046a8f2
+  metadata.gz: ff7cb53138fab8c991338c6f585d2bc547ea34dd6c4458ce4d2fda798980db9b
+  data.tar.gz: b3d1a389e3019373b61c5776747909ccacd309294b0b3ed3e9fa94a850845237
 SHA512:
-  metadata.gz: 9841914519bfb9b77f1dd53c2f4ffcc344e411f083830a5104101be69b5ee4821636203d0c9a77cd09a7d39209b43a43098b4965236fa1f823ee6a365501c6f1
-  data.tar.gz: 826d5bd6e22ef43312e244b63ce864b6223b836f0f3ae4612516d555943b6760385b6839735f8445f96f90694bd5390c5980dbf8a42b0be87847b787aa7fc809
+  metadata.gz: cecd2553a802eb1cf908730bc636e3987c651bdbbf1cda33e0c521c26ff9e40c4397101688c1ee331b7faf2946d21b2d4687f614a3348ede4a705039a8654518
+  data.tar.gz: 0f9b85e7ea6019c63a5115f2e53d9a335710b796b539155e5354933b4792c55340b8883388640f09bf98026081e17aa531c18001ff6664eb6566cb4efd998927

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

@@ -34,11 +34,14 @@ module Api::Printer
             # single_text = "#{printer.print_template.template.gsub("%DESCRIPTION%", item.description)}"
             # text = single_text * params[:quantity].to_i
             # # Preso l'ordine mi recupero l'item e ne stampo la quantità richiesta
-            # ::PrintWorker.perform_async(printer.ip, text)
+            # ::PrintWorker.perform_async('192.168.0.1', 9100, "We all love DJ")
 
             printer = Printer.find(params[:id])
-            text = printer.print_template.template.gsub(printer.print_template.translation_matrix.lines.first, params[:barcode])
-            ::PrintWorker.perform_async(printer.ip, printer.port, text)
+            base_template = printer.print_template.template.dup
+            result = printer.print_template.translation_matrix.lines.map(&:strip).inject(base_template) do |base_template, replacement|
+                base_template.gsub("$#{replacement}", params[replacement]) unless replacement.blank? && params[replacement].blank?
+            end
+            ::PrintWorker.perform_async(printer.ip, printer.port, result)
             { info: "Print job sent in background to #{printer.ip} on port #{printer.port}" }
         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

data/app/workers/print_worker.rb

@@ -2,18 +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)
         streamSock = Socket.tcp ip, port, connect_timeout: 0.5
         streamSock.send text, 0
         streamSock.close
-        # '~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: total) # 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: true)
     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.3
+  version: 2.1.7
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-09-27 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