govkit-ca 0.0.2 → 0.0.3

metadata

@@ -1,90 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: govkit-ca
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.3
+  prerelease: 
 platform: ruby
-authors: 
-- James McKinney
+authors:
+- Open North
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-16 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70168055271360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 1
-        version: 0.6.1
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.8
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70168055271360
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70168055270320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 4
-        version: 1.4.4
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70168055270320
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70168055269100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 8
-        version: 0.7.8
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70168055269100
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &70168055267600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70168055267600
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70168055247900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :development
-  version_requirements: *id004
-description: GovKit-CA lets you quickly get encapsulated Ruby objects for Canadian civic data.
-email: 
-- james@slashpoundbang.com
+  prerelease: false
+  version_requirements: *70168055247900
+description: GovKit-CA lets you quickly get encapsulated Ruby objects for Canadian
+  civic data.
+email:
+- info@opennorth.ca
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -95,65 +84,158 @@ files:
 - lib/data/rid_to_edid.yml
 - lib/gov_kit-ca.rb
 - lib/gov_kit-ca/postal_code.rb
-- lib/gov_kit-ca/postal_code/strategy.rb
 - lib/gov_kit-ca/postal_code/strategy/base.rb
-- lib/gov_kit-ca/postal_code/strategy/cbc-ca.rb
-- lib/gov_kit-ca/postal_code/strategy/conservative-ca.rb
-- lib/gov_kit-ca/postal_code/strategy/digital_copyright-ca.rb
-- lib/gov_kit-ca/postal_code/strategy/elections-ca.rb
-- lib/gov_kit-ca/postal_code/strategy/greenparty-ca.rb
-- lib/gov_kit-ca/postal_code/strategy/liberal-ca.rb
-- lib/gov_kit-ca/postal_code/strategy/ndp-ca.rb
-- lib/gov_kit-ca/postal_code/strategy/parl-gc-ca.rb
+- lib/gov_kit-ca/postal_code/strategy/cbc_ca.rb
+- lib/gov_kit-ca/postal_code/strategy/conservative_ca.rb
+- lib/gov_kit-ca/postal_code/strategy/digital-copyright_ca.rb
+- lib/gov_kit-ca/postal_code/strategy/elections_ca.rb
+- lib/gov_kit-ca/postal_code/strategy/greenparty_ca.rb
+- lib/gov_kit-ca/postal_code/strategy/liberal_ca.rb
+- lib/gov_kit-ca/postal_code/strategy/ndp_ca.rb
+- lib/gov_kit-ca/postal_code/strategy/parl_gc_ca.rb
+- lib/gov_kit-ca/postal_code/strategy_set.rb
 - lib/gov_kit-ca/version.rb
 - lib/govkit-ca.rb
 - spec/cbc_ca_spec.rb
+- spec/digital-copyright_ca_spec.rb
 - spec/elections_ca_spec.rb
+- spec/fixtures/cbc_ca/A1A1A1.response
+- spec/fixtures/cbc_ca/G0C2Y0.response
+- spec/fixtures/cbc_ca/H0H0H0.response
+- spec/fixtures/cbc_ca/K0A1K0.response
+- spec/fixtures/cbc_ca/T5S2B9.response
+- spec/fixtures/cbc_ca/X1B1B1.response
+- spec/fixtures/conservative_ca/A1A1A1.response
+- spec/fixtures/conservative_ca/G0C2Y0.response
+- spec/fixtures/conservative_ca/H0H0H0.response
+- spec/fixtures/conservative_ca/K0A1K0.response
+- spec/fixtures/conservative_ca/T5S2B9.response
+- spec/fixtures/conservative_ca/X1B1B1.response
+- spec/fixtures/digital-copyright_ca/A1A1A1.response
+- spec/fixtures/digital-copyright_ca/G0C2Y0.response
+- spec/fixtures/digital-copyright_ca/H0H0H0.response
+- spec/fixtures/digital-copyright_ca/K0A1K0.response
+- spec/fixtures/digital-copyright_ca/T5S2B9.response
+- spec/fixtures/digital-copyright_ca/X1B1B1.response
+- spec/fixtures/elections_ca/A1A1A1.response
+- spec/fixtures/elections_ca/G0C2Y0.response
+- spec/fixtures/elections_ca/H0H0H0.response
+- spec/fixtures/elections_ca/K0A1K0.response
+- spec/fixtures/elections_ca/T5S2B9.response
+- spec/fixtures/elections_ca/X1B1B1.response
+- spec/fixtures/greenparty_ca/A1A1A1.response
+- spec/fixtures/greenparty_ca/G0C2Y0.response
+- spec/fixtures/greenparty_ca/H0H0H0.response
+- spec/fixtures/greenparty_ca/K0A1K0.response
+- spec/fixtures/greenparty_ca/T5S2B9.response
+- spec/fixtures/greenparty_ca/X1B1B1.response
+- spec/fixtures/liberal_ca/A1A1A1.response
+- spec/fixtures/liberal_ca/G0C2Y0.response
+- spec/fixtures/liberal_ca/H0H0H0.response
+- spec/fixtures/liberal_ca/K0A1K0.response
+- spec/fixtures/liberal_ca/T5S2B9.response
+- spec/fixtures/liberal_ca/X1B1B1.response
+- spec/fixtures/ndp_ca/A1A1A1.response
+- spec/fixtures/ndp_ca/G0C2Y0.response
+- spec/fixtures/ndp_ca/H0H0H0.response
+- spec/fixtures/ndp_ca/K0A1K0.response
+- spec/fixtures/ndp_ca/T5S2B9.response
+- spec/fixtures/ndp_ca/X1B1B1.response
+- spec/fixtures/parl_gc_ca/A1A1A1.response
+- spec/fixtures/parl_gc_ca/G0C2Y0.response
+- spec/fixtures/parl_gc_ca/H0H0H0.response
+- spec/fixtures/parl_gc_ca/K0A1K0.response
+- spec/fixtures/parl_gc_ca/T5S2B9.response
+- spec/fixtures/parl_gc_ca/X1B1B1.response
 - spec/greenparty_ca_spec.rb
 - spec/liberal_ca_spec.rb
 - spec/ndp_ca_spec.rb
 - spec/postal_code_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/rid_to_edid.rb
-has_rdoc: true
-homepage: http://github.com/jpmckinney/govkit-ca
+- spec/strategy_set_spec.rb
+- tasks/postal-code-for-districts.csv
+- tasks/tasks.rb
+homepage: http://github.com/opennorth/govkit-ca
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: govkit-ca
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Easy access to Canadian civic data around the web
-test_files: 
+test_files:
 - spec/cbc_ca_spec.rb
+- spec/digital-copyright_ca_spec.rb
 - spec/elections_ca_spec.rb
+- spec/fixtures/cbc_ca/A1A1A1.response
+- spec/fixtures/cbc_ca/G0C2Y0.response
+- spec/fixtures/cbc_ca/H0H0H0.response
+- spec/fixtures/cbc_ca/K0A1K0.response
+- spec/fixtures/cbc_ca/T5S2B9.response
+- spec/fixtures/cbc_ca/X1B1B1.response
+- spec/fixtures/conservative_ca/A1A1A1.response
+- spec/fixtures/conservative_ca/G0C2Y0.response
+- spec/fixtures/conservative_ca/H0H0H0.response
+- spec/fixtures/conservative_ca/K0A1K0.response
+- spec/fixtures/conservative_ca/T5S2B9.response
+- spec/fixtures/conservative_ca/X1B1B1.response
+- spec/fixtures/digital-copyright_ca/A1A1A1.response
+- spec/fixtures/digital-copyright_ca/G0C2Y0.response
+- spec/fixtures/digital-copyright_ca/H0H0H0.response
+- spec/fixtures/digital-copyright_ca/K0A1K0.response
+- spec/fixtures/digital-copyright_ca/T5S2B9.response
+- spec/fixtures/digital-copyright_ca/X1B1B1.response
+- spec/fixtures/elections_ca/A1A1A1.response
+- spec/fixtures/elections_ca/G0C2Y0.response
+- spec/fixtures/elections_ca/H0H0H0.response
+- spec/fixtures/elections_ca/K0A1K0.response
+- spec/fixtures/elections_ca/T5S2B9.response
+- spec/fixtures/elections_ca/X1B1B1.response
+- spec/fixtures/greenparty_ca/A1A1A1.response
+- spec/fixtures/greenparty_ca/G0C2Y0.response
+- spec/fixtures/greenparty_ca/H0H0H0.response
+- spec/fixtures/greenparty_ca/K0A1K0.response
+- spec/fixtures/greenparty_ca/T5S2B9.response
+- spec/fixtures/greenparty_ca/X1B1B1.response
+- spec/fixtures/liberal_ca/A1A1A1.response
+- spec/fixtures/liberal_ca/G0C2Y0.response
+- spec/fixtures/liberal_ca/H0H0H0.response
+- spec/fixtures/liberal_ca/K0A1K0.response
+- spec/fixtures/liberal_ca/T5S2B9.response
+- spec/fixtures/liberal_ca/X1B1B1.response
+- spec/fixtures/ndp_ca/A1A1A1.response
+- spec/fixtures/ndp_ca/G0C2Y0.response
+- spec/fixtures/ndp_ca/H0H0H0.response
+- spec/fixtures/ndp_ca/K0A1K0.response
+- spec/fixtures/ndp_ca/T5S2B9.response
+- spec/fixtures/ndp_ca/X1B1B1.response
+- spec/fixtures/parl_gc_ca/A1A1A1.response
+- spec/fixtures/parl_gc_ca/G0C2Y0.response
+- spec/fixtures/parl_gc_ca/H0H0H0.response
+- spec/fixtures/parl_gc_ca/K0A1K0.response
+- spec/fixtures/parl_gc_ca/T5S2B9.response
+- spec/fixtures/parl_gc_ca/X1B1B1.response
 - spec/greenparty_ca_spec.rb
 - spec/liberal_ca_spec.rb
 - spec/ndp_ca_spec.rb
 - spec/postal_code_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/strategy_set_spec.rb

data/lib/gov_kit-ca/postal_code/strategy/digital_copyright-ca.rb

@@ -1,28 +0,0 @@
-module GovKit
-  module CA
-    module PostalCode
-      module Strategy
-        # Occasionally suffers from timeout errors.
-        class DigitalCopyrightCa < Base
-          base_uri 'www.digital-copyright.ca'
-
-        private
-
-          def electoral_districts!
-            Nokogiri::HTML(response.parsed_response).css('.node .content a').map{|a| a[:href][/\d+\Z/]}
-          end
-
-          def valid?
-            !response.parsed_response.match /\binvalid postal code\b/
-          end
-
-          def response
-            @response ||= self.class.get "/edid/postal?postalcode=#{@postal_code}"
-          end
-        end
-
-        StrategySet.register DigitalCopyrightCa
-      end
-    end
-  end
-end

data/tasks/rid_to_edid.rb

@@ -1,136 +0,0 @@
-require 'csv'
-require 'open-uri'
-require File.expand_path('../../lib/gov_kit-ca', __FILE__)
-
-# http://www.digital-copyright.ca/pcfrf/pcfrf.tgz contains
-# `postal-code-for-districts.csv`, "which is 308 postal codes that should
-# map to each of the 308 different electoral districts." However, six of the
-# postal codes do not exist (G0A2C0, J8M1R8, J0W1B0, J0B1H0, L0J1B0, N2A1A3),
-# 14 are duplicate, and the remaining 294 map to 246 electoral districts.
-desc "Picks the set cover for postal codes to cbc.ca riding IDs"
-task :trim_postal_codes do |t,args|
-  abort "Usage: rake #{t.name} file=postal-codes-for-districts.csv" unless args[:file]
-
-  # Get the riding IDs that each postal code covers
-  postal_to_rid = {}
-  File.read(args[:file]).split("\n").uniq.each do |postal_code| # Remove duplicate postal codes
-    begin
-      postal_to_rid[postal_code] = GovKit::CA::PostalCode::Strategy::CbcCa.new(postal_code).json_response.map{|hash| hash['rid'].to_i}
-    rescue JSON::ParserError => e # Ignore invalid postal codes
-      puts "ERROR: #{postal_code} is invalid"
-    end
-  end
-
-  # Get the minimum number of postal codes to cover all riding IDs. This is an
-  # instance of the set cover problem, which is NP-complete. We use the greedy
-  # algorithm, which is the best-possible polynomial time approximation
-  # algorithm for set cover. http://en.wikipedia.org/wiki/Set_cover_problem
-  postal_codes = []
-  until postal_to_rid.empty?
-    postal_code, rids = postal_to_rid.find{|k,v| v.size == postal_to_rid.map{|k,v| v.size}.max}
-    postal_to_rid.each{|k,v| postal_to_rid[k] -= rids}
-    postal_to_rid.reject!{|k,v| v.empty?}
-    postal_codes << postal_code
-  end
-
-  puts postal_codes.sort
-end
-
-# Use https://github.com/danielharan/pc_scraper/raw/master/data/index.csv and
-# https://github.com/danielharan/canadian-postal-code-to-electoral-districts/raw/master/pc_edid.yml
-# The YAML file may contain invalid postal codes, e.g. M5V1L6, and does not
-# contain every electoral district, e.g. 35061. 35061 corresponds to riding ID
-# 168, which contains the postal code L1H1X8.
-desc "Generates postal codes within the given list of cbc.ca riding IDs"
-task :riding_id_to_postal_code do |t,args|
-  abort "Usage: rake #{t.name} file=riding-ids.csv csv=index.csv yml=pc_edid.yml" unless args[:file] && args[:csv] && args[:yml]
-
-  # The YML file maps postal codes to electoral districts
-  yml = YAML.load_file(args[:yml])
-
-  # Get an old map of riding IDs to electoral districts
-  rid_to_edid = {}
-  CSV.foreach(args[:csv]) do |row|
-    rid_to_edid[row[1]] = row[0]
-  end
-
-  # Map riding IDs to postal codes
-  rid_to_postal = {}
-  File.read(args[:file]).split("\n").each do |riding_id|
-    match = yml.find{|k,v| v == rid_to_edid[riding_id]}
-    if match
-      rid_to_postal[riding_id] = match[0]
-    else
-      puts "ERROR: No postal code for riding ID #{riding_id}, electoral district #{rid_to_edid[riding_id]}"
-    end
-  end
-
-  puts rid_to_postal.values.sort
-end
-
-# Pass postal-code-for-districts.csv from http://www.digital-copyright.ca/pcfrf/pcfrf.tgz
-# through `rake trim_postal_codes`. This rake task will print a list of riding
-# IDs which none of the given postal codes belong to. Pass this list through
-# `rake riding_id_to_postal_code` to get a list of postal codes belonging to
-# those riding IDs. Manually add postal codes for any remaining riding IDs.
-desc "Generates YAML mapping cbc.ca riding IDs to electoral districts"
-task :riding_id_to_electoral_district do |t,args|
-  abort "Usage: rake #{t.name} file=postal-codes-for-districts.csv" unless args[:file]
-
-  def transliterate_elections_ca(string)
-    {
-      /\342\200\223/   => '-',
-      /\303\242/       => 'a',
-      /\303[\251\250]/ => 'e',
-      /\303\264/       => 'o',
-      /\303\211/       => 'E',
-      /\303\216/       => 'I',
-    }.reduce(string) do |string,map|
-      string.gsub(map[0], map[1])
-    end
-  end
-
-  # Map electoral district names to electoral district IDs
-  name_to_edid = {}
-  doc = Nokogiri::HTML(open("http://www.elections.ca/content.aspx?section=res&dir=cir/list&document=index&lang=e").read)
-  doc.css('sup').remove
-  edids = doc.css('table[summary^="List"] th.normal').map{|x| x.text.to_i}
-  doc.css('table[summary^="List"] th.normal + td').map{|x| x.text.gsub(/\s+/, ' ').strip}.each_with_index do |name,index|
-    name_to_edid[transliterate_elections_ca(name)] = edids[index]
-  end
-
-  def transliterate_cbc_ca(string)
-    {
-      / - /            => '-',
-      /\342/           => 'a',
-      /[\350\351]/     => 'e',
-      /\364/           => 'o',
-      /\311/           => 'E',
-      /\316/           => 'I',
-    }.reduce(string) do |string,map|
-      string.gsub(map[0], map[1])
-    end
-  end
-
-  # Map electoral district names to riding IDs
-  name_to_rid = {}
-  File.read(args[:file]).split("\n").each do |postal_code|
-    GovKit::CA::PostalCode::Strategy::CbcCa.new(postal_code).json_response.each do |hash|
-      name_to_rid[transliterate_cbc_ca(hash['name'])] = hash['rid'].to_i
-    end
-  end
-
-  # Can we generate a complete mapping?
-  missing = name_to_edid.keys - name_to_rid.keys
-  unless missing.empty?
-    abort "The postal codes in #{args[:file]} do not cover #{missing.size} electoral districts:\n#{missing.sort.join("\n")}\n\nThe missing cbc.ca riding IDs are:\n#{([*1..308] - name_to_rid.map{|k,v| v}.flatten).sort.join("\n")}"
-  end
-
-  # Map riding IDs to electoral districts
-  rid_to_edid = {}
-  name_to_edid.keys.each do |name|
-    rid_to_edid[name_to_rid[name]] = name_to_edid[name]
-  end
-
-  puts rid_to_edid.to_yaml
-end