oxen_printer 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a918cf905652b41bc32adc6d0c5d3221ad81e99
-  data.tar.gz: 9457bafe60e2d9d7b3e8bcbaaffcfef1d75b5b53
+  metadata.gz: 254a3bc1044f2d2f7d1dfd3655922e32c820ffd4
+  data.tar.gz: d626e235f66eb0862557cd3f92237a65af60ee82
 SHA512:
-  metadata.gz: 651448244cd3d40400babf94b94ad19ad962edde48c1740dd74f3dfa91c9aefca48d5281b725bd97e1c36662207b38e611cf4b6ce24b3b0c6b6954be8e84feab
-  data.tar.gz: 05637d38f7738235bc87e5b76ab1e6981ab0a25ecfa59b850edf7e0033116d41c44947c77f33f3b907a06f636f66a170881d3462b402f3a73643616aad54c67e
+  metadata.gz: 3ca3466c68c0e609fc0b36e959d9d0c5be4be8c7644b57ddb6dbb7b96a4e3136682876205534dadec9c4f4439bb9b442f4fd9f6d144dce3efef6f5798a0360da
+  data.tar.gz: d987b734385f15f64f36637ebd1fdecafd9d85cc3000b77bbd7bd163ec14bced011481fc1bbf19803c691abfcf2f65e9fd97fdfc89213fe5a66694d1e456625e

data/app/controllers/oxen/printservers_controller.rb

@@ -0,0 +1,39 @@
+class Oxen::PrintserversController < AbstractResourcesController
+  skip_before_filter :authenticate_user!, only: :port
+
+  def port
+    authorize Printserver.new
+    unless params[:mac].blank?
+      port = Printserver.find_by_mac_addr(params[:mac])
+      if !port
+        port = 'port not found!'
+      else
+        port = port.active ? port.port : 'printserver er ikke aktiv!'
+      end
+      render plain: port
+    end
+  end
+
+  private
+
+    def set_fab_button_options
+
+      opt = { items: {}}
+      case params[:action]
+      when 'edit','update';    opt[:items].merge! list: { ajax: 'get', icon: 'list', class: 'blue', url: "/admin/accounts/#{resource.account.id}" }
+      when 'show';             opt[:items].merge! list: { ajax: 'get', icon: 'list', class: 'blue', url: "/admin/accounts/#{resource.account.id}" }
+      # when 'index';            opt[:items].merge! list: { ajax: 'get', icon: 'list', class: 'blue', url: "/admin/accounts/#{resource.account.id}" }
+      end
+
+      @fab_button_options = opt
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def resource_params
+      params[:printserver][:mac_addr] = params[:printserver][:mac_addr].strip.gsub( / /, ':') rescue ''
+      params[:printserver][:account_id] = current_user.admin? ? (params[:parent_id] || params[:printserver][:account_id]) : current_user.account.id
+      params.require(:printserver).permit(:parent, :parent_id, :account_id, :location, :lokation, :mac_addr, :port, :active)
+    end
+
+
+end

data/app/mailers/printer_mailer.rb

@@ -1,18 +1,21 @@
 class PrinterMailer < ActionMailer::Base
   layout 'mailer'
 
-  def send_print usr, file, msg=nil
-    @usr = User.find(usr)
+  def send_print usr, file, msg=nil, subj=nil
+    @usr = usr
     fname = case file
     when /\/pdf.*$/; 'print%s.pdf' % DateTime.now.nsec
     else 'print%s.label' % DateTime.now.nsec
     end
     attachments[fname] = File.read(file) unless file.blank?
     @logo = @usr.account.logos.first.image.url rescue ""
-    @msg = msg || "Der er ikke defineret nogen printere til dette job, for dig - så jeg er nødt til at sende dig filen vedhæftet denne email! ;)Du bør kontakte din system administrator og bede om at der bliver oprettet en printer definition til denne printer jobtype, for dig!"
+    attachments.inline['logo.png'] = File.read( File.join(Rails.root,'public',@logo)) unless @logo.blank?
+
+    @msg = msg || "See attached PDF"
+    subj ||= "Kontakt administrator! Der mangler en printer definition!"
 
     mail  from: 'no-reply@wheelstore.space',
           to: @usr.email,
-          subject: "Kontakt administrator! Der mangler en printer definition!"
+          subject: subj
   end
 end

data/app/models/ox_print_job.rb

@@ -40,7 +40,7 @@ class OxPrintJob < AbstractResource
   def perform *args
     context = args[0].delete(:context)
     if !download
-      print_with rendered_on(args)
+      print_with rendered_on(args), args
     else
       send_with( rendered_on(args), context) if context
     end

data/app/models/ox_printserver.rb

@@ -0,0 +1,21 @@
+class OxPrintserver < AbstractResource
+  self.table_name = 'printservers'
+  establish_connection ((Rails.env=="development") ? :dev_oxen_tables : :oxen_tables )
+
+  has_paper_trail
+
+  belongs_to :account
+  has_many :printers, dependent: :destroy
+
+  validates :mac_addr, presence: true
+  validates :port, presence: true
+
+  scope :active, -> { where(active: true) }
+
+  def list_title
+    location
+  end
+
+
+
+end

data/config/locales/da.yml

@@ -1,4 +1,5 @@
 da:
+  print_delivered_by_email: 'Din udskrift er vedhæftet denne email'
   oxen:
     printers:
       form:

data/lib/action_printer.rb

@@ -1,6 +1,6 @@
 #encoding: utf-8
 class ActionPrinter < ActionView::Base
- 
+
   include Exceptions
 
   attr_accessor :printer, :paper
@@ -15,6 +15,10 @@ class ActionPrinter < ActionView::Base
     @printer.command
   end
 
+  def command=val
+    @printer.command=val
+  end
+
   #
   # the default rendering is from a string of chars to an html file - statically placed
   # for who ever knows the exact path to the file, to see
@@ -24,7 +28,7 @@ class ActionPrinter < ActionView::Base
     # TODO vi får en fejl her når vi begynder at mixe modellerne f.eks. Employee.find_by_sql('select * from products')
 		rc = print_job.printing_class.constantize
 		coll = rc.find_by_sql( print_job.print_sql)
-    locals = { resource_class: rc, collection: coll, resource: coll.first  }
+    locals = { resource_class: rc, collection: coll, resource: coll.first, resources: coll }
     #
     # TODO args must be mergeable ;)
     # if args.flatten.compact.any?
@@ -47,14 +51,18 @@ class ActionPrinter < ActionView::Base
   end
 
   # the default print is sending a link to the user who ordered the print
-  def do_print copies, usr=nil
-    # move pdf_file_path to a static place where it will not be accidentally deleted from
-    # static_path = File.join(Rails.root,'public','files','1.pdf')
-    # var = %x[ mv #{pdf_file_path} #{static_path}  2>&1 ]
-    # send email to usr with link
-    # raise MovingFileFailedError.new(var) unless var.blank?
-    PrinterMailer.send_print(usr,file_path).deliver_now if usr
-    true
+  #
+  def do_print print_job, args
+    result = nil
+    prn = printer
+    if prn.nil? or prn.command.blank? or prn.command=="email"
+      mail_print print_job, args
+    else
+      print_print prn, print_job, args
+    end
+  rescue => e
+    logit :error, "Printing failed! The error was #{e.message}"
+    false
   end
 
   #
@@ -96,12 +104,51 @@ class ActionPrinter < ActionView::Base
 
   def send_print_file context
     context.send_file pdf_file_path, filename: 'oxen_file', type: get_file_type, disposition: "attachment"
+    # send_file path, type: asset_content_type, disposition: 'inline', filename: filename
     # context.cookies['fileDownload'] = 'true'
     # File.open(pdf_file_path, 'r') do |fp|
     #   context.send_data fp.read.force_encoding('BINARY'), filename: 'oxen_file', type: "application/pdf", disposition: "attachment"
     # end
   end
 
+  def mail_print print_job, args
+    # move pdf_file_path to a static place where it will not be accidentally deleted from
+    # static_path = File.join(Rails.root,'public','files','1.pdf')
+    # var = %x[ mv #{pdf_file_path} #{static_path}  2>&1 ]
+    # send email to usr with link
+    # raise MovingFileFailedError.new(var) unless var.blank?
+    msg = args[:message] || "Der er ikke defineret nogen printere til dette job, for dig - så jeg er nødt til at sende dig filen vedhæftet denne email! ;)Du bør kontakte din system administrator og bede om at der bliver oprettet en printer definition til denne printer jobtype, for dig!"
+    if print_job.printed_by.nil?
+      raise PrintJobPrintingError.new t('action_printer.user_not_found')
+    else
+      PrinterMailer.send_print(print_job.printed_by,file_path,msg,t('print_delivered_by_email')).deliver_now
+    end
+  end
+
+  def print_print prn, print_job, args
+    args[:copies] ||= 1
+    cmd = build_print_cmd prn, args
+    if args[:copies].to_i > 1
+      cmdargs = cmd.split(" ")
+      f = cmdargs.pop
+      cmdargs.push "-n", args[:copies].to_i, f
+      cmd = cmdargs.join(" ")
+    end
+    # Here we start actually printing
+    # $1 is the CUPS printer
+    # $2 is the PDF file_path_and_name
+    # $3 is the PDF filename
+    # the command being something along the lines of: lp -d $1 -o media=a4 $2
+    return `#{cmd}`
+  end
+
+  def build_print_cmd prn, args
+    cups = !prn.printserver ? prn.cups_printer : "#{prn.cups_printer} -h 10.0.0.26:4#{prn.printserver.port}"
+    pdf_path =  pdf_file_path.split("/")[-1]
+    paper = args.delete(:paper) || prn.paper
+    prn.command.gsub( /\$1/, cups ).gsub( /\$2/, paper ).gsub( /\$3/, pdf_file_path ).gsub( /\$4/, pdf_path )
+  end
+
   def logit( log_type, msg )
     Rails.logger.send(log_type, "[OXEN] #{Time.now} [#{log_type.to_s}] #{msg}")
   end

data/lib/oxen_printer/cab_printer.rb

@@ -32,16 +32,15 @@ class CabPrinter < ActionPrinter
   end
 
   # CAB print last command is "A n" where n is the number of copies - an information which we add at print time
-  def do_print copies=1, usr=nil
+  def do_print print_job, args
     result = nil
     prn = printer
     unless prn.command.blank?
       if prn.command=="email"
-        prn.delete
-        return super
+        return super print_job, args
       else
-        if copies.to_i > 0
-          cpcmd = `echo 'A #{copies.to_i}\n' >> #{label_file_path}`
+        if args[:copies].to_i > 0
+          cpcmd = `echo 'A #{args[:copies].to_i}\n' >> #{label_file_path}`
           label_path =  label_file_path.split("/")[-1]
           pap = paper || prn.paper
           cmd = prn.command.gsub(/\$1/, prn.cups_printer).gsub(/\$2/, label_file_path)

data/lib/oxen_printer/pdf_printer.rb

@@ -13,36 +13,6 @@ class PdfPrinter < ActionPrinter
     false
   end
 
-  def do_print copies, usr=nil
-    result = nil
-    prn = printer
-    unless prn.command.blank?
-      if prn.command=="email"
-        prn.delete
-        return super
-      else
-        pdf_path =  pdf_file_path.split("/")[-1]
-        pap = paper || prn.paper
-        cmd = prn.command.gsub( /\$1/, prn.cups_printer ).gsub( /\$2/, pap ).gsub( /\$3/, pdf_file_path ).gsub( /\$4/, pdf_path )
-        if copies > 1
-          cmdargs = cmd.split(" ")
-          f = cmdargs.pop
-          cmdargs.push "-n", copies, f
-          cmd = cmdargs.join(" ")
-        end
-        # Here we start actually printing
-        # $1 is the CUPS printer
-        # $2 is the PDF file_path_and_name
-        # $3 is the PDF filename
-        # the command being something along the lines of: lp -d $1 -o media=a4 $2
-        return `#{cmd}`
-      end
-    end
-  rescue => e
-    logit :error, "Printing failed! The error was #{e.message}"
-    false
-  end
-
   def file_path
     pdf_file_path
   end

data/lib/oxen_printer/version.rb

@@ -1,3 +1,3 @@
 module OxenPrinter
-  VERSION = "0.4.5"
+  VERSION = "0.4.7"
 end

data/lib/print_drivers.rb

@@ -49,14 +49,31 @@ module PrintDrivers
     # print_with will use the action_printer to build the print
     # and return the resulting filepath
     #
-    def print_with action_printer
+    def print_with action_printer, args
       update_column(:state, "printing")
-      if action_printer && action_printer.do_print(copies,printed_by_id)
-        update_column(:state, 'done')
-        action_printer.file_path
+      args = set_default_args args
+      status = case args[:medium]
+      when "email"
+        if action_printer
+          printed_by.email = args[:email_to]
+          action_printer.printer.command="email"
+          action_printer.do_print(self,args)
+          update_column(:state, 'done')
+          action_printer.file_path
+        else
+          update_column(:state, 'error printing')
+          raise PrintJobPrintingError.new t('print_drivers.print_with.email_error')
+        end
+      when "printer"
+        if action_printer && action_printer.do_print(self,args)
+          update_column(:state, 'done')
+          action_printer.file_path
+        else
+          update_column(:state, 'error printing')
+          raise PrintJobPrintingError.new I18n.t('print_drivers.print_with.print_error')
+        end
       else
-        update_column(:state, 'error printing')
-        raise PrintJobPrintingError
+        raise PrintJobPrintingError.new I18n.t('print_drivers.print_with.case_error');
       end
     end
 
@@ -71,6 +88,13 @@ module PrintDrivers
       end
     end
 
+    def set_default_args args
+      args[0][:print] ||= {}
+      args[0][:print][:copies] ||= 1
+      args[0][:print][:medium] ||= "printer"
+      args[0][:print]
+    end
+
     # q%{
     #   Problem with CUPS printer definitions - losing knowledge of attached printers
     #

data/lib/print_engine.rb

@@ -10,7 +10,6 @@
 
 # http://rarlindseysmash.com/posts/config-and-generators-in-gems
 #
-
 #
 #
 # ARGS                            # first value is default
@@ -54,12 +53,88 @@ module PrintEngine
 
   include Exceptions
 
+  #
+  #
+  # # list_title
+  # def list_title
+  #   self.respond_to?( "name") ? self.name : "please define list_title on model (#{self.class.to_s})!"
+  # end
+  #
+  # # implement on relevant models
+  def find_template template, paper="A4"
+    raise 'you have to implement "def find_template(paper)" on your Model'
+    # 'label.html.haml'
+  end
+  #
+  #
+  #
+  # def set_print_defaults options
+  #   options[:context]                         ||= ""
+  #   options[:print_job][:download]            =   options[:print][:medium]=="download" || false
+  #   options[:print_job][:print_driver]        =   spot_the_driver(options)
+  #   options[:print_job][:paper]               =   options[:paper] || "A4"
+  #   options[:print_job][:view_template_path]  =   find_template( options[:template], options[:paper] ) || params[:print_job][:view_template_path]
+  #   options
+  # end
+  #
+
+  def print_label(options={})
+
+    options[:context]                   ||= ""
+    options[:print]                     ||= {}
+    options[:print][:collation]           = 'record'
+    options[:print][:paper]             ||= 'label'
+    options[:print][:output_type]       ||= 'raw'
+
+    options = self.class.set_print_job_defaults [self], options
+    options[:print_job][:print_driver]        =   options[:print][:print_driver] || :cab
+    options[:print_job][:paper]               =   options[:print][:paper] || "label"
+    options[:print_job][:print_format]        =   options[:print][:collation] || 'record'
+    options[:print_job][:view_template_path]  =   "stock_items/print/zebra_stock_items_label.html.haml"
+
+    pj = self.class.print [self], options
+  end
+
+
+  # options[:print][:printer_name] = options[:print][:printer_name] || ''
+  # options[:user] = options[:user] || current_user
+
+
+  def print_record(options={})
+
+    options[:context]                   ||= ""
+    options[:print]                     ||= {}
+    options[:print][:collation]           = 'record'
+    options[:print][:paper]             ||= 'A4'
+    options[:print][:output_type]       ||= 'pdf'
+
+    options = self.class.set_print_job_defaults [self], options
+    options[:print_job][:print_driver]        =   options[:print][:print_driver] || :pdf
+    options[:print_job][:paper]               =   options[:print][:paper] || "A4"
+    options[:print_job][:print_format]        =   options[:print][:collation] || 'record'
+    options[:print_job][:view_template_path]  =   "stock_items/print/slip.html.haml"
+
+    pj = self.class.print [self], options
+  end
+
+
+
   def self.included(base)
 
     #
     def base.print_list(options={})
+      raise NoContextFound.new('ViewContext missing!') if options[:context].blank?
+      options[:print]                     ||= {}
+      options[:print][:collation]           = 'list'
+      options[:print][:paper]             ||= 'A4'
+      options[:print][:output_type]       ||= 'pdf'
+
       options = set_print_job_defaults options[:resources], options
+      options[:print_job][:print_driver]        =   options[:print][:print_driver] || :pdf
+      options[:print_job][:paper]               =   options[:print][:paper] || "A4"
       options[:print_job][:print_format]        =   options[:print][:collation] || 'list'
+      options[:print_job][:view_template_path]  =   "stock_items/print/pdf_stock_items_list.html.haml"
+
       pj = print options[:resources], options
     end
 
@@ -73,17 +148,25 @@ module PrintEngine
     # If creating the PrintJob is successful, cycle will be called in print_job.rb
     # and the PrintJob will be enqueued in the delayed_job queue called 'printing'.
     # cycle_error will be called in print_job.rb if it cannot be enqueued sucessfully.
+    #   print[medium]                 # 'display' | 'email' | 'printer' | 'download'
+    #   print[output_type]            # 'html' | 'pdf' | 'text'
+    #   print[printer]                # what printer to send output to
+    #   print[email_to]               # email address
+    #   print[message]                # body of email
+    #   print[range]                  # which pages should print
+    #   print[copies]                 # number of copies
+
     def base.print( resources, params )
       pj = create_print_job( resources, params )
       if Rails.env=='development' or pj.download
         return pj.perform params
       else
         user = User.find(pj.printed_by_id)
-        BackgroundPrinterJob.perform_later pj, queue: "printing", account_id: user.account.id
+        BackgroundPrinterJob.perform_later pj, queue: "printing", account_id: user.account.id, print: params[:print]
         # Delayed::Job.enqueue pj, :queue => 'printing'
         # pj.cycle if Delayed::Job.enqueue pj, :queue => 'printing'
         # If you comment out above line and use below line with pj.perform instead, you thereby surpass delayed_job, and thus don't have to wait for it
-        # pj.perform
+        # pj.perform queue: "printing", account_id: user.account.id, print: params[:print]
         return pj
       end
     end
@@ -131,19 +214,21 @@ module PrintEngine
     #
     # find the best printer for the job
     def base.default_printer usr, printer_name, paper=nil
-      if printer_name=="default"
+      if printer_name!="default"
+        return Printer.find(printer_name) if printer_name.to_i.to_s == printer_name
+        Printer.active.find_by( 'name like ?',  "%#{printer_name.downcase}%") or raise NoPreferredPrintersFound.new('Printer with name not found!')
+      else
+        raise NoPreferredPrintersFound.new('No printers found!') if usr.printers.empty?
         if paper.nil?
-          printer = (usr.printers.empty? ? nil : usr.printers.active.preferred_printer.first) or raise NoPreferredPrintersFound.new('No preferred printers found!')
+          usr.printers.active.preferred_printer.first or raise NoPreferredPrintersFound.new('No preferred printers found!')
         else
