barby 0.5.0 → 0.5.1

data/CHANGELOG

@@ -1,3 +1,12 @@
+* 0.5.1
+
+* Fix some encoding issues (ruby 2.0 & 1.9)
+* Rewrite HtmlOutputter. Not entirely backwards compatible with the previous version.
+
+* 0.5.0
+
+* Require requirement of barcode symbologies in the same way outputters must be required before being used
+
 * 0.4.4
 
 * Use Gemfile for dependency management [Ken Collins]

data/README

@@ -6,6 +6,8 @@ Full list of symbologies and filenames below.
 
 ***
 
+For more information, check out the Barby wiki at https://github.com/toretore/barby/wiki
+
 Barby is a Ruby library that generates barcodes in a variety of symbologies.
 Its functionality is split into barcode and "outputter" objects. Barcode
 objects turn data into a binary representation for a given symbology.

data/lib/barby/barcode/bookland.rb

@@ -1,3 +1,4 @@
+#encoding: ASCII
 require 'barby/barcode/ean_13'
 
 module Barby

data/lib/barby/barcode/code_128.rb

@@ -1,3 +1,4 @@
+#encoding: ASCII
 require 'barby/barcode'
 
 module Barby
@@ -242,6 +243,8 @@ module Barby
         count = 0
         while count < chars.size
           if chars[count] =~ /^\d$/
+            #If encountering a digit, next char/byte *must* be second digit in pair. I.e. if chars[count] is 5,
+            #chars[count+1] must be /[0-9]/, otherwise it's not valid
             result << "#{chars[count]}#{chars[count+1]}"
             count += 2
           else

data/lib/barby/barcode/code_39.rb

@@ -1,3 +1,4 @@
+#encoding: ASCII
 require 'barby/barcode'
 
 module Barby

data/lib/barby/barcode/code_93.rb

@@ -1,3 +1,4 @@
+#encoding: ASCII
 require 'barby/barcode'
 
 module Barby

data/lib/barby/barcode/data_matrix.rb

@@ -1,4 +1,4 @@
-require 'semacode'
+require 'semacode' #Ruby 1.8: gem install semacode - Ruby 1.9: gem install semacode-ruby19
 require 'barby/barcode'
 
 module Barby

data/lib/barby/outputter.rb

@@ -58,8 +58,6 @@ module Barby
     end
 
 
-  private
-
     def two_dimensional?
       barcode.respond_to?(:two_dimensional?) && barcode.two_dimensional?
     end
@@ -107,6 +105,8 @@ module Barby
     end
 
 
+  private
+
     #Takes a hash and temporarily sets properties on self (the outputter object)
     #corresponding with the keys to their values. When the block exits, the
     #properties are reset to their original values. Returns whatever the block returns.

data/lib/barby/outputter/html_outputter.rb

@@ -2,87 +2,92 @@ require 'barby/outputter'
 
 module Barby
 
-  # Outputs an HTML representation of the barcode.
-  # 
-  # Registers to_html
-  # 
-  # Allowed options include.
-  #   :width        - Applied to parent element's style attribute. Default 100.
-  #   :height       - Applied to parent element's style attribute. Default 100.
-  #   :css          - Include Barby::HtmlOutputter.css in output's style tag. If you pass false
-  #                   you can include the output of Barby::HtmlOutputter.css in single place like 
-  #                   your own stylesheet on once on the page. Default true.
-  #   :parent_style - Include inline style for things like width and height on parent element. 
-  #                   Useful if you want to style these attributes elsewhere globally. Default true.
+  # Outputs an HTML <table> containing cells for each module in the barcode.
+  #
+  # This does NOT include any styling, you're expected to add the relevant
+  # CSS yourself. The markup is simple: One <table> with class 'barby-barcode',
+  # one or more <tr class="barby-row"> inside a <tbody> each containing
+  # <td class="barby-cell"> for each module with the additional class "on" or "off".
+  #
+  # Example, let's say the barcode.encoding == ['101', '010'] :
+  #
+  #   <table class="barby-barcode">
+  #     <tbody>
+  #        <tr class="barby-row">
+  #          <td class="barby-cell on"></td>
+  #          <td class="barby-cell off"></td>
+  #          <td class="barby-cell on"></td>
+  #        </tr>
+  #        <tr class="barby-row">
+  #          <td class="barby-cell off"></td>
+  #          <td class="barby-cell on"></td>
+  #          <td class="barby-cell off"></td>
+  #        </tr>
+  #     </tbody>
+  #   </table>
+  #
+  # You could then style this with:
+  #
+  #   table.barby-barcode { border-spacing: 0; }
+  #   tr.barby-row {}
+  #   td.barby-cell { width: 3px; height: 3px; }
+  #   td.barby-cell.on { background: #000; }
+  #
+  # Options:
+  #
+  #   :class_name - A class name that will be added to the <table> in addition to barby-barcode
   class HtmlOutputter < Outputter
 
     register :to_html
-    
-    def self.css
-      <<-CSS
-        table.barby_code {
-          border: 0 none transparent !important;
-          border-collapse: collapse !important;
-        }
-        table.barby_code tr.barby_row {
-          border: 0 none transparent !important;
-          border-collapse: collapse !important;
-          margin: 0 !important;
-          padding: 0 !important;
-        }
-        table.barby_code tr.barby_row td { border: 0 none transparent !important; }
-        table.barby_code tr.barby_row td.barby_black { background-color: black !important; }
-        table.barby_code tr.barby_row td.barby_white { background-color: white !important; }
-      CSS
+
+    attr_accessor :class_name
+
+
+    def to_html(options = {})
+      with_options options do
+        start + rows.join + stop
+      end
     end
-    
-    def to_html(options={})
-      default_options = {:width => 100, :height => 100, :css => true, :parent_style => :true}
-      options = default_options.merge(options)
-      elements = if barcode.two_dimensional?
-                   booleans.map do |bools|
-                     line_to_elements_row(bools, options)
-                   end.join("\n")
-                 else
-                   line_to_elements_row(booleans, options)
-                 end
-      html = %|<#{parent_element} class="barby_code" #{parent_style_attribute(options)}>\n#{elements}\n</#{parent_element}>|
-      options[:css] ? "<style>#{self.class.css}</style>\n#{html}" : html
+
+
+    def rows
+      if barcode.two_dimensional?
+        rows_for(booleans)
+      else
+        rows_for([booleans])
+      end
     end
 
 
-  private
+    def rows_for(boolean_groups)
+      boolean_groups.map{|g| row_for(cells_for(g)) }
+    end
 
-    def line_to_elements_row(bools, options)
-      elements = bools.map{ |b| b ? black_tag : white_tag }.join
-      Array(%|<#{row_element} class="barby_row">#{elements}</#{row_element}>|)
+    def cells_for(booleans)
+      booleans.map{|b| b ? on_cell : off_cell }
     end
-    
-    def black_tag
-      '<td class="barby_black"></td>'
+
+    def row_for(cells)
+      "<tr class=\"barby-row\">#{cells.join}</tr>"
     end
-    
-    def white_tag
-      '<td class="barby_white"></td>'
+
+    def on_cell
+      '<td class="barby-cell on"></td>'
     end
-    
-    def row_element
-      'tr'
+
+    def off_cell
+      '<td class="barby-cell off"></td>'
     end
-    
-    def parent_element
-      'table'
+
+    def start
+      '<table class="barby-barcode'+(class_name ? " #{class_name}" : '')+'"><tbody>'
     end
-    
-    def parent_style_attribute(options)
-      return unless options[:parent_style]
-      s = ''
-      s << "width: #{options[:width]}px; " if options[:width]
-      s << "height: #{options[:height]}px; " if options[:height]
-      s.strip!
-      s.empty? ? nil : %|style="#{s}"|
+
+    def stop
+      '</tbody></table>'
     end
 
+
   end
 
 end

data/lib/barby/outputter/point_matrix.rb

@@ -0,0 +1,211 @@
+require 'barby/outputter'
+
+module Barby
+
+  class Outputter
+
+
+    #A collection of rows - an array of arrays
+    class PointMatrix < Array
+
+      DEFAULT_XDIM = 1.0
+      DEFAULT_YDIM = 1.0
+
+      attr_writer :xdim, :ydim
+
+
+      def initialize(*a, &b)
+        # new([[t,f,t,f], [f,t,f,t], ...])
+        if a[0].is_a?(Array) && a[0][0].is_a?(Array) && [true,false].include?(a[0][0][0])
+          a[0] = a[0].map{|r| PointRow.new(self, r) }
+        # new(['1010', '0101', ...])
+        elsif a[0].is_a?(Array) && a[0][0].is_a?(String)
+          a[0] = a[0].map{|s| PointRow.new(self, s) }
+        end
+
+        super(*a, &b)
+      end
+
+
+      def xdim
+        @xdim || DEFAULT_XDIM
+      end
+
+      def ydim
+        @ydim || DEFAULT_YDIM
+      end
+
+
+      def width
+        inject(0){|m,r| r.width > m ? r.width : m }
+      end
+
+      def height
+        inject(0){|s,r| s + r.height }
+      end
+
+
+      def to_s
+        map{|r| r.to_s }
+      end
+
+      def inspect
+        to_s
+      end
+
+
+      def dup
+        self.class.new(map{|r| r.dup })
+      end
+
+
+    end
+
+
+    class PointRow < Array
+
+      attr_reader :matrix
+      attr_accessor :xdim, :ydim
+
+
+      def initialize(*a, &b)
+        raise ArgumentError, 'PointRow must belong to a PointMatrix' unless a[0].is_a?(PointMatrix)
+        @matrix = a.shift
+
+        #Assume called with [t,f,t,f,..]
+        if a[0].is_a?(Array) && [true, false].include?(a[0][0])
+          a[0] = a[0].map{|b| Point.new(self, b) }
+        #Assume called with '1010..'
+        elsif a[0].is_a?(String)
+          a[0] = a[0].split(//).map{|s| Point.new(self, s == '1') }
+        end
+
+        super(*a, &b)
+      end
+
+
+      def booleans
+        map{|p| p.active? }
+      end
+
+
+      def xdim
+        @xdim || matrix.xdim
+      end
+
+      def ydim
+        @ydim || matrix.ydim
+      end
+
+
+      def width
+        inject(0){|s,p| s + p.width }
+      end
+
+      def height
+        inject(0){|m,p| p.height > m ? p.height : m }
+      end
+
+
+      def to_s
+        inject(''){|s,p| s << (p.active ? '1' : '0') }
+      end
+
+      def inspect
+        to_s
+      end
+
+      def ==(other)
+        super #Just to say explicitly that equality should behave like in an array
+      end
+
+
+      def dup
+        self.class.new(matrix, map{|p| p.dup })
+      end
+
+    end
+
+
+    class Point
+
+      attr_reader :row, :active
+      attr_writer :width, :height, :color, :active
+      alias active? active
+
+
+      def initialize(row, active, opts={})
+        @row = row
+        self.active = active
+      end
+
+
+      def color
+        @color || (active ? Color.new(0,0,0) : nil)
+      end
+
+      def width
+        @width || row.xdim
+      end
+
+      def height
+        @height || row.ydim
+      end
+
+
+      def ==(other)
+        active == other.active &&
+        width == other.width &&
+        height == other.height &&
+        color == other.color
+      end
+
+
+    end
+
+
+    #TODO Add alpha
+    class Color
+
+      MIN_VALUE = 0
+      MAX_VALUE = 255
+
+      attr_reader :red, :blue, :green
+
+      def initialize(r, b, g)
+        self.red, self.blue, self.green = r, b, g
+      end
+
+
+      def red=(r)
+        set_color(:red, r)
+      end
+
+      def blue=(b)
+        set_color(:blue, b)
+      end
+
+      def green=(g)
+        set_color(:green, g)
+      end
+
+
+      def ==(other)
+        other.red == red && other.blue == blue && other.green == green
+      end
+
+
+    private
+
+      def set_color(name, value)
+        raise ArgumentError, "Value must be between 0-255" if value < MIN_VALUE || value > MAX_VALUE
+        instance_variable_set("@#{name}", value)
+      end
+
+
+    end
+
+
+  end
+
+end

data/lib/barby/version.rb

@@ -2,7 +2,7 @@ module Barby #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,27 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: barby
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.1
   prerelease: 
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Tore Darell
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-18 00:00:00 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies: []
-
 description: Barby creates barcodes.
 email: toredarell@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - CHANGELOG
 - README
 - LICENSE
@@ -45,6 +41,7 @@ files:
 - lib/barby/outputter/html_outputter.rb
 - lib/barby/outputter/pdfwriter_outputter.rb
 - lib/barby/outputter/png_outputter.rb
+- lib/barby/outputter/point_matrix.rb
 - lib/barby/outputter/prawn_outputter.rb
 - lib/barby/outputter/rmagick_outputter.rb
 - lib/barby/outputter/svg_outputter.rb
@@ -57,36 +54,41 @@ files:
 - bin/barby
 homepage: http://toretore.github.com/barby
 licenses: []
+post_install_message: ! '
 
-post_install_message: "\n\
-  *** NEW REQUIRE POLICY ***\"\n\
-  Barby no longer require all barcode symbologies by default. You'll have\n\
-  to require the ones you need. For example, if you need EAN-13,\n\
-  require 'barby/barcode/ean_13'; For a full list of symbologies and their\n\
-  filenames, see README.\n\
-  ***\n\n"
-rdoc_options: []
+  *** NEW REQUIRE POLICY ***"
+
+  Barby no longer require all barcode symbologies by default. You''ll have
+
+  to require the ones you need. For example, if you need EAN-13,
 
-require_paths: 
+  require ''barby/barcode/ean_13''; For a full list of symbologies and their
+
+  filenames, see README.
+
+  ***
+
+
+'
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: barby
-rubygems_version: 1.8.5
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: The Ruby barcode generator
 test_files: []
-