govkit-ca 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ae05fc85b84b282bab633a2f50fe5aea6758511
-  data.tar.gz: 7f7cf3d90f90e54368342a5077427b48f08fd422
+  metadata.gz: 60277f47ef35ddd41b20164989eb02e673e0b6ff
+  data.tar.gz: 5b1c0312a70afa33193bc0a676959d18755e5c02
 SHA512:
-  metadata.gz: b4f04a41569fce7b696d8865c9cac932e85d65428dec27862e9f09cbcfbdce1b74dedf209c178ecfc9b840a3bf1fdd1fba5039576ac71cf8a8cb157fffc0665d
-  data.tar.gz: b363b08cf0c3867180c033e761c7a891573cbbb384fe690909d2e9c2ddbf711d38bb5eeaea4a7cef7f5237ae90fef1c2a32f558a62515771d06f2123cf035253
+  metadata.gz: 8013b9e8b88f57696fca95e51009b4e5a787170eb7873b2db2c105213f9a8729433ddd5204063f79aa832a58c7a84d0194ae5f424280129a32a81604aef656ce
+  data.tar.gz: cb0376eba458d2778c83a9a1040838068ffb188b878879c7c495e8e6d33c41919c76e992f26b054bdddbe25d7798063ef2404ee2a188958953c5eaf458136b73

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-# Specify your gem's dependencies in govkit-ca.gemspec
+# Specify your gem's dependencies in the gemspec
 gemspec

data/README.md

@@ -1,7 +1,7 @@
 # GovKit-CA
 
-[![Gem Version](https://badge.fury.io/rb/govkit-ca.svg)](http://badge.fury.io/rb/govkit-ca)
-[![Build Status](https://secure.travis-ci.org/opennorth/govkit-ca.png)](http://travis-ci.org/opennorth/govkit-ca)
+[![Gem Version](https://badge.fury.io/rb/govkit-ca.svg)](https://badge.fury.io/rb/govkit-ca)
+[![Build Status](https://secure.travis-ci.org/opennorth/govkit-ca.png)](https://travis-ci.org/opennorth/govkit-ca)
 [![Dependency Status](https://gemnasium.com/opennorth/govkit-ca.png)](https://gemnasium.com/opennorth/govkit-ca)
 [![Coverage Status](https://coveralls.io/repos/opennorth/govkit-ca/badge.png?branch=master)](https://coveralls.io/r/opennorth/govkit-ca)
 [![Code Climate](https://codeclimate.com/github/opennorth/govkit-ca.png)](https://codeclimate.com/github/opennorth/govkit-ca)
@@ -14,7 +14,7 @@ GovKit-CA is a Ruby gem that provides easy access to Canadian civic information
 
 ## Represent API
 
-GovKit-CA provides a [Represent API](http://represent.opennorth.ca/api/) client. First, create a client:
+GovKit-CA provides a [Represent API](https://represent.opennorth.ca/api/) client. First, create a client:
 
 ```ruby
 require 'govkit-ca'
@@ -22,31 +22,31 @@ require 'govkit-ca'
 client = GovKit::CA::Represent.new
 ```
 
-Send a request to the [`/postcodes` endpoint](http://represent.opennorth.ca/api/#postcode):
+Send a request to the [`/postcodes` endpoint](https://represent.opennorth.ca/api/#postcode):
 
 ```ruby
 client.postcodes('A1A1A1')
 ```
 
-Send a request to the [`/representative-sets` endpoint](http://represent.opennorth.ca/api/#representativeset):
+Send a request to the [`/representative-sets` endpoint](https://represent.opennorth.ca/api/#representativeset):
 
 ```ruby
 client.representative_sets(limit: 0)
 ```
 
-Send a request to the [`/representatives` endpoint](http://represent.opennorth.ca/api/#representative):
+Send a request to the [`/representatives` endpoint](https://represent.opennorth.ca/api/#representative):
 
 ```ruby
 client.representatives(representative_set: 'toronto-city-council')
 ```
 
-Send a request to the [`/boundary-sets` endpoint](http://represent.opennorth.ca/api/#boundaryset):
+Send a request to the [`/boundary-sets` endpoint](https://represent.opennorth.ca/api/#boundaryset):
 
 ```ruby
 client.boundary_sets(limit: 0)
 ```
 
-Send a request to the [`/boundaries` endpoint](http://represent.opennorth.ca/api/#boundary):
+Send a request to the [`/boundaries` endpoint](https://represent.opennorth.ca/api/#boundary):
 
 ```ruby
 client.boundaries(boundary_set: 'toronto-wards')
@@ -62,7 +62,7 @@ GovKit-CA provides an API for free postal code to electoral district lookups, us
 * [parl.gc.ca](http://www.parl.gc.ca/)
 * [conservative.ca](http://www.conservative.ca/)
 * [greenparty.ca](http://www.greenparty.ca/)
-* [liberal.ca](http://www.liberal.ca/)
+* [liberal.ca](https://www.liberal.ca/)
 * [ndp.ca](http://www.ndp.ca/)
 * [cbc.ca](http://www.cbc.ca/)
 * [digital-copyright.ca](http://www.digital-copyright.ca/)
@@ -94,8 +94,4 @@ GovKit-CA will raise `GovKit::CA::ResourceNotFound` if the electoral districts w
 
 GovKit-CA interoperates with the [Participatory Politics Foundation](http://www.participatorypolitics.org/)'s [GovKit](https://github.com/opengovernment/govkit). GovKit-CA is not affiliated with the Participatory Politics Foundation or GovKit.
 
-## Bugs? Questions?
-
-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

@@ -7,11 +7,9 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Open North"]
   s.email       = ["info@opennorth.ca"]
-  s.homepage    = "http://github.com/opennorth/govkit-ca"
+  s.homepage    = "https://github.com/opennorth/govkit-ca"
   s.summary     = %q{Easy access to Canadian civic data around the web}
   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")
@@ -22,9 +20,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('faraday')
   s.add_runtime_dependency('httparty', '~> 0.10.0')
   s.add_runtime_dependency('nokogiri', '~> 1.6.0')
-  s.add_development_dependency('json')
-  s.add_development_dependency('rspec', '~> 2.6.0')
-  s.add_development_dependency('rake', '~> 10.1.0')
+
   s.add_development_dependency('coveralls')
+  s.add_development_dependency('json', '~> 1.8') # to silence coveralls warning
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec', '~> 3.1')
   s.add_development_dependency('mime-types', '~> 1.16')
 end

data/lib/gov_kit-ca/postal_code.rb

@@ -1,11 +1,11 @@
 module GovKit
   module CA
     # A collection of postal code helpers.
-    # @see http://en.wikipedia.org/wiki/Postal_codes_in_Canada Postal codes in Canada
+    # @see https://en.wikipedia.org/wiki/Postal_codes_in_Canada Postal codes in Canada
     module PostalCode
       # @param [String] postal_code a postal code
       # @return [Boolean] whether the postal code is properly formatted
-      # @see http://en.wikipedia.org/wiki/Postal_codes_in_Canada#Number_of_possible_postal_codes Possible postal codes
+      # @see https://en.wikipedia.org/wiki/Postal_codes_in_Canada#Number_of_possible_postal_codes Possible postal codes
       def self.valid?(postal_code)
         !!postal_code.match(/\A[ABCEGHJKLMNPRSTVXY][0-9][ABCEGHJKLMNPRSTVWXYZ][0-9][ABCEGHJKLMNPRSTVWXYZ][0-9]\z/)
       end
@@ -32,7 +32,7 @@ module GovKit
       # @param [String] postal_code a postal code
       # @return [String] the province that the postal code belongs to
       # @raise [ResourceNotFound] if the province cannot be determined
-      # @see http://en.wikipedia.org/wiki/List_of_postal_codes_in_Canada List of postal codes in Canada
+      # @see https://en.wikipedia.org/wiki/List_of_postal_codes_in_Canada List of postal codes in Canada
       def self.find_province_by_postal_code(postal_code)
         case format_postal_code(postal_code)
         when /\AA/
@@ -55,7 +55,7 @@ module GovKit
           'Alberta'
         when /\AV/
           'British Columbia'
-        # http://en.wikipedia.org/wiki/List_of_X_postal_codes_of_Canada
+        # https://en.wikipedia.org/wiki/List_of_X_postal_codes_of_Canada
         when /\AX0[ABC]/
           'Nunavut'
         when /\AX0[EG]/, /\AX1A/

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

@@ -21,7 +21,7 @@ module GovKit
           # canonical electoral district ID.
           # @return [Hash] a map of cbc.ca riding ID to electoral district ID
           def self.rid_to_edid
-            @@yml ||= YAML.load_file(File.expand_path('../../../../data/rid_to_edid.yml', __FILE__))
+            @@yml ||= YAML.load_file(File.expand_path('../../../../rid_to_edid.yml', __FILE__))
           end
         end
       end

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

@@ -5,17 +5,17 @@ module GovKit
         class ElectionsCa < Base
           base_uri 'elections.ca'
           http_method :post
-          path '/Scripts/vis/FindED?L=e&PAGEID=20'
-          post_data 'CommonSearchTxt=<%= @postal_code %>'
+          path '/Scripts/vis/FindED?L=e&QID=-1&PAGEID=20'
+          post_data 'CommonSearchTxt=<%= @postal_code %>&CivicSearchTxt=1'
 
         private
 
           def electoral_districts!
-            [ response.headers['location'][/\bED=(\d{5})&/, 1] ]
+            [response.headers['location'][/\bED=(\d{5})&/, 1]]
           end
 
           def valid?
-            !response.headers['location'][/EDNotFound|MultipleEDs/]
+            !response.headers['location']['/ShowStreets?']
           end
         end
       end

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

@@ -11,7 +11,7 @@ module GovKit
         private
 
           def electoral_districts!
-            [ response.headers['location'][/\d+\z/] ]
+            [response.headers['location'][/\d+\z/]]
           end
 
           def valid?

data/lib/gov_kit-ca/represent.rb

@@ -1,7 +1,7 @@
 module GovKit
   module CA
     # A Ruby wrapper for the Represent API.
-    # @see http://represent.opennorth.ca/api/
+    # @see https://represent.opennorth.ca/api/
     class Represent
       # @param [Faraday::Connection] connection a Faraday connection
       def initialize(connection = nil)
@@ -14,7 +14,7 @@ module GovKit
       # @option opts [String] :boundary_set a boundary set
       # @option opts [Integer] :limit
       # @option opts [Integer] :offset
-      # @see http://represent.opennorth.ca/api/#boundaryset
+      # @see https://represent.opennorth.ca/api/#boundaryset
       def boundary_sets(opts = {})
         request(['boundary-sets', opts.delete(:boundary_set)], opts)
       end
@@ -31,7 +31,7 @@ module GovKit
       # @option opts [String] :intersects a boundary
       # @option opts [Integer] :limit
       # @option opts [Integer] :offset
-      # @see http://represent.opennorth.ca/api/#boundary
+      # @see https://represent.opennorth.ca/api/#boundary
       def boundaries(opts = {})
         if Array === opts[:sets]
           opts[:sets] = opts[:sets].join(',')
@@ -54,7 +54,7 @@ module GovKit
       # @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
+      # @see https://represent.opennorth.ca/api/#postcode
       def postcodes(postcode, opts = {})
         if Array === opts[:sets]
           opts[:sets] = opts[:sets].join(',')
@@ -68,7 +68,7 @@ module GovKit
       # @option opts [String] :representative_set a representative set
       # @option opts [Integer] :limit
       # @option opts [Integer] :offset
-      # @see http://represent.opennorth.ca/api/#representativeset
+      # @see https://represent.opennorth.ca/api/#representativeset
       def representative_sets(opts = {})
         request ['representative-sets', opts.delete(:representative_set)], opts
       end
@@ -81,7 +81,7 @@ module GovKit
       # @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
+      # @see https://represent.opennorth.ca/api/#representative
       def representatives(opts = {})
         if Array === opts[:point]
           opts[:point] = opts[:point].join(',')
@@ -96,7 +96,7 @@ module GovKit
 
       def request(parts, opts)
         begin
-          url = "http://represent.opennorth.ca/#{parts.compact.join('/')}/"
+          url = "https://represent.opennorth.ca/#{parts.compact.join('/')}/"
           response = @client.get(url, opts)
           case response.status
           when 200

data/lib/gov_kit-ca/version.rb

@@ -1,5 +1,5 @@
 module GovKit
   module CA
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

data/spec/cbc_ca_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe GovKit::CA::PostalCode::Strategy::CBCCa do
+RSpec.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],
@@ -8,16 +8,16 @@ describe GovKit::CA::PostalCode::Strategy::CBCCa do
         'B0J2L0' => [12002, 12007, 12008],
         'K0A1K0' => [35025, 35052, 35063, 35064],
       }.each do |postal_code,electoral_districts|
-        GovKit::CA::PostalCode::Strategy::CBCCa.new(postal_code).electoral_districts.should == electoral_districts
+        expect(GovKit::CA::PostalCode::Strategy::CBCCa.new(postal_code).electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::CBCCa.new('H0H0H0').electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::CBCCa.new('X1B1B1').electoral_districts).to eq(false)
     end
   end
 end

data/spec/conservative_ca_spec.rb

@@ -1,27 +1,27 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe GovKit::CA::PostalCode::Strategy::ConservativeCa do
+RSpec.describe GovKit::CA::PostalCode::Strategy::ConservativeCa do
   describe '#electoral_districts' do
     it 'should return the electoral districts within a postal code' do
       { 'T1P1K1' => [48010],
         'K0A1K0' => [35025, 35052, 35063],
       }.each do |postal_code,electoral_districts|
-        GovKit::CA::PostalCode::Strategy::ConservativeCa.new(postal_code).electoral_districts.should == electoral_districts
+        expect(GovKit::CA::PostalCode::Strategy::ConservativeCa.new(postal_code).electoral_districts).to eq(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
-      GovKit::CA::PostalCode::Strategy::ConservativeCa.new('T5S2B9').electoral_districts.should be_false
-      GovKit::CA::PostalCode::Strategy::ConservativeCa.new('B0J2L0').electoral_districts.should be_false
+      expect(GovKit::CA::PostalCode::Strategy::ConservativeCa.new('G0C2Y0').electoral_districts).to eq(false)
+      expect(GovKit::CA::PostalCode::Strategy::ConservativeCa.new('T5S2B9').electoral_districts).to eq(false)
+      expect(GovKit::CA::PostalCode::Strategy::ConservativeCa.new('B0J2L0').electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::ConservativeCa.new('H0H0H0').electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::ConservativeCa.new('X1B1B1').electoral_districts).to eq(false)
     end
   end
 end

data/spec/digital-copyright_ca_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa do
+RSpec.describe GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa do
   describe '#electoral_districts' do
     it 'should return the electoral districts within a postal code' do
       { 'G0C2Y0' => [24019, 24039], # too many 24019
@@ -8,16 +8,16 @@ describe GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa do
         'B0J2L0' => [12002, 12007, 12008],
         'K0A1K0' => [35025, 35052, 35063],
       }.each do |postal_code,electoral_districts|
-        GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa.new(postal_code).electoral_districts.should == electoral_districts
+        expect(GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa.new(postal_code).electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa.new('H0H0H0').electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::DigitalCopyrightCa.new('X1B1B1').electoral_districts).to eq(false)
     end
   end
 end

data/spec/elections_ca_spec.rb

@@ -1,26 +1,26 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe GovKit::CA::PostalCode::Strategy::ElectionsCa do
+RSpec.describe GovKit::CA::PostalCode::Strategy::ElectionsCa do
   describe '#electoral_districts' do
     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
+        expect(GovKit::CA::PostalCode::Strategy::ElectionsCa.new(postal_code).electoral_districts).to eq(electoral_districts)
       end
     end
 
     it 'should (unfortunately) return false if a postal code contains multiple electoral districts' do
-      GovKit::CA::PostalCode::Strategy::ElectionsCa.new('B0J2L0').electoral_districts.should be_false
-      GovKit::CA::PostalCode::Strategy::ElectionsCa.new('K0A1K0').electoral_districts.should be_false
+      expect(GovKit::CA::PostalCode::Strategy::ElectionsCa.new('B0J2L0').electoral_districts).to eq(false)
+      expect(GovKit::CA::PostalCode::Strategy::ElectionsCa.new('K0A1K0').electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::ElectionsCa.new('H0H0H0').electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::ElectionsCa.new('X1B1B1').electoral_districts).to eq(false)
     end
   end
 end

data/spec/greenparty_ca_spec.rb

@@ -1,20 +1,26 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe GovKit::CA::PostalCode::Strategy::GreenPartyCa do
+RSpec.describe GovKit::CA::PostalCode::Strategy::GreenPartyCa do
   describe '#electoral_districts' do
     it 'should return the electoral districts within a postal code' do
       { 'G0C2Y0' => [24026],
         'T5S2B9' => [48031],
-        'B0J2L0' => [12002], # too few
-        'K0A1K0' => [35076], # too few
-        'H0H0H0' => [24036], # wrong
       }.each do |postal_code,electoral_districts|
-        GovKit::CA::PostalCode::Strategy::GreenPartyCa.new(postal_code).electoral_districts.should == electoral_districts
+        expect(GovKit::CA::PostalCode::Strategy::GreenPartyCa.new(postal_code).electoral_districts).to eq(electoral_districts)
       end
     end
 
+    it 'should (unfortunately) return false if a postal code contains multiple electoral districts' do
+      expect(GovKit::CA::PostalCode::Strategy::GreenPartyCa.new('B0J2L0').electoral_districts).to eq(false)
+      expect(GovKit::CA::PostalCode::Strategy::GreenPartyCa.new('K0A1K0').electoral_districts).to eq(false)
+    end
+
+    it 'should return false if a postal code contains no electoral districts' do
+      expect(GovKit::CA::PostalCode::Strategy::GreenPartyCa.new('H0H0H0').electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::GreenPartyCa.new('X1B1B1').electoral_districts).to eq(false)
     end
   end
 end

data/spec/liberal_ca_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe GovKit::CA::PostalCode::Strategy::LiberalCa do
+RSpec.describe GovKit::CA::PostalCode::Strategy::LiberalCa do
   describe '#electoral_districts' do
     it 'should return the electoral districts within a postal code' do
       { 'G0C2Y0' => [24026],
@@ -8,16 +8,16 @@ describe GovKit::CA::PostalCode::Strategy::LiberalCa do
         'B0J2L0' => [12002], # too few
         'K0A1K0' => [35076], # too few
       }.each do |postal_code,electoral_districts|
-        GovKit::CA::PostalCode::Strategy::LiberalCa.new(postal_code).electoral_districts.should == electoral_districts
+        expect(GovKit::CA::PostalCode::Strategy::LiberalCa.new(postal_code).electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::LiberalCa.new('H0H0H0').electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::LiberalCa.new('X1B1B1').electoral_districts).to eq(false)
     end
   end
 end

data/spec/ndp_ca_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe GovKit::CA::PostalCode::Strategy::NDPCa do
+RSpec.describe GovKit::CA::PostalCode::Strategy::NDPCa do
   describe '#electoral_districts' do
     it 'should return the electoral districts within a postal code' do
       { 'G0C2Y0' => [24026],
@@ -8,16 +8,16 @@ describe GovKit::CA::PostalCode::Strategy::NDPCa do
         'B0J2L0' => [12002], # too few
         'K0A1K0' => [35031, 35076, 35088],
       }.each do |postal_code,electoral_districts|
-        GovKit::CA::PostalCode::Strategy::NDPCa.new(postal_code).electoral_districts.should == electoral_districts
+        expect(GovKit::CA::PostalCode::Strategy::NDPCa.new(postal_code).electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::NDPCa.new('H0H0H0').electoral_districts).to eq(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
+      expect(GovKit::CA::PostalCode::Strategy::NDPCa.new('X1B1B1').electoral_districts).to eq(false)
     end
   end
 end

data/spec/parl_gc_ca_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe GovKit::CA::PostalCode::Strategy::ParlGcCa do
+RSpec.describe GovKit::CA::PostalCode::Strategy::ParlGcCa do
   describe '#electoral_districts' do
     pending
   end

data/spec/postal_code_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe GovKit::CA::PostalCode do
+RSpec.describe GovKit::CA::PostalCode do
   before :all do
     GovKit::CA::PostalCode::StrategySet.register GovKit::CA::PostalCode::Strategy::ElectionsCa
     GovKit::CA::PostalCode::StrategySet.register GovKit::CA::PostalCode::Strategy::LiberalCa
@@ -19,7 +19,7 @@ describe GovKit::CA::PostalCode do
         'Q1Q1Q1', # Q as letter
         'a1a1a1', # lowercase
       ].each do |postal_code|
-        subject.valid?(postal_code).should be_false
+        expect(subject.valid?(postal_code)).to eq(false)
       end
     end
 
@@ -28,7 +28,7 @@ describe GovKit::CA::PostalCode do
         'H0H0H0', # doesn't exist
         'A1A1A1', # does exist
       ].each do |postal_code|
-        subject.valid?(postal_code).should be_true
+        expect(subject.valid?(postal_code)).to eq(true)
       end
     end
   end
@@ -38,16 +38,16 @@ describe GovKit::CA::PostalCode do
       { 'A1A1A1' => [10007],
         'K0A1K0' => [35076],
       }.each do |postal_code,electoral_districts|
-        subject.find_electoral_districts_by_postal_code(postal_code).should == electoral_districts
+        expect(subject.find_electoral_districts_by_postal_code(postal_code)).to eq(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)
+      expect(lambda{subject.find_electoral_districts_by_postal_code('H0H0H0')}).to 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)
+      expect(lambda{subject.find_electoral_districts_by_postal_code('AAAAAA')}).to raise_error(GovKit::CA::InvalidRequest)
     end
   end
 
@@ -76,19 +76,19 @@ describe GovKit::CA::PostalCode do
         'X0G' => 'Northwest Territories',
         'X1A' => 'Northwest Territories',
         'Y' => 'Yukon',
-      }.each do |postal_code, province|
-        subject.find_province_by_postal_code(postal_code).should == province
+      }.each do |postal_code,province|
+        expect(subject.find_province_by_postal_code(postal_code)).to eq(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)
+      expect(lambda{subject.find_province_by_postal_code('X1B1B1')}).to 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'
+      expect(subject.format_postal_code("+a1a 1a1\n")).to eq('A1A1A1')
     end
   end
 end

data/spec/represent_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe GovKit::CA::Represent do
+RSpec.describe GovKit::CA::Represent do
   describe '#boundary_sets' do
     let :api do
       GovKit::CA::Represent.new
@@ -16,27 +16,27 @@ describe GovKit::CA::Represent do
 
     it 'should return boundary sets' do
       response = api.boundary_sets
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
     end
 
     it 'should return a boundary set' do
       response = api.boundary_sets(:boundary_set => 'federal-electoral-districts')
-      response.should be_a(Hash)
-      response.should have_key('related')
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('related')
     end
 
     it 'should raise an error if the boundary set does not exist' do
-      expect{api.boundary_sets(:boundary_set => 'foo')}.to raise_error(GovKit::CA::ResourceNotFound, "404 http://represent.opennorth.ca/boundary-sets/foo/?")
+      expect{api.boundary_sets(:boundary_set => 'foo')}.to raise_error(GovKit::CA::ResourceNotFound, "404 https://represent.opennorth.ca/boundary-sets/foo/?")
     end
 
     it 'should raise an error if the limit is invalid' do
-      expect{api.boundary_sets(:limit => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 http://represent.opennorth.ca/boundary-sets/?limit=-1 Invalid limit '-1' provided. Please provide a positive integer >= 0.")
+      expect{api.boundary_sets(:limit => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 https://represent.opennorth.ca/boundary-sets/?limit=-1 Invalid limit '-1' provided. Please provide a positive integer >= 0.")
     end
 
     it 'should raise an error if the offset is invalid' do
-      expect{api.boundary_sets(:offset => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 http://represent.opennorth.ca/boundary-sets/?offset=-1 Invalid offset '-1' provided. Please provide a positive integer >= 0.")
+      expect{api.boundary_sets(:offset => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 https://represent.opennorth.ca/boundary-sets/?offset=-1 Invalid offset '-1' provided. Please provide a positive integer >= 0.")
     end
   end
 
@@ -47,27 +47,27 @@ describe GovKit::CA::Represent do
 
     it 'should return representative sets' do
       response = api.representative_sets
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
     end
 
     it 'should return a representative set' do
       response = api.representative_sets(:representative_set => 'house-of-commons')
-      response.should be_a(Hash)
-      response.should have_key('related')
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('related')
     end
 
     it 'should raise an error if the representative set does not exist' do
-      expect{api.representative_sets(:representative_set => 'foo')}.to raise_error(GovKit::CA::ResourceNotFound, "404 http://represent.opennorth.ca/representative-sets/foo/?")
+      expect{api.representative_sets(:representative_set => 'foo')}.to raise_error(GovKit::CA::ResourceNotFound, "404 https://represent.opennorth.ca/representative-sets/foo/?")
     end
 
     it 'should raise an error if the limit is invalid' do
-      expect{api.representative_sets(:limit => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 http://represent.opennorth.ca/representative-sets/?limit=-1 Invalid limit '-1' provided. Please provide a positive integer >= 0.")
+      expect{api.representative_sets(:limit => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 https://represent.opennorth.ca/representative-sets/?limit=-1 Invalid limit '-1' provided. Please provide a positive integer >= 0.")
     end
 
     it 'should raise an error if the offset is invalid' do
-      expect{api.representative_sets(:offset => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 http://represent.opennorth.ca/representative-sets/?offset=-1 Invalid offset '-1' provided. Please provide a positive integer >= 0.")
+      expect{api.representative_sets(:offset => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 https://represent.opennorth.ca/representative-sets/?offset=-1 Invalid offset '-1' provided. Please provide a positive integer >= 0.")
     end
   end
 
@@ -78,24 +78,24 @@ describe GovKit::CA::Represent do
 
     it 'should query by postal code' do
       response = api.postcodes('A1A1A1')
-      response.should be_a(Hash)
-      response.should have_key('code')
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('code')
     end
 
     it 'should accept an array of boundary sets' do
       response = api.postcodes('A1A1A1', :sets => ['federal-electoral-districts', 'census-subdivisions'])
-      response.should be_a(Hash)
-      (response['boundaries_centroid'] + response['boundaries_concordance']).should have(2).items
+      expect(response).to be_a(Hash)
+      expect((response['boundaries_centroid'] + response['boundaries_concordance']).size).to eq(2)
     end
 
     it 'should accept a comma-separated list of boundary sets' do
       response = api.postcodes('A1A1A1', :sets => 'federal-electoral-districts,census-subdivisions')
-      response.should be_a(Hash)
-      (response['boundaries_centroid'] + response['boundaries_concordance']).should have(2).items
+      expect(response).to be_a(Hash)
+      expect((response['boundaries_centroid'] + response['boundaries_concordance']).size).to eq(2)
     end
 
     it 'should raise an error if the postal code does not exist' do
-      expect{api.postcodes('foo')}.to raise_error(GovKit::CA::ResourceNotFound, "404 http://represent.opennorth.ca/postcodes/FOO/?")
+      expect{api.postcodes('foo')}.to raise_error(GovKit::CA::ResourceNotFound, "404 https://represent.opennorth.ca/postcodes/FOO/?")
     end
   end
 
@@ -106,81 +106,81 @@ describe GovKit::CA::Represent do
 
     it 'should return boundaries' do
       response = api.boundaries
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['meta']['next'].should_not be_nil
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['meta']['next']).to_not be_nil
     end
 
     it 'should return boundaries from a boundary set' do
       response = api.boundaries(:boundary_set => 'st-johns-wards')
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['objects'].should have(5).items
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['objects'].size).to eq(5)
     end
 
     it 'should return a boundary from a boundary set' do
       response = api.boundaries(:boundary_set => 'st-johns-wards', :boundary => 'ward-1')
-      response.should be_a(Hash)
-      response.should have_key('related')
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('related')
     end
 
     it 'should return the representatives of a boundary from a boundary set' do
       response = api.boundaries(:boundary_set => 'st-johns-wards', :boundary => 'ward-1', :representatives => true)
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['meta']['next'].should be_nil
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['meta']['next']).to be_nil
     end
 
     it 'should return boundaries from many boundary sets as an array' do
       response = api.boundaries(:sets => ['st-johns-wards','caledon-wards'])
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['objects'].should have(10).items
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['objects'].size).to eq(10)
     end
 
     it 'should return boundaries from many boundary sets as a comma-separated list' do
       response = api.boundaries(:sets => 'st-johns-wards,caledon-wards')
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['objects'].should have(10).items
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['objects'].size).to eq(10)
     end
 
     it 'should accept a point as an array' do
       response = api.boundaries(:contains => ['47.5699', '-52.6954'])
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['meta']['next'].should be_nil
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['meta']['next']).to be_nil
     end
 
     it 'should accept a point as a comma-separated list' do
       response = api.boundaries(:contains => '47.5699,-52.6954')
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['meta']['next'].should be_nil
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['meta']['next']).to be_nil
     end
 
     it 'should raise an error if the point is invalid' do
-      expect{api.boundaries(:contains => '0,0,0')}.to raise_error(GovKit::CA::InvalidRequest, "400 http://represent.opennorth.ca/boundaries/?contains=0,0,0 Invalid latitude,longitude '0,0,0' provided.")
+      expect{api.boundaries(:contains => '0,0,0')}.to raise_error(GovKit::CA::InvalidRequest, "400 https://represent.opennorth.ca/boundaries/?contains=0,0,0 Invalid latitude,longitude '0,0,0' provided.")
     end
 
     it 'should raise an error if the boundary set does not exist' do
-      expect{api.boundaries(:boundary_set => 'foo')}.to raise_error(GovKit::CA::ResourceNotFound, "404 http://represent.opennorth.ca/boundaries/foo/?")
+      expect{api.boundaries(:boundary_set => 'foo')}.to raise_error(GovKit::CA::ResourceNotFound, "404 https://represent.opennorth.ca/boundaries/foo/?")
     end
 
     context 'when retrieving a boundary' do
       it 'should raise an error if the boundary set does not exist' do
-        expect{api.boundaries(:boundary_set => 'foo', :boundary => 'ward-1')}.to raise_error(GovKit::CA::ResourceNotFound, "404 http://represent.opennorth.ca/boundaries/foo/ward-1/?")
+        expect{api.boundaries(:boundary_set => 'foo', :boundary => 'ward-1')}.to raise_error(GovKit::CA::ResourceNotFound, "404 https://represent.opennorth.ca/boundaries/foo/ward-1/?")
       end
 
       it 'should raise an error if the boundary does not exist' do
-        expect{api.boundaries(:boundary_set => 'st-johns-wards', :boundary => 'foo')}.to raise_error(GovKit::CA::ResourceNotFound, "404 http://represent.opennorth.ca/boundaries/st-johns-wards/foo/?")
+        expect{api.boundaries(:boundary_set => 'st-johns-wards', :boundary => 'foo')}.to raise_error(GovKit::CA::ResourceNotFound, "404 https://represent.opennorth.ca/boundaries/st-johns-wards/foo/?")
       end
 
       it 'should raise an error if the boundary set is not given' do
@@ -207,11 +207,11 @@ describe GovKit::CA::Represent do
     end
 
     it 'should raise an error if the limit is invalid' do
-      expect{api.boundaries(:limit => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 http://represent.opennorth.ca/boundaries/?limit=-1 Invalid limit '-1' provided. Please provide a positive integer >= 0.")
+      expect{api.boundaries(:limit => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 https://represent.opennorth.ca/boundaries/?limit=-1 Invalid limit '-1' provided. Please provide a positive integer >= 0.")
     end
 
     it 'should raise an error if the offset is invalid' do
-      expect{api.boundaries(:offset => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 http://represent.opennorth.ca/boundaries/?offset=-1 Invalid offset '-1' provided. Please provide a positive integer >= 0.")
+      expect{api.boundaries(:offset => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 https://represent.opennorth.ca/boundaries/?offset=-1 Invalid offset '-1' provided. Please provide a positive integer >= 0.")
     end
   end
 
@@ -222,54 +222,54 @@ describe GovKit::CA::Represent do
 
     it 'should return representatives' do
       response = api.representatives
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['meta']['next'].should_not be_nil
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['meta']['next']).to_not be_nil
     end
 
     it 'should return representatives from a representative set' do
       response = api.representatives(:representative_set => 'st-johns-city-council')
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['meta']['next'].should be_nil
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['meta']['next']).to be_nil
     end
 
     it 'should accept a point as an array' do
       response = api.representatives(:point => ['47.5699', '-52.6954'])
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['meta']['next'].should be_nil
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['meta']['next']).to be_nil
     end
 
     it 'should accept a point as a comma-separated list' do
       response = api.representatives(:point => '47.5699,-52.6954')
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['meta']['next'].should be_nil
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['meta']['next']).to be_nil
     end
 
     it 'should accept an array of districts' do
       response = api.representatives(:districts => ['federal-electoral-districts/10007', 'census-subdivisions/1001519'])
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['meta']['next'].should be_nil
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['meta']['next']).to be_nil
     end
 
     it 'should accept a comma-separated list of districts' do
       response = api.representatives(:districts => 'federal-electoral-districts/10007,census-subdivisions/1001519')
-      response.should be_a(Hash)
-      response.should have_key('objects')
-      response.should have_key('meta')
-      response['meta']['next'].should be_nil
+      expect(response).to be_a(Hash)
+      expect(response).to have_key('objects')
+      expect(response).to have_key('meta')
+      expect(response['meta']['next']).to be_nil
     end
 
     it 'should raise an error if the point is invalid' do
-      expect{api.representatives(:point => '0,0,0')}.to raise_error(GovKit::CA::InvalidRequest, "400 http://represent.opennorth.ca/representatives/?point=0,0,0 Invalid latitude,longitude '0,0,0' provided.")
+      expect{api.representatives(:point => '0,0,0')}.to raise_error(GovKit::CA::InvalidRequest, "400 https://represent.opennorth.ca/representatives/?point=0,0,0 Invalid latitude,longitude '0,0,0' provided.")
     end
 
     it 'should not raise an error if the representative set does not exist' do
@@ -277,11 +277,11 @@ describe GovKit::CA::Represent do
     end
 
     it 'should raise an error if the limit is invalid' do
-      expect{api.representatives(:limit => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 http://represent.opennorth.ca/representatives/?limit=-1 Invalid limit '-1' provided. Please provide a positive integer >= 0.")
+      expect{api.representatives(:limit => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 https://represent.opennorth.ca/representatives/?limit=-1 Invalid limit '-1' provided. Please provide a positive integer >= 0.")
     end
 
     it 'should raise an error if the offset is invalid' do
-      expect{api.representatives(:offset => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 http://represent.opennorth.ca/representatives/?offset=-1 Invalid offset '-1' provided. Please provide a positive integer >= 0.")
+      expect{api.representatives(:offset => -1)}.to raise_error(GovKit::CA::InvalidRequest, "400 https://represent.opennorth.ca/representatives/?offset=-1 Invalid offset '-1' provided. Please provide a positive integer >= 0.")
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,18 +1,15 @@
 require 'rubygems'
 
+require 'simplecov'
 require 'coveralls'
-Coveralls.wear!
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+  add_filter 'spec'
+end
 
 require 'rspec'
 require File.dirname(__FILE__) + '/../lib/gov_kit-ca'
 
-module Helpers
-  def fixture_path(*args)
-    File.join(File.dirname(__FILE__), 'fixtures', *args)
-  end
-end
-
 RSpec.configure do |config|
-  config.include Helpers
   config.filter_run_excluding :broken => true
 end

data/spec/strategy_set_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe GovKit::CA::PostalCode::StrategySet do
+RSpec.describe GovKit::CA::PostalCode::StrategySet do
   let :strategy do
     Class.new
   end
@@ -14,27 +14,27 @@ describe GovKit::CA::PostalCode::StrategySet do
 
     describe '#strategies' do
       it 'should return the strategies' do
-        GovKit::CA::PostalCode::StrategySet.strategies[0..4].should == [
+        expect(GovKit::CA::PostalCode::StrategySet.strategies[0..4]).to eq([
           GovKit::CA::PostalCode::Strategy::ElectionsCa,
           GovKit::CA::PostalCode::Strategy::LiberalCa,
           GovKit::CA::PostalCode::Strategy::NDPCa,
           # GovKit::CA::PostalCode::Strategy::GreenPartyCa,
           # GovKit::CA::PostalCode::Strategy::CBCCa,
           # GovKit::CA::PostalCode::Strategy::ConservativeCa,
-        ]
+        ])
       end
     end
 
     describe '#register' do
       it 'should append a strategy' do
         GovKit::CA::PostalCode::StrategySet.register(strategy)
-        GovKit::CA::PostalCode::StrategySet.strategies.last.should == strategy
+        expect(GovKit::CA::PostalCode::StrategySet.strategies.last).to eq(strategy)
       end
     end
 
     describe '#run' do
       it 'should run the strategies' do
-        GovKit::CA::PostalCode::StrategySet.run('A1A1A1').should == [10007]
+        expect(GovKit::CA::PostalCode::StrategySet.run('A1A1A1')).to eq([10007])
       end
     end
   end
@@ -46,14 +46,14 @@ describe GovKit::CA::PostalCode::StrategySet do
 
     describe '#strategies' do
       it 'should return the strategies' do
-        GovKit::CA::PostalCode::StrategySet.strategies.should == []
+        expect(GovKit::CA::PostalCode::StrategySet.strategies).to eq([])
       end
     end
 
     describe '#register' do
       it 'should add a strategy' do
         GovKit::CA::PostalCode::StrategySet.register(strategy)
-        GovKit::CA::PostalCode::StrategySet.strategies.should == [strategy]
+        expect(GovKit::CA::PostalCode::StrategySet.strategies).to eq([strategy])
       end
     end
 

data/tasks/tasks.rb

@@ -31,7 +31,7 @@ task :trim_postal_codes, :file do |t,args|
   # Get the minimum number of postal codes to cover all electoral districts.
   # This is an instance of the set cover problem, which is NP-complete. Use the
   # greedy algorithm, which is the best-possible polynomial time approximation
-  # algorithm for set cover. http://en.wikipedia.org/wiki/Set_cover_problem
+  # algorithm for set cover. https://en.wikipedia.org/wiki/Set_cover_problem
   postal_codes = []
   until postal_to_edid.empty?
     postal_code, edids = postal_to_edid.max{|_,v| v.size}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govkit-ca
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Open North
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,47 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
@@ -139,7 +140,6 @@ files:
 - Rakefile
 - USAGE
 - govkit-ca.gemspec
-- 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/base.rb
@@ -155,6 +155,7 @@ files:
 - lib/gov_kit-ca/represent.rb
 - lib/gov_kit-ca/version.rb
 - lib/govkit-ca.rb
+- lib/rid_to_edid.yml
 - spec/cbc_ca_spec.rb
 - spec/conservative_ca_spec.rb
 - spec/digital-copyright_ca_spec.rb
@@ -165,12 +166,11 @@ files:
 - spec/parl_gc_ca_spec.rb
 - spec/postal_code_spec.rb
 - spec/represent_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/strategy_set_spec.rb
 - tasks/postal-code-for-districts.csv
 - tasks/tasks.rb
-homepage: http://github.com/opennorth/govkit-ca
+homepage: https://github.com/opennorth/govkit-ca
 licenses:
 - MIT
 metadata: {}
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: govkit-ca
+rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
@@ -205,6 +205,5 @@ test_files:
 - spec/parl_gc_ca_spec.rb
 - spec/postal_code_spec.rb
 - spec/represent_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/strategy_set_spec.rb

data/spec/spec.opts

@@ -1,5 +0,0 @@
---colour
---format nested
---loadby mtime
---reverse
---backtrace