barby 0.4.3 → 0.4.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+* 0.4.4
+
+* Use Gemfile for dependency management [Ken Collins]
+* Move to MiniTest [Ken Collins]
+* HTML outputter [Ken Collins]
+* Various 1.9 fixes [Ken Collins, Dominique Ribaut]
+
 * 0.4.3
 
 * 2- and 5-digit UPC supplements

data/lib/barby/outputter/html_outputter.rb

@@ -0,0 +1,88 @@
+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.
+  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
+    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
+    end
+
+
+  private
+
+    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}>|)
+    end
+    
+    def black_tag
+      '<td class="barby_black"></td>'
+    end
+    
+    def white_tag
+      '<td class="barby_white"></td>'
+    end
+    
+    def row_element
+      'tr'
+    end
+    
+    def parent_element
+      'table'
+    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}"|
+    end
+
+  end
+
+end

data/lib/barby/version.rb

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

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: barby
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 3
-  version: 0.4.3
+  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors: 
 - Tore Darell
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 +02:00
-default_executable: 
+date: 2011-08-13 00:00:00 Z
 dependencies: []
 
 description: Barby creates barcodes.
@@ -47,6 +42,7 @@ files:
 - lib/barby/barcode.rb
 - lib/barby/outputter/ascii_outputter.rb
 - lib/barby/outputter/cairo_outputter.rb
+- lib/barby/outputter/html_outputter.rb
 - lib/barby/outputter/pdfwriter_outputter.rb
 - lib/barby/outputter/png_outputter.rb
 - lib/barby/outputter/prawn_outputter.rb
@@ -58,28 +54,7 @@ files:
 - lib/barby.rb
 - vendor/Pdf417lib-java-0.91/lib/Pdf417lib.jar
 - vendor/Pdf417lib-java-0.91/lib/Pdf417lib.java
-- vendor/rqrcode/CHANGELOG
-- vendor/rqrcode/COPYING
-- vendor/rqrcode/lib/rqrcode/core_ext/array/behavior.rb
-- vendor/rqrcode/lib/rqrcode/core_ext/array.rb
-- vendor/rqrcode/lib/rqrcode/core_ext/integer/bitwise.rb
-- vendor/rqrcode/lib/rqrcode/core_ext/integer.rb
-- vendor/rqrcode/lib/rqrcode/core_ext.rb
-- vendor/rqrcode/lib/rqrcode/qrcode/qr_8bit_byte.rb
-- vendor/rqrcode/lib/rqrcode/qrcode/qr_bit_buffer.rb
-- vendor/rqrcode/lib/rqrcode/qrcode/qr_code.rb
-- vendor/rqrcode/lib/rqrcode/qrcode/qr_math.rb
-- vendor/rqrcode/lib/rqrcode/qrcode/qr_polynomial.rb
-- vendor/rqrcode/lib/rqrcode/qrcode/qr_rs_block.rb
-- vendor/rqrcode/lib/rqrcode/qrcode/qr_util.rb
-- vendor/rqrcode/lib/rqrcode/qrcode.rb
-- vendor/rqrcode/lib/rqrcode.rb
-- vendor/rqrcode/Rakefile
-- vendor/rqrcode/README
-- vendor/rqrcode/test/runtest.rb
-- vendor/rqrcode/test/test_data.rb
 - bin/barby
-has_rdoc: true
 homepage: http://toretore.github.com/barby
 licenses: []
 
@@ -93,21 +68,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: barby
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: The Ruby barcode generator

data/vendor/rqrcode/CHANGELOG

@@ -1,34 +0,0 @@
-*0.3.3* (Feb 1st, 2011)
-
-* check to see if the level is valid
-* fix for 'rszf' bug by [Rob la Lau https://github.com/ohreally]
-
-*0.3.2* (Mar 15th, 2009)
-
-* Ruby 1.9 fixes by [Tore Darell http://tore.darell.no] [Chris Mowforth http://blog.99th.st]
-
-*0.3.1* (Nov 24th, 2008)
-
-* expanded RS block table to QRcode version 40  [Vladislav Gorodetskiy]
-
-*0.3.0* (Feb 28th, 2008)
-
-* added more documentation
-* changed to_console to to_s (what was I thinking)
-* add more tests
-
-*0.2.1* (Feb 24th, 2008)
-
-* small changes to rakefile and readme
-* small change to to_console method
-* make console_count method private (use modules.size instead)
-* slowy updating rdocs 
-
-*0.2.0* (Feb 23rd, 2008)
-
-* Split files up [DR]
-* added rdoc comment ... more to do there
-
-*0.1.0* (Feb 22rd, 2008)
-
-* Initial Release [DR]

data/vendor/rqrcode/COPYING

@@ -1,19 +0,0 @@
-Copyright (c) 2008 Duncan Robertson 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-  
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-   
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

data/vendor/rqrcode/README

@@ -1,96 +0,0 @@
-== rQRCode, Encode QRCodes
-
-rQRCode is a library for encoding QR Codes in Ruby. It has a simple interface with all the standard qrcode options. It was adapted from the Javascript library by Kazuhiko Arase.
-
-== An Overview
-
-Let's clear up some rQRCode stuff.
-
- # rQRCode is a *standalone library*. It requires no other libraries. Just Ruby!
- # It is an encoding library. You can't decode QR codes with it.
- # The interface is simple and assumes you just want to encode a string into a QR code
- # QR code is trademarked by Denso Wave inc
-
-== Resources
-
-wikipedia:: http://en.wikipedia.org/wiki/QR_Code
-Denso-Wave website:: http://www.denso-wave.com/qrcode/index-e.html
-kaywa:: http://qrcode.kaywa.com
-
-
-== Installing
-
-You may get the latest stable version from Rubyforge. 
-
-  $ gem install rqrcode
-
-You can also get the source from http://github.com/whomwah/rqrcode/tree/master
-
-  $ git clone git://github.com/whomwah/rqrcode.git
- 
-
-=== Loading rQRCode Itself
-
-You have installed the gem already, yeah?
-
- require 'rubygems'
- require 'rqrcode'
-
-=== Simple QRCode generation to screen
-
- qr = RQRCode::QRCode.new( 'my string to generate', :size => 4, :level => :h )
- puts qr.to_s
- #
- # Prints:
- # xxxxxxx x  x x   x x  xx  xxxxxxx
- # x     x  xxx  xxxxxx xxx  x     x
- # x xxx x  xxxxx x       xx x xxx x
- # ... etc
-
-=== Simple QRCode generation to view (RubyOnRails)
-
-<b>Controller:</b>
- @qr = RQRCode::QRCode.new( 'my string to generate', :size => 4, :level => :h )
-
-<b>View: (minimal styling added)</b>
- <style type="text/css">
- table {
-   border-width: 0;
-   border-style: none;
-   border-color: #0000ff;
-   border-collapse: collapse;
- }
- td {
-   border-width: 0; 
-   border-style: none;
-   border-color: #0000ff; 
-   border-collapse: collapse; 
-   padding: 0; 
-   margin: 0; 
-   width: 10px; 
-   height: 10px; 
- }
- td.black { background-color: #000; }
- td.white { background-color: #fff; }
- </style>
-
- <table>
- <% @qr.modules.each_index do |x| %>
-   <tr>  
-   <% @qr.modules.each_index do |y| %>
-    <% if @qr.is_dark(x,y) %>
-     <td class="black"/>
-    <% else %>
-     <td class="white"/>
-    <% end %>
-   <% end %>
-   </tr>
- <% end %>
- </table>
-
-== Contact
-
-Author::     Duncan Robertson 
-Email::      duncan@whomwah.com 
-Home Page::  http://whomwah.com
-License::    MIT Licence (http://www.opensource.org/licenses/mit-license.html)

data/vendor/rqrcode/Rakefile

@@ -1,63 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/testtask'
-
-NAME = "rqrcode"
-VERS = "0.3.3"
-CLEAN.include ['pkg', 'rdoc']
-
-spec = Gem::Specification.new do |s|
-  s.name            = NAME
-  s.version         = VERS
-  s.author          = "Duncan Robertson"
-  s.email           = "duncan@whomwah.com"
-  s.homepage        = "http://whomwah.github.com/rqrcode/"
-  s.platform        = Gem::Platform::RUBY
-  s.summary          = "A library to encode QR Codes" 
-  s.rubyforge_project = NAME 
-  s.description = <<EOF
-rQRCode is a library for encoding QR Codes. The simple
-interface allows you to create QR Code data structures 
-ready to be displayed in the way you choose. 
-EOF
-  s.files = FileList["lib/**/*", "test/*"].exclude("rdoc").to_a
-  s.require_path    = "lib"
-  s.has_rdoc        = true
-  s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]  
-  s.test_file       = "test/runtest.rb"
-end
-
-task :build_package => [:repackage]
-Rake::GemPackageTask.new(spec) do |pkg|
-  #pkg.need_zip = true
-  #pkg.need_tar = true
-  pkg.gem_spec = spec
-end
-
-desc "Default: run unit tests."
-task :default => :test
-
-desc "Run all the tests"
-Rake::TestTask.new(:test) do |t|
-  t.libs << "lib"
-  t.pattern = "test/runtest.rb"
-  t.verbose = true
-end
-
-desc "Generate documentation for the library"
-Rake::RDocTask.new("rdoc") { |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = "rQRCode Documentation"
-  rdoc.template = "~/bin/jamis.rb"
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.main = "README"
-  rdoc.rdoc_files.include("README", "CHANGELOG", "COPYING", 'lib/**/*.rb')
-}
-
-desc "rdoc to rubyforge"
-task :rubyforge => [:rdoc] do
-  sh %{/usr/bin/scp -r -p rdoc/* rubyforge:/var/www/gforge-projects/rqrcode}
-end

data/vendor/rqrcode/lib/rqrcode.rb

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-#--
-# Copyright 2008 by Duncan Robertson (duncan@whomwah.com).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#++
-
-require "rqrcode/core_ext"
-require "rqrcode/qrcode"

data/vendor/rqrcode/lib/rqrcode/core_ext.rb

@@ -1,5 +0,0 @@
-Dir[File.dirname(__FILE__) + "/core_ext/*.rb"].sort.each do |path|
-  filename = File.basename(path)
-  require "rqrcode/core_ext/#{filename}"
-end
-

data/vendor/rqrcode/lib/rqrcode/core_ext/array.rb

@@ -1,5 +0,0 @@
-require 'rqrcode/core_ext/array/behavior'
-
-class Array #:nodoc:
-  include CoreExtensions::Array::Behavior
-end

data/vendor/rqrcode/lib/rqrcode/core_ext/array/behavior.rb

@@ -1,9 +0,0 @@
-module CoreExtensions #:nodoc:
-  module Array #:nodoc:
-    module Behavior
-      def extract_options!
-        last.is_a?(::Hash) ? pop : {}
-      end
-    end
-  end
-end