oddb2xml 1.7.8 → 1.7.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (1.7.5)
+    oddb2xml (1.7.9)
       archive-tar-minitar
       mechanize (~> 2.5.1)
       nokogiri (~> 1.5.10)
@@ -14,13 +14,13 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.6)
-    akami (1.2.1)
+    akami (1.2.2)
       gyoku (>= 0.4.0)
       nokogiri
     archive-tar-minitar (0.5.2)
     builder (3.2.2)
     coderay (1.1.0)
-    columnize (0.3.6)
+    columnize (0.8.9)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     debugger (1.6.6)
@@ -61,7 +61,7 @@ GEM
       debugger (~> 1.3)
       pry (~> 0.9.10)
     rack (1.5.2)
-    rake (10.2.2)
+    rake (10.3.1)
     rdoc (4.1.1)
       json (~> 1.4)
     rspec (2.14.1)
@@ -73,12 +73,12 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     ruby-ole (1.2.11.7)
-    rubyXL (2.5.0)
+    rubyXL (2.5.1)
       nokogiri (>= 1.4.4)
       rubyzip (>= 1.0.0)
     rubyntlm (0.3.4)
-    rubyzip (1.1.2)
-    safe_yaml (1.0.1)
+    rubyzip (1.1.3)
+    safe_yaml (1.0.2)
     savon (2.4.0)
       akami (~> 1.2.0)
       builder (>= 2.1.2)
@@ -90,7 +90,7 @@ GEM
     slop (3.5.0)
     spreadsheet (0.9.7)
       ruby-ole (>= 1.0)
-    unf (0.1.3)
+    unf (0.1.4)
       unf_ext
     unf_ext (0.0.6)
     wasabi (3.2.3)

data/README.md

@@ -43,19 +43,26 @@ The following additional data is in the files:
 see `--help`.
 
 ```
-$ oddb2xml --help
-oddb2xml ver.1.2.7
+/usr/local/bin/oddb2xml ver.1.7.8
 Usage:
   oddb2xml [option]
+    produced files are found under data
     -a T, --append=T     Additional target. T, only 'nonpharma' is available.
     -c F, --compress=F   Compress format F. {tar.gz|zip}
+    -e    --extended     pharma, non-pharma plus prices and non-pharma from zurrose. Products without EAN-Code will also be listed.
     -f F, --format=F     File format F, default is xml. {xml|dat}
                          If F is given, -o option is ignored.
-    -o O, --optional=O   Optional output. O, only 'fi' is available.
     -i I, --include=I    Include target option for 'dat' format. only 'ean14' is available.
                          'xml' format includes always ean14 records.
+    -o O, --option=O     Optional output. O, only 'fi' is available.
+    -p P, --price=P      Price source (transfer.dat). P, only 'zurrose' is available.
     -t S, --tag-suffix=S XML tag suffix S. Default is none. [A-z0-9]
                          If S is given, it is also used as prefix of filename.
+    -x N, --context=N    context N {product|address}. product is default.
+                         
+                         For debugging purposes
+    --skip-download      skips downloading files it the file is already under data/downloads.
+                         Downloaded files are saved under data/downloads
     -h,   --help         Show this help message.
 
 ```

data/lib/oddb2xml/builder.rb

@@ -1086,9 +1086,7 @@ module Oddb2xml
           row << "%#{DAT_LEN[:CBGG]}s"  % '0'
           row << "%#{DAT_LEN[:CIKS]}s"  % ' ' # no category
           row << "%0#{DAT_LEN[:ITHE]}d" %  0
-          ean = idx[:ean]
-          ean = 0 if ean.match(/^000000/)
-          row << "%0#{DAT_LEN[:CEAN]}d" % ean
+          row << idx[:ean].to_s.rjust(DAT_LEN[:CEAN], '0')
           row << "%#{DAT_LEN[:CMWS]}s"  % '1' # nonpharma
           rows << row
         end

data/lib/oddb2xml/downloader.rb

@@ -243,7 +243,7 @@ XML
       super({}, url)
     end
     def download
-      @type == :orphan ? file = "swissmedic_#{@type}.xls" :  file = "swissmedic_#{@type}.xlsx"
+      @type == file = "swissmedic_#{@type}.xlsx"
       begin
         page = @agent.get(@url)
         if link_node = page.search(@xpath).first

data/lib/oddb2xml/extractor.rb

@@ -201,12 +201,7 @@ module Oddb2xml
       @filename = filename
       @type  = type
       return unless File.exists?(filename)
-      if type == :orphan
-        book = Spreadsheet.open(filename, 'rb')
-        @sheet = book.worksheet(0)
-      else
-        @sheet = RubyXL::Parser.parse(File.expand_path(filename)).worksheets[0]
-      end
+      @sheet = RubyXL::Parser.parse(File.expand_path(filename)).worksheets[0]
     end
     def to_arry
       data = []
@@ -215,7 +210,7 @@ module Oddb2xml
       when :orphan
         i = 1
         @sheet.each do |row|
-          number = row[1].to_i
+          number = row[1].value.to_i
           if number != 0
             data << sprintf("%05d", number)
           end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.7.8"
+  VERSION = "1.7.9"
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 1.7.9
+  prerelease: 
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -257,26 +282,27 @@ files:
 homepage: https://github.com/zdavatz/oddb2xml
 licenses:
 - GPL-v2
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: oddb2xml creates xml files.
 test_files:
 - spec/builder_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzRmYjExNzg3YzVmYjg1Y2QzZTRiNzkwZGZlZWVjNThkOTExNjljNA==
-  data.tar.gz: !binary |-
-    MmFiOTY2MTI1MjY4ZDM2MjVhOWUzMGNlY2RjYzE4YzM3NWM1MGU1YQ==
-SHA512:
-  metadata.gz: !binary |-
-    ZTk4NTc1NDUyYWMwN2M0YTQ0NDVlMDIzZTAwZWM4YmFmMmZkZTI0ZTViODNi
-    ZDc5ODI1ODU2MDI3NmFkYWEyYTlmMmU3ODljZjllY2Y4NGU5MTYyNjk3MTA0
-    OTBkMGViYWIxODhhYzIwNzYzZjkzZWRkYWQ2YmNkMjAzNTEyNjU=
-  data.tar.gz: !binary |-
-    NGE5ZGMyZDMxYjM1MTk4MzdmOTc4M2RiNGJmM2ZlMWI0MzdkYTQ0NmE2YTY3
-    ZmE3OWJlOWI5YzYwZTcxNjlmNTk3ZmMwMzFkMmI2YjI4ZmUzMzAxZjZjNDI0
-    NTVmNDkzNzY4NzQ3YzQxZjQ3Y2Q5Y2IyMDgxMzQ4NzgwYTEyN2U=