govkit-ca 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7e88d9a36dfcf9ce1825f8a204c801d2c3c902ee
+  data.tar.gz: 527b1088c8bffbd00458b6e7855c3e365994fbb6
+SHA512:
+  metadata.gz: 3cb1d44087529a014496717a00a38435f66aa1db7e02dddc7ecfb3a78d958e2f0f754a449a33329d73123690ed7178d99faf9ea19e4d630dc46c95e08a4f0596
+  data.tar.gz: 9a46ef38c43306f7c733dd8eb105d4e6b03c39a3db644c4b205e26820a3f0e6a60928e87feeb4abd7f6dbc93f4a69402bb1b04fe89e28f19af7e21ce89b3c859

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
+  - 1.8.7
+  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - ree

data/README.md

@@ -50,4 +50,4 @@ GovKit-CA interoperates with [Participatory Politics Foundation](http://www.part
 
 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
+Copyright (c) 2011-2013 Open North Inc., released under the MIT license

data/govkit-ca.gemspec

@@ -12,17 +12,19 @@ Gem::Specification.new do |s|
   s.description = %q{GovKit-CA lets you quickly get encapsulated Ruby objects for Canadian civic data.}
 
   s.rubyforge_project = "govkit-ca"
+  s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_runtime_dependency('faraday')
   s.add_runtime_dependency('httparty', '~> 0.10.0')
   s.add_runtime_dependency('nokogiri', '~> 1.5.0')
-  s.add_runtime_dependency('yajl-ruby', '~> 0.8.2')
+  s.add_development_dependency('json')
   s.add_development_dependency('rspec', '~> 2.6.0')
-  s.add_development_dependency('fakeweb', '~> 1.3.0')
   s.add_development_dependency('rake')
   s.add_development_dependency('coveralls')
+  s.add_development_dependency('mime-types', '~> 1.16')
 end

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

@@ -10,7 +10,7 @@ module GovKit
         private
 
           def electoral_districts!
-            Yajl::Parser.parse(response.parsed_response).map{|x| self.class.rid_to_edid[x['rid'].to_i]}
+            JSON.load(response.parsed_response).map{|x| self.class.rid_to_edid[x['rid'].to_i]}
           end
 
           def valid?

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

@@ -4,9 +4,8 @@ module GovKit
       module Strategy
         class ConservativeCa < Base
           base_uri 'www.conservative.ca'
-          http_method :post
-          path '/?page_id=35'
-          post_data 'findmymp=35&pc=<%= @postal_code %>'
+          http_method :get
+          path '/wp-content/themes/conservative/functions-process.php?x=vldpc&fpc=<%= @postal_code %>'
 
         private
 
@@ -19,7 +18,7 @@ module GovKit
           end
 
           def images
-            @document ||= Nokogiri::HTML(response.parsed_response, nil, 'utf-8').css('#type img')
+            @images ||= Nokogiri::HTML(response.parsed_response, nil, 'utf-8').css('img')
           end
         end
 

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

@@ -2,13 +2,11 @@ module GovKit
   module CA
     module PostalCode
       module Strategy
-        # elections.ca is a reliable source, but it does not return electoral
-        # districts for postal codes that contain multiple electoral districts.
-        # @see https://github.com/danielharan/postal_code_to_edid_webservice
         class ElectionsCa < Base
           base_uri 'elections.ca'
-          http_method :head
-          path '/scripts/pss/FindED.aspx?PC=<%= @postal_code %>'
+          http_method :post
+          path '/Scripts/vis/FindED'
+          post_data 'CommonSearchTxt=<%= @postal_code %>'
 
         private
 
@@ -17,7 +15,7 @@ module GovKit
           end
 
           def valid?
-            !!response.headers['location']
+            !response.headers['location'][/EDNotFound|MultipleEDs/]
           end
         end
 

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

@@ -2,7 +2,6 @@ module GovKit
   module CA
     module PostalCode
       module Strategy
-        # liberal.ca seems unreliable. It returns three ridings for K0A1K0.
         class LiberalCa < Base
           follow_redirects true
           base_uri 'www.liberal.ca'

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

@@ -14,7 +14,11 @@ module GovKit
           end
 
           def valid?
-            # @todo
+            !!div
+          end
+
+          def div
+            @div ||= Nokogiri::HTML(response.parsed_response, nil, 'utf-8').at_css('#ctl00_cphContent_pnlWithMP')
           end
         end
 

data/lib/gov_kit-ca/postal_code.rb

@@ -79,14 +79,26 @@ end
 
 require 'gov_kit-ca/postal_code/strategy_set'
 require 'gov_kit-ca/postal_code/strategy/base'
-#require 'gov_kit-ca/postal_code/strategy/parl_gc_ca' # only riding name
-require 'gov_kit-ca/postal_code/strategy/elections_ca' # only one-to-one
+
+# Only riding name and not implemented.
+# require 'gov_kit-ca/postal_code/strategy/parl_gc_ca'
+
+# Only one-to-one.
+require 'gov_kit-ca/postal_code/strategy/elections_ca'
+
 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
 
-# If not held by Conservative MP, returns only riding name.
+# Only one-to-one.
+require 'gov_kit-ca/postal_code/strategy/greenparty_ca'
+
+# Only riding name if not held by a Conservative MP.
 # require 'gov_kit-ca/postal_code/strategy/conservative_ca'
-# Returns too many or too few ridings.
+
+# 2014-02-12: Occasionally renders HTML instead of redirect.
+# require 'gov_kit-ca/postal_code/strategy/liberal_ca'
+
+# 2014-02-12: Broken until next election.
+# require 'gov_kit-ca/postal_code/strategy/cbc_ca'
+
+# Too many or too few ridings.
 # require 'gov_kit-ca/postal_code/strategy/digital-copyright_ca'

data/lib/gov_kit-ca/represent.rb

@@ -0,0 +1,108 @@
+module GovKit
+  module CA
+    # A Ruby wrapper for the Represent API.
+    # @see http://represent.opennorth.ca/api/
+    class Represent
+      # Get boundary sets.
+      #
+      # @param [Hash] opts optional arguments
+      # @option opts [String] :boundary_set a boundary set
+      # @option opts [Integer] :limit
+      # @option opts [Integer] :offset
+      # @see http://represent.opennorth.ca/api/#boundaryset
+      def boundary_sets(opts = {})
+        request(['boundary-sets', opts.delete(:boundary_set)], opts)
+      end
+
+      # Get boundaries.
+      #
+      # @param [Hash] opts optional arguments
+      # @option opts [String] :boundary_set a boundary set
+      # @option opts [String] :boundary a boundary
+      # @option opts [Boolean] :representatives
+      # @option opts [Array<String>,String] :sets comma-separated list of boundary sets
+      # @option opts [Array<Float>,String] :contains comma-separated latitude and longitude
+      # @option opts [String] :touches a boundary
+      # @option opts [String] :intersects a boundary
+      # @option opts [Integer] :limit
+      # @option opts [Integer] :offset
+      # @see http://represent.opennorth.ca/api/#boundary
+      def boundaries(opts = {})
+        if Array === opts[:sets]
+          opts[:sets] = opts[:sets].join(',')
+        end
+        if Array === opts[:contains]
+          opts[:contains] = opts[:contains].join(',')
+        end
+        if opts.has_key?(:boundary) && !opts.has_key?(:boundary_set)
+          raise ArgumentError, ':boundary_set must be set if :boundary is set'
+        end
+        if opts[:representatives] && !(opts.has_key?(:boundary) && opts.has_key?(:boundary_set))
+          raise ArgumentError, ':boundary_set and :boundary must be set if :representatives is true'
+        end
+        request(['boundaries', opts.delete(:boundary_set), opts.delete(:boundary), opts.delete(:representatives) && 'representatives'], opts)
+      end
+
+      # Get boundaries and representatives by postal code.
+      #
+      # @param [Hash] opts optional arguments
+      # @option opts [Array<String>,String] :sets comma-separated list of boundary sets
+      # @option opts [Integer] :limit
+      # @option opts [Integer] :offset
+      # @see http://represent.opennorth.ca/api/#postcode
+      def postcodes(postcode, opts = {})
+        if Array === opts[:sets]
+          opts[:sets] = opts[:sets].join(',')
+        end
+        request(['postcodes', postcode], opts)
+      end
+
+      # Get representative sets.
+      #
+      # @param [Hash] opts optional arguments
+      # @option opts [String] :representative_set a representative set
+      # @option opts [Integer] :limit
+      # @option opts [Integer] :offset
+      # @see http://represent.opennorth.ca/api/#representativeset
+      def representative_sets(opts = {})
+        request ['representative-sets', opts.delete(:representative_set)], opts
+      end
+
+      # Get representatives.
+      #
+      # @param [Hash] opts optional arguments
+      # @option opts [String] :representative_set a representative set
+      # @option opts [Array<Float>,String] :point a comma-separated latitude and longitude
+      # @option opts [Array<Strong>,String] :districts a comma-separated list of boundaries
+      # @option opts [Integer] :limit
+      # @option opts [Integer] :offset
+      # @see http://represent.opennorth.ca/api/#representative
+      def representatives(opts = {})
+        if Array === opts[:point]
+          opts[:point] = opts[:point].join(',')
+        end
+        if Array === opts[:districts]
+          opts[:districts] = opts[:districts].join(',')
+        end
+        request(['representatives', opts.delete(:representative_set)], opts)
+      end
+
+    private
+
+      def request(parts, opts)
+        begin
+          url = "http://represent.opennorth.ca/#{parts.compact.join('/')}/"
+          response = Faraday.get(url, opts)
+          case response.status
+          when 200
+            JSON.parse(response.body)
+          when 404
+            raise ResourceNotFound, "#{response.status} #{url}?#{opts.map{|k,v| "#{k}=#{v}"}.join('&')}"
+          else
+            raise InvalidRequest, "#{response.status} #{url}?#{opts.map{|k,v| "#{k}=#{v}"}.join('&')} #{response.body}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gov_kit-ca/version.rb

@@ -1,5 +1,5 @@
 module GovKit
   module CA
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/gov_kit-ca.rb

@@ -2,9 +2,9 @@ require 'erb'
 require 'json'
 require 'yaml'
 
+require 'faraday'
 require 'httparty'
 require 'nokogiri'
-require 'yajl'
 
 module GovKit
   module CA
@@ -15,3 +15,4 @@ module GovKit
 end
 
 require 'gov_kit-ca/postal_code'
+require 'gov_kit-ca/represent'

data/spec/cbc_ca_spec.rb

@@ -1,34 +1,23 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'gov_kit-ca/postal_code/strategy/cbc_ca'
 
-class GovKit::CA::PostalCode::Strategy::CBCCa
-  describe GovKit::CA::PostalCode::Strategy::CBCCa do
-    describe '#electoral_districts' do
-      before :all do
-        %w(G0C2Y0 T5S2B9 K0A1K0 H0H0H0 X1B1B1).each do |postal_code|
-          strategy = GovKit::CA::PostalCode::Strategy::CBCCa.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('cbc_ca', "#{postal_code}.response")
-          end
-        end
-      end
-
-      it 'should return the electoral districts within a postal code' do
-        { 'G0C2Y0' => [24019],
-          '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
+describe GovKit::CA::PostalCode::Strategy::CBCCa do
+  describe '#electoral_districts', :broken => true do
+    it 'should return the electoral districts within a postal code' do
+      { 'G0C2Y0' => [24019],
+        '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
+    end
 
-      it 'should return false if a postal code contains no electoral districts' do
-        GovKit::CA::PostalCode::Strategy::CBCCa.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::CBCCa.new('H0H0H0').electoral_districts.should be_false
+    end
 
-      it 'should return false if a postal code does not exist' do
-        GovKit::CA::PostalCode::Strategy::CBCCa.new('X1B1B1').electoral_districts.should be_false
-      end
+    it 'should return false if a postal code does not exist' do
+      GovKit::CA::PostalCode::Strategy::CBCCa.new('X1B1B1').electoral_districts.should be_false
     end
   end
 end

data/spec/conservative_ca_spec.rb

@@ -3,17 +3,8 @@ 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],
+      { 'T1P1K1' => [48010],
         'K0A1K0' => [35025, 35052, 35063],
         # returns nothing for B0J2L0
       }.each do |postal_code,electoral_districts|

data/spec/digital-copyright_ca_spec.rb

@@ -3,15 +3,6 @@ require 'gov_kit-ca/postal_code/strategy/digital-copyright_ca'
 
 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

data/spec/elections_ca_spec.rb

@@ -3,15 +3,6 @@ require 'gov_kit-ca/postal_code/strategy/elections_ca'
 
 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],
         # returns nothing for T5S2B9

data/spec/greenparty_ca_spec.rb

@@ -3,15 +3,6 @@ require 'gov_kit-ca/postal_code/strategy/greenparty_ca'
 
 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],

data/spec/liberal_ca_spec.rb

@@ -2,16 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'gov_kit-ca/postal_code/strategy/liberal_ca'
 
 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
-
+  describe '#electoral_districts', :broken => true do
     it 'should return the electoral districts within a postal code' do
       { 'G0C2Y0' => [24019],
         'T5S2B9' => [48015],

data/spec/ndp_ca_spec.rb

@@ -3,15 +3,6 @@ require 'gov_kit-ca/postal_code/strategy/ndp_ca'
 
 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],

data/spec/parl_gc_ca_spec.rb

@@ -0,0 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'gov_kit-ca/postal_code/strategy/parl_gc_ca'
+
+describe GovKit::CA::PostalCode::Strategy::ParlGcCa do
+  describe '#electoral_districts' do
+    pending
+  end
+end

data/spec/postal_code_spec.rb

@@ -1,106 +1,88 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-module GovKit::CA::PostalCode
-  describe GovKit::CA::PostalCode do
-    describe '#valid?' do
-      it 'should return false if the postal code is not properly formatted' do
-        [ 'A1A1A', # too short
-          'A1A1A1A', # too long
-          "A1A1A1\nA1A1A1", # multiline
-          'AAAAAA', # no digits
-          '111111', # no letters
-          '1A1A1A', # wrong order
-          'Z1Z1Z1', # Z as first letter
-          'Q1Q1Q1', # Q as letter
-          'a1a1a1', # lowercase
-        ].each do |postal_code|
-          subject.valid?(postal_code).should be_false
-        end
-      end
-
-      it 'should return true if the postal code is properly formatted' do
-        [ 'A1Z1Z1', # Z not as first letter
-          'H0H0H0', # doesn't exist
-          'A1A1A1', # does exist
-        ].each do |postal_code|
-          subject.valid?(postal_code).should be_true
-        end
+describe GovKit::CA::PostalCode do
+  describe '#valid?' do
+    it 'should return false if the postal code is not properly formatted' do
+      [ 'A1A1A', # too short
+        'A1A1A1A', # too long
+        "A1A1A1\nA1A1A1", # multiline
+        'AAAAAA', # no digits
+        '111111', # no letters
+        '1A1A1A', # wrong order
+        'Z1Z1Z1', # Z as first letter
+        'Q1Q1Q1', # Q as letter
+        'a1a1a1', # lowercase
+      ].each do |postal_code|
+        subject.valid?(postal_code).should be_false
       end
     end
 
-    describe '#find_electoral_districts_by_postal_code' do
-      before :all do
-        { 'ElectionsCa'  => 'elections_ca',
-          'CBCCa'        => 'cbc_ca',
-          'NDPCa'        => 'ndp_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)
-            unless FakeWeb.allow_net_connect?
-              FakeWeb.register_uri strategy.class.http_method, "#{strategy.class.base_uri}#{strategy.send(:path)}", :response => fixture_path(path, "#{postal_code}.response")
-            end
-          end
-        end
+    it 'should return true if the postal code is properly formatted' do
+      [ 'A1Z1Z1', # Z not as first letter
+        'H0H0H0', # doesn't exist
+        'A1A1A1', # does exist
+      ].each do |postal_code|
+        subject.valid?(postal_code).should be_true
       end
+    end
+  end
 
-      it 'should return the electoral districts within a postal code' do
-        { 'A1A1A1' => [10007],
-          'K0A1K0' => [35012, 35025, 35040, 35052],
-        }.each do |postal_code,electoral_districts|
-          subject.find_electoral_districts_by_postal_code(postal_code).should == electoral_districts
-        end
+  describe '#find_electoral_districts_by_postal_code' do
+    it 'should return the electoral districts within a postal code' do
+      { 'A1A1A1' => [10007],
+        'K0A1K0' => [35012, 35025, 35040, 35052],
+      }.each do |postal_code,electoral_districts|
+        subject.find_electoral_districts_by_postal_code(postal_code).should == electoral_districts
       end
+    end
 
-      it 'should raise an error if the postal code cannot be determined' do
-        lambda{subject.find_electoral_districts_by_postal_code('H0H0H0')}.should raise_error(GovKit::CA::ResourceNotFound)
-      end
+    it 'should raise an error if the postal code cannot be determined' do
+      lambda{subject.find_electoral_districts_by_postal_code('H0H0H0')}.should raise_error(GovKit::CA::ResourceNotFound)
+    end
 
-      it 'should raise an error if the postal code is invalid' do
-        lambda{subject.find_electoral_districts_by_postal_code('AAAAAA')}.should raise_error(GovKit::CA::InvalidRequest)
-      end
+    it 'should raise an error if the postal code is invalid' do
+      lambda{subject.find_electoral_districts_by_postal_code('AAAAAA')}.should raise_error(GovKit::CA::InvalidRequest)
     end
+  end
 
-    describe '#find_province_by_postal_code' do
-      it 'should return the province that a postal code belongs to' do
-        { 'A' => 'Newfoundland and Labrador',
-          'B' => 'Nova Scotia',
-          'C' => 'Prince Edward Island',
-          'E' => 'New Brunswick',
-          'G' => 'Quebec',
-          'H' => 'Quebec',
-          'J' => 'Quebec',
-          'K' => 'Ontario',
-          'L' => 'Ontario',
-          'M' => 'Ontario',
-          'N' => 'Ontario',
-          'P' => 'Ontario',
-          'R' => 'Manitoba',
-          'S' => 'Saskatchewan',
-          'T' => 'Alberta',
-          'V' => 'British Columbia',
-          'X0A' => 'Nunavut',
-          'X0B' => 'Nunavut',
-          'X0C' => 'Nunavut',
-          'X0E' => 'Northwest Territories',
-          'X0G' => 'Northwest Territories',
-          'X1A' => 'Northwest Territories',
-          'Y' => 'Yukon',
-        }.each do |postal_code, province|
-          subject.find_province_by_postal_code(postal_code).should == province
-        end
+  describe '#find_province_by_postal_code' do
+    it 'should return the province that a postal code belongs to' do
+      { 'A' => 'Newfoundland and Labrador',
+        'B' => 'Nova Scotia',
+        'C' => 'Prince Edward Island',
+        'E' => 'New Brunswick',
+        'G' => 'Quebec',
+        'H' => 'Quebec',
+        'J' => 'Quebec',
+        'K' => 'Ontario',
+        'L' => 'Ontario',
+        'M' => 'Ontario',
+        'N' => 'Ontario',
+        'P' => 'Ontario',
+        'R' => 'Manitoba',
+        'S' => 'Saskatchewan',
+        'T' => 'Alberta',
+        'V' => 'British Columbia',
+        'X0A' => 'Nunavut',
+        'X0B' => 'Nunavut',
+        'X0C' => 'Nunavut',
+        'X0E' => 'Northwest Territories',
+        'X0G' => 'Northwest Territories',
+        'X1A' => 'Northwest Territories',
+        'Y' => 'Yukon',
+      }.each do |postal_code, province|
+        subject.find_province_by_postal_code(postal_code).should == province
       end
+    end
 
-      it 'should raise an error if the province cannot be determined' do
-        lambda{subject.find_province_by_postal_code('X1B1B1')}.should raise_error(GovKit::CA::ResourceNotFound)
-      end
+    it 'should raise an error if the province cannot be determined' do
+      lambda{subject.find_province_by_postal_code('X1B1B1')}.should raise_error(GovKit::CA::ResourceNotFound)
     end
+  end
 
-    describe '#format_postal_code' do
-      it 'should format a postal code' do
-        subject.format_postal_code("+a1a 1a1\n").should == 'A1A1A1'
-      end
+  describe '#format_postal_code' do
+    it 'should format a postal code' do
+      subject.format_postal_code("+a1a 1a1\n").should == 'A1A1A1'
     end
   end
 end