govkit-ca 0.0.4 → 0.0.5

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/README.md

@@ -1,5 +1,9 @@
 # GovKit-CA
 
+[![Build Status](https://secure.travis-ci.org/opennorth/govkit-ca.png)](http://travis-ci.org/opennorth/govkit-ca)
+[![Dependency Status](https://gemnasium.com/opennorth/govkit-ca.png)](https://gemnasium.com/opennorth/govkit-ca)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/opennorth/govkit-ca)
+
 GovKit-CA is a Ruby gem that provides easy access to Canadian civic data around the web. It currently provides an API for free postal code to electoral district lookups, using the following sources:
 
 * [elections.ca](http://elections.ca/)
@@ -43,6 +47,6 @@ GovKit-CA will raise GovKit::CA::ResourceNotFound if the electoral districts wit
 
 GovKit-CA interoperates with [Participatory Politics Foundation](http://www.participatorypolitics.org/)'s [GovKit](https://github.com/opengovernment/govkit). Please join the [GovKit Google Group](http://groups.google.com/group/govkit), especially if you'd like to talk about a new feature and get announcements.
 
-Govkit-CA's main repository is on GitHub: [http://github.com/opennorth/govkit-ca](http://github.com/opennorth/govkit-ca), where your contributions, forks, bug reports, feature requests, and feedback are greatly welcomed.
+This gem's main repository is on GitHub: [http://github.com/opennorth/govkit-ca](http://github.com/opennorth/govkit-ca), where your contributions, forks, bug reports, feature requests, and feedback are greatly welcomed.
 
 Copyright (c) 2011 Open North Inc., released under the MIT license

data/govkit-ca.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('yajl-ruby', '~> 0.8.2')
   s.add_development_dependency('rspec', '~> 2.6.0')
   s.add_development_dependency('fakeweb', '~> 1.3.0')
+  s.add_development_dependency('rake')
 end

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

@@ -47,7 +47,13 @@ module GovKit
           # Performs the request and returns the response.
           # @return [HTTParty::Response] a HTTParty response object
           def response
-            @response ||= self.class.send self.class.http_method, path
+            @response ||= begin
+              if self.class.http_method == :post
+                self.class.post path, :body => post_data
+              else
+                self.class.send self.class.http_method, path
+              end
+            end
           end
 
           # Allows setting an HTTP method to be used for each request.
@@ -70,6 +76,19 @@ module GovKit
           def path
             ERB.new(self.class.path).result binding
           end
+
+          # Allows setting POST data to be sent in each request.
+          # @param [String] post_data an ERB template for the POST data
+          # @return [String] the POST data for the request
+          def self.post_data(post_data = nil)
+            return default_options[:post_data] unless post_data
+            default_options[:post_data] = post_data
+          end
+
+          # @return [String] the POST data for the request
+          def post_data
+            ERB.new(self.class.post_data).result binding
+          end
         end
       end
     end

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

@@ -2,15 +2,13 @@ module GovKit
   module CA
     module PostalCode
       module Strategy
-        # cbc.ca ought to be a reliable source. It is unknown if its database
-        # is kept up-to-date between elections, however.
-        # @see https://github.com/danielharan/pc_scraper
         class CBCCa < Base
           base_uri 'www.cbc.ca'
           http_method :get
           path '/news/politics/canadavotes2011/myelection/postalcodes/index.php?pc=<%= @postal_code %>'
 
         private
+
           def electoral_districts!
             Yajl::Parser.parse(response.parsed_response).map{|x| self.class.rid_to_edid[x['rid'].to_i]}
           end

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

@@ -2,21 +2,24 @@ module GovKit
   module CA
     module PostalCode
       module Strategy
-        # conservative.ca seems unreliable. In the case of B0J2L0, for example,
-        # it does not return three ridings like other sources.
         class ConservativeCa < Base
           base_uri 'www.conservative.ca'
-          http_method :get
-          path '/?section_id=1051&postal_code=<%= @postal_code %>'
+          http_method :post
+          path '/?page_id=35'
+          post_data 'findmymp=35&pc=<%= @postal_code %>'
 
         private
 
           def electoral_districts!
-            # TODO returns HTML with electoral district names only
+            images.map{|a| a[:src][/\d+\.jpg\z/]}
           end
 
           def valid?
-            # TODO
+            !images.empty?
+          end
+
+          def images
+            @document ||= Nokogiri::HTML(response.parsed_response, nil, 'utf-8').css('#type img')
           end
         end
 

data/lib/gov_kit-ca/postal_code/strategy/digital-copyright_ca.rb

@@ -2,9 +2,6 @@ module GovKit
   module CA
     module PostalCode
       module Strategy
-        # digital-copyright.ca often returns more or fewer electoral districts
-        # than others. It says it uses makethechange.ca, but makethechange.ca
-        # returns different results for, e.g., K0A1K0.
         class DigitalCopyrightCa < Base
           base_uri 'www.digital-copyright.ca'
           http_method :get

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

@@ -2,13 +2,10 @@ module GovKit
   module CA
     module PostalCode
       module Strategy
-        # greenparty.ca does not return electoral districts for postal codes
-        # that contain multiple electoral districts. It has no lookup service
-        # between elections.
         class GreenPartyCa < Base
-          base_uri 'greenparty.ca'
+          base_uri 'www.greenparty.ca'
           http_method :head
-          path '/search/civicrm_lookup/<%= @postal_code %>'
+          path '/search/green_geo/<%= @postal_code %>'
 
         private
 
@@ -17,7 +14,7 @@ module GovKit
           end
 
           def valid?
-            response.headers['location'] != 'http://greenparty.ca/find_your_riding'
+            response.headers['location'] != 'http://www.greenparty.ca/find_your_riding'
           end
         end
 

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

@@ -2,21 +2,19 @@ module GovKit
   module CA
     module PostalCode
       module Strategy
-        # ndp.ca does not return electoral districts for postal codes that
-        # contain multiple electoral districts.
         class NDPCa < Base
           base_uri 'www.ndp.ca'
-          http_method :head
-          path '/riding/<%= @postal_code %>'
+          http_method :get
+          path '/your-riding/?search=<%= @postal_code %>'
 
         private
 
           def electoral_districts!
-            [ response.headers['location'][/\d+\z/] ]
+            Nokogiri::HTML(response.parsed_response, nil, 'utf-8').css('a.mp-riding-link,a.no-mp').map{|a| a[:href][/\d+\z/]}
           end
 
           def valid?
-            response.headers['location'] != 'http://www.ndp.ca/'
+            !response.parsed_response['No ridings or MPs match this search.']
           end
         end
 

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

@@ -2,7 +2,6 @@ module GovKit
   module CA
     module PostalCode
       module Strategy
-        # parl.gc.ca is a reliable source.
         class ParlGcCa < Base
           base_uri 'www.parl.gc.ca'
           http_method :get

data/lib/gov_kit-ca/postal_code.rb

@@ -80,13 +80,15 @@ module GovKit
 end
 
 require 'gov_kit-ca/postal_code/strategy/base'
-require 'gov_kit-ca/postal_code/strategy/elections_ca'
+# Returns only riding name.
 #require 'gov_kit-ca/postal_code/strategy/parl_gc_ca'
-require 'gov_kit-ca/postal_code/strategy/cbc_ca'
+require 'gov_kit-ca/postal_code/strategy/elections_ca' # only one-to-one
 require 'gov_kit-ca/postal_code/strategy/ndp_ca'
+require 'gov_kit-ca/postal_code/strategy/liberal_ca' # incomplete database
+require 'gov_kit-ca/postal_code/strategy/greenparty_ca' # only one-to-one
+require 'gov_kit-ca/postal_code/strategy/cbc_ca' # disagrees with elections.ca
 
-# These strategies are suboptimal:
+# If not held by Conservative MP, returns only riding name.
 # require 'gov_kit-ca/postal_code/strategy/conservative_ca'
+# Returns too many or too few ridings.
 # require 'gov_kit-ca/postal_code/strategy/digital-copyright_ca'
-# require 'gov_kit-ca/postal_code/strategy/greenparty_ca'
-# require 'gov_kit-ca/postal_code/strategy/liberal_ca'

data/lib/gov_kit-ca/version.rb

@@ -1,5 +1,5 @@
 module GovKit
   module CA
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/gov_kit-ca.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
-
 require 'erb'
 require 'json'
 require 'yaml'

data/spec/cbc_ca_spec.rb

@@ -14,8 +14,8 @@ class GovKit::CA::PostalCode::Strategy::CBCCa
 
       it 'should return the electoral districts within a postal code' do
         { 'G0C2Y0' => [24019],
-          'T5S2B9' => [48015, 48017], # differs from elections.ca, ndp.ca, greenparty.ca, liberal.ca
-          'K0A1K0' => [35025, 35052, 35063, 35064], # differs from liberal.ca, digital-copyright.ca
+          'T5S2B9' => [48015, 48017],
+          'K0A1K0' => [35025, 35052, 35063, 35064],
         }.each do |postal_code,electoral_districts|
           GovKit::CA::PostalCode::Strategy::CBCCa.new(postal_code).electoral_districts.should == electoral_districts
         end

data/spec/conservative_ca_spec.ca

@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'gov_kit-ca/postal_code/strategy/conservative_ca'
+
+describe GovKit::CA::PostalCode::Strategy::ConservativeCa do
+  describe '#electoral_districts' do
+    before :all do
+      %w(G0C2Y0 T5S2B9 K0A1K0 H0H0H0 X1B1B1).each do |postal_code|
+        strategy = GovKit::CA::PostalCode::Strategy::ConservativeCa.new(postal_code)
+        unless FakeWeb.allow_net_connect?
+          FakeWeb.register_uri strategy.class.http_method, "#{strategy.class.base_uri}#{strategy.send(:path)}", :response => fixture_path('digital-copyright_ca', "#{postal_code}.response")
+        end
+      end
+    end
+
+    it 'should return the electoral districts within a postal code' do
+      { 'T5S2B9' => [48015],
+        'K0A1K0' => [35025, 35052, 35063],
+        'B0J2L0' => [12002, 12006, 12009, 12011],
+      }.each do |postal_code,electoral_districts|
+        GovKit::CA::PostalCode::Strategy::ConservativeCa.new(postal_code).electoral_districts.should == electoral_districts
+      end
+    end
+
+    it 'should (unfortunately) return false if a postal code is held by another party' do
+      GovKit::CA::PostalCode::Strategy::ConservativeCa.new('G0C2Y0').electoral_districts.should be_false
+    end
+
+    it 'should return false if a postal code contains no electoral districts' do
+      GovKit::CA::PostalCode::Strategy::ConservativeCa.new('H0H0H0').electoral_districts.should be_false
+    end
+
+    it 'should return false if a postal code does not exist' do
+      GovKit::CA::PostalCode::Strategy::ConservativeCa.new('X1B1B1').electoral_districts.should be_false
+    end
+  end
+end

data/spec/digital-copyright_ca_spec.rb

@@ -1,34 +1,33 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'gov_kit-ca/postal_code/strategy/digital-copyright_ca'
 
-class GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa
-  describe GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa do
-    describe '#electoral_districts' do
-      before :all do
-        %w(G0C2Y0 T5S2B9 K0A1K0 H0H0H0 X1B1B1).each do |postal_code|
-          strategy = GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa.new(postal_code)
-          unless FakeWeb.allow_net_connect?
-            FakeWeb.register_uri strategy.class.http_method, "#{strategy.class.base_uri}#{strategy.send(:path)}", :response => fixture_path('digital-copyright_ca', "#{postal_code}.response")
-          end
+describe GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa do
+  describe '#electoral_districts' do
+    before :all do
+      %w(G0C2Y0 T5S2B9 K0A1K0 H0H0H0 X1B1B1).each do |postal_code|
+        strategy = GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa.new(postal_code)
+        unless FakeWeb.allow_net_connect?
+          FakeWeb.register_uri strategy.class.http_method, "#{strategy.class.base_uri}#{strategy.send(:path)}", :response => fixture_path('digital-copyright_ca', "#{postal_code}.response")
         end
       end
+    end
 
-      it 'should return the electoral districts within a postal code' do
-        { 'G0C2Y0' => [24019, 24039], # differs from all
-          'T5S2B9' => [48012, 48013, 48014, 48015, 48017, 48018], # differs from all
-          'K0A1K0' => [35025, 35052, 35063], # differs from cbc.ca
-        }.each do |postal_code,electoral_districts|
-          GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa.new(postal_code).electoral_districts.should == electoral_districts
-        end
+    it 'should return the electoral districts within a postal code' do
+      { 'G0C2Y0' => [24019, 24039], # differs from all
+        'T5S2B9' => [48012, 48013, 48014, 48015, 48017, 48018], # differs from all
+        'K0A1K0' => [35025, 35052, 35063],
+        'B0J2L0' => [12002, 12007, 12008],
+      }.each do |postal_code,electoral_districts|
+        GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa.new(postal_code).electoral_districts.should == electoral_districts
       end
+    end
 
-      it 'should return false if a postal code contains no electoral districts' do
-        GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa.new('H0H0H0').electoral_districts.should be_false
-      end
+    it 'should return false if a postal code contains no electoral districts' do
+      GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa.new('H0H0H0').electoral_districts.should be_false
+    end
 
-      it 'should return false if a postal code does not exist' do
-        GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa.new('X1B1B1').electoral_districts.should be_false
-      end
+    it 'should return false if a postal code does not exist' do
+      GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa.new('X1B1B1').electoral_districts.should be_false
     end
   end
 end

data/spec/elections_ca_spec.rb

@@ -1,36 +1,35 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-class GovKit::CA::PostalCode::Strategy::ElectionsCa
-  describe GovKit::CA::PostalCode::Strategy::ElectionsCa do
-    describe '#electoral_districts' do
-      before :all do
-        %w(G0C2Y0 T5S2B9 K0A1K0 H0H0H0 X1B1B1).each do |postal_code|
-          strategy = GovKit::CA::PostalCode::Strategy::ElectionsCa.new(postal_code)
-          unless FakeWeb.allow_net_connect?
-            FakeWeb.register_uri strategy.class.http_method, "#{strategy.class.base_uri}#{strategy.send(:path)}", :response => fixture_path('elections_ca', "#{postal_code}.response")
-          end
-        end
-      end
 
-      it 'should return the electoral districts within a postal code' do
-        { 'G0C2Y0' => [24019],
-          'T5S2B9' => [48015], # differs from cbc.ca
-        }.each do |postal_code,electoral_districts|
-          GovKit::CA::PostalCode::Strategy::ElectionsCa.new(postal_code).electoral_districts.should == electoral_districts
+describe GovKit::CA::PostalCode::Strategy::ElectionsCa do
+  describe '#electoral_districts' do
+    before :all do
+      %w(G0C2Y0 T5S2B9 K0A1K0 H0H0H0 X1B1B1).each do |postal_code|
+        strategy = GovKit::CA::PostalCode::Strategy::ElectionsCa.new(postal_code)
+        unless FakeWeb.allow_net_connect?
+          FakeWeb.register_uri strategy.class.http_method, "#{strategy.class.base_uri}#{strategy.send(:path)}", :response => fixture_path('elections_ca', "#{postal_code}.response")
         end
       end
+    end
 
-      it 'should (unfortunately) return false if a postal code contains multiple electoral districts' do
-        GovKit::CA::PostalCode::Strategy::ElectionsCa.new('K0A1K0').electoral_districts.should be_false
+    it 'should return the electoral districts within a postal code' do
+      { 'G0C2Y0' => [24019],
+        'T5S2B9' => [48015],
+      }.each do |postal_code,electoral_districts|
+        GovKit::CA::PostalCode::Strategy::ElectionsCa.new(postal_code).electoral_districts.should == electoral_districts
       end
+    end
 
-      it 'should return false if a postal code contains no electoral districts' do
-        GovKit::CA::PostalCode::Strategy::ElectionsCa.new('H0H0H0').electoral_districts.should be_false
-      end
+    it 'should (unfortunately) return false if a postal code contains multiple electoral districts' do
+      GovKit::CA::PostalCode::Strategy::ElectionsCa.new('K0A1K0').electoral_districts.should be_false # B0J2L0
+    end
 
-      it 'should return false if a postal code does not exist' do
-        GovKit::CA::PostalCode::Strategy::ElectionsCa.new('X1B1B1').electoral_districts.should be_false
-      end
+    it 'should return false if a postal code contains no electoral districts' do
+      GovKit::CA::PostalCode::Strategy::ElectionsCa.new('H0H0H0').electoral_districts.should be_false
+    end
+
+    it 'should return false if a postal code does not exist' do
+      GovKit::CA::PostalCode::Strategy::ElectionsCa.new('X1B1B1').electoral_districts.should be_false
     end
   end
 end

data/spec/greenparty_ca_spec.rb

@@ -1,36 +1,35 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'gov_kit-ca/postal_code/strategy/greenparty_ca'
 
-class GovKit::CA::PostalCode::Strategy::GreenPartyCa
-  describe GovKit::CA::PostalCode::Strategy::GreenPartyCa, broken: true do
-    describe '#electoral_districts' do
-      before :all do
-        %w(G0C2Y0 T5S2B9 K0A1K0 H0H0H0 X1B1B1).each do |postal_code|
-          strategy = GovKit::CA::PostalCode::Strategy::GreenPartyCa.new(postal_code)
-          unless FakeWeb.allow_net_connect?
-            FakeWeb.register_uri strategy.class.http_method, "#{strategy.class.base_uri}#{strategy.send(:path)}", :response => fixture_path('greenparty_ca', "#{postal_code}.response")
-          end
+describe GovKit::CA::PostalCode::Strategy::GreenPartyCa do
+  describe '#electoral_districts' do
+    before :all do
+      %w(G0C2Y0 T5S2B9 K0A1K0 H0H0H0 X1B1B1).each do |postal_code|
+        strategy = GovKit::CA::PostalCode::Strategy::GreenPartyCa.new(postal_code)
+        unless FakeWeb.allow_net_connect?
+          FakeWeb.register_uri strategy.class.http_method, "#{strategy.class.base_uri}#{strategy.send(:path)}", :response => fixture_path('greenparty_ca', "#{postal_code}.response")
         end
       end
+    end
 
-      it 'should return the electoral districts within a postal code' do
-        { 'G0C2Y0' => [24019],
-          'T5S2B9' => [48015], # differs from cbc.ca
-        }.each do |postal_code,electoral_districts|
-          GovKit::CA::PostalCode::Strategy::GreenPartyCa.new(postal_code).electoral_districts.should == electoral_districts
-        end
+    it 'should return the electoral districts within a postal code' do
+      { 'G0C2Y0' => [24019],
+        'T5S2B9' => [48015],
+      }.each do |postal_code,electoral_districts|
+        GovKit::CA::PostalCode::Strategy::GreenPartyCa.new(postal_code).electoral_districts.should == electoral_districts
       end
+    end
 
-      it 'should (unfortunately) return false if a postal code contains multiple electoral districts' do
-        GovKit::CA::PostalCode::Strategy::GreenPartyCa.new('K0A1K0').electoral_districts.should be_false
-      end
+    it 'should (unfortunately) return false if a postal code contains multiple electoral districts' do
+      GovKit::CA::PostalCode::Strategy::GreenPartyCa.new('K0A1K0').electoral_districts.should be_false # B0J2L0
+    end
 
-      it 'should return false if a postal code contains no electoral districts' do
-        GovKit::CA::PostalCode::Strategy::GreenPartyCa.new('H0H0H0').electoral_districts.should be_false
-      end
+    it 'should return false if a postal code contains no electoral districts' do
+      GovKit::CA::PostalCode::Strategy::GreenPartyCa.new('H0H0H0').electoral_districts.should be_false
+    end
 
-      it 'should return false if a postal code does not exist' do
-        GovKit::CA::PostalCode::Strategy::GreenPartyCa.new('X1B1B1').electoral_districts.should be_false
-      end
+    it 'should return false if a postal code does not exist' do
+      GovKit::CA::PostalCode::Strategy::GreenPartyCa.new('X1B1B1').electoral_districts.should be_false
     end
   end
 end

data/spec/liberal_ca_spec.rb

@@ -1,34 +1,36 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'gov_kit-ca/postal_code/strategy/liberal_ca'
 
-class GovKit::CA::PostalCode::Strategy::LiberalCa
-  describe GovKit::CA::PostalCode::Strategy::LiberalCa do
-    describe '#electoral_districts' do
-      before :all do
-        %w(G0C2Y0 T5S2B9 K0A1K0 H0H0H0 X1B1B1).each do |postal_code|
-          strategy = GovKit::CA::PostalCode::Strategy::LiberalCa.new(postal_code)
-          unless FakeWeb.allow_net_connect?
-            FakeWeb.register_uri strategy.class.http_method, "#{strategy.class.base_uri}#{strategy.send(:path)}", :response => fixture_path('liberal_ca', "#{postal_code}.response")
-          end
+describe GovKit::CA::PostalCode::Strategy::LiberalCa do
+  describe '#electoral_districts' do
+    before :all do
+      %w(G0C2Y0 T5S2B9 K0A1K0 H0H0H0 X1B1B1).each do |postal_code|
+        strategy = GovKit::CA::PostalCode::Strategy::LiberalCa.new(postal_code)
+        unless FakeWeb.allow_net_connect?
+          FakeWeb.register_uri strategy.class.http_method, "#{strategy.class.base_uri}#{strategy.send(:path)}", :response => fixture_path('liberal_ca', "#{postal_code}.response")
         end
       end
+    end
 
-      it 'should return the electoral districts within a postal code' do
-        { 'G0C2Y0' => [24019], # this postal code intermittently fails
-          'T5S2B9' => [48015], # differs from cbc.ca
-          'K0A1K0' => [35025, 35052, 35063], # differs from cbc.ca
-        }.each do |postal_code,electoral_districts|
-          GovKit::CA::PostalCode::Strategy::LiberalCa.new(postal_code).electoral_districts.should == electoral_districts
-        end
+    it 'should return the electoral districts within a postal code' do
+      { 'G0C2Y0' => [24019],
+        'T5S2B9' => [48015],
+        'K0A1K0' => [35025, 35052, 35063],
+      }.each do |postal_code,electoral_districts|
+        GovKit::CA::PostalCode::Strategy::LiberalCa.new(postal_code).electoral_districts.should == electoral_districts
       end
+    end
 
-      it 'should return false if a postal code contains no electoral districts' do
-        GovKit::CA::PostalCode::Strategy::LiberalCa.new('H0H0H0').electoral_districts.should be_false
-      end
+    it 'should (unfortunately) return false if a postal code is rare or ambiguous' do
+      GovKit::CA::PostalCode::Strategy::LiberalCa.new('B0J2L0').electoral_districts.should be_false
+    end
 
-      it 'should return false if a postal code does not exist' do
-        GovKit::CA::PostalCode::Strategy::LiberalCa.new('X1B1B1').electoral_districts.should be_false
-      end
+    it 'should return false if a postal code contains no electoral districts' do
+      GovKit::CA::PostalCode::Strategy::LiberalCa.new('H0H0H0').electoral_districts.should be_false
+    end
+
+    it 'should return false if a postal code does not exist' do
+      GovKit::CA::PostalCode::Strategy::LiberalCa.new('X1B1B1').electoral_districts.should be_false
     end
   end
 end

data/spec/ndp_ca_spec.rb

@@ -1,36 +1,33 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-class GovKit::CA::PostalCode::Strategy::NDPCa
-  describe GovKit::CA::PostalCode::Strategy::NDPCa do
-    describe '#electoral_districts' do
-      before :all do
-        %w(G0C2Y0 T5S2B9 K0A1K0 H0H0H0 X1B1B1).each do |postal_code|
-          strategy = GovKit::CA::PostalCode::Strategy::NDPCa.new(postal_code)
-          unless FakeWeb.allow_net_connect?
-            FakeWeb.register_uri strategy.class.http_method, "#{strategy.class.base_uri}#{strategy.send(:path)}", :response => fixture_path('ndp_ca', "#{postal_code}.response")
-          end
-        end
-      end
 
-      it 'should return the electoral districts within a postal code' do
-        { 'G0C2Y0' => [24019],
-          'T5S2B9' => [48015], # differs from cbc.ca
-        }.each do |postal_code,electoral_districts|
-          GovKit::CA::PostalCode::Strategy::NDPCa.new(postal_code).electoral_districts.should == electoral_districts
+describe GovKit::CA::PostalCode::Strategy::NDPCa do
+  describe '#electoral_districts' do
+    before :all do
+      %w(G0C2Y0 T5S2B9 K0A1K0 H0H0H0 X1B1B1).each do |postal_code|
+        strategy = GovKit::CA::PostalCode::Strategy::NDPCa.new(postal_code)
+        unless FakeWeb.allow_net_connect?
+          FakeWeb.register_uri strategy.class.http_method, "#{strategy.class.base_uri}#{strategy.send(:path)}", :response => fixture_path('ndp_ca', "#{postal_code}.response")
         end
       end
+    end
 
-      it 'should (unfortunately) return false if a postal code contains multiple electoral districts' do
-        GovKit::CA::PostalCode::Strategy::NDPCa.new('K0A1K0').electoral_districts.should be_false
+    it 'should return the electoral districts within a postal code' do
+      { 'G0C2Y0' => [24019],
+        'T5S2B9' => [48015],
+        'K0A1K0' => [35012, 35025, 35040, 35052],
+        'B0J2L0' => [12002, 12006, 12009, 12011],
+      }.each do |postal_code,electoral_districts|
+        GovKit::CA::PostalCode::Strategy::NDPCa.new(postal_code).electoral_districts.should == electoral_districts
       end
+    end
 
-      it 'should return false if a postal code contains no electoral districts' do
-        GovKit::CA::PostalCode::Strategy::NDPCa.new('H0H0H0').electoral_districts.should be_false
-      end
+    it 'should return false if a postal code contains no electoral districts' do
+      GovKit::CA::PostalCode::Strategy::NDPCa.new('H0H0H0').electoral_districts.should be_false
+    end
 
-      it 'should return false if a postal code does not exist' do
-        GovKit::CA::PostalCode::Strategy::NDPCa.new('X1B1B1').electoral_districts.should be_false
-      end
+    it 'should return false if a postal code does not exist' do
+      GovKit::CA::PostalCode::Strategy::NDPCa.new('X1B1B1').electoral_districts.should be_false
     end
   end
 end

data/spec/postal_code_spec.rb

@@ -33,7 +33,8 @@ module GovKit::CA::PostalCode
         { 'ElectionsCa'  => 'elections_ca',
           'CBCCa'        => 'cbc_ca',
           'NDPCa'        => 'ndp_ca',
-          'GreenPartyCa' => 'greenparty_ca',
+          # GreenPartyCa is broken.
+          #'GreenPartyCa' => 'greenparty_ca',
         }.each do |const,path|
           %w(A1A1A1 K0A1K0 H0H0H0).each do |postal_code|
             strategy = GovKit::CA::PostalCode::Strategy.const_get(const).new(postal_code)
@@ -46,7 +47,7 @@ module GovKit::CA::PostalCode
 
       it 'should return the electoral districts within a postal code' do
         { 'A1A1A1' => [10007],
-          'K0A1K0' => [35025, 35052, 35063, 35064],
+          'K0A1K0' => [35012, 35025, 35040, 35052],
         }.each do |postal_code,electoral_districts|
           subject.find_electoral_districts_by_postal_code(postal_code).should == electoral_districts
         end