friends 0.26 → 0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 045b1ac8af5c8004d171bf68792d452509beb67b
-  data.tar.gz: 817d9105c51b235a4d317ef4bc7271a55b888739
+  metadata.gz: f518378eebb4f86c3a576648152ed462ed01618b
+  data.tar.gz: 76c7d599c00fd30eb91034c07f699b9f9b23986e
 SHA512:
-  metadata.gz: bc9894a009593305940c9b241374d7e7fa8568f83152efdf59522b74fa7caad9af32c2990cc055428856e5f1835ff4b74028ead5dfa7c96f26e5f6a93e9af8c4
-  data.tar.gz: 52d6e320aefd0fd4a45373ae20b1aa36c2b96f24367c35d61a13f10d29470c78ada7640460e03565f06084c2f389229f8689eca9519cbe18a26aca9ff391224b
+  metadata.gz: c46eadf9adfbf48498f84eed1fe6dd7b7edc7563ad7ec66250465719a5653ebe44553d8639edda26abe14e5afa8d383e2784852a884f61bdb8f4b70bb99b3893
+  data.tar.gz: 522058cf6e6b06d9d9fa8fffe24c7d7aeda87fe448a3349bfffe8627b637bfec96fb2ba70526c0fb4c6d37c61ce83a17cc9de4702555d8eb3a4319d89c55fade

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## [v0.27](https://github.com/JacobEvelyn/friends/tree/v0.27) (2016-06-22)
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.26...v0.27)
+
+**Implemented enhancements:**
+
+- Allow tags to be added and removed from friends without quotes [\#148](https://github.com/JacobEvelyn/friends/issues/148)
+- Allow multi-word locations to be added without quotes [\#147](https://github.com/JacobEvelyn/friends/issues/147)
+- Speed up initialization [\#143](https://github.com/JacobEvelyn/friends/issues/143)
+- `friends update` can skip reading the friends.md file [\#137](https://github.com/JacobEvelyn/friends/issues/137)
+- Add Gemnasium badge to README [\#130](https://github.com/JacobEvelyn/friends/issues/130)
+
+**Fixed bugs:**
+
+- Commands that find a friend fail on exact text matches when there's more than one fuzzy match [\#149](https://github.com/JacobEvelyn/friends/issues/149)
+
+**Merged pull requests:**
+
+- Small improvements to UX for some commands [\#150](https://github.com/JacobEvelyn/friends/pull/150) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Bump development dependencies [\#146](https://github.com/JacobEvelyn/friends/pull/146) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Skips reading the `friends.md` file on update [\#145](https://github.com/JacobEvelyn/friends/pull/145) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Simplify code and improve performance [\#144](https://github.com/JacobEvelyn/friends/pull/144) ([JacobEvelyn](https://github.com/JacobEvelyn))
+- Add Gemnasium integration with README badge [\#142](https://github.com/JacobEvelyn/friends/pull/142) ([JacobEvelyn](https://github.com/JacobEvelyn))
+
 ## [v0.26](https://github.com/JacobEvelyn/friends/tree/v0.26) (2016-05-23)
 [Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.25...v0.26)
 

data/CODE_OF_CONDUCT.md

@@ -1,24 +1,41 @@
-# Contributor Code of Conduct
+# Contributor Covenant Code of Conduct
 
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
+## Our Pledge
 
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
 Project maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
@@ -26,25 +43,32 @@ that are not aligned to this Code of Conduct, or to ban temporarily or
 permanently any contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
+## Scope
 
 This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at jacobevelyn@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. Maintainers are
-obligated to maintain confidentiality with regard to the reporter of an
-incident.
+reported by contacting the project team at jacobevelyn@gmail.com. The project team
+will review and investigate all complaints, and will respond in a way that it deems
+appropriate to the circumstances. The project team is obligated to maintain
+confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
 
+## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+[version]: http://contributor-covenant.org/version/1/4/

data/README.md

@@ -1,6 +1,7 @@
-[![Gem Version](https://badge.fury.io/rb/friends.svg)](https://badge.fury.io/rb/friends) [![Code Climate](https://codeclimate.com/github/JacobEvelyn/friends/badges/gpa.svg)](https://codeclimate.com/github/JacobEvelyn/friends) [![Test Coverage](https://codeclimate.com/github/JacobEvelyn/friends/badges/coverage.svg)](https://codeclimate.com/github/JacobEvelyn/friends) [![Build Status](https://travis-ci.org/JacobEvelyn/friends.svg?branch=master)](https://travis-ci.org/JacobEvelyn/friends) [![Inline docs](http://inch-ci.org/github/JacobEvelyn/friends.png)](http://inch-ci.org/github/JacobEvelyn/friends) [![ghit.me](https://ghit.me/badge.svg?repo=JacobEvelyn/friends)](https://ghit.me/repo/JacobEvelyn/friends)
+[![Gem Version](https://badge.fury.io/rb/friends.svg)](https://badge.fury.io/rb/friends) [![Dependency Status](https://gemnasium.com/badges/github.com/JacobEvelyn/friends.svg)](https://gemnasium.com/github.com/JacobEvelyn/friends)
+ [![Code Climate](https://codeclimate.com/github/JacobEvelyn/friends/badges/gpa.svg)](https://codeclimate.com/github/JacobEvelyn/friends) [![Test Coverage](https://codeclimate.com/github/JacobEvelyn/friends/badges/coverage.svg)](https://codeclimate.com/github/JacobEvelyn/friends) [![Build Status](https://travis-ci.org/JacobEvelyn/friends.svg?branch=master)](https://travis-ci.org/JacobEvelyn/friends) [![Inline docs](http://inch-ci.org/github/JacobEvelyn/friends.png)](http://inch-ci.org/github/JacobEvelyn/friends) [![ghit.me](https://ghit.me/badge.svg?repo=JacobEvelyn/friends)](https://ghit.me/repo/JacobEvelyn/friends)
 
-# Friends
+# `friends`
 
 Spend time with the people you care about. Introvert-tested.
 Extrovert-approved.
@@ -270,7 +271,7 @@ Friend added: "Grace Hopper"
 #### `add tag`
 
 ```bash
-$ friends add tag "Grace Hopper" science
+$ friends add tag Grace Hopper science
 Tag added to friend: "Grace Hopper @science"
 ```
 
@@ -568,7 +569,7 @@ Paris
 Removes a specific tag from a friend:
 
 ```bash
-$ friends remove tag "Grace Hopper" fun
+$ friends remove tag Grace Hopper fun
 Tag removed from friend: "Grace Hopper (a.k.a. Amazing Grace) @OtherTag"
 ```
 

data/RELEASING.md

@@ -8,7 +8,8 @@ These are steps for the maintainer to take to release a new version of this gem.
 3. Add a tag (`git tag -am "vX.X" vX.X`).
 4. `git push && git push --tags`
 5. `CHANGELOG_GITHUB_TOKEN=... github_changelog_generator`
-6. `git add -A && git commit -m 'Update CHANGELOG for vX.X'`
-7. `git push`
-8. `gem build friends.gemspec && gem push *.gem && rm *.gem`
-9. Celebrate!
+6. Confirm the `CHANGELOG` looks good with `git diff`
+7. `git add -A && git commit -m 'Update CHANGELOG for vX.X'`
+8. `git push`
+9. `gem build friends.gemspec && gem push *.gem && rm *.gem`
+10. Celebrate!

data/bin/friends

@@ -63,14 +63,18 @@ command :update do |update|
          Semverse::Version.coerce(Friends::VERSION)
         `gem update friends && gem cleanup friends`
         if $?.success?
-          puts Paint["Updated to friends #{remote_version}", :bold, :green]
+          @message = Paint[
+            "Updated to friends #{remote_version}", :bold, :green
+          ]
         else
-          puts Paint[
+          @message = Paint[
             "Error updating to friends version #{remote_version}", :bold, :red
           ]
         end
       else
-        puts Paint["Already up-to-date (#{Friends::VERSION})", :bold, :green]
+        @message = Paint[
+          "Already up-to-date (#{Friends::VERSION})", :bold, :green
+        ]
       end
     end
   end
@@ -250,7 +254,7 @@ command :add do |add|
   add.arg_name "LOCATION"
   add.command :location do |add_location|
     add_location.action do |_, _, args|
-      location = @introvert.add_location(name: args.first)
+      location = @introvert.add_location(name: args.join(" "))
       @message = "Location added: \"#{location.name}\""
       @dirty = true # Mark the file for cleaning.
     end
@@ -271,8 +275,8 @@ command :add do |add|
   add.command :tag do |add_tag|
     add_tag.action do |_, _, args|
       friend = @introvert.add_tag(
-        name: args.first,
-        tag: Tag.convert_to_tag(args[1])
+        name: args[0..-2].join(" "),
+        tag: Tag.convert_to_tag(args.last)
       )
       @message = "Tag added to friend: \"#{friend}\""
       @dirty = true # Mark the file for cleaning.
@@ -310,8 +314,8 @@ command :remove do |remove|
   remove.command :tag do |remove_tag|
     remove_tag.action do |_, _, args|
       friend = @introvert.remove_tag(
-        name: args.first,
-        tag: Tag.convert_to_tag(args[1])
+        name: args[0..-2].join(" "),
+        tag: Tag.convert_to_tag(args.last)
       )
       @message = "Tag removed from friend: \"#{friend}\""
       @dirty = true # Mark the file for cleaning.
@@ -429,15 +433,19 @@ command :rename do |rename|
 end
 
 # Before each command, clean up all arguments and create the global Introvert.
-pre do |global_options, _, options|
+pre do |global_options, cmd, options|
   @debug_mode = global_options[:debug]
 
   final_options = global_options.merge!(options).select do |key, _|
     [:filename].include? key
   end
 
-  @introvert = Friends::Introvert.new(final_options)
-  true
+  # If we're updating the friends program we don't need to read the friends file
+  # but we don't skip this block entirely because we might still want to enable
+  # debug mode.
+  @introvert = Friends::Introvert.new(final_options) unless cmd.name == :update
+
+  true # Continue executing the command.
 end
 
 post do |global_options|

data/friends.gemspec

@@ -25,14 +25,14 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "chronic", "~> 0.10"
   spec.add_dependency "gli", "~> 2.12"
-  spec.add_dependency "memoist", "~> 0.11"
+  spec.add_dependency "memoist", "~> 0.14"
   spec.add_dependency "paint", "~> 1.0"
   spec.add_dependency "semverse", "~> 1.2"
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.5"
   spec.add_development_dependency "minitest", "~> 5.5"
-  spec.add_development_dependency "overcommit", "~> 0.30"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "overcommit", "~> 0.34"
+  spec.add_development_dependency "rake", "~> 11.2"
   spec.add_development_dependency "rubocop", "~> 0.40"
 end

data/lib/friends/activity.rb

@@ -37,7 +37,7 @@ module Friends
       date_s, _, description = str.partition(DATE_PARTITION)
 
       # rubocop:disable Lint/AssignmentInCondition
-      if time = Chronic.parse(date_s)
+      if time = (date_s =~ /^\d{4}-\d{2}-\d{2}$/ ? Time : Chronic).parse(date_s)
         # rubocop:enable Lint/AssignmentInCondition
         @date = time.to_date
         @description = description
@@ -211,7 +211,6 @@ module Friends
       end
 
       # Now, we compute the likelihood of each friend in the possible-match set.
-      introvert.set_friend_n_activities!
       introvert.set_likelihood_score!(
         matches: matched_friends,
         possible_matches: possible_matched_friends

data/lib/friends/friend.rb

@@ -103,7 +103,7 @@ module Friends
     # and is set by the Introvert as needed.
     attr_writer :n_activities
     def n_activities
-      @n_activities || 0
+      defined?(@n_activities) ? @n_activities : 0
     end
 
     # The likelihood_score that an activity description that matches part of
@@ -113,7 +113,7 @@ module Friends
     # introvert#set_likelihood_score! methods.
     attr_writer :likelihood_score
     def likelihood_score
-      @likelihood_score || 0
+      defined?(@likelihood_score) ? @likelihood_score : 0
     end
 
     # @return [Array] a list of all regexes to match the name in a string

data/lib/friends/introvert.rb

@@ -49,15 +49,11 @@ module Friends
     # @raise [FriendsError] when a friend with that name is already in the file
     # @return [Friend] the added friend
     def add_friend(name:)
-      if friend_with_exact_name(name)
-        raise FriendsError, "Friend named #{name} already exists"
+      if @friends.any? { |friend| friend.name == name }
+        raise FriendsError, "Friend named \"#{name}\" already exists"
       end
 
-      begin
-        friend = Friend.deserialize(name)
-      rescue Serializable::SerializationError => e
-        raise FriendsError, e
-      end
+      friend = Friend.deserialize(name)
 
       @friends << friend
 
@@ -68,11 +64,7 @@ module Friends
     # @param serialization [String] the serialized activity
     # @return [Activity] the added activity
     def add_activity(serialization:)
-      begin
-        activity = Activity.deserialize(serialization)
-      rescue Serializable::SerializationError => e
-        raise FriendsError, e
-      end
+      activity = Activity.deserialize(serialization)
 
       activity.highlight_description(introvert: self) if activity.description
       @activities.unshift(activity)
@@ -89,11 +81,7 @@ module Friends
         raise FriendsError, "Location \"#{name}\" already exists"
       end
 
-      begin
-        location = Location.deserialize(name)
-      rescue Serializable::SerializationError => e
-        raise FriendsError, e
-      end
+      location = Location.deserialize(name)
 
       @locations << location
 
@@ -107,8 +95,8 @@ module Friends
     # @raise [FriendsError] if 0 or 2+ locations match the given location name
     # @return [Friend] the modified friend
     def set_location(name:, location_name:)
-      friend = friend_with_name_in(name)
-      location = location_with_name_in(location_name)
+      friend = thing_with_name_in(:friend, name)
+      location = thing_with_name_in(:location, location_name)
       friend.location_name = location.name
       friend
     end
@@ -119,7 +107,7 @@ module Friends
     # @raise [FriendsError] if 0 or 2+ friends match the given name
     # @return [Friend] the existing friend
     def rename_friend(old_name:, new_name:)
-      friend = friend_with_name_in(old_name)
+      friend = thing_with_name_in(:friend, old_name)
       @activities.each do |activity|
         activity.update_friend_name(old_name: friend.name, new_name: new_name)
       end
@@ -133,7 +121,7 @@ module Friends
     # @raise [FriendsError] if 0 or 2+ friends match the given name
     # @return [Location] the existing location
     def rename_location(old_name:, new_name:)
-      loc = location_with_name_in(old_name)
+      loc = thing_with_name_in(:location, old_name)
 
       # Update locations in activities.
       @activities.each do |activity|
@@ -155,7 +143,7 @@ module Friends
     # @raise [FriendsError] if 0 or 2+ friends match the given name
     # @return [Friend] the existing friend
     def add_nickname(name:, nickname:)
-      friend = friend_with_name_in(name)
+      friend = thing_with_name_in(:friend, name)
       friend.add_nickname(nickname)
       friend
     end
@@ -166,7 +154,7 @@ module Friends
     # @raise [FriendsError] if 0 or 2+ friends match the given name
     # @return [Friend] the existing friend
     def add_tag(name:, tag:)
-      friend = friend_with_name_in(name)
+      friend = thing_with_name_in(:friend, name)
       friend.add_tag(tag)
       friend
     end
@@ -178,7 +166,7 @@ module Friends
     # @raise [FriendsError] if the friend does not have the given nickname
     # @return [Friend] the existing friend
     def remove_tag(name:, tag:)
-      friend = friend_with_name_in(name)
+      friend = thing_with_name_in(:friend, name)
       friend.remove_tag(tag)
       friend
     end
@@ -190,7 +178,7 @@ module Friends
     # @raise [FriendsError] if the friend does not have the given nickname
     # @return [Friend] the existing friend
     def remove_nickname(name:, nickname:)
-      friend = friend_with_name_in(name)
+      friend = thing_with_name_in(:friend, name)
       friend.remove_nickname(nickname)
       friend
     end
@@ -208,7 +196,7 @@ module Friends
 
       # Filter by location if a name is passed.
       if location_name
-        location = location_with_name_in(location_name)
+        location = thing_with_name_in(:location, location_name)
         fs = fs.select { |friend| friend.location_name == location.name }
       end
 
@@ -244,9 +232,12 @@ module Friends
     # @param tagged [String] the name of a tag to filter by (of the form:
     #   "@tag"), or nil for unfiltered
     # @return [Array] a list of all activity text values
+    # @raise [ArgumentError] if limit is present but limit < 1
     # @raise [FriendsError] if friend, location or tag cannot be found or
     #   is ambiguous
     def list_activities(limit:, with:, location_name:, tagged:)
+      raise ArgumentError, "Limit must be positive" if limit && limit < 1
+
       acts = filtered_activities(
         with: with,
         location_name: location_name,
@@ -338,8 +329,6 @@ module Friends
     #   for unfiltered
     # @return [Hash{String => Array<String>}]
     def suggest(location_name:)
-      set_friend_n_activities! # Set n_activities for all friends.
-
       # Filter our friends by location if necessary.
       fs = @friends
       fs = fs.select { |f| f.location_name == location_name } if location_name
@@ -369,11 +358,6 @@ module Friends
     # Methods below this are only used internally and are not tested. #
     ###################################################################
 
-    # Sets the n_activities field on each friend.
-    def set_friend_n_activities!
-      set_n_activities!(:friend)
-    end
-
     # Get a regex friend map.
     #
     # The returned hash uses the following format:
@@ -480,13 +464,13 @@ module Friends
 
       # Filter by friend name if argument is passed.
       unless with.nil?
-        friend = friend_with_name_in(with)
+        friend = thing_with_name_in(:friend, with)
         acts = acts.select { |act| act.includes_friend?(friend) }
       end
 
       # Filter by location name if argument is passed.
       unless location_name.nil?
-        location = location_with_name_in(location_name)
+        location = thing_with_name_in(:location, location_name)
         acts = acts.select { |act| act.includes_location?(location) }
       end
 
@@ -501,16 +485,14 @@ module Friends
     # @param type [Symbol] one of: [:friend, :location]
     # @param limit [Integer] the number of favorite things to return
     # @return [Array] a list of the favorite things' names and activity counts
+    # @raise [ArgumentError] if type is not one of: [:friend, :location]
+    # @raise [ArgumentError] if limit is < 1
     def list_favorite_things(type, limit:)
       unless [:friend, :location].include? type
-        raise FriendsError, "Type must be either :friend or :location"
+        raise ArgumentError, "Type must be either :friend or :location"
       end
 
-      if limit < 1
-        raise FriendsError, "Favorites limit must be positive"
-      end
-
-      send("set_n_activities!", type) # Set n_activities for all things.
+      raise ArgumentError, "Favorites limit must be positive" if limit < 1
 
       # Sort the results, with the most favorite thing first.
       results = instance_variable_get("@#{type}s").sort_by do |thing|
@@ -531,9 +513,10 @@ module Friends
 
     # Sets the n_activities field on each thing.
     # @param type [Symbol] one of: [:friend, :location]
+    # @raise [ArgumentError] if `type` is not one of: [:friend, :location]
     def set_n_activities!(type)
       unless [:friend, :location].include? type
-        raise FriendsError, "Type must be either :friend or :location"
+        raise ArgumentError, "Type must be either :friend or :location"
       end
 
       # Construct a hash of location name to frequency of appearance.
@@ -546,8 +529,16 @@ module Friends
 
       # Remove names that are not in the locations list.
       freq_table.each do |name, count|
-        thing = send("#{type}_with_exact_name", name)
-        thing.n_activities = count if thing # Do nothing if name isn't valid.
+        things = instance_variable_get("@#{type}s").select do |thing|
+          thing.name == name
+        end
+
+        # Do nothing if no matches found.
+        if things.size == 1
+          things.first.n_activities = count
+        elsif things.size > 1
+          raise FriendsError, "More than one #{type} named \"#{name}\""
+        end
       end
     end
 
@@ -569,6 +560,9 @@ module Friends
         # Parse the line and update the parsing state.
         state = parse_line!(line, line_num: line_num, state: state)
       end
+
+      set_n_activities!(:friend)
+      set_n_activities!(:location)
     end
 
     # Parse the given line, adding to the various internal data structures as
@@ -599,7 +593,7 @@ module Friends
 
       begin
         instance_variable_get("@#{stage.id}") << stage.klass.deserialize(line)
-      rescue FriendsError => e
+      rescue => e
         bad_line(e, line_num)
       end
 
@@ -615,67 +609,37 @@ module Friends
       ParsingStage.new(:locations, Location)
     ].freeze
 
-    # @param name [String] the name of the friend to search for
-    # @return [Friend] the friend whose name exactly matches the argument
-    # @raise [FriendsError] if more than one friend has the given name
-    def friend_with_exact_name(name)
-      results = @friends.select { |friend| friend.name == name }
-
-      case results.size
-      when 0 then nil
-      when 1 then results.first
-      else raise FriendsError, "More than one friend named #{name}"
-      end
-    end
-
-    # @param text [String] the name (or substring) of the friend to search for
-    # @return [Friend] the friend that matches
+    # @param type [Symbol] one of: [:friend, :location]
+    # @param text [String] the name (or substring) of the friend or location to
+    #   search for
+    # @return [Friend/Location] the friend or location that matches
     # @raise [FriendsError] if 0 or 2+ friends match the given text
-    def friend_with_name_in(text)
-      regex = Regexp.new(text, Regexp::IGNORECASE)
-      friends = @friends.select { |friend| friend.name.match(regex) }
-
-      case friends.size
-      when 1
-        # If exactly one friend matches, use that friend.
-        return friends.first
-      when 0 then raise FriendsError, "No friend found for \"#{text}\""
-      else
-        raise FriendsError,
-              "More than one friend found for \"#{text}\": "\
-                "#{friends.map(&:name).join(', ')}"
+    def thing_with_name_in(type, text)
+      things = instance_variable_get("@#{type}s").select do |thing|
+        if type == :friend
+          thing.regexes_for_name.any? { |regex| regex.match(text) }
+        else
+          thing.regex_for_name.match(text)
+        end
       end
-    end
 
-    # @param name [String] the name of the location to search for
-    # @return [Location] the location whose name exactly matches the argument
-    # @raise [FriendsError] if more than one location has the given name
-    def location_with_exact_name(name)
-      results = @locations.select { |location| location.name == name }
+      # If there's more than one match with fuzzy regexes but exactly one thing
+      # with that exact name, match it.
+      if things.size > 1
+        exact_things = things.select do |thing|
+          thing.name.casecmp(text) == 0 # We ignore case for an "exact" match.
+        end
 
-      case results.size
-      when 0 then nil
-      when 1 then results.first
-      else raise FriendsError, "More than one location named #{name}"
+        things = exact_things if exact_things.size == 1
       end
-    end
-
-    # @param text [String] the name (or substring) of the location to search for
-    # @return [Location] the location that matches
-    # @raise [FriendsError] if 0 or 2+ location match the given text
-    def location_with_name_in(text)
-      regex = Regexp.new(text, Regexp::IGNORECASE)
-      locations = @locations.select { |location| location.name.match(regex) }
 
-      case locations.size
-      when 1
-        # If exactly one location matches, use that location.
-        return locations.first
-      when 0 then raise FriendsError, "No location found for \"#{text}\""
+      case things.size
+      when 1 then things.first # If exactly one thing matches, use that thing.
+      when 0 then raise FriendsError, "No #{type} found for \"#{text}\""
       else
         raise FriendsError,
-              "More than one location found for \"#{text}\": "\
-                "#{locations.map(&:name).join(', ')}"
+              "More than one #{type} found for \"#{text}\": "\
+                "#{things.map(&:name).join(', ')}"
       end
     end
 

data/lib/friends/location.rb

@@ -44,7 +44,7 @@ module Friends
     # only and is set by the Introvert as needed.
     attr_writer :n_activities
     def n_activities
-      @n_activities || 0
+      defined?(@n_activities) ? @n_activities : 0
     end
 
     private

data/lib/friends/version.rb

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

data/test/activity_spec.rb

@@ -125,6 +125,7 @@ describe Friends::Activity do
     def stub_friends(val)
       old_val = introvert.instance_variable_get(:@friends)
       introvert.instance_variable_set(:@friends, val)
+      introvert.send(:set_n_activities!, :friend)
       yield
       introvert.instance_variable_set(:@friends, old_val)
     end
@@ -132,6 +133,8 @@ describe Friends::Activity do
     def stub_activities(val)
       old_val = introvert.instance_variable_get(:@activities)
       introvert.instance_variable_set(:@activities, val)
+      introvert.send(:set_n_activities!, :friend)
+      introvert.send(:set_n_activities!, :location)
       yield
       introvert.instance_variable_set(:@activities, old_val)
     end
@@ -139,6 +142,7 @@ describe Friends::Activity do
     def stub_locations(val)
       old_val = introvert.instance_variable_get(:@locations)
       introvert.instance_variable_set(:@locations, val)
+      introvert.send(:set_n_activities!, :location)
       yield
       introvert.instance_variable_set(:@locations, old_val)
     end

data/test/introvert_spec.rb

@@ -14,6 +14,7 @@ describe Friends::Introvert do
   def stub_friends(val)
     old_val = introvert.instance_variable_get(:@friends)
     introvert.instance_variable_set(:@friends, val)
+    introvert.send(:set_n_activities!, :friend)
     yield
     introvert.instance_variable_set(:@friends, old_val)
   end
@@ -21,6 +22,8 @@ describe Friends::Introvert do
   def stub_activities(val)
     old_val = introvert.instance_variable_get(:@activities)
     introvert.instance_variable_set(:@activities, val)
+    introvert.send(:set_n_activities!, :friend)
+    introvert.send(:set_n_activities!, :location)
     yield
     introvert.instance_variable_set(:@activities, old_val)
   end
@@ -28,6 +31,7 @@ describe Friends::Introvert do
   def stub_locations(val)
     old_val = introvert.instance_variable_get(:@locations)
     introvert.instance_variable_set(:@locations, val)
+    introvert.send(:set_n_activities!, :location)
     yield
     introvert.instance_variable_set(:@locations, old_val)
   end
@@ -79,7 +83,7 @@ describe Friends::Introvert do
     subject { introvert.clean }
 
     # Delete the file that is created each time.
-    after { File.delete(filename) if File.exists?(filename) }
+    after { File.delete(filename) if File.exist?(filename) }
 
     it "writes cleaned file" do
       sorted_friends = friends.sort
@@ -394,7 +398,7 @@ describe Friends::Introvert do
       let(:with) { "george" }
 
       describe "when there is more than one friend match" do
-        let(:friend_names) { ["George Washington Carver", "Boy George"] }
+        let(:friend_names) { ["George Washington Carver", "George Harrison"] }
 
         it "raises an error" do
           stub_friends(friends) do
@@ -695,6 +699,28 @@ describe Friends::Introvert do
         subject.must_equal friends.first
       end
     end
+
+    describe "when more than one friend name matches" do
+      let(:friend_names) { ["George Washington Carver", "George Washington"] }
+
+      describe "when one friend name matches exactly" do
+        it "returns the modified friend" do
+          stub_friends(friends) do
+            subject.must_equal friends.first
+          end
+        end
+      end
+
+      describe "when no friend name matches exactly" do
+        it "raises an error" do
+          proc do
+            stub_friends(friends) do
+              introvert.add_tag(name: "George", tag: "@school")
+            end
+          end.must_raise Friends::FriendsError
+        end
+      end
+    end
   end
 
   describe "#remove_tag" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: '0.26'
+  version: '0.27'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.34'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.34'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement