brocade 1.2.3 → 1.3.0

data/.gitignore

@@ -0,0 +1,23 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+Gemfile.lock
+

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/Rakefile

@@ -1,12 +1,9 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
 desc 'Test the brocade plugin.'
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end

data/brocade.gemspec

@@ -1,22 +1,27 @@
-$LOAD_PATH.unshift 'lib'
+# encoding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
 require 'brocade/version'
 
 Gem::Specification.new do |s|
-  s.name         = 'brocade'
-  s.version      = Brocade::VERSION
-  s.summary      = 'Generates barcodes for Rails ActiveRecord models.'
-  s.description  = s.summary
-  s.homepage     = 'http://github.com/airblade/brocade'
-  s.authors      = ['Andy Stewart']
-  s.email        = 'boss@airbladesoftware.com'
-  s.files        = %w[ LICENSE README.md Rakefile brocade.gemspec ]
-  s.files       += %w[ init.rb install.rb ]
-  s.files       += Dir.glob("lib/**/*")
-  s.test_files   = Dir.glob("test/**/*")
-  s.require_path = 'lib'
+  s.name          = 'brocade'
+  s.version       = Brocade::VERSION
+  s.summary       = 'Generates barcodes for Rails ActiveRecord models.'
+  s.description   = s.summary
+  s.homepage      = 'https://github.com/airblade/brocade'
+  s.authors       = ['Andy Stewart']
+  s.email         = 'boss@airbladesoftware.com'
+
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ['lib']
 
   s.add_dependency 'barby',      '~> 0.5'
   s.add_dependency 'chunky_png', '~> 1.2'
-  s.add_development_dependency 'rake', '0.8.7'
+  s.add_dependency 'active_support', '~> 3'
+  s.add_dependency 'i18n'
+  s.add_development_dependency 'rake', '~> 10'
+  s.add_development_dependency 'minitest', '~> 5'
 end
 

data/lib/brocade/has_barcode.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext'
 require 'barby'
 require 'barby/barcode/code_128'
 require 'barby/outputter/png_outputter'
@@ -36,21 +37,35 @@ module Brocade
       :code
     end
 
-    def symbology
-      :code128
+    # Returns a Code128 barcode instance.
+    #
+    # opts:
+    # :subset - specify the Code128 subset to use ('A', 'B', or 'C').
+    def barcode(opts = {})
+      data = format_for_subset_c_if_applicable send(barcodable)
+      if (subset = opts[:subset])
+        case subset
+        when 'A'; Barby::Code128A.new data
+        when 'B'; Barby::Code128B.new data
+        when 'C'; Barby::Code128C.new data
+        end
+      else
+        most_efficient_barcode_for data
+      end
     end
 
+    # Writes a barcode PNG image.
+    #
+    # opts:
+    # :subset - specify the Code128 subset to use ('A', 'B', or 'C').
+    # remaining options passed through to PNGOutputter.
     def create_barcode(opts = {})
-      barcode = Barby::Code128B.new send(barcodable)
       path = barcode_path
       FileUtils.mkdir_p File.dirname(path)
       File.open(path, 'wb') do |f|
-        # Barby's PNG Outputter defaults to a margin of 10px and height of 100px.
-        # NOTE: setting the width makes no difference.
-        # http://github.com/toretore/barby/blob/master/lib/barby/outputter/png_outputter.rb
-        f.write barcode.to_png(self.class.options.merge(opts))
+        f.write barcode(opts).to_png(self.class.options.merge(opts))
       end
-      FileUtils.chmod(0666&~File.umask, path)
+      FileUtils.chmod(0666 &~ File.umask, path)
     end
 
     def update_barcode(opts = {})
@@ -85,6 +100,8 @@ module Brocade
       "#{::Rails.root}/public/system/barcodes/#{klass}/#{partitioned_id}/#{symbology}.png"
     end
 
+    private
+
     def klass
       self.class.to_s.underscore.pluralize
     end
