oddb2xml 1.4.5 → 1.4.6

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.4.6 / 24.04.2013
+
+* Update to skip ean14 as default in also oddb.dat
+
 === 1.4.5 / 19.02.2013
 
 * Add name slicing for dat output

data/lib/oddb2xml/builder.rb

@@ -34,7 +34,7 @@ module Oddb2xml
       @actions    = []
       @orphans    = []
       @fridges    = []
-      @ean14      = true
+      @ean14      = false
       @companies  = []
       @people     = []
       @tag_suffix = nil
@@ -900,7 +900,7 @@ module Oddb2xml
       rows = []
       @articles.each do |obj|
         obj[:de].each_with_index do |idx, i|
-          next if (!ean14 && idx[:ean].to_s.length != 13)
+          next if ((idx[:ean].to_s.length != 13) and !ean14)
           row = ''
           # Oddb2tdat.parse
           if idx[:status] =~ /A|I/
@@ -971,7 +971,7 @@ module Oddb2xml
       @articles.each do |obj|
         obj[:de].each_with_index do |idx, i|
           row = ''
-          next if (!ean14 && idx[:ean].to_s.length != 13)
+          next if ((idx[:ean].to_s.length != 13) and !ean14)
           # Oddb2tdat.parse_migel
           row << "%#{DAT_LEN[:RECA]}s"  % '11'
           row << "%#{DAT_LEN[:CMUT]}s"  % if (phar = idx[:pharmacode] and phar.size > 3)

data/lib/oddb2xml/cli.rb

@@ -122,12 +122,12 @@ module Oddb2xml
               LANGUAGES.each do |lang|
                 index[lang] = @index[lang][type]
               end
-              builder.index = index
               _sbj = (type == :pharma ? :dat : :with_migel_dat)
+              builder.index   = index
               builder.subject = _sbj
+              builder.ean14   = @options[:ean14]
               if type == :nonpharma
                 output << "\n"
-                builder.ean14 = @options[:ean14]
               end
               output << builder.to_dat
             end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.4.5"
+  VERSION = "1.4.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &7737440 !ruby/object:Gem::Requirement
+  requirement: &12823940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7737440
+  version_requirements: *12823940
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &7729360 !ruby/object:Gem::Requirement
+  requirement: &12823400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7729360
+  version_requirements: *12823400
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &7725500 !ruby/object:Gem::Requirement
+  requirement: &12822680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *7725500
+  version_requirements: *12822680
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &7721120 !ruby/object:Gem::Requirement
+  requirement: &12821680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7721120
+  version_requirements: *12821680
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &7712080 !ruby/object:Gem::Requirement
+  requirement: &12820900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *7712080
+  version_requirements: *12820900
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &7710800 !ruby/object:Gem::Requirement
+  requirement: &12820160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7710800
+  version_requirements: *12820160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7709420 !ruby/object:Gem::Requirement
+  requirement: &12818940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7709420
+  version_requirements: *12818940
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &7704620 !ruby/object:Gem::Requirement
+  requirement: &12818080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7704620
+  version_requirements: *12818080
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7702500 !ruby/object:Gem::Requirement
+  requirement: &12816820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *7702500
+  version_requirements: *12816820
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7700940 !ruby/object:Gem::Requirement
+  requirement: &12815860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7700940
+  version_requirements: *12815860
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7697980 !ruby/object:Gem::Requirement
+  requirement: &12814700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *7697980
+  version_requirements: *12814700
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7694680 !ruby/object:Gem::Requirement
+  requirement: &12813860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *7694680
+  version_requirements: *12813860
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: