congress 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6f9234cbf7d9536bb2e50c670633efbf02c7038
-  data.tar.gz: a4664f6a79651dc2e4a05e2731b6edc4cacc0b80
+  metadata.gz: 5516ea302639f934b2fcba072da933205a5bec83
+  data.tar.gz: 9af7c88cd0983c83a733c577a01e9f44727ad67c
 SHA512:
-  metadata.gz: d4c5500a56021013a611f81c24ec5b6cd5b92ef6e73397ad075a3ec929fb968102adf193e8483c7171bbd7a014d17a3df7b5a8b23ca81777b9e1e7172b10d708
-  data.tar.gz: 82a3854a324a88e56cb341689a2f10211ecafdcc169426595b87ed9250911f3e66c66ad415965dad1fdc4b5027b49493b460804b5be8b6a9475e57340d4cfc28
+  metadata.gz: 1779fe53f8cddf90e2f3772fd52fc662230c99505be175ae88a48116327d9663b096e283daa0826776e55cbcb35e7ee0c64332ea9ce8a96215a1f9cb3264a3bb
+  data.tar.gz: d77c88f13a9c5d87503eec2952eeab89fdce5507c1358ccc80a7c5219d5d9f6a50756d4ff08a9823c840b3c9f525b32f312c775c204cae68339dd4e1eae4e7b7

data/.rubocop.yml

@@ -1,43 +1,36 @@
 AllCops:
-  Includes:
+  Include:
     - 'Gemfile'
     - 'Rakefile'
     - 'congress.gemspec'
 
 # Avoid long parameter lists
 ParameterLists:
-  Max: 4
+  Max: 3
   CountKeywordArgs: true
 
+ClassLength:
+  Max: 60
+
+LineLength:
+  Enabled: false
+
 MethodLength:
   CountComments: false
-  Max: 15
+  Max: 14
 
 # Avoid more than `Max` levels of nesting.
 BlockNesting:
-  Max: 3
+  Max: 2
 
 # Align with the style guide.
 CollectionMethods:
   PreferredMethods:
-    collect:  'map'
-    inject:   'reduce'
+    map:      'collect'
+    reduce:   'inject'
     find:     'detect'
     find_all: 'select'
 
-# Do not force public/protected/private keyword to be indented at the same
-# level as the def keyword. My personal preference is to outdent these keywords
-# because I think when scanning code it makes it easier to identify the
-# sections of code and visually separate them. When the keyword is at the same
-# level I think it sort of blends in with the def keywords and makes it harder
-# to scan the code and see where the sections are.
-AccessModifierIndentation:
-  Enabled: false
-
-# Limit line length
-LineLength:
-  Enabled: false
-
 # Disable documentation checking until a class needs to be documented once
 Documentation:
   Enabled: false
@@ -77,5 +70,20 @@ CaseIndentation:
 Lambda:
   Enabled: false
 
+RaiseArgs:
+  EnforcedStyle: compact
+
+PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%':  ()
+    '%i': ()
+    '%q': ()
+    '%Q': ()
+    '%r': '{}'
+    '%s': ()
+    '%w': '[]'
+    '%W': '[]'
+    '%x': ()
+
 NumericLiterals:
   Enabled: false

data/Gemfile

@@ -19,7 +19,7 @@ group :test do
   gem 'coveralls', :require => false
   gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
   gem 'rspec', '>= 2.14'
-  gem 'rubocop', '>= 0.16', :platforms => [:ruby_19, :ruby_20, :ruby_21]
+  gem 'rubocop', '>= 0.20', :platforms => [:ruby_19, :ruby_20, :ruby_21]
   gem 'simplecov', :require => false
   gem 'webmock'
   gem 'yardstick'

data/README.md

@@ -45,13 +45,13 @@ Congress.legislators
 ###### Fetch representatives and senators for a latitude/longitude or zip code
 ```ruby
 Congress.legislators_locate(37.775, -122.418)
-Congress.legislators_locate(94107)
+Congress.legislators_locate('94107')
 ```
 
 ###### Fetch congressional districts for a latitude/longitude or zip code
 ```ruby
 Congress.districts_locate(37.775, -122.418)
-Congress.districts_locate(94107)
+Congress.districts_locate('94107')
 ```
 
 ###### Fetch current committees, subcommittees, and their membership

data/congress.gemspec