@@ -95,6 +112,27 @@ module Brocade
       # 1,000,000 records is enough for now.
       ("%06d" % id).scan(/\d{3}/).join('/')
     end
+
+    def most_efficient_barcode_for(data)
+      Barby::Code128C.new data
+    rescue ArgumentError
+      begin
+        Barby::Code128B.new data
+      rescue ArgumentError
+        Barby::Code128A.new data
+      end
+    end
+
+    def symbology
+      :code128
+    end
+
+    def format_for_subset_c_if_applicable(data)
+      stringified_data = "#{data}"
+      return data unless stringified_data =~ /^\d+$/
+      return data if stringified_data.length.even?
+      "0#{stringified_data}"
+    end
   end
 
 end

data/lib/brocade/version.rb

@@ -1,3 +1,3 @@
 module Brocade
-  VERSION = '1.2.3'
+  VERSION = '1.3.0'
 end

data/test/brocade_test.rb

@@ -0,0 +1,49 @@
+require_relative 'helper'
+require 'brocade'
+
+class Foo
+  include Brocade
+  attr_accessor :code
+
+  def self.after_create(callback); end
+  def self.before_update(callback); end
+  def self.after_destroy(callback); end
+end
+
+class BrocadeTest < TestCase
+
+  test 'sanity' do
+    assert_respond_to Foo, :has_barcode
+  end
+
+  test 'explicit code 128 subset' do
+    Foo.send :has_barcode
+    foo = Foo.new
+    foo.code = 42
+    assert_kind_of Barby::Code128A, foo.barcode(subset: 'A')
+    assert_kind_of Barby::Code128B, foo.barcode(subset: 'B')
+    assert_kind_of Barby::Code128C, foo.barcode(subset: 'C')
+  end
+
+  test 'implicit code 128 subset' do
+    Foo.send :has_barcode
+    foo = Foo.new
+
+    foo.code = 42
+    assert_kind_of Barby::Code128C, foo.barcode
+
+    foo.code = '42aA'
+    assert_kind_of Barby::Code128B, foo.barcode
+
+    foo.code = "42A\t"
+    assert_kind_of Barby::Code128A, foo.barcode
+  end
+
+  test 'code c handles odd number of digits' do
+    Foo.send :has_barcode
+    foo = Foo.new
+    foo.code = 4
+    assert_kind_of Barby::Code128C, foo.barcode(subset: 'C')
+  end
+
+end

data/test/helper.rb

@@ -1,10 +1,8 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
+gem 'minitest'
+require 'minitest/autorun'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'brocade'
-
-class Test::Unit::TestCase
+class TestCase < Minitest::Test
+  def self.test(name, &block)
+    define_method :"test_#{name.inspect}", &block
+  end
 end

metadata

@@ -1,123 +1,159 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: brocade
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 3
-  version: 1.2.3
 platform: ruby
-authors: 
+authors:
 - Andy Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-20 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-11-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: barby
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
   name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :development
-  requirement: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5'
 description: Generates barcodes for Rails ActiveRecord models.
 email: boss@airbladesoftware.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .gitignore
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - brocade.gemspec
-- init.rb
-- install.rb
+- lib/brocade.rb
 - lib/brocade/has_barcode.rb
 - lib/brocade/version.rb
-- lib/brocade.rb
+- test/brocade_test.rb
 - test/helper.rb
-- test/test_brocade.rb
-has_rdoc: true
-homepage: http://github.com/airblade/brocade
+homepage: https://github.com/airblade/brocade
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3770506909574615478
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3770506909574615478
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Generates barcodes for Rails ActiveRecord models.
-test_files: 
+test_files:
+- test/brocade_test.rb
 - test/helper.rb
-- test/test_brocade.rb

data/init.rb

@@ -1 +0,0 @@
-require 'brocade'

data/install.rb

@@ -1 +0,0 @@
-puts 'You have chosen wisely.'

data/test/test_brocade.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestBrocade < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end