friends 0.22 → 0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66aa8129ccdd246b263b11bca7381c826e051d3b
-  data.tar.gz: 186024855c83d91b0f42f29e5e09a9ca8dfab8c3
+  metadata.gz: 560b5f5b4af9d8762ecb97f2a0ffdbb0cd8be02e
+  data.tar.gz: 39338ddbdffe9c8c712bed9e5078d0cfc5c8877a
 SHA512:
-  metadata.gz: 119e32928a14606556b7d0601e11d5223c3ebca405707d44a1a06e497c73918b13fd7a497c1aa1a4ac264344bd57b3007db06e52429a4f22922bf8f748d62be1
-  data.tar.gz: 8a4c1483bb0d90cddbdf011978a2a94dd6ea7e1a6e8825cd37d9e51c17b6b7a4c4d766a8b36d812cb3ab061a1bb2463b3c936e0dfad65c77456ece09c19680ab
+  metadata.gz: d2349672e223cec6d4f08df3ffce8209b8190540eb51862c72354d9a36144c813232bc18327a8d04c0da0d62ad1101f1a0931858f029e8e9cf1c94ea433c7ae0
+  data.tar.gz: 3c833ed0d247ea59064335482a182b9ffbb094b172e5388370161baba6992e0f7f125d41fb967628b14e581b252039e17c7fbb3cac9a800fc0c9cf6945983e37

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v0.23](https://github.com/JacobEvelyn/friends/tree/v0.23) (2016-05-16)
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.22...v0.23)
+
+**Implemented enhancements:**
+
+- Change `graph` to use `--with`, `--tagged`, and `--in` flags [\#124](https://github.com/JacobEvelyn/friends/issues/124)
+- Add `graph` command for locations [\#109](https://github.com/JacobEvelyn/friends/issues/109)
+
+**Merged pull requests:**
+
+- Allow graph to be filtered by friend, location and hashtag [\#129](https://github.com/JacobEvelyn/friends/pull/129) ([andypearson](https://github.com/andypearson))
+
 ## [v0.22](https://github.com/JacobEvelyn/friends/tree/v0.22) (2016-05-14)
 [Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.21...v0.22)
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec

data/README.md

@@ -318,24 +318,51 @@ Opening "./friends.md" in atom
 
 #### `graph`
 
-Graphs (in color!) your relationship with a given friend over time:
+Graphs (in color!) your activities over time:
 
 ```bash
-$ friends graph George
+$ friends graph
+Nov 2014 |███
+Dec 2014 |██
+Jan 2015 |███████
+Feb 2015 |█████
+```
+
+Or graph only activities with a certain friend:
+
+```bash
+$ friends graph --with George
 Nov 2014 |█
 Dec 2014 |
 Jan 2015 |█████
 Feb 2015 |███
 ```
 
-Or just graph all of your activities:
+Or graph only activities with a certain hashtag:
 
 ```bash
-$ friends graph
-Nov 2014 |███
-Dec 2014 |██
-Jan 2015 |███████
-Feb 2015 |█████
+$ friends graph --tagged food
+Nov 2014 |█
+Dec 2014 |
+Jan 2015 |
+Feb 2015 |███
+```
+
+Or graph only activities in a certain location:
+
+```bash
+$ friends graph --in Paris
+Nov 2014 |█
+Dec 2014 |
+Jan 2015 |
+Feb 2015 |█
+```
+
+And you can use multiple of these flags together:
+
+```bash
+$ friends graph --in Paris --tagged food --with George
+Nov 2014 |█
 ```
 
 #### `help`

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 

data/bin/friends

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "gli"
 require "paint"
@@ -27,7 +28,7 @@ class Hashtag
   # See: https://github.com/davetron5000/gli/issues/241
   def self.convert_to_hashtag(str)
     str = str.strip
-    str.size > 0 && str[0] == "#" ? str : "##{str}"
+    !str.empty? && str[0] == "#" ? str : "##{str}"
   end
 end
 
@@ -35,10 +36,8 @@ accept(Hashtag) do |value|
   Hashtag.convert_to_hashtag(value)
 end
 
-class Stripped ; end
-accept(Stripped) do |value|
-  value.strip
-end
+class Stripped; end
+accept(Stripped, &:strip)
 
 switch [:quiet],
        negatable: false,
@@ -320,10 +319,24 @@ command :remove do |remove|
   end
 end
 
-desc "Graph all activities or a friend's relationship over time"
-arg_name "NAME (default: none)"
+desc "Graph activities over time"
 command :graph do |graph|
-  graph.action do |_, _, args|
+  graph.flag [:with],
+             arg_name: "NAME",
+             desc: "Graph activities with the given friend",
+             type: Stripped
+
+  graph.flag [:in],
+             arg_name: "LOCATION",
+             desc: "Graph activities in the given location",
+             type: Stripped
+
+  graph.flag [:tagged],
+             arg_name: "HASHTAG",
+             desc: "Graph activities with the given hashtag",
+             type: Hashtag
+
+  graph.action do |_, options|
     # This math is taken from Minitest's Pride plugin (the PrideLOL class).
     PI_3 = Math::PI / 3
 
@@ -336,7 +349,11 @@ command :graph do |graph|
       [r, g, b].map { |c| c * 51 }
     end
 
-    data = @introvert.graph(name: args.first)
+    data = @introvert.graph(
+      with: options[:with],
+      location_name: options[:in],
+      tagged: options[:tagged]
+    )
 
     data.each do |month, count|
       print "#{month} |"

data/friends.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "friends/version"
@@ -33,5 +34,5 @@ Gem::Specification.new do |spec|
   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 "rubocop", "~> 0.36"
+  spec.add_development_dependency "rubocop", "~> 0.40"
 end

data/lib/friends.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "friends/introvert"
 require "friends/version"
 

data/lib/friends/activity.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Activity represents an activity you've done with one or more Friends.
 
 require "chronic"
@@ -12,8 +13,8 @@ module Friends
     extend Serializable
     extend Memoist
 
-    SERIALIZATION_PREFIX = "- ".freeze
-    DATE_PARTITION = ": ".freeze
+    SERIALIZATION_PREFIX = "- "
+    DATE_PARTITION = ": "
 
     # @return [Regexp] the regex for capturing groups in deserialization
     def self.deserialization_regex
@@ -97,7 +98,7 @@ module Friends
     # @return [String] if name found in description
     # @return [nil] if no change was made
     def update_friend_name(old_name:, new_name:)
-      @description.gsub!(
+      @description = @description.gsub(
         Regexp.new("(?<=\\*\\*)#{old_name}(?=\\*\\*)"),
         new_name
       )
@@ -109,7 +110,10 @@ module Friends
     # @return [String] if name found in description
     # @return [nil] if no change was made
     def update_location_name(old_name:, new_name:)
-      @description.gsub!(Regexp.new("(?<=_)#{old_name}(?=_)"), new_name)
+      @description = @description.gsub(
+        Regexp.new("(?<=_)#{old_name}(?=_)"),
+        new_name
+      )
     end
 
     # @param location [Location] the location to test

data/lib/friends/friend.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Friend represents a friend. You know, a real-life friend!
 
 require "friends"
@@ -9,8 +10,8 @@ module Friends
   class Friend
     extend Serializable
 
-    SERIALIZATION_PREFIX = "- ".freeze
-    NICKNAME_PREFIX = "a.k.a. ".freeze
+    SERIALIZATION_PREFIX = "- "
+    NICKNAME_PREFIX = "a.k.a. "
 
     # @return [Regexp] the regex for capturing groups in deserialization
     def self.deserialization_regex

data/lib/friends/friends_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Friends
   class FriendsError < StandardError
   end

data/lib/friends/graph.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+# Graphs activities by month
+
+module Friends
+  class Graph
+    DATE_FORMAT = "%b %Y"
+
+    # @param start_date [Date] the first month of the graph
+    # @param end_date [Date] the last month of the graph
+    # @param activities [Array<Friends::Activity>] a list of activities to graph
+    def initialize(start_date:, end_date:, activities:)
+      self.start_date = start_date
+      self.end_date = end_date
+      self.activities = activities
+    end
+
+    # Render the graph as a hash in the format:
+    #
+    #   {
+    #     "Jan 2015" => 3, # The number of activities during each month.
+    #     "Feb 2015" => 0,
+    #     "Mar 2015" => 9
+    #   }
+    #
+    # @return [Hash{String => Integer}]
+    def to_h
+      empty_graph.tap do |graph|
+        activities.each do |activity|
+          graph[format_date(activity.date)] += 1
+        end
+      end
+    end
+
+    private
+
+    attr_accessor :start_date, :end_date, :activities
+
+    # Render an empty graph as a hash in the format:
+    #
+    #   {
+    #     "Jan 2015" => 0,
+    #     "Feb 2015" => 0,
+    #     "Mar 2015" => 0
+    #   }
+    #
+    # @return [Hash{String => Integer}]
+    def empty_graph
+      Hash[(start_date..end_date).map do |date|
+        [format_date(date), 0]
+      end]
+    end
+
+    # Format a date for use in the graph label
+    # @param date [Date] the date to format
+    # @return [String]
+    def format_date(date)
+      date.strftime(DATE_FORMAT)
+    end
+  end
+end

data/lib/friends/introvert.rb

@@ -1,20 +1,21 @@
 # frozen_string_literal: true
+
 # Introvert is the internal handler for the friends script. It is designed to be
 # able to be used directly within another Ruby program, without needing to call
 # the command-line script explicitly.
 
 require "friends/activity"
 require "friends/friend"
+require "friends/graph"
 require "friends/location"
 require "friends/friends_error"
 
 module Friends
   class Introvert
-    DEFAULT_FILENAME = "./friends.md".freeze
-    ACTIVITIES_HEADER = "### Activities:".freeze
-    FRIENDS_HEADER = "### Friends:".freeze
-    LOCATIONS_HEADER = "### Locations:".freeze
-    GRAPH_DATE_FORMAT = "%b %Y".freeze # Used as the param for date.strftime().
+    DEFAULT_FILENAME = "./friends.md"
+    ACTIVITIES_HEADER = "### Activities:"
+    FRIENDS_HEADER = "### Friends:"
+    LOCATIONS_HEADER = "### Locations:"
 
     # @param filename [String] the name of the friends Markdown file
     def initialize(filename: DEFAULT_FILENAME)
@@ -241,26 +242,14 @@ module Friends
     # @param tagged [String] the name of a hashtag to filter by, or nil for
     #   unfiltered
     # @return [Array] a list of all activity text values
-    # @raise [FriendsError] if 0 or 2+ friends match the given `with` text
+    # @raise [FriendsError] if friend, location or hashtag cannot be found or
+    #   is ambiguous
     def list_activities(limit:, with:, location_name:, tagged:)
-      acts = @activities
-
-      # Filter by friend name if argument is passed.
-      unless with.nil?
-        friend = friend_with_name_in(with)
-        acts = acts.select { |act| act.includes_friend?(friend: friend) }
-      end
-
-      # Filter by location name if argument is passed.
-      unless location_name.nil?
-        location = location_with_name_in(location_name)
-        acts = acts.select { |act| act.includes_location?(location: location) }
-      end
-
-      # Filter by tag if argument is passed.
-      unless tagged.nil?
-        acts = acts.select { |act| act.includes_hashtag?(hashtag: tagged) }
-      end
+      acts = filtered_activities(
+        with: with,
+        location_name: location_name,
+        tagged: tagged
+      )
 
       # If we need to, trim the list.
       acts = acts.take(limit) unless limit.nil?
@@ -297,7 +286,7 @@ module Friends
     end
 
     # Find data points for graphing activities over time.
-    # Optionally filter by a friend to see a given relationship over time.
+    # Optionally filter by friend, location and hashtag
     #
     # The returned hash uses the following format:
     #   {
@@ -308,32 +297,30 @@ module Friends
     # The keys of the hash are all of the months (inclusive) between the first
     # and last month in which activities have been recorded.
     #
-    # @param name [String] the name of the friend to use
-    # @return [Hash{String => Fixnum}]
-    # @raise [FriendsError] if 0 or 2+ friends match the given name
-    def graph(name: nil)
-      if name
-        friend = friend_with_name_in(name) # Find the friend by name.
-
-        # Filter out activities that don't include the given friend.
-        acts = @activities.select { |act| act.includes_friend?(friend: friend) }
-      else
-        acts = @activities
-      end
-
-      # Initialize the table of activities to have all of the months of that
-      # friend's activity range (including months in the middle of the range
-      # with no relevant activities).
-      act_table = {}
-      (acts.last.date..acts.first.date).each do |date|
-        act_table[date.strftime(GRAPH_DATE_FORMAT)] = 0
-      end
-
-      acts.each do |activity|
-        month = activity.date.strftime(GRAPH_DATE_FORMAT)
-        act_table[month] += 1
-      end
-      act_table
+    # @param with [String] the name of a friend to filter by, or nil for
+    #   unfiltered
+    # @param location_name [String] the name of a location to filter by, or nil
+    #   for unfiltered
+    # @param tagged [String] the name of a hashtag to filter by, or nil for
+    #   unfiltered
+    # @return [Hash{String => Integer}]
+    # @raise [FriendsError] if friend, location or hashtag cannot be found or
+    #   is ambiguous
+    def graph(with:, location_name:, tagged:)
+      # There is no point trying to graph no activities
+      return {} if @activities.empty?
+
+      activities_to_graph = filtered_activities(
+        with: with,
+        location_name: location_name,
+        tagged: tagged
+      )
+
+      Graph.new(
+        start_date: @activities.last.date,
+        end_date: @activities.first.date,
+        activities: activities_to_graph
+      ).to_h
     end
 
     # Suggest friends to do something with.
@@ -476,6 +463,39 @@ module Friends
 
     private
 
+    # Filter activities by friend, location and hashtag
+    # @param with [String] the name of a friend to filter by, or nil for
+    #   unfiltered
+    # @param location_name [String] the name of a location to filter by, or nil
+    #   for unfiltered
+    # @param tagged [String] the name of a hashtag to filter by, or nil for
+    #   unfiltered
+    # @return [Array] an array of activities
+    # @raise [FriendsError] if friend, location or hashtag cannot be found or
+    #   is ambiguous
+    def filtered_activities(with:, location_name:, tagged:)
+      acts = @activities
+
+      # Filter by friend name if argument is passed.
+      unless with.nil?
+        friend = friend_with_name_in(with)
+        acts = acts.select { |act| act.includes_friend?(friend: friend) }
+      end
+
+      # Filter by location name if argument is passed.
+      unless location_name.nil?
+        location = location_with_name_in(location_name)
+        acts = acts.select { |act| act.includes_location?(location: location) }
+      end
+
+      # Filter by tag if argument is passed.
+      unless tagged.nil?
+        acts = acts.select { |act| act.includes_hashtag?(hashtag: tagged) }
+      end
+
+      acts
+    end
+
     # @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

data/lib/friends/location.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Location represents a location in the world.
 
 require "friends/regex_builder"
@@ -8,7 +9,7 @@ module Friends
   class Location
     extend Serializable
 
-    SERIALIZATION_PREFIX = "- ".freeze
+    SERIALIZATION_PREFIX = "- "
 
     # @return [Regexp] the regex for capturing groups in deserialization
     def self.deserialization_regex

data/lib/friends/regex_builder.rb

@@ -1,30 +1,31 @@
 # frozen_string_literal: true
+
 # RegexpBuilder is an internal class that helps us build regexes to find things.
 
 module Friends
   class RegexBuilder
     # We don't want to match strings that are "escaped" with a leading
     # backslash.
-    NO_LEADING_BACKSLASH = "(?<!\\\\)".freeze
+    NO_LEADING_BACKSLASH = "(?<!\\\\)"
 
     # We don't want to match strings that are directly touching double asterisks
     # as these are treated as sacred by our program.
-    NO_LEADING_ASTERISKS = "(?<!\\*\\*)".freeze
-    NO_TRAILING_ASTERISKS = "(?!\\*\\*)".freeze
+    NO_LEADING_ASTERISKS = "(?<!\\*\\*)"
+    NO_TRAILING_ASTERISKS = "(?!\\*\\*)"
 
     # We don't want to match strings that are directly touching underscores
     # as these are treated as sacred by our program.
-    NO_LEADING_UNDERSCORES = "(?<!_)".freeze
-    NO_TRAILING_UNDERSCORES = "(?!_)".freeze
+    NO_LEADING_UNDERSCORES = "(?<!_)"
+    NO_TRAILING_UNDERSCORES = "(?!_)"
 
     # We don't want to match strings that are part of other words.
-    NO_LEADING_ALPHABETICALS = "(?<![A-z])".freeze
-    NO_TRAILING_ALPHABETICALS = "(?![A-z])".freeze
+    NO_LEADING_ALPHABETICALS = "(?<![A-z])"
+    NO_TRAILING_ALPHABETICALS = "(?![A-z])"
 
     # We ignore case within the regex as opposed to globally to allow consumers
     # of this API the ability to pass in strings that turn off this modifier
     # with the "(?-i)" string.
-    IGNORE_CASE = "(?i)".freeze
+    IGNORE_CASE = "(?i)"
 
     def self.regex(str)
       Regexp.new(

data/lib/friends/serializable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Serializable provides functionality around serialization to the classes that
 # extend it. This includes a class method to deserialize a string and create an
 # instance of the class.

data/lib/friends/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Friends
-  VERSION = "0.22".freeze
+  VERSION = "0.23"
 end

data/test/activity_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "./test/helper"
 
 describe Friends::Activity do

data/test/friend_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "./test/helper"
 
 describe Friends::Friend do

data/test/graph_spec.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+require "./test/helper"
+
+describe Friends::Graph do
+  subject do
+    Friends::Graph.new(
+      start_date: start_date,
+      end_date: end_date,
+      activities: activities
+    ).to_h
+  end
+
+  let(:start_date) { Date.new(2016, 1, 1) }
+  let(:end_date) { Date.new(2016, 2, 1) }
+  let(:activities) do
+    [
+      Friends::Activity.new(
+        str: "2016-02-01: Relaxing."
+      ),
+
+      Friends::Activity.new(
+        str: "2016-01-01: Running."
+      )
+    ]
+  end
+
+  it "graphs activities by month" do
+    subject.must_equal(
+      "Jan 2016" => 1,
+      "Feb 2016" => 1
+    )
+  end
+
+  describe "there is a gap between activities" do
+    let(:end_date) { Date.new(2016, 3, 1) }
+
+    let(:activities) do
+      [
+        Friends::Activity.new(
+          str: "2016-03-01: Relaxing."
+        ),
+
+        Friends::Activity.new(
+          str: "2016-01-01: Running."
+        )
+      ]
+    end
+
+    it "includes the month with no activities" do
+      subject.must_equal(
+        "Jan 2016" => 1,
+        "Feb 2016" => 0,
+        "Mar 2016" => 1
+      )
+    end
+  end
+
+  describe "graph starts before the first activity" do
+    let(:start_date) { Date.new(2015, 12, 1) }
+
+    it "graphs activities by month" do
+      subject.must_equal(
+        "Dec 2015" => 0,
+        "Jan 2016" => 1,
+        "Feb 2016" => 1
+      )
+    end
+  end
+
+  describe "graph ends after the last activity" do
+    let(:end_date) { Date.new(2016, 3, 1) }
+
+    it "graphs activities by month" do
+      subject.must_equal(
+        "Jan 2016" => 1,
+        "Feb 2016" => 1,
+        "Mar 2016" => 0
+      )
+    end
+  end
+
+  describe "there are no activities" do
+    let(:activities) { [] }
+
+    it "graphs activities by month" do
+      subject.must_equal(
+        "Jan 2016" => 0,
+        "Feb 2016" => 0
+      )
+    end
+  end
+end

data/test/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 

data/test/introvert_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "./test/helper"
 
 describe Friends::Introvert do
@@ -804,82 +806,103 @@ describe Friends::Introvert do
   end
 
   describe "#graph" do
-    subject { introvert.graph(name: friend_name) }
+    subject do
+      introvert.graph(
+        with: with,
+        location_name: location_name,
+        tagged: tagged
+      )
+    end
+
+    let(:with) { nil }
+    let(:location_name) { nil }
+    let(:tagged) { nil }
 
     let(:activities) do
       [
+        # With a friend
         Friends::Activity.new(
-          str: "2016-04-01: Lunch with **George Washington Carver**."
+          str: "2016-01-01: \
+            At _The Eiffel Tower_ with **George Washington Carver**."
         ),
 
-        # Create another activity with a gap of over a month between it and
-        # the next activity, so we can test that we correctly return data for
-        # months in the range with no activities.
+        # In a location
         Friends::Activity.new(
-          str: "2016-02-01: Called **George Washington Carver**."
+          str: "2016-01-01: Called **George Washington Carver**. #phone"
         ),
 
-        # Create an activity that doesn't involve our friend name.
+        # Tagged with a hashtag
         Friends::Activity.new(
-          str: "2016-01-01: Called **Betsy Ross** on the phone."
+          str: "2016-01-01: Hung out with **Betsy Ross**."
         )
       ]
     end
 
-    describe "when friend name is invalid" do
-      let(:friend_name) { "Oscar the Grouch" }
+    it "graphs activities by month" do
+      stub_activities(activities) do
+        subject.must_equal("Jan 2016" => 3)
+      end
+    end
 
-      it "raises an error" do
-        proc { subject }.must_raise Friends::FriendsError
+    describe "No activities" do
+      it "returns an empty graph" do
+        subject.must_equal({})
       end
     end
 
-    describe "when friend name has more than one match" do
-      let(:friend_name) { "e" }
+    describe "Filtering by friend" do
+      let(:with) { "Betsy Ross" }
 
-      it "raises an error" do
+      it "graphs activities with a friend" do
         stub_friends(friends) do
-          proc { subject }.must_raise Friends::FriendsError
+          stub_activities(activities) do
+            subject.must_equal("Jan 2016" => 1)
+          end
         end
       end
-    end
 
-    describe "when friend is empty" do
-      let(:friend_name) { nil }
+      describe "when the friend does not exist" do
+        let(:with) { "Oscar the Grouch" }
 
-      it "returns a hash of months and frequencies" do
-        stub_friends(friends) do
+        it "raises an error" do
           stub_activities(activities) do
-            subject.must_equal(
-              {
-                "Jan 2016" => 1,
-                "Feb 2016" => 1,
-                "Mar 2016" => 0,
-                "Apr 2016" => 1
-              }
-            )
+            proc { subject }.must_raise Friends::FriendsError
           end
         end
       end
     end
 
-    describe "when friend name is valid" do
-      let(:friend_name) { "George" }
+    describe "Filtering by location" do
+      let(:location_name) { "The Eiffel Tower" }
 
-      it "returns a hash of months and frequencies" do
-        stub_friends(friends) do
+      it "graphs activities in a location" do
+        stub_locations(locations) do
           stub_activities(activities) do
-            subject.must_equal(
-              {
-                "Feb 2016" => 1,
-                "Mar 2016" => 0,
-                "Apr 2016" => 1
-              }
-            )
+            subject.must_equal("Jan 2016" => 1)
+          end
+        end
+      end
+
+      describe "when the location does not exist" do
+        let(:location_name) { "Nowhere" }
+
+        it "raises an error" do
+          stub_activities(activities) do
+            proc { subject }.must_raise Friends::FriendsError
           end
         end
       end
     end
+
+    describe "Filtering by hashtag" do
+      let(:tagged) { "#phone" }
+
+      it "graphs activities tagged with a hashtag" do
+        stub_activities(activities) do
+          subject.must_equal("Jan 2016" => 1)
+        end
+      end
+    end
   end
 
   describe "#total_friends" do

data/test/location_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "./test/helper"
 
 describe Friends::Location do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: '0.22'
+  version: '0.23'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.40'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.40'
 description: Spend time with the people you care about. Introvert-tested. Extrovert-approved.
 email:
 - jacobevelyn@gmail.com
@@ -192,6 +192,7 @@ files:
 - lib/friends/activity.rb
 - lib/friends/friend.rb
 - lib/friends/friends_error.rb
+- lib/friends/graph.rb
 - lib/friends/introvert.rb
 - lib/friends/location.rb
 - lib/friends/regex_builder.rb
@@ -199,6 +200,7 @@ files:
 - lib/friends/version.rb
 - test/activity_spec.rb
 - test/friend_spec.rb
+- test/graph_spec.rb
 - test/helper.rb
 - test/introvert_spec.rb
 - test/location_spec.rb
@@ -230,6 +232,7 @@ summary: Spend time with the people you care about.
 test_files:
 - test/activity_spec.rb
 - test/friend_spec.rb
+- test/graph_spec.rb
 - test/helper.rb
 - test/introvert_spec.rb
 - test/location_spec.rb