everypolitician 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f5019b4f32557bebbe011a84ef324b25faedfa2
-  data.tar.gz: 721813c2e6d40c2714c742520ccb7e569174303c
+  metadata.gz: c734f5270dbb5bb015317c50984d2556901bb325
+  data.tar.gz: 5f973a73b4e6f1bc867d8654e84ec170c6f84e55
 SHA512:
-  metadata.gz: 7f648d3407c0ffd02073518f016a2c5f5964a75d98fbcf18aff88dc39344ef6f929fc7c4be4dbd4c58d43511b0e1e78d674b2f830bba2df22b5f8c397526b2a7
-  data.tar.gz: ee7abeb616c7537c2b4111953051900ce4138369bd403b0f350eb5f1b844190f65f2bd0a3218c8f887cbceb375aff3dd801e7214ae3d65784dad8ed5b457ca8c
+  metadata.gz: 8ad9fece5fa48421aa809bbf5f749bf7cf87e053eb8d2def8ec77cef3672a5d37578639c7af7ce30fd4a27318ab274469d0ed3b440190a868ac2eb8bee7f1827
+  data.tar.gz: 32188629d9022a9d7bdfe275869e612be058a20afaa6179c2f5c7e1222c62bf080b96be22d49b889fd06dcb9e827cdbeb733c01c377b2a0373fa61b4c01d4cea

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 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-01-29
+
+### Added
+
+- There is now a `LegislativePeriod` class to represent each legislative period in a legislature. This has a `#csv` method to return a parsed version of the legislative periods CSV.
+- You can now call `Legislature#country` to get the country for a legislature. Similarly you can call `LegislativePeriod#country` or `LegislativePeriod#legislature` to get the related objects.
+
 ## [0.5.0] - 2016-01-27
 
 ### Added
@@ -47,3 +54,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 [0.3.0]: https://github.com/everypolitician/everypolitician-ruby/compare/v0.2.0...v0.3.0
 [0.4.0]: https://github.com/everypolitician/everypolitician-ruby/compare/v0.3.0...v0.4.0
 [0.5.0]: https://github.com/everypolitician/everypolitician-ruby/compare/v0.4.0...v0.5.0
+[0.6.0]: https://github.com/everypolitician/everypolitician-ruby/compare/v0.5.0...v0.6.0

data/lib/everypolitician.rb

@@ -2,6 +2,7 @@ require 'everypolitician/version'
 require 'json'
 require 'open-uri'
 require 'everypolitician/popolo'
+require 'csv'
 
 module Everypolitician
   class Error < StandardError; end
@@ -63,13 +64,13 @@ module Everypolitician
     end
 
     def legislatures
-      @legislatures ||= @raw_data[:legislatures].map { |l| Legislature.new(l) }
+      @legislatures ||= @raw_data[:legislatures].map { |l| Legislature.new(l, self) }
     end
 
     def legislature(query)
       query = { slug: query } if query.is_a?(String)
       legislature = legislatures.find { |l| query.all? { |k, v| l.__send__(k) == v } }
-      fail Error, "Unknown legislature slug: #{slug}" if legislature.nil?
+      fail Error, "Unknown legislature: #{query}" if legislature.nil?
       legislature
     end
   end
@@ -80,19 +81,21 @@ module Everypolitician
     attr_reader :lastmod
     attr_reader :person_count
     attr_reader :sha
+    attr_reader :country
     attr_reader :raw_data
 
     def self.find(country_slug, legislature_slug)
       Country.find(country_slug).legislature(legislature_slug)
     end
 
-    def initialize(legislature_data)
+    def initialize(legislature_data, country)
       @name = legislature_data[:name]
       @slug = legislature_data[:slug]
       @lastmod = legislature_data[:lastmod]
       @person_count = legislature_data[:person_count]
       @sha = legislature_data[:sha]
       @raw_data = legislature_data
+      @country = country
     end
 
     def popolo
@@ -105,7 +108,48 @@ module Everypolitician
     end
 
     def legislative_periods
-      @legislative_periods ||= raw_data[:legislative_periods]
+      @legislative_periods ||= raw_data[:legislative_periods].map do |lp|
+        LegislativePeriod.new(lp, self, self.country)
+      end
+    end
+  end
+
+  class LegislativePeriod
+    attr_reader :id
+    attr_reader :name
+    attr_reader :slug
+    attr_reader :legislature
+    attr_reader :country
+    attr_reader :raw_data
+
+    def initialize(legislative_period_data, legislature, country)
+      @id = legislative_period_data[:id]
+      @name = legislative_period_data[:name]
+      @slug = legislative_period_data[:slug]
+      @legislature = legislature
+      @country = country
+      @raw_data = legislative_period_data
+    end
+
+    def start_date
+      @start_date ||= Date.parse(raw_data[:start_date])
+    end
+
+    def end_date
+      @end_date ||= Date.parse(raw_data[:end_date])
+    end
+
+    def csv_url
+      @csv_url ||= 'https://raw.githubusercontent.com/everypolitician' \
+        "/everypolitician-data/#{legislature.sha}/#{raw_data[:csv]}"
+    end
+
+    def csv
+      CSV.parse(open(csv_url).read, headers: true, header_converters: :symbol, converters: nil)
+    end
+
+    def [](key)
+      raw_data[key]
     end
   end
 end

data/lib/everypolitician/version.rb

@@ -1,3 +1,3 @@
 module Everypolitician
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: everypolitician
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Chris Mytton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: everypolitician-popolo