reading 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70825fd8a882da595b06db4f8a0766962dd71b8149248ada3ed55280d68b2975
-  data.tar.gz: 124c660e9888c712a8bedc05156700b3e233300a8fe9806dd36ec168e910bfea
+  metadata.gz: a4145847e60a6045a1381afe207be44d30636ca7b058d4c1c1e0db70009af0b4
+  data.tar.gz: 833b042be4b575e4ed166d0269610504c031d03460a0f75c4dedc214b1eaf152
 SHA512:
-  metadata.gz: 174a7a35761e5a26569651bee4e7ddefd0bbe8592b3828df34cb9f465d0a734876a57bb0fecb04683c470567a0df151289c375213cdf7ad67d632d8d06d02d10
-  data.tar.gz: 0cec333e90f2a701521d06c4924083e137268112c1a2749effb17b952b3028a4f4deae9ababd9ce1592eb0a21ba60afac75c0e18f81762af936306d86f2adb82
+  metadata.gz: '09f08e0be8d6cd97481097d4193209af3cda404e076f2d5529c7c4bdee5f146afbf980a2cb05f2435c06633b89954067ee8bea9d02dae4eddd924f86626a9f63'
+  data.tar.gz: 3a50b075c63f2a8b0082b309bef201a8351344c729e90b18482b5796a53bedee1af7fad71af3a0dd884d1245440cfd14dbf6d28aa38bdf5d09717059bd22e7f8

data/bin/reading

@@ -7,8 +7,8 @@
 #   reading "<CSV string>" "<optional comma-separated names of enabled columns>`
 #
 # Examples:
-#   reading '3|📕Trying|Lexpub 1970147288'
-#   reading '📕Trying|Lexpub 1970147288' 'head, sources'
+#   reading '3|📕Trying|Little Library 1970147288'
+#   reading '📕Trying|Little Library 1970147288' 'head, sources'
 
 
 require_relative "../lib/reading/csv"
@@ -16,7 +16,7 @@ require "amazing_print"
 
 input = ARGV[0]
 unless input
-  raise ArgumentError, "CSV string argument required, such as '3|📕Trying|Lexpub 1970147288'"
+  raise ArgumentError, "CSV string argument required, such as '3|📕Trying|Little Library 1970147288'"
 end
 
 config = {}

data/lib/reading/attribute/all_attributes.rb

@@ -63,9 +63,9 @@ module Reading
 
     class NotesAttribute < Attribute
       def parse
-        return nil unless columns[:public_notes]
+        return nil unless columns[:notes]
 
-        columns[:public_notes]
+        columns[:notes]
           .presence
           &.chomp
           &.remove(/#{config.deep_fetch(:csv, :long_separator).rstrip}\s*\z/)

data/lib/reading/config.rb

@@ -133,9 +133,7 @@ module Reading
                 dates_finished
                 genres
                 length
-                public_notes
-                blurb
-                private_notes
+                notes
                 history
               ],
             # Custom columns are listed in a hash with default values, like simple columns in item[:template] above.
@@ -146,6 +144,8 @@ module Reading
             separator:                ",",
             short_separator:          " - ",
             long_separator:           " -- ",
+            date_separator:           "/",
+            date_range_separator:     "..",
             dnf_string:               "DNF",
             series_prefix:            "in",
             group_emoji:              "🤝🏼",
@@ -172,6 +172,7 @@ module Reading
       time_length = /(?<time>\d+:\d\d)/
       pages_length = /p?(?<pages>\d+)p?/
       url = /https?:\/\/[^\s#{@hash.deep_fetch(:csv, :separator)}]+/
+      date_sep = @hash.deep_fetch(:csv, :date_separator)
 
       isbn_lookbehind = "(?<=\\A|\\s|#{@hash.deep_fetch(:csv, :separator)})"
       isbn_lookahead = "(?=\\z|\\s|#{@hash.deep_fetch(:csv, :separator)})"
@@ -191,7 +192,7 @@ module Reading
         progress: /(?<=#{dnf_string}|\A)\s*(?:(?<percent>\d?\d)%|#{time_length}|#{pages_length})\s+/,
         group_experience: /#{@hash.deep_fetch(:csv, :group_emoji)}\s*(.*)\s*\z/,
         variant_index: /\s+v(\d+)/,
-        date: /\d{4}\/\d?\d\/\d?\d/,
+        date: /\d{4}#{date_sep}\d?\d#{date_sep}\d?\d/,
         time_length: /\A#{time_length}(?<each>\s+each)?\z/,
         time_length_in_variant: time_length,
         pages_length: /\A#{pages_length}(?<each>\s+each)?\z/,

data/lib/reading/csv.rb

@@ -26,17 +26,7 @@ module Reading
     # @param config [Hash] a custom config which overrides the defaults,
     #   e.g. { errors: { styling: :html } }
     def initialize(feed = nil, path: nil, config: {})
-      if feed.nil? && path.nil?
-        raise ArgumentError, "No file given to load."
-      end
-
-      if path
-        if !File.exist?(path)
-          raise FileError, "File not found! #{@path}"
-        elsif File.directory?(path)
-          raise FileError, "The reading log must be a file, but the path given is a directory: #{@path}"
-        end
-      end
+      validate_feed_or_path(feed, path)
 
       @feed = feed
       @path = path
@@ -63,5 +53,24 @@ module Reading
     ensure
       feed&.close if feed.respond_to?(:close)
     end
+
+    private
+
+    # Checks on the given feed and path (arguments to #initialize).
+    # @raise [FileError] if the given path is invalid.
+    # @raise [ArgumentError] if both feed and path are nil.
+    def validate_feed_or_path(feed, path)
+      return true if feed
+
+      if path
+        if !File.exist?(path)
+          raise FileError, "File not found! #{path}"
+        elsif File.directory?(path)
+          raise FileError, "The reading log must be a file, but the path given is a directory: #{path}"
+        end
+      else
+        raise ArgumentError, "Either a feed (String, File, etc.) or a file path must be provided."
+      end
+    end
   end
 end

data/lib/reading/errors.rb

@@ -60,6 +60,9 @@ module Reading
 
   # VALIDATION # # # # # # # # # # # # # # # # # # # # # # #
 
+  # Means there are too many columns in a row.
+  class TooManyColumnsError < Reading::Error; end
+
   # Means a date is unparsable, or a set of dates does not make logical sense.
   class InvalidDateError < Reading::Error; end
 

data/lib/reading/row/compact_planned_row.rb

@@ -57,7 +57,7 @@ module Reading
 
       if item_match[:sources_column]
         if item_match[:sources_column].include?(config.deep_fetch(:csv, :column_separator))
-          raise InvalidSourceError, "Too many columns (only Sources allowed) " \
+          raise TooManyColumnsError, "Too many columns (only Sources allowed) " \
             "after #{item_head} in compact planned row"
         end
 

data/lib/reading/row/regular_row.rb

@@ -62,13 +62,18 @@ module Reading
     end
 
     def set_columns
-      @columns = (
-        config.deep_fetch(:csv, :enabled_columns) +
-          config.deep_fetch(:csv, :custom_numeric_columns).keys +
-          config.deep_fetch(:csv, :custom_text_columns).keys
-        )
-        .zip(string.split(config.deep_fetch(:csv, :column_separator)))
-        .to_h
+      column_names = config.deep_fetch(:csv, :enabled_columns) +
+        config.deep_fetch(:csv, :custom_numeric_columns).keys +
+        config.deep_fetch(:csv, :custom_text_columns).keys
+
+      columns_count = string.count(config.deep_fetch(:csv, :column_separator))
+      if columns_count >= column_names.count
+        raise TooManyColumnsError, "Too many columns"
+      end
+
+      column_contents = string.split(config.deep_fetch(:csv, :column_separator))
+
+      @columns = column_names.zip(column_contents).to_h
     end
 
     def ensure_head_column_present

data/lib/reading/version.rb

@@ -1,3 +1,3 @@
 module Reading
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reading
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Felipe Vogel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-27 00:00:00.000000000 Z
+date: 2023-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel