friends 0.25 → 0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 858f0bb2e50b71b1b716d3eaf88e5106231ddd61
-  data.tar.gz: dd9290e06e2ef48d27647596f54397c85fbfaf17
+  metadata.gz: 045b1ac8af5c8004d171bf68792d452509beb67b
+  data.tar.gz: 817d9105c51b235a4d317ef4bc7271a55b888739
 SHA512:
-  metadata.gz: effd46430149b527101da397820d12000788919f2ba18739e7d4f311f7bcc8c9df442f40c00233ed60c5e768c5e16ffdfc42fc34776c86e786f51def19a33daf
-  data.tar.gz: 2cd814bb39b04da722a2ede75420f44ab2178282e34be63f6ccab97175d245337323bcb601bcdc665f242d71b019119cecdf314863f64cc758a05da7eb32370b
+  metadata.gz: bc9894a009593305940c9b241374d7e7fa8568f83152efdf59522b74fa7caad9af32c2990cc055428856e5f1835ff4b74028ead5dfa7c96f26e5f6a93e9af8c4
+  data.tar.gz: 52d6e320aefd0fd4a45373ae20b1aa36c2b96f24367c35d61a13f10d29470c78ada7640460e03565f06084c2f389229f8689eca9519cbe18a26aca9ff391224b

data/CHANGELOG.md

@@ -1,12 +1,20 @@
 # Change Log
 
-## [v0.25](https://github.com/JacobEvelyn/friends/tree/v0.25) (2016-05-22)
-[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.24...v0.25)
+## [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)
 
 **Fixed bugs:**
 
+- Adding/filtering friend with tag but no nickname incorrectly counts the tag as part of the name [\#140](https://github.com/JacobEvelyn/friends/issues/140)
 - Error: stack level too deep [\#136](https://github.com/JacobEvelyn/friends/issues/136)
 
+**Merged pull requests:**
+
+- Fix deserialization for friends with tags and no nicknames [\#141](https://github.com/JacobEvelyn/friends/pull/141) ([JacobEvelyn](https://github.com/JacobEvelyn))
+
+## [v0.25](https://github.com/JacobEvelyn/friends/tree/v0.25) (2016-05-22)
+[Full Changelog](https://github.com/JacobEvelyn/friends/compare/v0.24...v0.25)
+
 **Closed issues:**
 
 - Remove tag-migration code for 1.0 release [\#139](https://github.com/JacobEvelyn/friends/issues/139)

data/README.md

@@ -5,6 +5,10 @@
 Spend time with the people you care about. Introvert-tested.
 Extrovert-approved.
 
+**NOTE: Participation is encouraged! Make Issues, ask questions, submit Pull
+Requests (even if it's your first time contributing to open-source—you'll get
+lots of help), and give feedback!**
+
 ## Table of Contents
 
 - [Overview](#overview)

data/lib/friends/friend.rb

@@ -17,7 +17,7 @@ module Friends
     def self.deserialization_regex
       # Note: this regex must be on one line because whitespace is important
       # rubocop:disable Metrics/LineLength
-      /(#{SERIALIZATION_PREFIX})?(?<name>[^\(\[#]*[^\(\[#\s])(\s+\(#{NICKNAME_PREFIX}(?<nickname_str>.+)\))?(\s+\[(?<location_name>[^\]]+)\])?(\s+(?<tags_str>(#{TAG_REGEX}\s*)+))?/
+      /(#{SERIALIZATION_PREFIX})?(?<name>[^\(\[@]*[^\(\[@\s])(\s+\(#{NICKNAME_PREFIX}(?<nickname_str>.+)\))?(\s+\[(?<location_name>[^\]]+)\])?(\s+(?<tags_str>(#{TAG_REGEX}\s*)+))?/
       # rubocop:enable Metrics/LineLength
     end
 

data/lib/friends/version.rb

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

data/test/friend_spec.rb

@@ -24,6 +24,82 @@ describe Friends::Friend do
 
       it { proc { subject }.must_raise Serializable::SerializationError }
     end
+
+    describe "when string has one nickname" do
+      let(:serialized_str) { "Guybrush Threepwood (a.k.a. Brush)" }
+      it { subject.name.must_equal "Guybrush Threepwood" }
+      it { subject.instance_variable_get(:@nicknames).must_equal ["Brush"] }
+    end
+
+    describe "when string has multiple nicknames" do
+      let(:serialized_str) { "Guybrush Threepwood (a.k.a. Brush a.k.a. Guy)" }
+      it { subject.name.must_equal "Guybrush Threepwood" }
+      it do
+        subject.instance_variable_get(:@nicknames).must_equal ["Brush", "Guy"]
+      end
+    end
+
+    describe "when string has a location" do
+      let(:serialized_str) { "Guybrush Threepwood [Plunder Island]" }
+      it { subject.name.must_equal "Guybrush Threepwood" }
+      it { subject.location_name.must_equal "Plunder Island" }
+    end
+
+    describe "when string has one tag" do
+      let(:serialized_str) { "Guybrush Threepwood @pirate" }
+      it { subject.name.must_equal "Guybrush Threepwood" }
+      it { subject.tags.must_equal ["@pirate"] }
+    end
+
+    describe "when string has multiple tags" do
+      let(:serialized_str) { "Guybrush Threepwood @pirate @swashbuckler" }
+      it { subject.name.must_equal "Guybrush Threepwood" }
+      it { subject.tags.must_equal ["@pirate", "@swashbuckler"] }
+    end
+
+    describe "when string has nicknames and tags" do
+      let(:serialized_str) do
+        "Guybrush Threepwood (a.k.a. Brush a.k.a. Guy) @pirate @swashbuckler"
+      end
+      it { subject.name.must_equal "Guybrush Threepwood" }
+      it do
+        subject.instance_variable_get(:@nicknames).must_equal ["Brush", "Guy"]
+      end
+      it { subject.tags.must_equal ["@pirate", "@swashbuckler"] }
+    end
+
+    describe "when string has nicknames and a location" do
+      let(:serialized_str) do
+        "Guybrush Threepwood (a.k.a. Brush a.k.a. Guy) [Plunder Island]"
+      end
+      it { subject.name.must_equal "Guybrush Threepwood" }
+      it do
+        subject.instance_variable_get(:@nicknames).must_equal ["Brush", "Guy"]
+      end
+      it { subject.location_name.must_equal "Plunder Island" }
+    end
+
+    describe "when string has a location and tags" do
+      let(:serialized_str) do
+        "Guybrush Threepwood [Plunder Island] @pirate @swashbuckler"
+      end
+      it { subject.name.must_equal "Guybrush Threepwood" }
+      it { subject.location_name.must_equal "Plunder Island" }
+      it { subject.tags.must_equal ["@pirate", "@swashbuckler"] }
+    end
+
+    describe "when string has nicknames, a location, and tags" do
+      let(:serialized_str) do
+        "Guybrush Threepwood (a.k.a. Brush a.k.a. Guy) [Plunder Island] "\
+          "@pirate @swashbuckler"
+      end
+      it { subject.name.must_equal "Guybrush Threepwood" }
+      it do
+        subject.instance_variable_get(:@nicknames).must_equal ["Brush", "Guy"]
+      end
+      it { subject.location_name.must_equal "Plunder Island" }
+      it { subject.tags.must_equal ["@pirate", "@swashbuckler"] }
+    end
   end
 
   describe "#new" do

metadata

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