zebra-zpl 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f71f645c261f13d07c249d0aa2185d0457eb9cd82950bccc7cece4affd4e8ae
-  data.tar.gz: 54584c33bbadbc85afdd1d3d6909ed2f97fb310a914fbb06937563c6382699a5
+  metadata.gz: fd34dee028d5f1722409a1976624d6b34412730dbeaae95cca39994416a562d5
+  data.tar.gz: 7d1f93a2ca77cd89d365b3b830eb27ed7efefa9bb12a06a42ab195c6d5088917
 SHA512:
-  metadata.gz: fa31bbcf69048fb620115dfd1e7da60d7c01dc366486019cccefb0d70889c4028676a539375dffec5cface9693fb00f64bf21a97ada1394847710ec60b6cf129
-  data.tar.gz: 0c07546694365b8549429e9690de5942f2c161703c3c5691336f44a109906fcabd8b207a123dacef94e93ecabb675011b84afdb23224e7e3497cd0e6b84cb029
+  metadata.gz: 3987b04350d612a3168247e181072d4f906ba0ed30e87f6b5acfd1be01907142bddac4aec4237cf1301b16c7d90f2ae4d2ba0ee29057f8dd6d4657ac2cb4d0d0
+  data.tar.gz: 47baa040cbad0068c9d7cf4ddad08fc25e48dcfb84ddf8b9f01eb01251a894e159c1214afc3d18bc7102df0c3170043b90ab3571262d0cc044dea71cc9ade798

data/.gitignore

@@ -1,4 +1,4 @@
-
+*.gem
 *.rbc
 .bundle
 .config

data/CHANGELOG.md

@@ -1,7 +1,12 @@
-### 1.1.1 (next)
+### 1.1.3 (next)
 
 * Your contribution here.
 
+### 1.1.2 (02/25/2019)
+
+* [#63](https://github.com/bbulpett/zebra-zpl/pull/63): Un-restrict font size - [@mtking2](https://github.com/mtking2)
+* [#62](https://github.com/bbulpett/zebra-zpl/pull/62): Add print service option for print jobs (`lp`/`rlpr`) - [@LagTag](https://github.com/LagTag)
+
 ### 1.1.1 (12/19/2019)
 
 * [#58](https://github.com/bbulpett/zebra-zpl/pull/58): Add access to source `Img2Zpl::Image` object - [@mtking2](https://github.com/mtking2)

data/README.md

@@ -97,6 +97,18 @@ print_job.print label, ip
 
 This will persist the label contents to a tempfile (using Ruby's tempfile core library) and copy the file to the printer using either `rlpr -H <hostname/ip> -P <your-printer-name-on-windows> -o <path-to-the-temp-file>` (for Windows systems, see [section](#printing-directly-to-windows-lpd) below) or `lp -h <hostname/ip> -d <your-printer-name-on-cups> -o raw <path-to-the-tempfile>` (for Unix systems). All the tempfile creation/path resolution, as well as which command has to be used, are handled by the `PrintJob` class.
 
+##### Print Service
+
+You can specify what print service command you want to be used when calling the `print` method by setting the `:print_service` option parameter. If left unspecified, it will attempt to send the print job first via `rlpr` - if the `rlpr` command fails in anyway then it will fall back to the `lp` command.
+
+```ruby
+print_job.print label, ip, print_service: 'lp'  # attempt only via the lp command
+
+print_job.print label, ip, print_service: 'rlpr'  # attempt only via the rlpr command
+
+print_job.print label, ip  # attempt via rlpr first, fallback to lp
+```
+
 #### Printing directly to Windows LPD
 This gem also supports printing directly to shared printer on Windows using LPD.
 In order to print directly to a LPD on a Windows machine you need two things:

data/lib/zebra/print_job.rb

@@ -7,7 +7,7 @@ module Zebra
       @printer = printer
     end
 
-    def print(label, ip)
+    def print(label, ip, print_service: "")
       @remote_ip = ip
       if label.is_a? String
         tempfile = Tempfile.new "zebra_label"
@@ -16,15 +16,22 @@ module Zebra
       else
         tempfile = label.persist
       end
-      send_to_printer tempfile.path
+      send_to_printer(tempfile.path, print_service)
     end
 
     private
 
-    def send_to_printer(path)
+    def send_to_printer(path, print_service)
       puts "* * * * * * * * * * * * Sending file to printer #{@printer} at #{@remote_ip} * * * * * * * * * * "
-      result = system("rlpr -H #{@remote_ip} -P #{@printer} -o #{path} 2>&1") # try printing to LPD on windows machine first
-      system("lp -h #{@remote_ip} -d #{@printer} -o raw #{path}") if !result # print to unix (CUPS) if rlpr failed
+      case print_service
+      when "rlpr"
+        system("rlpr -H #{@remote_ip} -P #{@printer} -o #{path} 2>&1") # try printing to LPD on windows machine 
+      when "lp"
+        system("lp -h #{@remote_ip} -d #{@printer} -o raw #{path}") # print to unix (CUPS) using lp
+      else 
+        result = system("rlpr -H #{@remote_ip} -P #{@printer} -o #{path} 2>&1") # try printing to LPD on windows machine first
+        system("lp -h #{@remote_ip} -d #{@printer} -o raw #{path}") if !result # print to unix (CUPS) if rlpr failed
+      end
     end
   end
 end

data/lib/zebra/zpl/font.rb

@@ -15,7 +15,7 @@ module Zebra
       SIZE_9 = 133 # 48pt
 
       def self.valid_font_size?(font_size)
-        [12, 17, 22, 28, 33, 44, 67, 100, 111, 133].include?(font_size.to_i)
+        (0..32000).include?(font_size.to_i)
       end
 
       def self.validate_font_size(font_size)

data/lib/zebra/zpl/version.rb

@@ -1,5 +1,5 @@
 module Zebra
   module Zpl
-    VERSION = '1.1.1'.freeze
+    VERSION = '1.1.2'.freeze
   end
 end

data/spec/zebra/zpl/text_spec.rb

@@ -56,7 +56,10 @@ describe Zebra::Zpl::Text do
   describe "#font_size=" do
     it "raises an error if the received font_size is invalid" do
       expect {
-        described_class.new.font_size = 6
+        described_class.new.font_size = -1
+      }.to raise_error(Zebra::Zpl::FontSize::InvalidFontSizeError)
+      expect {
+        described_class.new.font_size = 32001
       }.to raise_error(Zebra::Zpl::FontSize::InvalidFontSizeError)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zebra-zpl
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Barnabas Bulpett
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: img2zpl