From 74db016420f9bdab62c2528b1583fea14720c4b8 Mon Sep 17 00:00:00 2001
From: Tony Bowden <tony@mysociety.org>
Date: Sat, 27 Aug 2016 18:55:37 +0100
Subject: [PATCH] Revert "Release 0.6.0: Remove leading components from IDs"

---
 CHANGELOG.md                                     | 13 +------------
 lib/everypolitician/popolo/entity.rb             |  6 +-----
 lib/everypolitician/popolo/version.rb            |  2 +-
 test/everypolitician/popolo/event_test.rb        |  2 +-
 test/everypolitician/popolo/organization_test.rb |  2 +-
 test/everypolitician/popolo_test.rb              |  2 +-
 6 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 564b113..abd89b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,13 +3,6 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.6.0] - 2016-08-27
-
-### Changed
-
-- the `id` for an Entity will now strip any prefix (e.g. "party/abc"
-  will now be simply "abc")
-
 ## [0.5.0] - 2016-08-01
 
 ### Added
@@ -59,8 +52,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 [0.2.0]: https://github.com/everypolitician/everypolitician-popolo/compare/v0.1.0...v0.2.0
 [0.3.0]: https://github.com/everypolitician/everypolitician-popolo/compare/v0.2.0...v0.3.0
-[0.3.1]: https://github.com/everypolitician/everypolitician-popolo/compare/v0.3.0...v0.3.1
-[0.3.2]: https://github.com/everypolitician/everypolitician-popolo/compare/v0.3.1...v0.3.2
-[0.4.0]: https://github.com/everypolitician/everypolitician-popolo/compare/v0.3.0...v0.4.0
-[0.5.0]: https://github.com/everypolitician/everypolitician-popolo/compare/v0.4.0...v0.5.0
-[0.6.0]: https://github.com/everypolitician/everypolitician-popolo/compare/v0.5.0...v0.6.0
+[0.3.0]: https://github.com/everypolitician/everypolitician-popolo/compare/v0.3.0...v0.3.1
diff --git a/lib/everypolitician/popolo/entity.rb b/lib/everypolitician/popolo/entity.rb
index b2f1798..28b06c8 100644
--- a/lib/everypolitician/popolo/entity.rb
+++ b/lib/everypolitician/popolo/entity.rb
@@ -1,7 +1,7 @@
 module Everypolitician
   module Popolo
     class Entity
-      attr_writer :id
+      attr_accessor :id
       attr_reader :document
       attr_reader :popolo
 
@@ -31,10 +31,6 @@ def ==(other)
       end
       alias eql? ==
 
-      def id
-        @id.to_s.split('/').last
-      end
-
       def identifier(scheme)
         identifiers.find(-> { {} }) { |i| i[:scheme] == scheme }[:identifier]
       end
diff --git a/lib/everypolitician/popolo/version.rb b/lib/everypolitician/popolo/version.rb
index b8f4529..8aef50a 100644
--- a/lib/everypolitician/popolo/version.rb
+++ b/lib/everypolitician/popolo/version.rb
@@ -1,5 +1,5 @@
 module Everypolitician
   module Popolo
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end
diff --git a/test/everypolitician/popolo/event_test.rb b/test/everypolitician/popolo/event_test.rb
index 400953d..835d7ba 100644
--- a/test/everypolitician/popolo/event_test.rb
+++ b/test/everypolitician/popolo/event_test.rb
@@ -22,7 +22,7 @@ def test_accessing_event_properties
     )
     event = popolo.events.first
 
-    assert_equal '8', event.id
+    assert_equal 'term/8', event.id
     assert_equal '8th Verkhovna Rada', event.name
     assert_equal '2014-11-27', event.start_date
     assert_nil event.end_date
diff --git a/test/everypolitician/popolo/organization_test.rb b/test/everypolitician/popolo/organization_test.rb
index a893f73..7f15cc6 100644
--- a/test/everypolitician/popolo/organization_test.rb
+++ b/test/everypolitician/popolo/organization_test.rb
@@ -21,7 +21,7 @@ def test_accessing_organization_properties
   end
 
   def test_organization_equality_based_on_id
-    org1 = Everypolitician::Popolo::Organization.new(id: 'org/abc', name: 'ACME')
+    org1 = Everypolitician::Popolo::Organization.new(id: 'abc', name: 'ACME')
     org2 = Everypolitician::Popolo::Organization.new(id: 'abc', name: 'ACME')
     assert_equal org1, org2
   end
diff --git a/test/everypolitician/popolo_test.rb b/test/everypolitician/popolo_test.rb
index e011220..5b15ff2 100644
--- a/test/everypolitician/popolo_test.rb
+++ b/test/everypolitician/popolo_test.rb
@@ -17,7 +17,7 @@ def test_reading_file
     popolo = Everypolitician::Popolo.read('test/fixtures/ep-popolo-v1.0.json')
     assert_equal 1, popolo.persons.count
     person = popolo.persons.first
-    assert_equal '123', person.id
+    assert_equal 'person/123', person.id
     assert_equal 'Bob Smith', person.name
   end
 end