oddb2xml 1.4.3 → 1.4.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.4.4 / 18.02.2013
+
+* Update to work length formatter on ruby 1.8.7
+
 === 1.4.3 / 18.02.2013
 
 * Remove slicing bug for ruby 1.8.7 (This is Array)

data/lib/oddb2xml/builder.rb

@@ -842,6 +842,21 @@ module Oddb2xml
     end
 
     ### --- see oddb2tdat
+    DAT_LEN = {
+      :RECA =>  2,
+      :CMUT =>  1,
+      :PHAR =>  7,
+      :ABEZ => 50,
+      :PRMO =>  6,
+      :PRPU =>  6,
+      :CKZL =>  1,
+      :CLAG =>  1,
+      :CBGG =>  1,
+      :CIKS =>  1,
+      :ITHE =>  7,
+      :CEAN => 13,
+      :CMWS =>  1,
+    }
     def format_price(price_str, len=6, int_len=4, frac_len=2)
       price = price_str.split('.')
       pre = ''
@@ -865,21 +880,20 @@ module Oddb2xml
       end
       date[0,len]
     end
-    DAT_LEN = {
-      :RECA =>  2,
-      :CMUT =>  1,
-      :PHAR =>  7,
-      :ABEZ => 50,
-      :PRMO =>  6,
-      :PRPU =>  6,
-      :CKZL =>  1,
-      :CLAG =>  1,
-      :CBGG =>  1,
-      :CIKS =>  1,
-      :ITHE =>  7,
-      :CEAN => 13,
-      :CMWS =>  1,
-    }
+    def format_name(name)
+      if RUBY_VERSION.to_f < 1.9 # for multibyte chars length support
+        chars = name.scan(/./mu).to_a
+        diff  = DAT_LEN[:ABEZ] - chars.length
+        if diff > 0
+          chars += Array.new(diff, ' ')
+        elsif diff < 0
+          chars = chars [0,DAT_LEN[:ABEZ]]
+        end
+        chars.to_s
+      else
+        "%-#{DAT_LEN[:ABEZ]}s" % name
+      end
+    end
     def build_dat
       prepare_articles
       rows = []
@@ -903,11 +917,12 @@ module Oddb2xml
                                               '3'
                                             end
             row << "%0#{DAT_LEN[:PHAR]}d" % idx[:pharmacode].to_i
-            row << "%-#{DAT_LEN[:ABEZ]}s" % (
-                                              idx[:desc].to_s.gsub(/"/, '') + " " +
-                                              (pac ? pac[:name_de].to_s : '') +
-                                              idx[:additional_desc]
-                                            ).to_s[0, DAT_LEN[:ABEZ]].gsub(/"/, '')
+            abez = ( # de name
+              idx[:desc].to_s + " " +
+              (pac ? pac[:name_de].to_s : '') +
+              idx[:additional_desc]
+            ).gsub(/"/, '')
+            row << format_name(abez)
             row << "%#{DAT_LEN[:PRMO]}s"  % (pac ? format_price(pac[:prices][:exf_price][:price].to_s) : ('0' * DAT_LEN[:PRMO]))
             row << "%#{DAT_LEN[:PRPU]}s"  % (pac ? format_price(pac[:prices][:pub_price][:price].to_s) : ('0' * DAT_LEN[:PRPU]))
             row << "%#{DAT_LEN[:CKZL]}s"  % if (@lppvs[idx[:ean]])
@@ -963,10 +978,11 @@ module Oddb2xml
                                             '3'
                                           end
           row << "%0#{DAT_LEN[:PHAR]}d" % idx[:pharmacode].to_i
-          row << "%-#{DAT_LEN[:ABEZ]}s" % (
-                                            idx[:desc].to_s.gsub(/"/, '') + " " +
-                                            idx[:additional_desc]
-                                          ).to_s[0, DAT_LEN[:ABEZ]].gsub(/"/, '')
+          abez = ( # de name
+            idx[:desc].to_s + " " +
+            idx[:additional_desc]
+          ).gsub(/"/, '')
+          row << format_name(abez)
           row << "%#{DAT_LEN[:PRMO]}s"  % ('0' * DAT_LEN[:PRMO])
           row << "%#{DAT_LEN[:PRPU]}s"  % ('0' * DAT_LEN[:PRPU])
           row << "%#{DAT_LEN[:CKZL]}s"  % '3' # sl_entry and lppv

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &10008000 !ruby/object:Gem::Requirement
+  requirement: &9491760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10008000
+  version_requirements: *9491760
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &10005780 !ruby/object:Gem::Requirement
+  requirement: &9489900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10005780
+  version_requirements: *9489900
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &10003560 !ruby/object:Gem::Requirement
+  requirement: &9487320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *10003560
+  version_requirements: *9487320
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &10001120 !ruby/object:Gem::Requirement
+  requirement: &9485840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10001120
+  version_requirements: *9485840
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &9999560 !ruby/object:Gem::Requirement
+  requirement: &9484440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *9999560
+  version_requirements: *9484440
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &9998780 !ruby/object:Gem::Requirement
+  requirement: &9483500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9998780
+  version_requirements: *9483500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9998020 !ruby/object:Gem::Requirement
+  requirement: &9482040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9998020
+  version_requirements: *9482040
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &9996860 !ruby/object:Gem::Requirement
+  requirement: &9481420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9996860
+  version_requirements: *9481420
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &9996000 !ruby/object:Gem::Requirement
+  requirement: &9479900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *9996000
+  version_requirements: *9479900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &9995300 !ruby/object:Gem::Requirement
+  requirement: &9475580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9995300
+  version_requirements: *9475580
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &9994120 !ruby/object:Gem::Requirement
+  requirement: &9472360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *9994120
+  version_requirements: *9472360
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &9993160 !ruby/object:Gem::Requirement
+  requirement: &9469560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *9993160
+  version_requirements: *9469560
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: