barby 0.3.1 → 0.3.2

data/lib/barby/barcode/code_128.rb

@@ -208,7 +208,7 @@ module Barby
     #character set, an extra will be created.
     def data=(data)
       data, *extra = data.split(/([#{CODEA+CODEB+CODEC}])/n)
-      @data = data
+      @data = data || ''
       self.extra = extra.join unless extra.empty?
     end
 
@@ -226,9 +226,8 @@ module Barby
     #"change character set" symbol. The string may contain several character
     #sets, in which case the extra will itself have an extra.
     def extra=(extra)
-      raise ArgumentError, "Extra must begin with \\301, \\302 or \\303" unless extra =~ /^[#{CODEA+CODEB+CODEC}]/n
-      type = extra[/([#{CODEA+CODEB+CODEC}])/n, 1]
-      data = extra[/[#{CODEA+CODEB+CODEC}](.*)/n, 1]
+      raise ArgumentError, "Extra must begin with \\305, \\306 or \\307" unless extra =~ /^[#{CODEA+CODEB+CODEC}]/n
+      type, data = extra[0,1], extra[1..-1]
       @extra = class_for(type).new(data)
     end
 
@@ -359,9 +358,10 @@ module Barby
     end
 
     #Is the data in this barcode valid? Does a lookup of every character
-    #and checks if it exists in the character set.
+    #and checks if it exists in the character set. An empty data string
+    #will also be reported as invalid.
     def valid?
-      characters.all?{|c| values.include?(c) }
+      characters.any? && characters.all?{|c| values.include?(c) }
     end
 
     def values

data/lib/barby/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: barby
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Tore Darell
@@ -9,7 +9,7 @@ autorequire: barby
 bindir: bin
 cert_chain: []
 
-date: 2009-11-22 00:00:00 +01:00
+date: 2009-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: []