friends 0.42 → 0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f22962545b83fa5532f7533ff3695a860a2f0190a0b2b6ff9e4ce86437de3821
-  data.tar.gz: 037cafd4b8f73d84bb1d7a609899079371621a1469a7705730902df3788f4291
+SHA1:
+  metadata.gz: 779330dcc4a5fb8acc1ab8f7454045d9d69d0967
+  data.tar.gz: '04199e1544035835057259d1a4640609d4fa15d4'
 SHA512:
-  metadata.gz: ad3125d9527c7eed75e44e1317488faeaa5f4a9a8725fde13b76cb785f9f049bf0915bc931e36ee60a7d157ec17ed87d0a846baa26c24e2659387cf1afad81f7
-  data.tar.gz: a8d68d8dda6427becab02cd0456574f535ab9d2ecd6c73455124f61b607d2b08ada41ee7767cefbf1bcf43ee3f01a180f87cfc318bddf335cc421472dbb22bf6
+  metadata.gz: f32cb8224ae8eefbf19696f940109ade23f6092eb4c180907f30b4e0c4cb84ed047989235d5dcab54759be909bf25ac8e14527142dd1ae2a3b3f0da898c721ac
+  data.tar.gz: 760b017d4d42f127091227d592b4c3d044b5f2570e0156d0cd94789e7dce02cd128bb9c45628001537ead08374604667aa7738852106f2cd15e4dcd7549e1f8a

data/.travis.yml

@@ -1,12 +1,19 @@
 language: ruby
 rvm:
-- 2.1.0
-- 2.2.0
-- 2.3.0
-- 2.4.0
-- 2.5.0
+  - 2.1.0
+  - 2.2.0
+  - 2.3.0
+  - 2.4.0 # 2.5.0 is tested below
+branches:
+  only:
+    - master
 script:
-- bundle exec rake test
-- bundle exec rubocop
+  - bundle exec rake test
+matrix:
+  include:
+    - rvm: 2.5.0
+      script:
+        - bundle exec rake test
+        - gem install rubocop && rubocop
 notifications:
   email: false

data/CHANGELOG.md

@@ -14,6 +14,26 @@ making a small donation (🙏) to show you appreciate its continued development.
 
 👆 Donate with these buttons! 👆
 
+## [v0.43](https://github.com/JacobEvelyn/friends/tree/v0.43) (2018-11-25)
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.42...v0.43)
+
+**Implemented enhancements:**
+
+- Improve matches for friends with only first names [\#215](https://github.com/JacobEvelyn/friends/issues/215)
+- Better match friends with middle names [\#213](https://github.com/JacobEvelyn/friends/issues/213)
+
+**Closed issues:**
+
+- When specifying a file that does not exist, prompt to create it instead of aborting [\#214](https://github.com/JacobEvelyn/friends/issues/214)
+- Dependabot can't evaluate your Ruby dependency files [\#211](https://github.com/JacobEvelyn/friends/issues/211)
+- Sqlite as a backing datastore [\#210](https://github.com/JacobEvelyn/friends/issues/210)
+- Generate Searchable Static Site [\#209](https://github.com/JacobEvelyn/friends/issues/209)
+
+**Merged pull requests:**
+
+- Improve friend name matching for various edge cases [\#216](https://github.com/JacobEvelyn/friends/pull/216) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Fix contributing guide link [\#212](https://github.com/JacobEvelyn/friends/pull/212) ([Nitemice](https://github.com/Nitemice))
+
 ## [v0.42](https://github.com/JacobEvelyn/friends/tree/v0.42) (2018-09-22)
 [Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.41...v0.42)
 
@@ -67,7 +87,7 @@ making a small donation (🙏) to show you appreciate its continued development.
 - Give name-matching priority to full-text matches [\#203](https://github.com/JacobEvelyn/friends/pull/203) ([JacobEvelyn](https://github.com/JacobEvelyn))
 - Prevent the addition of blank events, names, and locations [\#200](https://github.com/JacobEvelyn/friends/pull/200) ([JacobEvelyn](https://github.com/JacobEvelyn))
 - Fix Rubocop errors [\#196](https://github.com/JacobEvelyn/friends/pull/196) ([JacobEvelyn](https://github.com/JacobEvelyn))
-- Update rake requirement to ~\> 12.3 [\#194](https://github.com/JacobEvelyn/friends/pull/194) ([dependabot[bot]](https://github.com/marketplace/dependabot))
+- Update rake requirement to ~\> 12.3 [\#194](https://github.com/JacobEvelyn/friends/pull/194) ([dependabot[bot]](https://github.com/apps/dependabot))
 
 ## [v0.37](https://github.com/JacobEvelyn/friends/tree/v0.37) (2018-02-24)
 [Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.36...v0.37)
@@ -608,4 +628,4 @@ making a small donation (🙏) to show you appreciate its continued development.
 ## [v0.0.1](https://github.com/JacobEvelyn/friends/tree/v0.0.1) (2014-12-11)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -932,7 +932,7 @@ If you have an idea,
 [make a GitHub issue](https://github.com/JacobEvelyn/friends/issues/new)!
 Suggestions are very very welcome, and usually are implemented very
 quickly. And if you'd like to do the implementing yourself, see the
-[contributing guide](https://github.com/JacobEvelyn/friends/blob/master/CONTRIBUTING.md).
+[contributing guide](https://github.com/JacobEvelyn/friends/blob/master/.github/CONTRIBUTING.md).
 
 A big big thanks to all of this project's lovely
 [contributors](https://github.com/JacobEvelyn/friends/graphs/contributors):

data/friends.gemspec

@@ -38,6 +38,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.5"
   spec.add_development_dependency "minitest-proveit", "~> 1.0"
   spec.add_development_dependency "rake", "~> 12.3"
-  spec.add_development_dependency "rubocop", "~> 0.49"
   spec.add_development_dependency "simplecov", "~> 0.14"
 end

data/lib/friends/friend.rb

@@ -131,7 +131,7 @@ module Friends
       # We check nicknames before first names because nicknames may contain
       # first names, as in "Amazing Grace" being a nickname for Grace Hopper.
       [
-        chunks,
+        chunks, # Match a full name with the highest priority.
         *@nicknames.map { |n| [n] },
 
         # Match a first name followed by a last name initial, period, and then
@@ -139,16 +139,16 @@ module Friends
         # the "Jake E." part of something like "Jake E. and I went skiing." This
         # allows us to correctly count the period as part of the name when it's
         # in the middle of a sentence.
-        [chunks.first, "#{chunks.last[0]}\.(?=#{splitter}(?-i)[a-z])"],
+        ([chunks.first, "#{chunks.last[0]}\.(?=#{splitter}(?-i)[a-z])"] if chunks.size > 1),
 
         # If the above doesn't match, we check for just the first name and then
         # a last name initial. This matches the "Jake E" part of something like
         # "I went skiing with Jake E." This allows us to correctly exclude the
         # period from the name when it's at the end of a sentence.
-        [chunks.first, chunks.last[0]],
+        ([chunks.first, chunks.last[0]] if chunks.size > 1),
 
-        [chunks.first]
-      ].map do |words|
+        *(1..chunks.size - 1).map { |i| chunks.take(i) }.reverse
+      ].compact.map do |words|
         Friends::RegexBuilder.regex(words.join(splitter))
       end
     end

data/lib/friends/tag_regex.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Friends
-  TAG_REGEX = /(?<!\p{Alnum})@\p{Alnum}(?:[:-]?\p{Alnum})*/
+  TAG_REGEX = /(?<!\p{Alnum})@\p{Alnum}(?:[:-]?\p{Alnum})*/.freeze
 end

data/lib/friends/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Friends
-  VERSION = "0.42".freeze
+  VERSION = "0.43".freeze
 end

data/test/add_event_helper.rb

@@ -258,6 +258,59 @@ FILE
       end
     end
 
+    describe "when a friend's first and middle name matches two other friends' first names" do
+      let(:description) { "Met Martin Luther." }
+
+      # Make sure "Martin Jones" and "Luther Jones" are closer friends than
+      # "Martin Luther King" so we know our test result isn't due to chance.
+      let(:content) do
+        <<-FILE
+### Activities:
+- 2018-01-01: Singing with **Martin Jones**.
+- 2018-01-01: Dancing with **Luther Jones**.
+
+### Notes:
+
+### Friends:
+- Luther Jones
+- Martin Jones
+- Martin Luther King
+
+### Locations:
+FILE
+      end
+
+      it { line_added "- #{date}: Met **Martin Luther King**." }
+      if test_stdout
+        it { stdout_only "#{capitalized_event} added: \"#{date}: Met Martin Luther King.\"" }
+      end
+    end
+
+    describe "when a friend has a first name only" do
+      # We want to explicitly check that the first-name last-initial behavior
+      # doesn't kick in here and match "Alejandra A" when the friend has no
+      # last name.
+      let(:description) { "Met Alejandra a few times." }
+
+      let(:content) do
+        <<-FILE
+### Activities:
+
+### Notes:
+
+### Friends:
+- Alejandra
+
+### Locations:
+FILE
+      end
+
+      it { line_added "- #{date}: Met **Alejandra** a few times." }
+      if test_stdout
+        it { stdout_only "#{capitalized_event} added: \"#{date}: Met Alejandra a few times.\"" }
+      end
+    end
+
     describe "when description has a friend's name with leading asterisks" do
       let(:description) { "Lunch with **Grace Hopper." }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: '0.42'
+  version: '0.43'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-22 00:00:00.000000000 Z
+date: 2018-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -150,20 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.49'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -279,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Spend time with the people you care about.