datanorm 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bc247f6b5cf0caa87be3451f4d2e90a72aba5ad997a00366d48d36f02b2b53d
-  data.tar.gz: 2f37db8b1e291a729c848a9fb6c2c5f8b1ec18985e2c6bc5f407a7ac06915c58
+  metadata.gz: 322ca5c2dbafa91a1c434f0bef802c668663d15df12e268cebd55d0f5d589e9f
+  data.tar.gz: b6552e47e101c2f41c4ed48fc64942dfbc735b26ce6d60bc8b83aacd680e487c
 SHA512:
-  metadata.gz: 06e36c422c1067c51217608f4c59b7112ae0342a4b3fae8d3f19e820c89be79363698c2e8ab39f4749243b9822739a4d752dbf785e080f45402ae44121682a07
-  data.tar.gz: 51b569323216339000c189c7c17744e403a8706ffb80095a3aec702413740d25f8f823477b5214b703779884893247f22c24d1a2fed9d3d45f6fb7e6df608f99
+  metadata.gz: 558a691b8d6d37121a5a9c4d71c0f519991cea4dff3a9a7a9c10ef344782d1072d25348e488955205e170c7fa3fc9e37fbd43c8f4f334008342a69cbeb8867ad
+  data.tar.gz: 8ffa635f8f6c97b340335622cbd6ea5ecfadf998bde2126a6317c18da694f71a24c06088242ed532b5638d6e3ba84e1592b2cb916583ebeec1924059b08617dd

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/file.rb

@@ -33,6 +33,7 @@ module Datanorm
       ::CSV.foreach(path, **options) do |columns|
         line_number += 1
         next if line_number == 1 # Skip header, it's parsed separately
+        next if columns.empty? # Empty line
 
         yield ::Datanorm::Lines::Parse.call(version:, columns:, source_line_number: line_number)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datanorm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - halo