dsu 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17c91e41af3f1aff56de7740ccbc27cb9d024bb28c850216e198036b2b8ddac3
-  data.tar.gz: 1ebff03df51f1d98642181c3504b7f14ce28a5c3b9ec7fee983e999291fddf06
+  metadata.gz: 6ce3877d498ca52f9395b713e062dd3448ef447028823b880d5a3e514009d8a9
+  data.tar.gz: 3c3a7ea5fd481d5d1e2ff409a812d5581d779d9061c736a8bd1994276c67e343
 SHA512:
-  metadata.gz: b2cd09f9407c7bd079f826f3e6450b6f092e2d19e9f1e0c5f6f81d77f338864e6f3617603e2f24d68d821cf23b1514d7e49b5efdb9de84acc098579b274180b6
-  data.tar.gz: 8a35fcaa5c4e376b8df795be462874cfa2fce1359c5b4c11fa7a251dd98d248ee0ab52150db99764405cd8a338e17f0358c4052ef2e2cd2c80f6a049975e67a6
+  metadata.gz: e25b5428fa6779df05b47b37323e5ae25ae776dfa9eb78463f79c2332d84e338b3f668f805ac5c9f24e5702db4d2802e46ee8439fa94d01ffafc6e15093f650a
+  data.tar.gz: 46aa0bbd606a025f9ffc458c98cc59d0070caac1d89d73eafec90d57da7cc7aedc552ece986fbede7bf7f7977d9afbbd314027f61c371d637d5187ae2968cbd2

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## [1.1.2] 2023-05-??
+## [1.2.1] 2023-06-02
+* Bug fixes
+  - Fixed a bug that raises an error `NoMethodError` for `entry_group_file_exists?` if the `carry_over_entries_to_today` configuration option is set to true, and attempting to edit today's dsu entries.
+## [1.2.0] 2023-05-26
+* Changes
+  - Various refactors.
+  - Bring test coverage to >= 85%.
+## [1.1.2] 2023-05-26
 * Changes
   - Various refactors.
   - Add more test coverage.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dsu (1.1.2)
+    dsu (1.2.1)
       activemodel (~> 7.0, >= 7.0.4.3)
       activesupport (~> 7.0, >= 7.0.4)
       colorize (~> 0.8.1)

data/lib/dsu/support/entry_group_fileable.rb

@@ -14,6 +14,11 @@ module Dsu
         File.exist?(entry_group_file_path)
       end
 
+      def entry_group_file_exists_for?(time:)
+        entries_file_name = time.strftime(configuration_or_options_configuration[:entries_file_name])
+        File.join(entries_folder, entries_file_name)
+      end
+
       private
 
       def entry_group_path_exists?

data/lib/dsu/validators/entries_validator.rb

@@ -11,12 +11,14 @@ module Dsu
 
       def validate(record)
         unless record.entries.is_a?(Array)
-          record.errors.add(:entries_entry, 'is the wrong object type. ' \
-                                            "\"Array\" was expected, but \"#{record.entries.class}\" was received.")
+          record.errors.add(:entries, 'is the wrong object type. ' \
+                                      "\"Array\" was expected, but \"#{record.entries.class}\" was received.")
+          return
         end
 
-        validate_entry_types record
-        validate_unique_entry record
+        return if validate_entry_types record
+        return if validate_unique_entry record
+
         validate_entries record
       end
 
@@ -26,10 +28,12 @@ module Dsu
         record.entries.each do |entry|
           next if entry.is_a? Dsu::Models::Entry
 
-          record.errors.add(:entries_entry, 'entry Array element is the wrong object type. ' \
-                                            "\"Entry\" was expected, but \"#{entry.class}\" was received.",
+          record.errors.add(:entries, 'Array element is the wrong object type. ' \
+                                      "\"Entry\" was expected, but \"#{entry.class}\" was received.",
             type: Support::FieldErrors::FIELD_TYPE_ERROR)
         end
+
+        record.errors.any?
       end
 
       def validate_unique_entry(record)
@@ -42,10 +46,12 @@ module Dsu
 
         non_unique_descriptions = descriptions.select { |description| descriptions.count(description) > 1 }.uniq
         if non_unique_descriptions.any?
-          record.errors.add(:entries_entry, 'contains a duplicate entry: ' \
-                                            "#{format_non_unique_descriptions(non_unique_descriptions)}.",
+          record.errors.add(:entries, 'Array contains a duplicate entry: ' \
+                                      "#{format_non_unique_descriptions(non_unique_descriptions)}.",
             type: Support::FieldErrors::FIELD_DUPLICATE_ERROR)
         end
+
+        record.errors.any?
       end
 
       def validate_entries(record)

data/lib/dsu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dsu
-  VERSION = '1.1.2'
+  VERSION = '1.2.1'
 end

data/lib/dsu/views/entry_group/edit.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require_relative '../../models/entry_group'
-require_relative '../../support/configurable'
+require_relative '../../support/entry_group_fileable'
 
 module Dsu
   module Views
     module EntryGroup
       class Edit
-        include Support::Configurable
+        include Support::EntryGroupFileable
 
         def initialize(entry_group:, options: {})
           raise ArgumentError, 'entry_group is nil' if entry_group.nil?
@@ -100,7 +100,7 @@ module Dsu
         end
 
         def previous_entry_group?
-          previous_entry_group.present?
+          previous_entry_group.entries.present?
         end
 
         def previous_entry_group
@@ -108,13 +108,13 @@ module Dsu
           # TODO: Make this configurable or accept an option?
           @previous_entry_group ||= (1..7).each do |days|
             t = time.days_ago(days)
-            return Models::EntryGroup.load(time: t) if Support::EntryGroupFileable.entry_group_file_exists?(time: t)
+            return Models::EntryGroup.load(time: t) if entry_group_file_exists_for?(time: t)
           end
           nil
         end
 
         def carry_over_entries_to_today?
-          configuration[:carry_over_entries_to_today]
+          configuration.merge(options)[:carry_over_entries_to_today]
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsu
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Gene M. Angelo, Jr.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -118,18 +118,25 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: "    dsu is little gem that helps manage your Agile DSU (Daily Stand
-  Up) participation. How? by providing a simple command line interface (CLI) which
-  allows you to create, read, update, and delete (CRUD) noteworthy activities that
-  you performed during your day. During your DSU, you can then easily recall and share
-  these these activities with your team. Activities are grouped by day and can be
-  viewed in simple text format from the command line. When displaying DSU entries
-  for a particular day or date (date), dsu will display the given day or date's (date)
-  DSU entries, as well as the DSU entries for the previous day, relative to the given
-  day or date. If the date or day you are trying to view falls on a weekend or Monday,
-  dsu will display back to, and including the weekend and previous Friday inclusive;
-  this is so that you can share what you did over the weekend (if anything) and the
-  previous Friday at your DSU.\n"
+description: '    dsu is a small, but powerful gem that helps manage your Agile DSU
+  (Daily Stand Up) participation. How? by providing a simple command-line interface
+  (CLI) which allows you to create, read, update, and delete (CRUD) your DSU entries
+  (activities). During your DSU, you can use dsu''s CLI to list and share what you
+  did "yesterday" and what you plan on doing "Today" with your team. DSU entries are
+  grouped by day and can be viewed in simple text format from the command-line. When
+  displaying DSU entries for a particular day, dsu will also display DSU entries for
+  the previous day. If the day you are trying to display falls on a weekend or Monday,
+  dsu will automatically search back to include the weekend and previous Friday dates
+  and display the entries; this is so that you can share what you did over the weekend
+  (if anything) and the previous Friday with your team. When searching for "Yesterday''s"
+  DSU entries, dsu will automatically search back a maximimum of 7 days to find DSU
+  entries to share. This could be helpful if, for example, if you are sharing what
+  you plan to do today (Wednesday), but were sick yesterday (Tuesday); dsu in this
+  case will display the last DSU entries it can find searching backwards a maximum
+  of 7 days. dsu does a LOT more and is perfect for command-line junkies and those
+  who LOVE simplicity. Give it a try and a star if you like it!
+
+  '
 email:
 - public.gma@gmail.com
 executables: