oxen_printer 0.4.9 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccc96e760b55fdbc7c035dfd03d880cf6d7ff47f
-  data.tar.gz: 71462500f21a098ea8355a8aa97ef87d0cc13bb5
+  metadata.gz: 340746cbd0ae2f5b42b4a107cfad60536344c0d2
+  data.tar.gz: 2f5c4a6d37163862c201f48a806a39d59236a7bb
 SHA512:
-  metadata.gz: 55f4764eee03eac1cd77439e82176a30aa7c53c777be10400d046056073534834988eb92f15f2967f34a12ff19a53d6fca462f8e6e4d75ba64af74803e9d790b
-  data.tar.gz: 86d248ea702636eb9675068ff40be5ebd34893012c7a204c8bd2674b2ba94a32fbfb1aeda94c7e69a9d26710ef8e6b023b5374ce8ced23e115f86093621d0b3d
+  metadata.gz: 075756650f64d9a6c174aaa4f1a28210fef375602a97368895db2742d7d04ebdec6b87d656b8e919b6bdd43e503a1a8c60b460082f360c5d227c4cd213db7f67
+  data.tar.gz: 26fc948fd43ac1f86a700a19c4bdec3190baba26228987e4ddcee9aa899b1f13d0b534f3d6419c4a855214fd45b274ec76a84fa0f3974f2d240a05816db8a6ac

data/app/views/oxen/print_jobs/_print_job.html.haml

@@ -1,3 +1,3 @@
-%tr{ id: "tr-#{resource_class}-#{resource.id}"}
+%tr{ id: "tr-#{resource.id}"}
   %td= link_to resource.name, resource
   %td= show_resource_delete_icon resource, '/admin/print_jobs'

data/app/views/oxen/print_jobs/_printer_print_job.html.haml

@@ -1,4 +1,4 @@
-%tr{ id: "tr-#{resource_class}-#{resource.id}"}
+%tr{ id: "tr-#{print_job.id}"}
   %td= link_to parent.name, parent
   %td= link_to print_job.name, print_job
   %td= show_resource_delete_icon print_job, '/admin/print_jobs'

data/app/views/oxen/printers/_account_printer.html.haml

@@ -1,4 +1,4 @@
-%tr{ id: "tr-#{resource_class}-#{printer.id}"}
+%tr{ id: "tr-#{printer.id}"}
   %td= link_to printer.name, printer
   %td= show_resource_delete_icon printer, '/admin/printers'
   -# - if parent? && parent_name == 'users'

data/app/views/oxen/printers/_printer.html.haml

@@ -1,3 +1,3 @@
-%tr{ id: "tr-#{resource_class}-#{resource.id}"}
+%tr{ id: "tr-#{resource.id}"}
   %td= link_to resource.name, resource
   %td= show_resource_delete_icon resource, '/admin/printers'

data/app/views/oxen/printers/_user_printer.html.haml

@@ -1,4 +1,4 @@
-%tr{ id: "tr-#{resource_class}-#{printer.id}"}
+%tr{ id: "tr-#{printer.id}"}
   %td= link_to printer.name, printer
   %td= show_resource_delete_icon printer, '/admin/printers'
   - if parent?

data/lib/action_printer.rb

@@ -126,8 +126,11 @@ class ActionPrinter < ActionView::Base
   end
 
   def print_print prn, print_job, args
+    paper = args.delete(:paper)
     args[:copies] ||= 1
-    cmd = build_print_cmd prn, args
+    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 args[:copies].to_i > 1
       cmdargs = cmd.split(" ")
       f = cmdargs.pop
@@ -142,13 +145,6 @@ class ActionPrinter < ActionView::Base
     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/version.rb

@@ -1,3 +1,3 @@
 module OxenPrinter
-  VERSION = "0.4.9"
+  VERSION = "0.4.11"
 end

data/lib/print_engine.rb

@@ -53,76 +53,11 @@ 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'
@@ -214,21 +149,21 @@ module PrintEngine
     #
     # find the best printer for the job
     def base.default_printer usr, printer_name, paper=nil
-      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 printer_name=="default"
         if paper.nil?
-          usr.printers.active.preferred_printer.first or raise NoPreferredPrintersFound.new('No preferred printers found!')
+          printer = (usr.printers.empty? ? nil : usr.printers.active.preferred_printer.first)
+          printer = Printer.new() if printer.nil? #or raise NoPreferredPrintersFound.new('No preferred printers found!')
         else
-          usr.printers.active.preferred_printer.on_paper(paper).first || usr.printers.on_paper(paper).first or raise NoPreferredPrintersFound.new('No preferred printers found!')
+          printer = (usr.printers.empty? ? nil : (usr.printers.active.preferred_printer.on_paper(paper).first || usr.printers.on_paper(paper).first ) )
+          printer = Printer.new() if printer.nil? #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)
@@ -244,5 +179,70 @@ 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.9
+  version: 0.4.11
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oxen_job
@@ -69,13 +69,11 @@ 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

data/app/controllers/oxen/printservers_controller.rb

@@ -1,39 +0,0 @@
-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/models/ox_printserver.rb

@@ -1,21 +0,0 @@
-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