Restore barcode functionality

lib/zebra/zpl/barcode.rb

@@ -34,8 +34,7 @@ def print_human_readable_code
       def to_zpl
         check_attributes
         human_readable = print_human_readable_code ? "Y" : "N"
-        # ["B#{x}", y, rotation, type, narrow_bar_width, wide_bar_width, height, human_readable, "\"#{data}\""].join(",")
-        "^FO#{x},#{y}^FB800,4,0,C,0^B#{type}#{rotation},#{height},#{human_readable},N,N^FD#{data}"
+        "^FO#{x},#{y}^BY#{narrow_bar_width}^B#{type}#{rotation},#{height},#{human_readable}^FD#{data}^FS"
       end
 
       private

lib/zebra/zpl/box.rb

@@ -7,20 +7,25 @@ class Box
 
       class InvalidLineThickness < StandardError; end
 
-      attr_reader :line_thickness, :end_position, :end_x, :end_y
+      attr_reader :line_thickness, :box_width, :box_height
 
       def line_thickness=(thickness)
         raise InvalidLineThickness unless thickness.nil? || thickness.to_i.to_s == thickness.to_s
         @line_thickness = thickness
       end
 
-      def end_position=(coords)
-        @end_position, @end_x, @end_y = coords, coords[0], coords[1]
+      def box_width=(width)
+        @box_width = width
+      end
+
+      def box_height=(height)
+        @box_height = height
       end
 
       def to_zpl
         check_attributes
-        ["X#{x}", y, line_thickness, end_x, end_y].join(",")
+        # "^FO#{x},#{y}^GB#{box_width},#{box_height},#{line_thickness}^FS"
+        "^FO#{x},#{y}^GB#{box_width},#{box_height},#{line_thickness}^FS"
       end
 
       private
@@ -32,8 +37,8 @@ def has_data?
       def check_attributes
         super
         raise MissingAttributeError.new("the line thickness is not given") unless line_thickness
-        raise MissingAttributeError.new("the horizontal end position (X) is not given") unless end_x
-        raise MissingAttributeError.new("the vertical end position (Y) is not given") unless end_y
+        raise MissingAttributeError.new("the box_width is not given") unless box_width
+        raise MissingAttributeError.new("the box_height is not given") unless box_height
       end
     end
   end

lib/zebra/zpl/label.rb

@@ -27,7 +27,7 @@ def print_speed=(s)
       end
 
       def print_density=(d)
-        raise InvalidPrintDensityError unless (0..15).include?(d)
+        raise InvalidPrintDensityError unless (0..6).include?(d)
         @print_density = d
       end
 
@@ -52,7 +52,6 @@ def dump_contents(io = STDOUT)
         io << "^PR#{print_speed}"
         # Density (D command) "Carried over from EPL, does this exist in ZPL ????"
         # io << "D#{print_density}\n" if print_density
-        # ZT = Printing from top of image buffer.
 
         # TEST ZPL (comment everything else out)...
         # io << "^XA^WD*:*.FNT*^XZ"
@@ -71,6 +70,7 @@ def dump_contents(io = STDOUT)
       end
 
       def persist
+        # debugger
         tempfile = Tempfile.new "zebra_label"
         dump_contents tempfile
         tempfile.close