reading 0.8.0 → 0.9.0

data/lib/reading/parsing/rows/regular_columns/length.rb

@@ -15,16 +15,16 @@ module Reading
                 )
                 (\s+|\z)
               )
-              # each or repetitions, used in conjunction with the History column
+              # each and repetitions are used in conjunction with the History column
+              # each
               (
-                # each
                 (?<each>each)
-                |
-                # repetitions
-                (
-                  x
-                  (?<repetitions>\d+)
-                )
+                (\s+|\z)
+              )?
+              # repetitions
+              (
+                x
+                (?<repetitions>\d+)
               )?
             \z}x]
           end

data/lib/reading/parsing/rows/regular_columns/sources.rb

@@ -6,17 +6,12 @@ module Reading
         # and https://github.com/fpsvogel/reading/blob/main/doc/csv-format.md#sources-column-variants
         class Sources < Column
           SOURCES_PARSING_ERRORS = {
-            "Missing comma before URL(s) in the Sources column" =>
-              ->(source) {
-                source.match?(/\shttps?:\/\//) || source.scan(/https?:\/\//).count > 1
-              },
-            "The ISBN/ASIN must be placed after sources in the Sources column" =>
+            "The ISBN/ASIN must be placed last in the Sources column" =>
               ->(source) {
                 source.match?(/\A#{ISBN_REGEX}/o) || source.match(/\A#{ASIN_REGEX}/o)
               },
           }
 
-
           def self.split_by_format?
             true
           end
@@ -32,7 +27,18 @@ module Reading
           def self.tweaks
             {
               sources: -> {
-                sources = _1.split(/\s*,\s*/)
+                comma = /\s*,\s*/
+                space_before_url = / (?=https?:\/\/)/
+                sources = _1.split(Regexp.union(comma, space_before_url))
+
+                # Split by space after URL.
+                sources = sources.flat_map { |src|
+                  if src.match?(/\Ahttps?:\/\//)
+                    src.split(" ", 2)
+                  else
+                    src
+                  end
+                }
 
                 SOURCES_PARSING_ERRORS.each do |message, check|
                   if sources.any? { |source| check.call(source) }
@@ -58,7 +64,7 @@ module Reading
                   |
                   (?<length_time>\d+:\d\d)
                 )?
-              \z}x if  segment_index.zero?),
+              \z}x if segment_index.zero?),
               # sources, ISBN/ASIN, length
               (%r{\A
                 (
@@ -78,7 +84,7 @@ module Reading
                   |
                   (?<length_time>\d+:\d\d)
                 )?
-              \z}xo if  segment_index.zero?),
+              \z}xo if segment_index.zero?),
               *Column::SHARED_REGEXES[:series_and_extra_info],
             ].compact
           end

data/lib/reading/parsing/transformer.rb

@@ -1,12 +1,12 @@
-require_relative "attributes/shared"
-require_relative "attributes/attribute"
-require_relative "attributes/rating"
-require_relative "attributes/author"
-require_relative "attributes/title"
-require_relative "attributes/genres"
-require_relative "attributes/variants"
-require_relative "attributes/experiences"
-require_relative "attributes/notes"
+require_relative 'attributes/shared'
+require_relative 'attributes/attribute'
+require_relative 'attributes/rating'
+require_relative 'attributes/author'
+require_relative 'attributes/title'
+require_relative 'attributes/genres'
+require_relative 'attributes/variants'
+require_relative 'attributes/experiences'
+require_relative 'attributes/notes'
 
 module Reading
   module Parsing
@@ -20,13 +20,9 @@ module Reading
       using Util::HashArrayDeepFetch
       using Util::HashCompactByTemplate
 
-      attr_reader :config
       private attr_reader :attributes
 
-      # @param config [Hash] an entire config.
-      def initialize(config)
-        @config = config
-
+      def initialize
         set_attributes
       end
 
@@ -40,7 +36,7 @@ module Reading
           raise InvalidHeadError, "Blank or missing Head column"
         end
 
-        template = config.deep_fetch(:item, :template)
+        template = Config.hash.deep_fetch(:item, :template)
 
         parsed_row[:head].map.with_index { |_head, head_index|
           template.map { |attribute_name, default_value|
@@ -58,11 +54,11 @@ module Reading
       # Sets the attributes classes which do all the transforming work.
       # See parsing/attributes/*.
       def set_attributes
-        @attributes ||= config.deep_fetch(:item, :template).map { |attribute_name, _default|
+        @attributes ||= Config.hash.deep_fetch(:item, :template).map { |attribute_name, _default|
           attribute_name_camelcase = attribute_name.to_s.split("_").map(&:capitalize).join
           attribute_class = Attributes.const_get(attribute_name_camelcase)
 
-          [attribute_name, attribute_class.new(config)]
+          [attribute_name, attribute_class.new]
         }.to_h
       end
     end