-          printer = (usr.printers.empty? ? nil : (usr.printers.active.preferred_printer.on_paper(paper).first || usr.printers.on_paper(paper).first ) ) or raise NoPreferredPrintersFound.new('No preferred printers found!')
+          usr.printers.active.preferred_printer.on_paper(paper).first || usr.printers.on_paper(paper).first or raise NoPreferredPrintersFound.new('No preferred printers found!')
         end
-      else
-        printer = Printer.active.find_by( 'name like ?',  "%#{printer_name.downcase}%")
       end
-      # usr.printers.where{ (printownerables.preferred==true) & (printownerables.preferred==true) }
-
-      # raise PrintJobPrinterNotAvailableError
-      printer || Printer.first
+      # # usr.printers.where{ (printownerables.preferred==true) & (printownerables.preferred==true) }
+      #
+      # # raise PrintJobPrinterNotAvailableError
+      # printer || Printer.first
     end
 
     def base.set_resource_sql(resources,params)
@@ -159,70 +244,5 @@ module PrintEngine
     end
 
   end
-  #
-  #
-  # # list_title
-  # def list_title
-  #   self.respond_to?( "name") ? self.name : "please define list_title on model (#{self.class.to_s})!"
-  # end
-  #
-  # # implement on relevant models
-  def find_template template, paper="A4"
-    raise 'you have to implement "def find_template(paper)" on your Model'
-    # 'label.html.haml'
-  end
-  #
-  #
-  #
-  # def set_print_defaults options
-  #   options[:context]                         ||= ""
-  #   options[:print_job][:download]            =   options[:print][:medium]=="download" || false
-  #   options[:print_job][:print_driver]        =   spot_the_driver(options)
-  #   options[:print_job][:paper]               =   options[:paper] || "A4"
-  #   options[:print_job][:view_template_path]  =   find_template( options[:template], options[:paper] ) || params[:print_job][:view_template_path]
-  #   options
-  # end
-  #
-
-  def print_label(options={})
-
-    options[:context]                   ||= ""
-    options[:print]                     ||= {}
-    options[:print][:collation]           = 'record'
-    options[:print][:paper]             ||= 'label'
-    options[:print][:output_type]       ||= 'raw'
-
-    options = self.class.set_print_job_defaults [self], options
-    options[:print_job][:print_driver]        =   options[:print][:print_driver] || :cab
-    options[:print_job][:paper]               =   options[:print][:paper] || "label"
-    options[:print_job][:print_format]        =   options[:print][:collation] || 'record'
-    options[:print_job][:view_template_path]  =   "stock_items/print/zebra_stock_items_label.html.haml"
-
-    pj = self.class.print [self], options
-  end
-
-
-  # options[:print][:printer_name] = options[:print][:printer_name] || ''
-  # options[:user] = options[:user] || current_user
-
-
-  def print_record(options={})
-
-    options[:context]                   ||= ""
-    options[:print]                     ||= {}
-    options[:print][:collation]           = 'record'
-    options[:print][:paper]             ||= 'A4'
-    options[:print][:output_type]       ||= 'pdf'
-
-    options = self.class.set_print_job_defaults [self], options
-    options[:print_job][:print_driver]        =   options[:print][:print_driver] || :pdf
-    options[:print_job][:paper]               =   options[:print][:paper] || "A4"
-    options[:print_job][:print_format]        =   options[:print][:collation] || 'record'
-    options[:print_job][:view_template_path]  =   "stock_items/print/slip.html.haml"
-
-    pj = self.class.print [self], options
-  end
-
-
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxen_printer
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oxen_job
@@ -69,11 +69,13 @@ files:
 - app/assets/javascripts/oxen_printer.js
 - app/controllers/oxen/print_jobs_controller.rb
 - app/controllers/oxen/printers_controller.rb
+- app/controllers/oxen/printservers_controller.rb
 - app/jobs/background_printer_job.rb
 - app/mailers/printer_mailer.rb
 - app/models/ox_print_job.rb
 - app/models/ox_printable.rb
 - app/models/ox_printer.rb
+- app/models/ox_printserver.rb
 - app/models/ox_template.rb
 - app/policies/oxen/print_job_policy.rb
 - app/views/layouts/1mailer.html.haml
@@ -160,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: oxen_printer provides printer and print_job management.