@@ -10,14 +10,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'geocoder', '~> 1.1.9'
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.author        = 'Erik Michaels-Ober'
-  spec.description   = %q{Ruby wrapper for the Sunlight Congress API, a live JSON API for the people and work of Congress, provided by the Sunlight Foundation.}
+  spec.description   = %q(Ruby wrapper for the Sunlight Congress API, a live JSON API for the people and work of Congress, provided by the Sunlight Foundation.)
   spec.email         = 'sferik@gmail.com'
   spec.files         = `git ls-files`.split("\n")
   spec.homepage      = 'https://github.com/codeforamerica/congress'
   spec.licenses      = ['MIT']
   spec.name          = 'congress'
   spec.require_paths = ['lib']
-  spec.summary       = %q{Ruby wrapper for the Sunlight Congress API}
+  spec.summary       = %q(Ruby wrapper for the Sunlight Congress API)
   spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   spec.version       = Congress::VERSION
 end

data/lib/congress/client.rb

@@ -27,7 +27,7 @@ module Congress
     # @return [Hashie::Rash]
     # @example
     #   Congress.key = YOUR_SUNLIGHT_API_KEY
-    #   Congress.legislators_locate(94107)
+    #   Congress.legislators_locate('94107')
     #   Congress.legislators_locate(37.775, -122.418)
     #   Congress.legislators_locate('2169 Mission Street, San Francisco, CA 94110')
     def legislators_locate(*args)
@@ -39,7 +39,7 @@ module Congress
     # @return [Hashie::Rash]
     # @example
     #   Congress.key = YOUR_SUNLIGHT_API_KEY
-    #   Congress.districts_locate(94107)
+    #   Congress.districts_locate('94107')
     #   Congress.districts_locate(37.775, -122.418)
     #   Congress.districts_locate('2169 Mission Street, San Francisco, CA 94110')
     def districts_locate(*args)
@@ -120,24 +120,26 @@ module Congress
 
     def extract_location(args)
       options = args.last.is_a?(::Hash) ? args.pop : {}
-      case [args.size, args.first.class]
-      when [1, Fixnum]
-        options.merge(:zip => to_zip_code(args.pop))
-      when [1, String]
-        placemark = Geocoder.search(args.pop).first
-        options.merge(:longitude => placemark.longitude, :latitude => placemark.latitude)
-      when [2, Float]
-        options.merge(:longitude => args.pop, :latitude => args.pop)
-      else
-        fail ArgumentError, 'Must pass a latitude/longitude, zip or address'
+      case args.size
+      when 1
+        case args[0]
+        when Integer, /\A[\d]{5}\Z/
+          options.merge!(:zip => to_zip_code(args[0]))
+        when String
+          placemark = Geocoder.search(args[0]).first
+          options.merge!(:latitude => placemark.latitude, :longitude => placemark.longitude)
+        end
+      when 2
+        options.merge!(:latitude => args[0], :longitude => args[1])
       end
+      options
     end
 
     # Proper zip code from a number, adding leading zeroes if required
     # @param number [Integer] zip code as an integer
     # @return [String]
     def to_zip_code(number)
-      sprintf('%05d', number)
+      format('%05d', number.to_i)
     end
   end
 end

data/lib/congress/version.rb

@@ -1,3 +1,3 @@
 module Congress
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/congress/client_spec.rb

@@ -38,6 +38,12 @@ describe Congress::Client do
           expect(a_get('/legislators/locate?zip=06511').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
         end
       end
+      context 'zip code as string' do
+        it 'interprets five-digit strings as zip codes' do
+          @client.legislators_locate('06511')
+          expect(a_get('/legislators/locate?zip=06511').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+        end
+      end
     end
     context 'with a latitude and longitude passed' do
       before do
@@ -65,11 +71,6 @@ describe Congress::Client do
         expect(legislators_locate['results'].first.bioguide_id).to eq('P000197')
       end
     end
-    context 'with no arguments passed' do
-      it 'raises an argument error' do
-        expect { @client.legislators_locate }.to raise_error ArgumentError
-      end
-    end
   end
 
   describe '#districts_locate' do
@@ -111,11 +112,6 @@ describe Congress::Client do
         expect(districts_locate['results'].first.district).to eq(12)
       end
     end
-    context 'with no arguments passed' do
-      it 'raises an argument error' do
-        expect { @client.districts_locate }.to raise_error ArgumentError
-      end
-    end
   end
 
   describe '#committees' do

data/spec/helper.rb

@@ -1,10 +1,7 @@
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
 
 SimpleCov.start do
   add_filter '/spec/'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: congress
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday