everypolitician-popolo 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e348db6764ddeea2411de793f0b2f46b4c23e32b
-  data.tar.gz: bdff4880f9a916bcb8e125f9ff11be5dcc2e5bd1
+  metadata.gz: 06d7ef4f90694c7c3bb3dd1b0c3c3d625ddb3b2b
+  data.tar.gz: 522b022a34eba1f04a62cf095fc13c4d32c73d49
 SHA512:
-  metadata.gz: 86f64b7e31c8b3d428572d38023b974813d4f919f78bb3b49294da84ec5b2b91e1b3f5f19b22391452ff9912c87fadaa8c032c207dc63b24e3e1bf5d7d757623
-  data.tar.gz: 6c59a7b46223324ce61a264422028a5a75ec71b7e80c0a73e34573f2dd5479a64562edb7e834cac2d1a25c87f9cdda3e7d0f7ff23afa1943aa93eb10d4a165cc
+  metadata.gz: 90aeb9436dd7897f98cf8c79932d68d3b78482de94e56d3fc23b49df30a6172e43582b0bf0b5c34ed92b606fd240f798d97764de2c066ee87346b04f8c0729e1
+  data.tar.gz: a202df2c86a1eaf3d5005c010c87a8361904a5c75b3c4a36b2b9927d960970f0f0195dcb6301e74e356ae6cef50a032a60bdd824e738b11df2269f14c6850c31

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,11 @@
+# Problem
+
+# Proposed Solution
+
+# Acceptance Criteria
+
+# Not Required
+
+# Prerequisites
+
+# Related Issues

data/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.4.0] - 2016-07-04
+
+### Added
+
+- Added `Organization#wikidata`
+
+## [0.3.2] - 2016-06-06
+
+### Fixed
+
+- Added missing attribute definition for `Event#start_date` and
+  `Event#end_date`
+
 ## [0.3.1] - 2016-05-04
 
 ### Fixed

data/lib/everypolitician/popolo.rb

@@ -30,28 +30,38 @@ module Everypolitician
       end
 
       def persons
-        People.new(popolo[:persons])
+        People.new(popolo[:persons], self)
       end
 
       def organizations
-        Organizations.new(popolo[:organizations])
+        Organizations.new(popolo[:organizations], self)
       end
 
       def areas
-        Areas.new(popolo[:areas])
+        Areas.new(popolo[:areas], self)
       end
 
       def events
-        Events.new(popolo[:events])
+        Events.new(popolo[:events], self)
       end
 
       def posts
-        Posts.new(popolo[:posts])
+        Posts.new(popolo[:posts], self)
       end
 
       def memberships
-        Memberships.new(popolo[:memberships])
+        Memberships.new(popolo[:memberships], self)
       end
+
+      def legislative_periods
+        events.where(classification: 'legislative period').sort_by(&:start_date)
+      end
+      alias_method :terms, :legislative_periods
+
+      def current_legislative_period
+        legislative_periods.last
+      end
+      alias_method :current_term, :current_legislative_period
     end
   end
 end

data/lib/everypolitician/popolo/collection.rb

@@ -4,9 +4,11 @@ module Everypolitician
       include Enumerable
 
       attr_reader :documents
+      attr_reader :popolo
 
-      def initialize(documents)
-        @documents = documents ? documents.map { |p| klass.new(p) } : []
+      def initialize(documents, popolo = nil)
+        @documents = documents ? documents.map { |p| klass.new(p, popolo) } : []
+        @popolo = popolo
       end
 
       def each(&block)

data/lib/everypolitician/popolo/entity.rb

@@ -4,9 +4,11 @@ module Everypolitician
 
       attr_accessor :id
       attr_reader :document
+      attr_reader :popolo
 
-      def initialize(document)
+      def initialize(document, popolo = nil)
         @document = document
+        @popolo = popolo
 
         document.each do |key, value|
           if respond_to?("#{key}=")
@@ -26,10 +28,13 @@ module Everypolitician
       end
 
       def ==(other)
-        id == other.id
+        self.class == other.class && id == other.id
       end
       alias eql? ==
 
+      def identifier(scheme)
+        identifiers.find(->{{}}) { |i| i[:scheme] == scheme }[:identifier]
+      end
     end
   end
 end

data/lib/everypolitician/popolo/event.rb

@@ -1,6 +1,8 @@
 module Everypolitician
   module Popolo
     class Events < Collection; end
-    class Event < Entity; end
+    class Event < Entity; 
+      attr_accessor :start_date, :end_date
+    end
   end
 end

data/lib/everypolitician/popolo/membership.rb

@@ -4,6 +4,10 @@ module Everypolitician
 
     class Membership < Entity
       attr_accessor :person_id, :on_behalf_of_id, :organization_id, :area_id, :role, :start_date, :end_date
+
+      def person
+        popolo.persons.find_by(id: person_id)
+      end
     end
   end
 end

data/lib/everypolitician/popolo/organization.rb

@@ -1,6 +1,11 @@
 module Everypolitician
   module Popolo
     class Organizations < Collection; end
-    class Organization < Entity; end
+
+    class Organization < Entity
+      def wikidata
+        identifier('wikidata')
+      end
+    end
   end
 end

data/lib/everypolitician/popolo/person.rb

@@ -5,7 +5,7 @@ module Everypolitician
     class Person < Entity
       class Error < StandardError; end
 
-      attr_accessor :name, :email, :image, :gender, :birth_date, :death_date
+      attr_accessor :name, :email, :image, :gender, :birth_date, :death_date, :honorific_prefix, :honorific_suffix
 
       def links
         document.fetch(:links, [])
@@ -19,11 +19,6 @@ module Everypolitician
         document.fetch(:contact_details, [])
       end
 
-
-      def identifier(scheme)
-        identifiers.find(->{{}}) { |i| i[:scheme] == scheme }[:identifier]
-      end
-
       def contact(type)
         contact_details.find(->{{}}) { |i| i[:type] == type }[:value]
       end
@@ -73,6 +68,10 @@ module Everypolitician
         fail Error, "Too many names at #{date}: #{at_date}" if at_date.count > 1
         at_date.first[:name]
       end
+
+      def memberships
+        popolo.memberships.where(person_id: id)
+      end
     end
   end
 end

data/lib/everypolitician/popolo/version.rb

@@ -1,5 +1,5 @@
 module Everypolitician
   module Popolo
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: everypolitician-popolo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Mytton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -118,3 +119,4 @@ signing_key:
 specification_version: 4
 summary: Makes it easy to work with EveryPolitician's Popolo output files from Ruby
 test_files: []
+has_rdoc: