oddb2xml 1.5.5 → 1.5.6

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.5.6 / 09.07.2013
+
+* Fix bug zurrose price format
+* Update time format for zurrose import
+* Update to add ZURROSE Price as optional value
+
 === 1.5.5 / 08.07.2013
 
 * Add local PATH option support for zurrose

data/lib/oddb2xml/builder.rb

@@ -653,13 +653,7 @@ module Oddb2xml
                   #xml.LINENO
                   #xml.NOUNITS
                 #}
-                if price # zurrose
-                  xml.ARTPRI {
-                   xml.VDAT  datetime
-                   xml.PTYP  "ZURROSE"
-                   xml.PRICE price[:price]
-                  }
-                elsif pac
+                if pac
                   pac[:prices].each_pair do |key, price|
                     xml.ARTPRI {
                      xml.VDAT  price[:valid_date] unless price[:valid_date].empty?
@@ -668,6 +662,13 @@ module Oddb2xml
                     }
                   end
                 end
+                if price
+                  xml.ARTPRI {
+                    xml.VDAT  Time.parse(datetime).strftime("%d.%m.%Y")
+                    xml.PTYP  "ZURROSE"
+                    xml.PRICE price[:price]
+                  }
+                end
                 #xml.ARTMIG {
                   #xml.VDAT
                   #xml.MIGCD

data/lib/oddb2xml/extractor.rb

@@ -409,7 +409,7 @@ module Oddb2xml
   end
   class ZurroseExtractor < Extractor
     def initialize(dat)
-      @io = StringIO.new(dat)
+      @io = StringIO.new(dat) if dat
     end
     def to_hash
       data = {}
@@ -417,9 +417,9 @@ module Oddb2xml
         next unless line =~ /(7680\d{9})(\d{1})\r\n$/
         data[$1.to_s] = {
          :vat   => $2.to_s,
-         :price => sprintf("%.2f", line[60,6].gsub(/(\d{2})$/, "." + $1.to_s).to_f)
+         :price => sprintf("%.2f", line[60,6].gsub(/(\d{2})$/, '.\1').to_f)
         }
-      end
+      end if @io
       data
     end
   end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.5.5"
+  VERSION = "1.5.6"
 end

data/spec/extractor_spec.rb

@@ -5,3 +5,46 @@ require 'spec_helper'
 describe Oddb2xml::Extractor do
   it "pending"
 end
+
+describe Oddb2xml::ZurroseExtractor do
+  context 'when transfer.dat is empty' do
+    subject { Oddb2xml::ZurroseExtractor.new("") }
+    it { expect(subject.to_hash).to be_empty }
+  end
+  context 'when transfer.dat is nil' do
+    subject { Oddb2xml::ZurroseExtractor.new(nil) }
+    it { expect(subject.to_hash).to be_empty }
+  end
+  context 'when as line break mark \n is given' do
+    subject do
+      dat = <<-DAT
+1120020244FERRO-GRADUMET Depottabl 30 Stk                   000895001090300C060710076803164401152
+      DAT
+      Oddb2xml::ZurroseExtractor.new(dat)
+    end
+    it { expect(subject.to_hash).to be_empty }
+  end
+  context 'when only 1 record have a valid EAN code' do
+    subject do
+      dat = <<-DAT
+1120020209ERYTRHOCIN I.V. Trockensub Fl 1g                  001518002010300B080160000000000000002\r\n
+1120020244FERRO-GRADUMET Depottabl 30 Stk                   000895001090300C060710076803164401152\r\n
+      DAT
+      Oddb2xml::ZurroseExtractor.new(dat)
+    end
+    it { expect(subject.to_hash.keys.length).to eq(1) }
+    it { expect(subject.to_hash.keys.first).to eq("7680316440115") }
+  end
+  context 'when expected line is given' do
+    subject do
+      dat = <<-DAT
+1120020244FERRO-GRADUMET Depottabl 30 Stk                   000895001090300C060710076803164401152\r\n
+      DAT
+      Oddb2xml::ZurroseExtractor.new(dat)
+    end
+    it { expect(subject.to_hash.keys.length).to eq(1) }
+    it { expect(subject.to_hash.keys.first).to eq("7680316440115") }
+    it { expect(subject.to_hash.values.first[:vat]).to eq("2") }
+    it { expect(subject.to_hash.values.first[:price]).to eq("8.95") }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip