everypolitician 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 154efdf06fb1ee844cdf89ec68f773f35edea46c
-  data.tar.gz: 0de8b2dc4fb88a2615870c48306536b587e029d6
+  metadata.gz: 5fb2e4b9951d0fcb07375a0eeb7e62654d69218a
+  data.tar.gz: 97535464a6f92d4ddaa1d94144aa48a44005a6bc
 SHA512:
-  metadata.gz: 2a6ae15925a9ce0a611e23557efb69f59b082d2d06faf3b2288dd832e37073079408d8111ced29a487bd7dab3d1553d9df9e6e68adff3c3f5579a5f6f3b8b04b
-  data.tar.gz: 18e7bd9edc5cb33c755609cff3c1836d316a84dcbdca5cb60f630feb4c45f84b8887f180ce77d8b1d8eeae593ab4d07ff0ee87c2ac746687511c71c744b1b858
+  metadata.gz: 3d812c5eedb13bdfe7f0d2cc68be4d1da742f724aa6c694b1ac82eb70b366cf50eef7f13bc2f850a6609bc66c49697157d0f50018d284600a30e28238506505e
+  data.tar.gz: b2cb5cb815eb29f841ed391cd2ce889aa9d259c47867bb748f1b8490c1564a36b8986ea1cc5b940642397c9c2cb3486e33c5fb1d81b33622885de429d91e8006

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 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-01-26
+
+### Changed
+
+- `Everypolitician::Legislature#popolo` now returns an instance of `Everypolitician::Popolo::JSON` from [everypolitician-popolo](https://github.com/everypolitician/everypolitician-popolo) instead of a string representing the path.
+
+### Added
+
+- `Everypolitician::Legislature#popolo_url` now returns a GitHub raw url to the popolo for the legislature.
+
 ## [0.3.0] - 2015-12-22
 
 ### Added
@@ -22,3 +32,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 [0.2.0]: https://github.com/everypolitician/everypolitician-ruby/compare/v0.1.0...v0.2.0
 [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

data/README.md

@@ -24,9 +24,9 @@ Or install it yourself as:
 require 'everypolitician'
 
 australia = Everypolitician.country('Australia')
-australia.code # AU
+australia.code # => "AU"
 senate = australia.legislature('Senate')
-senate.popolo # data/Australia/Senate/ep-popolo-v1.0.json
+senate.popolo # => #<Everypolitician::Popolo::JSON>
 ```
 
 If you want to point at a different `countries.json`, e.g. a local path or a different url, you can set it like this:

data/everypolitician.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'everypolitician-popolo'
+
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest'

data/lib/everypolitician.rb

@@ -1,6 +1,7 @@
 require 'everypolitician/version'
 require 'json'
 require 'open-uri'
+require 'everypolitician/popolo'
 
 module Everypolitician
   class Error < StandardError; end
@@ -30,12 +31,17 @@ module Everypolitician
 
   class Entity
     def initialize(data)
-      data.each do |key, value|
+      process_data(data).each do |key, value|
         define_singleton_method(key) do
           value
         end
       end
     end
+
+    # Override in subclasses to change structure of data
+    def process_data(data)
+      data
+    end
   end
 
   class Country < Entity
@@ -56,6 +62,16 @@ module Everypolitician
     def self.find(country_slug, legislature_slug)
       Country.find(country_slug).legislature(legislature_slug)
     end
+
+    def popolo
+      @popolo ||= Everypolitician::Popolo.parse(open(popolo_url).read)
+    end
+
+    def process_data(data)
+      data[:popolo_url] = 'https://raw.githubusercontent.com/everypolitician' \
+        "/everypolitician-data/master/#{data.delete(:popolo)}"
+      data
+    end
   end
 
   class CountriesJson

data/lib/everypolitician/version.rb

@@ -1,3 +1,3 @@
 module Everypolitician
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: everypolitician
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Mytton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: everypolitician-popolo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Interface with EveryPolitician data from your Ruby app