datanorm 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 157ab57a1e003bd67078ed80ff60a3321e424b3f13b9cbd9d568fa8b66e4f4ef
-  data.tar.gz: 42a35c9c02d4c22391cff9a067565bf2b2320e05c57bb5dfe3bd1845cad7b59a
+  metadata.gz: ba35b7a1d5969153035572f2d779c17b7686281448a4b2dbaa9d24082ca1fc6e
+  data.tar.gz: 83250ea0b2691f52ff92ca277e735579f52e0bfe46ee412d1f1fa65e90c2c39b
 SHA512:
-  metadata.gz: f7a112872947727f6ee390a5ed43fa0c4071fa52712d22cd7355d2d3f63e93579c45f59fb155cdaea4f2fab34eb2b76e51865fb3b3ef43e18697e987341c76ba
-  data.tar.gz: a3ba8c8ef11ef6d1ea6c21b822e255392eb608e63e703b2134e631e72dd689060eb3e46355a48ef4a9d0574ac595bdaad37c300f256080cd37eaad7bcef47088
+  metadata.gz: 263169ffa30220c0c48320d993aeb7977bbe9f037c757a52f201f6444f10ec9893c4450ef54c24979cfbb6af7c1120d808d98ef3d09d76736f1102dcee2e4053
+  data.tar.gz: 72095bf55d2bb18017c1a45c8f6393b4ab8a3579eebd03a5ee3684e72f54a06fb5c397f885ced36cc29683afc6e4cef63c5a55b3fa8d6997fa456caa3395a63c

data/lib/datanorm/documents/assembles/product.rb

@@ -53,7 +53,7 @@ module Datanorm
           # Instead, we choose one or the other.
           return dimension_content if dimension_content && !dimension_content.strip.empty?
 
-          text_reference.read
+          text_reference&.read
         end
 
         # -----------------------
@@ -108,19 +108,19 @@ module Datanorm
         # -----------------
 
         def matchcode
-          extra_reference.read[:matchcode]
+          extra_reference.read&.fetch(:matchcode)
         end
 
         def alternative_id
-          extra_reference.read[:alternative_id]
+          extra_reference.read&.fetch(:alternative_id)
         end
 
         def ean
-          extra_reference.read[:ean]
+          extra_reference.read&.fetch(:ean)
         end
 
         def category_id
-          extra_reference.read[:category_id]
+          extra_reference.read&.fetch(:category_id)
         end
 
         # -------
@@ -133,7 +133,7 @@ module Datanorm
 
         def as_json
           # Adding referenced attributes that were cached to disk during preprocessing.
-          json.merge(description:, prices: prices.map(&:as_json)).merge(extra_reference.read)
+          json.merge(description:, prices: prices.map(&:as_json)).merge(extra_reference.read || {})
         end
 
         def to_json(...)

data/lib/datanorm/documents/assembles/reference.rb

@@ -20,17 +20,26 @@ module Datanorm
         private
 
         def read!
-          if parse_json
-            JSON.parse(path.read, symbolize_names: true) if path.file?
+          return unless path.file?
 
+          if parse_json
+            read_json!
           elsif path.file?
-            if split_newlines
-              path.read.split("\n")
-            else
-              path.read
-            end
+            read_file!
           end
         end
+
+        def read_file!
+          if split_newlines
+            path.read.split("\n")
+          else
+            path.read
+          end
+        end
+
+        def read_json!
+          JSON.parse(path.read, symbolize_names: true)
+        end
       end
     end
   end

data/lib/datanorm/header.rb

@@ -2,6 +2,16 @@
 
 module Datanorm
   # Represents the first line of a DATANORM file.
+  #
+  # Zeichen 1: Satzkennzeichen für Vorlaufsatz: immer „V“
+  # Zeichen 2: freie Verwendung
+  # Zeichen 3-8: Datum im Format TTMMJJ, darf für Cadia nicht leer sein
+  # Zeichen 9-48: Infotext1 (Bezeichnung des Datenlieferanten), darf für Cadia nicht leer sein
+  # Zeichen 49-88: Infotext2
+  # Zeichen 89-123: Infotext3
+  # Zeichen 124-125: Datanormversion (für Cadia zwingend 04)
+  # Zeichen 126-128: Währung (im Regelfall EUR)
+  #
   class Header
     def initialize(line:)
       @line = line.to_s
@@ -23,6 +33,12 @@ module Datanorm
       @date = parse_date
     end
 
+    def title
+      return @title if defined?(@title)
+
+      @title = parse_title
+    end
+
     private
 
     attr_reader :line
@@ -42,5 +58,13 @@ module Datanorm
         ::Datanorm::Headers::V4::Date.call(line:)
       end
     end
+
+    def parse_title
+      if version.five?
+        ::Datanorm::Headers::V5::Title.call(line:)
+      elsif version.four?
+        ::Datanorm::Headers::V4::Title.call(line:)
+      end
+    end
   end
 end

data/lib/datanorm/headers/v4/title.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Datanorm
+  module Headers
+    module V4
+      # Parses a Vendor from the raw first line of a Datanorm file.
+      class Title
+        include Calls
+
+        option :line
+
+        def call
+          ::Datanorm::Helpers::Utf8.call all_texts
+        end
+
+        private
+
+        # Every supplier uses these three text fields differently.
+        # Best to return the entire thing.
+        def all_texts
+          "#{infotext1} #{infotext2} #{infotext3}".gsub(/\s+/, ' ').strip
+        end
+
+        def infotext1
+          line[8..47]
+        end
+
+        def infotext2
+          line[48..87]
+        end
+
+        def infotext3
+          line[88..122]
+        end
+      end
+    end
+  end
+end

data/lib/datanorm/headers/v5/title.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Datanorm
+  module Headers
+    module V5
+      # rubocop:disable Layout/LineLength
+      #
+      # Parses a Vendor from the raw first line of a Datanorm file.
+      #
+      # Examples:
+      #   V;050;A;20200406;EUR;Example GmbH;Produktdaten;;;;;;;;;
+      #   V;050;A;20201210;EUR;Produktkatalog 2021;ACME inc.;;;;;;;;;
+      #   V;050;A;20200730;EUR;Artikelstammdaten Deutschland, 29_DE;;EXAMPLE;EXAMPLE ELECTRONIC GMBH;www.example.de;info@example.de;Examplestr. 60;D;73434;Examplecity;
+      #
+      # rubocop:enable Layout/LineLength
+      class Title
+        include Calls
+
+        option :line
+
+        def call
+          ::Datanorm::Helpers::Utf8.call columns[5..14].join(' ').gsub(/\s+/, ' ').strip
+        end
+
+        private
+
+        def columns
+          line.split(';')
+        end
+      end
+    end
+  end
+end

data/lib/datanorm.rb

@@ -16,8 +16,10 @@ require 'datanorm/helpers/utf8'
 require 'datanorm/helpers/filename'
 
 require 'datanorm/headers/v4/date'
+require 'datanorm/headers/v4/title'
 require 'datanorm/headers/v4/version'
 require 'datanorm/headers/v5/date'
+require 'datanorm/headers/v5/title'
 require 'datanorm/headers/v5/version'
 
 require 'datanorm/lines/parse'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datanorm
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - halo
@@ -110,8 +110,10 @@ files:
 - lib/datanorm/file.rb
 - lib/datanorm/header.rb
 - lib/datanorm/headers/v4/date.rb
+- lib/datanorm/headers/v4/title.rb
 - lib/datanorm/headers/v4/version.rb
 - lib/datanorm/headers/v5/date.rb
+- lib/datanorm/headers/v5/title.rb
 - lib/datanorm/headers/v5/version.rb
 - lib/datanorm/helpers/filename.rb
 - lib/datanorm/helpers/utf8.rb
@@ -137,6 +139,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/halo/datanorm/issues
+  changelog_uri: https://github.com/halo/datanorm/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/halo/datanorm
 rdoc_options: []