barcodes 0.0.8 → 0.0.9

data/lib/barcodes/symbology/code128.rb

@@ -117,7 +117,7 @@ module Barcodes
       def encoded_data
         if self.valid?
           encoded_data = ""
-          charset = 'B'
+          charset = 'A'
           char_c = nil
           self.formatted_data.each_byte do |char|
             if char == "\xF4".bytes.to_a[0] || char == "\xF5".bytes.to_a[0] || char == "\xF6".bytes.to_a[0]
@@ -177,13 +177,12 @@ module Barcodes
       def checksum
         if valid?
           sum = 0
-          index = 0
-          charset = self.class.charset_b
+          index = 1
+          charset = self.class.charset_a
           char_c = nil
           self._prepared_data.each_byte do |char|
             if char == "\xF4".bytes.to_a[0] || char == "\xF5".bytes.to_a[0] || char == "\xF6".bytes.to_a[0]
               sum += self.class.charset_a.index(char) if self.class.charset_a.include?(char)
-              index += 1
               
               case char
               when "\xF4".bytes.to_a[0]
@@ -256,17 +255,17 @@ module Barcodes
       # Inspects barcode data and determines the best character sets to use
       # for provided data
       def _prepared_data
-        start = "\xF5"
-        charset = "B"
+        start = "\xF4"
+        charset = "A"
         data = ""
         cursor = 0
         
         if /^[\d]{4,}/ === @data
           start = "\xF6"
           charset = "C"
-        elsif self._encode_character_in_charset(@data.bytes.to_a[0], 'B').nil?
+        elsif self._encode_character_in_charset(@data.bytes.to_a[0], 'A').nil?
           start = "\xF4"
-          charset = "A"
+          charset = "B"
         end
         data += start
         

data/lib/barcodes/symbology/code93.rb

@@ -88,35 +88,35 @@ module Barcodes
           if char == 255 || char == 254 || char == 253 || char == 252
             case char
             when 252
-              sum += 43
+              sum += weight * 43
             when 253
-              sum += 44
+              sum += weight * 44
             when 254
-              sum += 45
+              sum += weight * 45
             when 255
-              sum += 46
+              sum += weight * 46
             end
           else
             if ('0'..'9').include? char.chr
               sum += weight * char.chr.to_i
             elsif ('A'..'Z').include? char.chr
-              sum += ('A'..'Z').to_a.index(char.chr) + 10
+              sum += weight * (('A'..'Z').to_a.index(char.chr) + 10)
             else
               case char.chr
               when '-'
-                sum += 36
+                sum += weight * 36
               when '.'
-                sum += 37
+                sum += weight * 837
               when ' '
-                sum += 38
+                sum += weight * 38
               when '$'
-                sum += 39
+                sum += weight * 39
               when '/'
-                sum += 40
+                sum += weight * 40
               when '+'
-                sum += 41
+                sum += weight * 41
               when '%'
-                sum += 42
+                sum += weight * 42
               end
             end
           end

data/lib/barcodes/symbology/ean.rb

@@ -88,7 +88,7 @@ module Barcodes
             elsif char.chr == 'C'
               encoded_data += "01010"
             else
-              if index < 9
+              if index < 8
                 unless parity.nil?
                   encoded_data += self._encode_character_with_parity(char, parity[index - 2])
                 else
@@ -131,18 +131,6 @@ module Barcodes
         end
       end
       
-      # Validates barcode using provided data
-      def valid?
-        self.data.each_byte do |char|
-          if char.chr == 'S' || char.chr == 'C'
-            return false
-          end
-          unless self.class.charset.include? char
-            return false
-          end
-        end
-      end
-      
       protected
       
       # Encodes a single given character (as ASCII integer) using the given parity (1,0)

data/lib/barcodes/symbology/ean13.rb

@@ -33,10 +33,6 @@ module Barcodes
       # is valid.
       # Data length must be exactly 12 digits
       def valid?
-        unless super
-          return false
-        end
-        
         return self.data.length == 12 ? true : false
       end
     end

data/lib/barcodes/symbology/ean8.rb

@@ -57,10 +57,6 @@ module Barcodes
       # is valid.
       # Data length must be exactly 7 digits
       def valid?
-        unless super
-          return false
-        end
-        
         return self.data.length == 7 ? true : false
       end
     end

data/lib/barcodes/symbology/upca.rb

@@ -32,10 +32,6 @@ module Barcodes
       # Validates barcode using provided data
       # Data length must be 11 digits
       def valid?
-        unless super
-          return false
-        end
-        
         return self.data.length == 11 ? true : false
       end
     end

data/lib/barcodes/version.rb

@@ -7,5 +7,5 @@
 # 
 module Barcodes
   # Returns the current version
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barcodes
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2449543112695884556
+      hash: -2445939698446787454
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2449543112695884556
+      hash: -2445939698446787454
 requirements: []
 rubyforge_project: barcodes
 rubygems_version: 1.8.24