gtin 0.0.1 → 0.1.1

data/History.txt

@@ -2,3 +2,8 @@
 
 * 1 major enhancement:
   * Initial release
+
+=== 0.1.0 2010-04-26
+
+* 1 major enhancement:
+  * Complete rework of core GTIN functionality to have a much cleaner checksum functionality

data/lib/gtin.rb

@@ -1,6 +1,6 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-module Gtin
-  VERSION = '0.0.1'
+module GTIN
+  VERSION = '0.1.1'
 end

data/lib/gtin/gtin.rb

@@ -1,84 +1,71 @@
+# This will ultimately become a gem in its own right
 # GTIN-12 (UPC-A): this is a 12-digit number used primarily in North America
 # GTIN-8 (EAN/UCC-8): this is an 8-digit number used predominately outside of North America
 # GTIN-13 (EAN/UCC-13): this is a 13-digit number used predominately outside of North America
 # GTIN-14 (EAN/UCC-14 or ITF-14): this is a 14-digit number used to identify trade items at various packaging levels
 
-module GTIN
-  def generate_check_digit
-    numbers = self.to_s.gsub(/[\D]+/, "").split(//)
-
-    checksum = 0
-    case numbers.length
-    when 7
-      0.upto(numbers.length-1) do |i| checksum += numbers[i].to_i * ((i-1)%2*3 +i%2) end
-    when 11
-      0.upto(numbers.length-1) do |i| checksum += numbers[i].to_i * ((i-1)%2*3 +i%2) end
-    when 12
-      0.upto(numbers.length-1) do |i| checksum += numbers[i].to_i * (i%2*3 +(i-1)%2) end
-    when 13
-      0.upto(numbers.length-1) do |i| checksum += numbers[i].to_i * ((i-1)%2*3 +i%2) end
-    else
-      0
-    end
-
-    return ((10 - checksum % 10)%10).to_s
+class Integer
+  def odd?
+    self & 1 != 0
   end
+   
+  def even?
+    self & 1 == 0
+  end
+end
 
+module GTIN
   def ean?
-    numbers = self.to_s.gsub(/[\D]+/, "").split(//)
-
-    checksum = 0
-    case numbers.length
-    when 8
-      0.upto(numbers.length-2) do |i| checksum += numbers[i].to_i * ((i-1)%2*3 +i%2) end
-    when 13
-      0.upto(numbers.length-2) do |i| checksum += numbers[i].to_i * (i%2*3 +(i-1)%2) end
-    when 14
-      0.upto(numbers.length-2) do |i| checksum += numbers[i].to_i * ((i-1)%2*3 +i%2) end
-    else
-      return false
-    end
-
-    return numbers[-1].to_i == (10 - checksum % 10)%10
+    # self = self.to_s.gsub(/[\D]+/, "").split(//)
+    return false if self.length != 13
+    valid_checksum?
   end
   
   def upc?
-    value = self.to_s.gsub(/[\D]+/, "").split(//)
-    return false if value.length != 12
-    valid_checksum? value
+    # self = self.to_s.gsub(/[\D]+/, "").split(//)
+    return false if self.length != 12
+    valid_checksum?
   end
 
+  # FOR A UPC:
+  # From the right to left, start with odd position, assign the odd/even position to each digit.
+  # Sum all digits in odd position and multiply the result by 3.
+  # Sum all digits in even position.
+  # Sum the results of step 3 and step 4.
+  # divide the result of step 4 by 10. The check digit is the number which adds the remainder to 10.
+
   # Determine if a gtin value has a valid checksum
-  def valid_checksum?(value)
-    checksum = 0
-    0.upto(value.length-2) do |i| 
-      value%2 == 0 ? 
-        (checksum += value[i].to_i * ((i-1)%2*3 +i%2)) :
-        (checksum += numbers[i].to_i * (i%2*3 +(i-1)%2))
+  def valid_checksum?
+    number = self.reverse
+    odd = even = 0
+    
+    (1..number.length-1).each do |i|
+      i.even? ? (even += number[i].chr.to_i) : (odd += number[i].chr.to_i)
     end
-    value[-1].to_i == (10 - checksum % 10)%10    
+    
+    number[0].chr.to_i == (10 - ((odd * 3) + even) % 10)
   end
 
 
   # GTIN-12 (UPC-A): this is a 12-digit number used primarily in North America
-  def to_gtin_12(number)
-    to_gtin(number, 12)
+  def to_gtin_12
+    to_gtin(12)
   end
   alias :to_upc   :to_gtin_12
   alias :to_upc_a :to_gtin_12
   
   
   # GTIN-8 (EAN/UCC-8): this is an 8-digit number used predominately outside of North America
-  def to_gtin_8(number)
-    to_gtin(number, 8)
+  def to_gtin_8
+    to_gtin(8)
   end
   alias :to_ean_8 :to_gtin_8
   alias :to_ucc_8 :to_gtin_8
   
   
   # GTIN-13 (EAN/UCC-13): this is a 13-digit number used predominately outside of North America
-  def to_gtin_13(number)
-    to_gtin(number, 13)
+  def to_gtin_13
+    to_gtin(13)
   end
   alias :to_ean_13 :to_gtin_13
   alias :to_ucc_13 :to_gtin_13
@@ -86,13 +73,13 @@ module GTIN
 
 
   # GTIN-14 (EAN/UCC-14 or ITF-14): this is a 14-digit number used to identify trade items at various packaging levels
-  def to_gtin_14(number)
-    to_gtin(number, 14)
+  def to_gtin_14
+    to_gtin(14)
   end
   alias :to_gtin :to_gtin_14
   
-  def to_gtin(number, size)
-    "%0#{size}d" % number.to_s.gsub(/[\D]+/, "")
+  def to_gtin(size=14)
+    "%0#{size.to_i}d" % self.to_s.gsub(/[\D]+/, "").to_i
   end
 end
 
@@ -100,8 +87,3 @@ end
 class String
   include GTIN
 end
-
-# Extend Numberic to include these methods
-class Numeric
-  include GTIN
-end

data/lib/gtin/version.rb

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Hans Masing
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-25 00:00:00 -04:00
+date: 2009-04-26 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -40,7 +40,7 @@ files:
 - test/test_gtin.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://www.dragonflydepot.org/
+homepage: http://github.com/hmasing/gtin
 licenses: []
 
 post_install_message: