friends 0.15 → 0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fd5cb3c9a9b913b0772d731f872709820e5fa12
-  data.tar.gz: 99b28c2a79ae11aea5b49e75f328ed03433f94dd
+  metadata.gz: c928a672142f62f482efa128ae2d09e8bb724fd4
+  data.tar.gz: 72d50a764d49a98b1d0e227817536a87274c9588
 SHA512:
-  metadata.gz: b8aba3f30dfc6de57c2d98a79b8fa3e131458b199c25e3bfff960ec0011069040844a90580848b10e255fb869ab2843e0ab941daa85c390e69e3ba74dbe650ce
-  data.tar.gz: f9491efb85eed54694805e080c2e00ab5893687d60d78bc643cdccae64cc3081139ea5333e8a9d5d99ba0861e9c3b5586a59156f81b6766d2facbc1ca9eeee65
+  metadata.gz: 1cfd5df61aa2f136dc49117a6e7bab7fd4b7c28b776885d564d59c4ffffe0a5c5a92ca04f7557b2a2a214dc6eaefbffc47e23003fd4d658a3d62eff03047c311
+  data.tar.gz: dc9e3a6aeac267ca1ab720936d170cf921224a637b8a9ae96da2672acc5bfe74873810825d53138d24082303e1c9ec5057aeea1ae4110ad80be72ed4f9079567

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [v0.16](https://github.com/JacobEvelyn/friends/tree/v0.16) (2016-03-23)
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.15...v0.16)
+
+**Implemented enhancements:**
+
+- Allow `graph` without arguments to graph all activities [\#83](https://github.com/JacobEvelyn/friends/issues/83)
+
+**Merged pull requests:**
+
+- Allow `graph` without arguments to graph all activities \(Closes \#83\) [\#85](https://github.com/JacobEvelyn/friends/pull/85) ([andypearson](https://github.com/andypearson))
+
 ## [v0.15](https://github.com/JacobEvelyn/friends/tree/v0.15) (2016-03-11)
 [Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.14...v0.15)
 
@@ -222,4 +233,4 @@
 ## [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/lib/friends/introvert.rb

@@ -179,11 +179,15 @@ module Friends
     #   and last month in which activities for the given friend have been
     #   recorded.
     # @raise [FriendsError] if 0 of 2+ friends match the given name
-    def graph(name:)
-      friend = friend_with_name_in(name) # Find the friend by 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) }
+        # 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

data/lib/friends/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Friends
-  VERSION = "0.15".freeze
+  VERSION = "0.16".freeze
 end

data/test/introvert_spec.rb

@@ -387,6 +387,26 @@ describe Friends::Introvert do
   describe "#graph" do
     subject { introvert.graph(name: friend_name) }
 
+    let(:activities) do
+      [
+        Friends::Activity.new(
+          str: "2016-04-01: Lunch 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.
+        Friends::Activity.new(
+          str: "2016-02-01: Called **George Washington Carver**."
+        ),
+
+        # Create an activity that doesn't involve our friend name.
+        Friends::Activity.new(
+          str: "2016-01-01: Called **Betsy Ross** on the phone."
+        )
+      ]
+    end
+
     describe "when friend name is invalid" do
       let(:friend_name) { "Oscar the Grouch" }
 
@@ -405,49 +425,34 @@ describe Friends::Introvert do
       end
     end
 
+    describe "when friend is empty" do
+      let(:friend_name) { nil }
+
+      it "returns a hash of months and frequencies" do
+        stub_friends(friends) do
+          stub_activities(activities) do
+            subject.must_equal({
+              "Jan 2016" => 1,
+              "Feb 2016" => 1,
+              "Mar 2016" => 0,
+              "Apr 2016" => 1
+            })
+          end
+        end
+      end
+    end
+
     describe "when friend name is valid" do
       let(:friend_name) { "George" }
-      let(:activities) do
-        [
-          Friends::Activity.new(
-            str: "Lunch 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.
-          Friends::Activity.new(
-            str: "70 days ago: Called **George Washington Carver**."
-          ),
-
-          # Create an activity that doesn't involve our friend name.
-          Friends::Activity.new(
-            str: "150 days ago: Called **Betsy Ross** on the phone."
-          )
-        ]
-      end
 
       it "returns a hash of months and frequencies" do
         stub_friends(friends) do
           stub_activities(activities) do
-            strftime_format = Friends::Introvert::GRAPH_DATE_FORMAT
-
-            first = activities[0]
-            second = activities[1]
-            months = (second.date..first.date).map do |date|
-              date.strftime(strftime_format)
-            end.uniq
-
-            # Make sure all of the months are in our output data set (even the
-            # months with no relevant activity). This also checks that the
-            # irrelevant activity is not in our data set.
-            subject.keys.must_equal(months)
-
-            # Check that the activities for George are recorded, and that all
-            # other months have no activities recorded.
-            subject[first.date.strftime(strftime_format)].must_equal 1
-            subject[second.date.strftime(strftime_format)].must_equal 1
-            subject.values.inject(:+).must_equal 2
+            subject.must_equal({
+              "Feb 2016" => 1,
+              "Mar 2016" => 0,
+              "Apr 2016" => 1
+            })
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: '0.15'
+  version: '0.16'
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic