reading 1.1.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c5e7713901523000e0218a07a0295c5190089ed4d890df7b08469f224d3e019
-  data.tar.gz: 1e77b55fc62c48f00c0c0ac284955ab231212f9a509cca75e00af76cf70f3644
+  metadata.gz: 5a081fbab3e05154fcd493884223c2eedcc0c60dd4be99d56f2373ef5689d337
+  data.tar.gz: e7f4dfef59413ce4ade78d2452193bec233482700cecee699655a1ea72a5e499
 SHA512:
-  metadata.gz: 103b4c3467c6ca5a8672f8b3e89767b89bd643114f114dd2e02e23c9432f980016f16cb11326b250efd308de9517f4986f95c4b1f1ca5a22e6aab6ac11d9abf4
-  data.tar.gz: 0a6dbeb09a6e1a44d314d4825a63452f1c6d2be3b3b147c70016ecc28d849371302ea32ec026e7b70e13d31ee5d40dfc2b7fccc53c39d4f8c89495ff56bac684
+  metadata.gz: 45e98e729dd0422b5e0e2abe014f8bab41190b5bd4d3df6969097a60c5738dace9c190bea8e82476c8de880a5d1c34772caf0d9957a975ce417c663190128b11
+  data.tar.gz: f5a9e4645ccc2b6b9a076197c1df92efb6f2219f51de1c7b8d746d08c98b4457aef143702cfabdf0b86eac4ac80bab56324814badae9bf739e56bcf4d49cd64f

data/lib/reading/config.rb

@@ -105,6 +105,7 @@ module Reading
             course:    "🏫",
             piece:     "✏️",
             website:   "🌐",
+            game:      "🎲",
           },
         source_names_from_urls:
           {
@@ -135,6 +136,7 @@ module Reading
                     piece: { emoji: "✏️" },
                     video: { emoji: "🎞️" },
                     audio: { emoji: "🎤" },
+                    game: { emoji: "🎲" },
                   },
                 default_type: :book,
               },
@@ -191,6 +193,8 @@ module Reading
                   [{
                     blurb?: false,
                     private?: false,
+                    date: nil,
+                    rating_change: [],
                     content: nil,
                   }],
               },

data/lib/reading/filter.rb

@@ -60,9 +60,21 @@ module Reading
         return items unless minimum_rating
 
         items.select! do |item|
-          if item.rating
-            item.rating >= minimum_rating
-          end
+          item.rating && item.rating >= minimum_rating
+        end
+      end
+
+      # Mutates the given array of Items to select only Items that were at some
+      # point greater than or equal to (but are now less than) the given minimum.
+      # @param items [Array<Item>]
+      # @param minimum_rating [Integer]
+      def by_minimum_previous_rating!(items, minimum_previous_rating)
+        return items unless minimum_previous_rating
+
+        items.select! do |item|
+          max_previous_rating = item.notes.map { it.rating_change.first }.compact.max
+          max_previous_rating && max_previous_rating >= minimum_previous_rating &&
+            item.rating && item.rating < minimum_previous_rating
         end
       end
 

data/lib/reading/parsing/attributes/notes.rb

@@ -12,9 +12,41 @@ module Reading
             {
               blurb?: note.has_key?(:blurb),
               private?: note.has_key?(:private),
+              date: date(note[:date]),
+              rating_change: rating_change(note[:rating_from], note[:rating_to]),
               content: note[:content],
             }
-          }
+          }.then { distribute_dates_to_rating_changes!(it, parsed_row) }
+        end
+
+        private
+
+        def date(date_string)
+          return nil unless date_string
+
+          Date.parse(date_string)
+        rescue Date::Error
+          raise InvalidDateError, "Unparsable date \"#{date_string}\""
+        end
+
+        def rating_change(rating_from, rating_to)
+          return [] unless rating_from && rating_to
+
+          [Integer(rating_from), Integer(rating_to)]
+        end
+
+        # Rating change notes without dates are automatically given the end or
+        # start dates of the item's experiences in reverse order.
+        def distribute_dates_to_rating_changes!(transformed_notes, parsed_row)
+          return unless transformed_notes
+          experiences = Experiences.new.transform_from_parsed(parsed_row, 0)
+
+          transformed_notes.reverse_each do |note|
+            return if experiences.empty?
+            next if note[:rating_change].empty? || note[:date]
+            last_experience = experiences.pop
+            note[:date] = last_experience[:spans].last[:dates]&.end || last_experience[:spans].first[:dates]&.begin
+          end
         end
       end
     end

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

@@ -58,7 +58,7 @@ module Reading
                 # planned or dates
                 (
                   (
-                    (?<planned>\?\?)
+                    (?<planned>\?\?|TODO)
                     |
                     (#{START_END_DATES_REGEX})
                   )

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

@@ -11,8 +11,24 @@ module Reading
 
           def self.regexes(segment_index)
             [%r{\A
-              (?:(?<blurb>💬)|(?<private>🔒))?(?<content>.+)
-            \z}x]
+              (?:(?<blurb>💬)|(?<private>🔒))?
+              (?<date>\d{4}/\d\d?/\d\d?)?:?\s*
+              (?:
+                (?:
+                  (?:downgraded|upgraded|updated|changed)?\s*rating
+                  |
+                  rating\s*(?:downgraded|upgraded|updated|changed)?
+                )?
+                (?:\s+from\s+)?
+                (?:
+                  (?<rating_from>\d)
+                  \s+to\s+
+                  (?<rating_to>\d)
+                )
+                (?:\s+because\s+|\s*[[:punct:]]\s*)?
+              )?
+              (?<content>.+)?
+            \z}xi]
           end
         end
       end

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

@@ -19,7 +19,7 @@ module Reading
                 (
                   (?<date>\d{4}/\d\d?/\d\d?)
                   |
-                  (?<planned>\?\?)
+                  (?<planned>\?\?|TODO)
                 )
                 (\s+|\z)
               )?

data/lib/reading/stats/filter.rb

@@ -101,6 +101,36 @@ module Reading
 
           matches
         },
+        :"previous-rating" => proc { |values, operator, items|
+          previous_ratings = values.map { |value|
+            if value
+              Integer(value, exception: false) ||
+                Float(value, exception: false) ||
+                (raise InputError, "Previous rating must be a number")
+            end
+          }
+
+          positive_operator = operator == :"!=" ? :== : operator
+
+          matches = items.select { |item|
+            actual_previous_ratings = item.notes.map { it.rating_change.first }.compact
+
+            previous_ratings.any? { |previous_rating|
+              if !actual_previous_ratings.empty? || %i[== !=].include?(operator)
+                actual_previous_ratings.any? { it.send(positive_operator, previous_rating) }
+              end
+            }
+          }
+
+          # Instead of using it.send(operator, format) above, invert the matches
+          # here to ensure multiple values after a negative operator have an
+          # "and" relation: "not(x and y)", rather than "not(x or y)".
+          if operator == :"!="
+            matches = items - matches
+          end
+
+          matches
+        },
         progress: proc { |values, operator, items|
           progresses = values.map { |value|
             value = "0%" if value == "0"
@@ -640,6 +670,7 @@ module Reading
 
       NUMERIC_OPERATORS = {
         rating: true,
+        :"previous-rating" => true,
         progress: true,
         experience: true,
         date: true,
@@ -654,6 +685,7 @@ module Reading
       }
 
       PROHIBIT_NONE_VALUE = {
+        :"previous-rating" => true,
         progress: true,
         title: true,
         :"end-date" => true,

data/lib/reading/stats/operation.rb

@@ -199,7 +199,7 @@ module Reading
               notes_word_count = item
                 .notes
                 .sum { |note|
-                  note.content.scan(/[\w[:punct:]]+/).count
+                  (note.content || "").scan(/[\w[:punct:]]+/).count
                 }
 
               [author_and_title(item), notes_word_count]

data/lib/reading/version.rb

@@ -1,3 +1,3 @@
 module Reading
-  VERSION = "1.1.2"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reading
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Felipe Vogel