everypolitician 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fb2e4b9951d0fcb07375a0eeb7e62654d69218a
-  data.tar.gz: 97535464a6f92d4ddaa1d94144aa48a44005a6bc
+  metadata.gz: 2f5019b4f32557bebbe011a84ef324b25faedfa2
+  data.tar.gz: 721813c2e6d40c2714c742520ccb7e569174303c
 SHA512:
-  metadata.gz: 3d812c5eedb13bdfe7f0d2cc68be4d1da742f724aa6c694b1ac82eb70b366cf50eef7f13bc2f850a6609bc66c49697157d0f50018d284600a30e28238506505e
-  data.tar.gz: b2cb5cb815eb29f841ed391cd2ce889aa9d259c47867bb748f1b8490c1564a36b8986ea1cc5b940642397c9c2cb3486e33c5fb1d81b33622885de429d91e8006
+  metadata.gz: 7f648d3407c0ffd02073518f016a2c5f5964a75d98fbcf18aff88dc39344ef6f929fc7c4be4dbd4c58d43511b0e1e78d674b2f830bba2df22b5f8c397526b2a7
+  data.tar.gz: ee7abeb616c7537c2b4111953051900ce4138369bd403b0f350eb5f1b844190f65f2bd0a3218c8f887cbceb375aff3dd801e7214ae3d65784dad8ed5b457ca8c

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.5.0] - 2016-01-27
+
+### Added
+
+- `Everypolitician.countries` method for returning an array of all countries.
+- Find countries and legislatures by arbitrary attributes, e.g. `Everypolitician.country(code: 'AU')`
+
+### Changed
+
+- We no longer use ruby metaprogramming to define the methods on `Country` and `Legislature`, they are now explicitly defined as properties and methods.
+- `Legislature#popolo_url` now uses the `Legislature#sha` method rather than `master` in the raw url.
+- `countries.json` is only loaded once, when it's first accessed. If you want to force a refetch then you can call `Everypolitician.countries = nil`.
+
 ## [0.4.0] - 2016-01-26
 
 ### Changed
@@ -33,3 +46,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
+[0.5.0]: https://github.com/everypolitician/everypolitician-ruby/compare/v0.4.0...v0.5.0

data/lib/everypolitician/version.rb

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

data/lib/everypolitician.rb

@@ -8,6 +8,7 @@ module Everypolitician
 
   class << self
     attr_writer :countries_json
+    attr_writer :countries
   end
 
   def self.countries_json
@@ -15,6 +16,14 @@ module Everypolitician
       'everypolitician/everypolitician-data/master/countries.json'
   end
 
+  def self.countries
+    @countries ||= begin
+      JSON.parse(open(countries_json).read, symbolize_names: true).map do |c|
+        Country.new(c)
+      end
+    end
+  end
+
   def self.country(slug)
     Country.find(slug)
   end
@@ -29,69 +38,77 @@ module Everypolitician
     [country, legislature]
   end
 
-  class Entity
-    def initialize(data)
-      process_data(data).each do |key, value|
-        define_singleton_method(key) do
-          value
-        end
-      end
+  class Country
+    attr_reader :name
+    attr_reader :code
+    attr_reader :slug
+    attr_reader :raw_data
+
+    def self.find(query)
+      query = { slug: query } if query.is_a?(String)
+      country = Everypolitician.countries.find { |c| query.all? { |k, v| c[k] == v } }
+      fail Error, "Couldn't find country for query: #{query}" if country.nil?
+      new(country)
     end
 
-    # Override in subclasses to change structure of data
-    def process_data(data)
-      data
+    def initialize(country_data)
+      @name = country_data[:name]
+      @code = country_data[:code]
+      @slug = country_data[:slug]
+      @raw_data = country_data
     end
-  end
 
-  class Country < Entity
-    def self.find(slug)
-      country = CountriesJson.new.find { |c| c[:slug] == slug }
-      fail Error, "Unknown country slug: #{slug}" if country.nil?
-      new(country)
+    def [](key)
+      raw_data[key]
+    end
+
+    def legislatures
+      @legislatures ||= @raw_data[:legislatures].map { |l| Legislature.new(l) }
     end
 
-    def legislature(slug)
-      legislature = legislatures.find { |l| l[:slug] == slug }
+    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?
-      Legislature.new(legislature)
+      legislature
     end
   end
 
-  class Legislature < Entity
+  class Legislature
+    attr_reader :name
+    attr_reader :slug
+    attr_reader :lastmod
+    attr_reader :person_count
+    attr_reader :sha
+    attr_reader :raw_data
+
     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
+    def initialize(legislature_data)
+      @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
     end
-  end
-
-  class CountriesJson
-    include Enumerable
 
-    def countries
-      @countries ||= JSON.parse(raw_json_string, symbolize_names: true)
+    def popolo
+      @popolo ||= Everypolitician::Popolo.parse(open(popolo_url).read)
     end
 
-    def each(&block)
-      countries.each(&block)
+    def popolo_url
+      @popolo_url ||= 'https://raw.githubusercontent.com/everypolitician' \
+        "/everypolitician-data/#{sha}/#{raw_data[:popolo]}"
     end
 
-    private
-
-    def raw_json_string
-      @json ||= open(Everypolitician.countries_json).read
+    def legislative_periods
+      @legislative_periods ||= raw_data[:legislative_periods]
     end
   end
 end
 
 # Alternative constant name which is how it's usually capitalized in public copy.
-EveryPolitician = Everypolitician
+EveryPolitician ||= Everypolitician

metadata

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