friends 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 625e3744b0240347b4e0c74a3a4063b672afab88
-  data.tar.gz: 25d066d3bb99d407adb41f01785772f514e7d4fa
+  metadata.gz: 018ee9e9043561fd60353d6db09a37ca42822a8d
+  data.tar.gz: 0591a729fb07a42bcd4ea872e280d849f6eb1bea
 SHA512:
-  metadata.gz: d9e23ab9e130aede68c68e7d65c07de1847585915af9794525db1057c3e3d6939010b73310fa7bf74ef808c94e41f41a41c7555af4d57bf96a1fb66548ee4bcc
-  data.tar.gz: 36300571ab2f75ef5406e5a6dddef153370dd5718a08d2dfe262f5ac03b368034ed21f2e6e97d0607abb35880bb4f28feb255e79513bea8c5cc693ce5159f02a
+  metadata.gz: fa12a4235f2aa2b5d24f6a507e872d8509caa06c356de44cf564c528e73767f181ea8f7d5ec459e48b95c221992d767f5a00844e87eeab9894bd05e82231859b
+  data.tar.gz: a8543253d63c267ac33a7dbb9535f6465f97df093528ac181d84325bc3b14728a98bd88366adf6191c2a3db075e683d0752d76909c401fe326b7dd14f1d06e83

data/.ruby-version

@@ -1 +1 @@
-2.1.4
+2.2.0

data/bin/friends

@@ -60,12 +60,18 @@ command :list do |c|
 
   c.desc "Lists all activities"
   c.command :activities do |list_activities|
+    list_activities.flag [:limit],
+      arg_name: "NUMBER",
+      default_value: 10,
+      desc: "The number of activities to return"
+
     list_activities.flag [:with],
       arg_name: "NAME",
       desc: "List only activities involving the given friend"
 
     list_activities.action do |_, options|
-      puts @introvert.list_activities(with: options[:with])
+      limit = options[:limit].to_i
+      puts @introvert.list_activities(limit: limit, with: options[:with])
     end
   end
 end

data/friends.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "gli", "~> 2.12"
   spec.add_dependency "memoist", "~> 0.11"
 
-  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4"
+  spec.add_development_dependency "minitest", "~> 5.5"
+  spec.add_development_dependency "rake", "~> 10.0"
 end

data/lib/friends/activity.rb

@@ -113,12 +113,20 @@ module Friends
       no_leading_asterisks = "(?<!\\*\\*)"
       no_ending_asterisks = "(?!\\*\\*)"
 
+      # We don't want to match names that are part of other words.
+      no_leading_alphabeticals = "(?<![A-z])"
+      no_ending_alphabeticals = "(?![A-z])"
+
       # Create the list of regexes and return it.
       chunks = name.split(Regexp.new(splitter))
 
       [chunks, [chunks.first]].map do |words|
         Regexp.new(
-          no_leading_asterisks + words.join(splitter) + no_ending_asterisks,
+          no_leading_asterisks +
+          no_leading_alphabeticals +
+          words.join(splitter) +
+          no_ending_alphabeticals +
+          no_ending_asterisks,
           Regexp::IGNORECASE
         )
       end

data/lib/friends/introvert.rb

@@ -48,12 +48,6 @@ module Friends
       filename
     end
 
-    # List all friend names in the friends file.
-    # @return [Array] a list of all friend names
-    def list_friends
-      friends.map(&:name)
-    end
-
     # Add a friend and write out the new friends file.
     # @param name [String] the name of the friend to add
     # @raise [FriendsError] when a friend with that name is already in the file
@@ -75,31 +69,6 @@ module Friends
       friend # Return the added friend.
     end
 
-    # List all activity details.
-    # @param [String] the name of a friend to filter by, or nil for unfiltered
-    # @return [Array] a list of all activity text values
-    def list_activities(with:)
-      acts = activities
-
-      # Filter by friend name if argument is passed.
-      unless with.nil?
-        friends = friends_with_name_in(with)
-
-        case friends.size
-        when 1
-          # If exactly one friend matches, use that friend to filter.
-          acts = acts.select { |a| a.friend_names.include? friends.first.name }
-        when 0 then raise FriendsError, "No friend found for \"#{with}\""
-        else
-          raise FriendsError,
-                "More than one friend found for \"#{with}\": "\
-                  "#{friends.map(&:name).join(', ')}"
-        end
-      end
-
-      acts.map(&:display_text)
-    end
-
     # Add an activity and write out the new friends file.
     # @param serialization [String] the serialized activity
     # @return [Activity] the added activity
@@ -117,9 +86,15 @@ module Friends
       activity # Return the added activity.
     end
 
+    # List all friend names in the friends file.
+    # @return [Array] a list of all friend names
+    def list_friends
+      friends.map(&:name)
+    end
+
     # List your favorite friends.
-    # @param num [Integer] the number of favorite friends to return, or nil if
-    #   unlimited
+    # @param limit [Integer] the number of favorite friends to return, or nil
+    #   for no limit
     # @return [Array] a list of the favorite friends' names and activity
     #   counts
     def list_favorites(limit:)
@@ -147,6 +122,37 @@ module Friends
       results.map(&:first)
     end
 
+    # List all activity details.
+    # @param limit [Integer] the number of activities to return, or nil for no
+    #   limit
+    # @param with [String] the name of a friend to filter by, or nil for
+    #   unfiltered
+    # @return [Array] a list of all activity text values
+    def list_activities(limit:, with:)
+      acts = activities
+
+      # Filter by friend name if argument is passed.
+      unless with.nil?
+        friends = friends_with_name_in(with)
+
+        case friends.size
+        when 1
+          # If exactly one friend matches, use that friend to filter.
+          acts = acts.select { |a| a.friend_names.include? friends.first.name }
+        when 0 then raise FriendsError, "No friend found for \"#{with}\""
+        else
+          raise FriendsError,
+                "More than one friend found for \"#{with}\": "\
+                  "#{friends.map(&:name).join(', ')}"
+        end
+      end
+
+      # If we need to, trim the list.
+      acts = acts.take(limit) unless limit.nil?
+
+      acts.map(&:display_text)
+    end
+
     private
 
     # Gets the list of friends as read from the file.

data/lib/friends/version.rb

@@ -1,3 +1,3 @@
 module Friends
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/activity_spec.rb

@@ -112,6 +112,39 @@ describe Friends::Activity do
       activity.description.must_equal "Dinner with Elizabeth." # No match found.
     end
 
+    it "ignores when at beginning of word" do
+      activity = Friends::Activity.new(
+        date_s: Date.today.to_s,
+        description: "Field trip to the Johnson Co."
+      )
+      activity.highlight_friends(friends: friends)
+
+      # No match found.
+      activity.description.must_equal "Field trip to the Johnson Co."
+    end
+
+    it "ignores when in middle of word" do
+      activity = Friends::Activity.new(
+        date_s: Date.today.to_s,
+        description: "Field trip to the JimJohnJames Co."
+      )
+      activity.highlight_friends(friends: friends)
+
+      # No match found.
+      activity.description.must_equal "Field trip to the JimJohnJames Co."
+    end
+
+    it "ignores when at end of word" do
+      activity = Friends::Activity.new(
+        date_s: Date.today.to_s,
+        description: "Field trip to the JimJohn Co."
+      )
+      activity.highlight_friends(friends: friends)
+
+      # No match found.
+      activity.description.must_equal "Field trip to the JimJohn Co."
+    end
+
     it "does not match with leading asterisks" do
       activity = Friends::Activity.new(
         date_s: Date.today.to_s,

data/test/friend_spec.rb

@@ -1,19 +1,19 @@
 require_relative "helper"
 
 describe Friends::Friend do
-  let(:name) { "Jacob Evelyn" }
-  let(:friend) { Friends::Friend.new(name: name) }
+  let(:friend_name) { "Jacob Evelyn" }
+  let(:friend) { Friends::Friend.new(name: friend_name) }
 
   describe ".deserialize" do
     subject { Friends::Friend.deserialize(serialized_str) }
 
     describe "when string is well-formed" do
       let(:serialized_str) do
-        "#{Friends::Friend::SERIALIZATION_PREFIX}#{name}"
+        "#{Friends::Friend::SERIALIZATION_PREFIX}#{friend_name}"
       end
 
       it "creates a friend with the correct name" do
-        subject.name.must_equal name
+        subject.name.must_equal friend_name
       end
     end
 
@@ -27,13 +27,17 @@ describe Friends::Friend do
   describe "#new" do
     subject { friend }
 
-    it { subject.name.must_equal name }
+    it { subject.name.must_equal friend_name }
   end
 
   describe "#serialize" do
     subject { friend.serialize }
 
-    it { subject.must_equal "#{Friends::Friend::SERIALIZATION_PREFIX}#{name}" }
+    it do
+      subject.must_equal(
+        "#{Friends::Friend::SERIALIZATION_PREFIX}#{friend_name}"
+      )
+    end
   end
 
   describe "#<=>" do

data/test/introvert_spec.rb

@@ -41,7 +41,7 @@ describe Friends::Introvert do
     subject { introvert.clean }
 
     # Delete the file that is created each time.
-    after { File.delete(filename) }
+    after { File.delete(filename) if File.exists?(filename) }
 
     it "writes cleaned file" do
       sorted_friends = friends.sort
@@ -85,6 +85,9 @@ describe Friends::Introvert do
     let(:new_friend_name) { "Jacob Evelyn" }
     subject { introvert.add_friend(name: new_friend_name) }
 
+    # Delete the file that is created each time.
+    after { File.delete(filename) if File.exists?(filename) }
+
     describe "when there is no existing friend with that name" do
       it "adds the given friend" do
         introvert.stub(:friends, friends) do
@@ -112,7 +115,49 @@ describe Friends::Introvert do
   end
 
   describe "#list_activities" do
-    subject { introvert.list_activities(with: with) }
+    subject { introvert.list_activities(limit: limit, with: with) }
+    let(:limit) { nil }
+    let(:with) { nil }
+
+    describe "when the limit is lower than the number of activities" do
+      let(:limit) { 1 }
+
+      it "lists that number of activities" do
+        introvert.stub(:activities, activities) do
+          subject.size.must_equal limit
+        end
+      end
+    end
+
+    describe "when the limit is equal to the number of activities" do
+      let(:limit) { activities.size }
+
+      it "lists all activities" do
+        introvert.stub(:activities, activities) do
+          subject.size.must_equal activities.size
+        end
+      end
+    end
+
+    describe "when the limit is greater than the number of activities" do
+      let(:limit) { activities.size + 5 }
+
+      it "lists all activities" do
+        introvert.stub(:activities, activities) do
+          subject.size.must_equal activities.size
+        end
+      end
+    end
+
+    describe "when the limit is nil" do
+      let(:limit) { nil }
+
+      it "lists all activities" do
+        introvert.stub(:activities, activities) do
+          subject.size.must_equal activities.size
+        end
+      end
+    end
 
     describe "when not filtering by a friend" do
       let(:with) { nil }
@@ -169,6 +214,9 @@ describe Friends::Introvert do
     let(:activity_description) { "Snorkeling with **Betsy Ross**." }
     subject { introvert.add_activity(serialization: activity_serialization) }
 
+    # Delete the file that is created each time.
+    after { File.delete(filename) if File.exists?(filename) }
+
     it "adds the given activity" do
       introvert.stub(:friends, friends) do
         subject

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friends
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jacob Evelyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -39,47 +39,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '5.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: Spend time with the people you care about. Introvert-tested. Extrovert-approved.
 email:
 - jacobevelyn@gmail.com
@@ -132,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Spend time with the people you care about.