friends 0.32 → 0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6442d6d8566016d767f79473e03abed09746b0b8
-  data.tar.gz: 63b53260698a0d144bce84e399fcf5947e6f9b13
+  metadata.gz: beaf0948ba10e832a1997429d3d4f3eea13874a0
+  data.tar.gz: 635351a704703797fbc817a0acbe43fa90b2ffbf
 SHA512:
-  metadata.gz: a526deeed0f736bb3dc7d5b9f67be7c7e9debaa1d85e7effc65b74c126db5e0acd4eef8a5e6fdb09808d7081a61de3afb9631feca4fcab16ae4865d48d68c93a
-  data.tar.gz: 9c2a52e89e4aaea1ddfb4e1f3f674d8031fff252374868403a9191104a8d6677fb4e65f541984b8caa1ba87ff850c926958f8f0d3515585546569b70ebab0daa
+  metadata.gz: f80bd7d3b7ac0603d52cb518cdaa2bf41c6711d3f0c5c82c50811a4e2ed417d68551b8303a0d9d077004590024809719d2c396c2b017e4932efb2b26d50cd46c
+  data.tar.gz: a7e060faa531c39ddaf1975292d6c2ad9722cc3145bbc8d9db5afa28da4e9b4d6aaeabdcc9cf9469cc855dceb522ac348690faee8b2e2169300bc820d0bdbad8

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.33](https://github.com/JacobEvelyn/friends/tree/v0.33) (2017-08-22)
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.32...v0.33)
+
+**Merged pull requests:**
+
+- Prevent dates without years from being in the future [\#181](https://github.com/JacobEvelyn/friends/pull/181) ([JacobEvelyn](https://github.com/JacobEvelyn))
+
 ## [v0.32](https://github.com/JacobEvelyn/friends/tree/v0.32) (2017-07-25)
 [Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.31...v0.32)
 

data/lib/friends/activity.rb

@@ -34,9 +34,28 @@ module Friends
       # Partition lets us parse "Today" and "Today: I awoke." identically.
       date_s, _, description = str.partition(DATE_PARTITION)
 
-      # rubocop:disable Lint/AssignmentInCondition
-      if time = (date_s =~ /^\d{4}-\d{2}-\d{2}$/ ? Time : Chronic).parse(date_s)
-        # rubocop:enable Lint/AssignmentInCondition
+      time = if date_s =~ /^\d{4}-\d{2}-\d{2}$/
+               Time.parse(date_s)
+             else
+               # If the user inputed a non YYYY-MM-DD format, asssume
+               # it is in the past.
+               past_time = Chronic.parse(date_s, context: :past)
+
+               # If there's no year, Chronic will sometimes parse the date
+               # as being the next occurrence of that date in the future.
+               # Instead, we want to subtract one year to make it the last
+               # occurrence of the date in the past.
+               # NOTE: This is a hacky workaround for the fact that
+               # Chronic's `context: :past` doesn't actually work. We should
+               # remove this when that behavior is fixed.
+               if past_time && past_time > Time.now
+                 Time.local(past_time.year - 1, past_time.month, past_time.day)
+               else
+                 past_time
+               end
+             end
+
+      if time
         @date = time.to_date
         @description = description
       else

data/lib/friends/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Friends
-  VERSION = "0.32"
+  VERSION = "0.33"
 end

data/test/commands/add/activity_spec.rb

@@ -29,12 +29,25 @@ def date_parsing_specs(test_stdout: true)
       it { stdout_only "Activity added: \"2017-03-02: #{description}\"" } if test_stdout
     end
 
-    describe "when date is natural language" do
+    describe "when date is natural language and in full" do
       let(:date) { "February 23rd, 2017" }
 
       it { line_added "- 2017-02-23: #{description}" }
       it { stdout_only "Activity added: \"2017-02-23: #{description}\"" } if test_stdout
     end
+
+    describe "when date is natural language and only month and day" do
+      # We use two days rather than just one to avoid strange behavior around
+      # edge cases when the test is being run right around midnight.
+      let(:two_days_in_seconds) { 2 * 24 * 60 * 60 }
+      let(:raw_date) { Time.now + two_days_in_seconds }
+      let(:date) { raw_date.strftime("%B %d") }
+      let(:expected_year) { raw_date.strftime("%Y").to_i - 1 }
+      let(:expected_date_str) { "#{expected_year}-#{raw_date.strftime('%m-%d')}" }
+
+      it { line_added "- #{expected_date_str}: #{description}" }
+      it { stdout_only "Activity added: \"#{expected_date_str}: #{description}\"" } if test_stdout
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: '0.32'
+  version: '0.33'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic