zebra-zpl 1.0.5 → 1.1.0

data/spec/zebra/zpl/text_spec.rb

@@ -3,46 +3,46 @@ require 'spec_helper'
 
 describe Zebra::Zpl::Text do
   it "can be initialized with the position of the text to be printed" do
-    text = described_class.new :position => [20, 40]
-    text.position.should == [20,40]
-    text.x.should == 20
-    text.y.should == 40
+    text = described_class.new position: [20, 40]
+    expect(text.position).to eq [20,40]
+    expect(text.x).to eq 20
+    expect(text.y).to eq 40
   end
 
   it "can be initialized with the text rotation" do
     rotation = Zebra::Zpl::Rotation::DEGREES_90
-    text = described_class.new :rotation => rotation
-    text.rotation.should == rotation
+    text = described_class.new rotation: rotation
+    expect(text.rotation).to eq rotation
   end
 
   it "can be initialized with the font_size to be used" do
     font_size = Zebra::Zpl::FontSize::SIZE_1
-    text = described_class.new :font_size => font_size
-    text.font_size.should == font_size
+    text = described_class.new font_size: font_size
+    expect(text.font_size).to eq font_size
   end
 
-  it "can be initialized with the horizontal multiplier" do
-    multiplier = Zebra::Zpl::HorizontalMultiplier::VALUE_1
-    text = described_class.new :h_multiplier => multiplier
-    text.h_multiplier.should == multiplier
-  end
-
-  it "can be initialized with the vertical multiplier" do
-    multiplier = Zebra::Zpl::VerticalMultiplier::VALUE_1
-    text = described_class.new :v_multiplier => multiplier
-    text.v_multiplier.should == multiplier
-  end
+  # it "can be initialized with the horizontal multiplier" do
+  #   multiplier = Zebra::Zpl::HorizontalMultiplier::VALUE_1
+  #   text = described_class.new h_multiplier: multiplier
+  #   expect(text.h_multiplier).to eq multiplier
+  # end
+  #
+  # it "can be initialized with the vertical multiplier" do
+  #   multiplier = Zebra::Zpl::VerticalMultiplier::VALUE_1
+  #   text = described_class.new v_multiplier: multiplier
+  #   expect(text.v_multiplier).to eq multiplier
+  # end
 
   it "can be initialized with the data to be printed" do
     data = "foobar"
-    text = described_class.new :data => data
-    text.data.should == data
+    text = described_class.new data: data
+    expect(text.data).to eq data
   end
 
   it "can be initialized with the printing mode" do
     print_mode = Zebra::Zpl::PrintMode::REVERSE
-    text = described_class.new :print_mode => print_mode
-    text.print_mode.should == print_mode
+    text = described_class.new print_mode: print_mode
+    expect(text.print_mode).to eq print_mode
   end
 
   describe "#rotation=" do
@@ -61,21 +61,21 @@ describe Zebra::Zpl::Text do
     end
   end
 
-  describe "#h_multiplier=" do
-    it "raises an error if the received multiplier is invalid" do
-      expect {
-        described_class.new.h_multiplier = 9
-      }.to raise_error(Zebra::Zpl::HorizontalMultiplier::InvalidMultiplierError)
-    end
-  end
-
-  describe "#v_multiplier=" do
-    it "raises an error if the received multiplier is invalid" do
-      expect {
-        described_class.new.v_multiplier = 10
-      }.to raise_error(Zebra::Zpl::VerticalMultiplier::InvalidMultiplierError)
-    end
-  end
+  # describe "#h_multiplier=" do
+  #   it "raises an error if the received multiplier is invalid" do
+  #     expect {
+  #       described_class.new.h_multiplier = 9
+  #     }.to raise_error(Zebra::Zpl::HorizontalMultiplier::InvalidMultiplierError)
+  #   end
+  # end
+  #
+  # describe "#v_multiplier=" do
+  #   it "raises an error if the received multiplier is invalid" do
+  #     expect {
+  #       described_class.new.v_multiplier = 10
+  #     }.to raise_error(Zebra::Zpl::VerticalMultiplier::InvalidMultiplierError)
+  #   end
+  # end
 
   describe "#print_mode=" do
     it "raises an error if the received print mode is invalid" do
@@ -86,24 +86,26 @@ describe Zebra::Zpl::Text do
   end
 
   describe "#to_zpl" do
-    subject(:text) { described_class.new :position => [100, 150], :font_size => Zebra::Zpl::FontSize::SIZE_3, :data => "foobar" }
+    subject(:text) { described_class.new position: [100, 150], font_size: Zebra::Zpl::FontSize::SIZE_3, data: "foobar" }
+    subject(:text_bold) { described_class.new position: [100, 150], font_size: Zebra::Zpl::FontSize::SIZE_3, bold: true, data: "foobar" }
+    subject(:tokens) { text.to_zpl.split(/(\^[A-Z]+|\,)/).reject{ |e| ['', ',', nil].include?(e) } }
 
     it "raises an error if the X position was not informed" do
-      text = described_class.new :position => [nil, 100], :data => "foobar"
+      text = described_class.new position: [nil, 100], data: "foobar"
       expect {
         text.to_zpl
       }.to raise_error(Zebra::Zpl::Printable::MissingAttributeError, "Can't print if the X value is not given")
     end
 
     it "raises an error if the Y position was not informed" do
-      text = described_class.new :position => [100, nil]
+      text = described_class.new position: [100, nil]
       expect {
         text.to_zpl
       }.to raise_error(Zebra::Zpl::Printable::MissingAttributeError, "Can't print if the Y value is not given")
     end
 
     it "raises an error if the font_size is not informed" do
-      text = described_class.new :position => [100, 100], :data => "foobar"
+      text = described_class.new position: [100, 100], data: "foobar"
       expect {
         text.to_zpl
       }.to raise_error(Zebra::Zpl::Printable::MissingAttributeError, "Can't print if the font_size to be used is not given")
@@ -116,24 +118,24 @@ describe Zebra::Zpl::Text do
       }.to raise_error(Zebra::Zpl::Printable::MissingAttributeError, "Can't print if the data to be printed is not given")
     end
 
-    it "begins width the 'A' command" do
-      text.to_zpl.should =~ /\AA/
+    it "contains the '^FB' command" do
+      expect(text.to_zpl).to match /\^FB/
     end
 
-    it "assumes 1 as the default horizontal multipler" do
-      text.to_zpl.split(",")[4].to_i.should == Zebra::Zpl::HorizontalMultiplier::VALUE_1
+    it "contains the attributes in correct order" do
+      expect(text.to_zpl).to eq '^FWN^CF0,28^CI28^FO100,150^FB,4,,L,^FDfoobar^FS'
     end
 
-    it "assumes 1 as the default vertical multiplier" do
-      text.to_zpl.split(",")[5].to_i.should == Zebra::Zpl::VerticalMultiplier::VALUE_1
+    it "contains the properly duplicated attributes in correct order for bold text" do
+      expect(text_bold.to_zpl).to eq '^FWN^CF0,28^CI28^FO102,150^FB,4,,L,^FDfoobar^FS^FWN^CF0,28^CI28^FO100,152^FB,4,,L,^FDfoobar^FS'
     end
 
-    it "assumes the normal print mode as the default" do
-      text.to_zpl.split(",")[6].should == Zebra::Zpl::PrintMode::NORMAL
-    end
-
-    it "assumes no rotation by default" do
-      text.to_zpl.split(",")[2].to_i.should == Zebra::Zpl::Rotation::NO_ROTATION
-    end
+    # it "assumes 1 as the default horizontal multipler" do
+    #   expect(text.to_zpl.split(",")[4].to_i).to eq Zebra::Zpl::HorizontalMultiplier::VALUE_1
+    # end
+    #
+    # it "assumes 1 as the default vertical multiplier" do
+    #   expect(text.to_zpl.split(",")[5].to_i).to eq Zebra::Zpl::VerticalMultiplier::VALUE_1
+    # end
   end
 end

data/zebra-zpl.gemspec

@@ -1,30 +1,29 @@
 # coding: utf-8
-# lib = File.expand_path('../lib', __FILE__)
-# $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-$LOAD_PATH.push File.expand_path('lib', __dir__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'zebra/zpl/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "zebra-zpl"
+  spec.name          = 'zebra-zpl'
   spec.version       = Zebra::Zpl::VERSION
-  spec.authors       = ["Barnabas Bulpett"]
-  spec.email         = ["barnabasbulpett@gmail.com"]
+  spec.authors       = ['Barnabas Bulpett','Michael King','Logan Green']
+  spec.email         = ['barnabasbulpett@gmail.com','mtking1123@gmail.com','loganagreen95@gmail.com']
   spec.description   = %q{Print labels using ZPL2 and Ruby}
   spec.summary       = %q{Simple DSL to create labels and send them to a Zebra printer using Ruby, ZPL2 and CUPS}
 
-  spec.homepage      = "https://github.com/bbulpett/zebra-zpl"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/bbulpett/zebra-zpl'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  # spec.add_dependency "cups"
+  spec.add_dependency 'img2zpl', '~> 1.0.0'
 
-  spec.add_development_dependency "bundler", ">= 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 13'
+  spec.add_development_dependency 'rspec', '~> 3.9'
+  spec.add_development_dependency 'guard', '~> 2.15'
+  spec.add_development_dependency 'guard-rspec', '~> 4.7'
 end

metadata

@@ -1,112 +1,149 @@
 --- !ruby/object:Gem::Specification
 name: zebra-zpl
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Barnabas Bulpett
+- Michael King
+- Logan Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: img2zpl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.15'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
 description: Print labels using ZPL2 and Ruby
 email:
 - barnabasbulpett@gmail.com
+- mtking1123@gmail.com
+- loganagreen95@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE
 - LICENSE_ORIGINAL.txt
 - README.md
 - Rakefile
+- docs/example.rb
+- docs/images/barcode.png
+- docs/images/datamatrix.png
+- docs/images/earth.jpg
+- docs/images/graphics.png
+- docs/images/image.png
+- docs/images/image_inverted.png
+- docs/images/images.png
+- docs/images/justification.png
+- docs/images/qrcode.png
+- docs/images/rotation.png
+- docs/images/text.png
 - lib/zebra/print_job.rb
 - lib/zebra/zpl.rb
 - lib/zebra/zpl/barcode.rb
 - lib/zebra/zpl/barcode_type.rb
 - lib/zebra/zpl/box.rb
 - lib/zebra/zpl/character_set.rb
+- lib/zebra/zpl/comment.rb
 - lib/zebra/zpl/country_code.rb
+- lib/zebra/zpl/datamatrix.rb
 - lib/zebra/zpl/font.rb
+- lib/zebra/zpl/graphic.rb
+- lib/zebra/zpl/image.rb
 - lib/zebra/zpl/justification.rb
 - lib/zebra/zpl/label.rb
 - lib/zebra/zpl/language.rb
 - lib/zebra/zpl/multipliers.rb
+- lib/zebra/zpl/pdf417.rb
 - lib/zebra/zpl/print_mode.rb
 - lib/zebra/zpl/printable.rb
 - lib/zebra/zpl/qrcode.rb
@@ -114,12 +151,18 @@ files:
 - lib/zebra/zpl/rotation.rb
 - lib/zebra/zpl/text.rb
 - lib/zebra/zpl/version.rb
+- spec/fixtures/default.jpg
 - spec/spec_helper.rb
 - spec/zebra/print_job_spec.rb
 - spec/zebra/zpl/barcode_spec.rb
 - spec/zebra/zpl/box_spec.rb
 - spec/zebra/zpl/character_set_spec.rb
+- spec/zebra/zpl/comment_spec.rb
+- spec/zebra/zpl/datamatrix_spec.rb
+- spec/zebra/zpl/graphics_spec.rb
+- spec/zebra/zpl/image_spec.rb
 - spec/zebra/zpl/label_spec.rb
+- spec/zebra/zpl/pdf417_spec.rb
 - spec/zebra/zpl/qrcode_spec.rb
 - spec/zebra/zpl/text_spec.rb
 - spec/zebra/zpl/zpl_spec.rb
@@ -149,12 +192,18 @@ specification_version: 4
 summary: Simple DSL to create labels and send them to a Zebra printer using Ruby,
   ZPL2 and CUPS
 test_files:
+- spec/fixtures/default.jpg
 - spec/spec_helper.rb
 - spec/zebra/print_job_spec.rb
 - spec/zebra/zpl/barcode_spec.rb
 - spec/zebra/zpl/box_spec.rb
 - spec/zebra/zpl/character_set_spec.rb
+- spec/zebra/zpl/comment_spec.rb
+- spec/zebra/zpl/datamatrix_spec.rb
+- spec/zebra/zpl/graphics_spec.rb
+- spec/zebra/zpl/image_spec.rb
 - spec/zebra/zpl/label_spec.rb
+- spec/zebra/zpl/pdf417_spec.rb
 - spec/zebra/zpl/qrcode_spec.rb
 - spec/zebra/zpl/text_spec.rb
 - spec/zebra/zpl/zpl_spec.rb