govkit 0.5.1 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/govkit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{govkit}
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Participatory Politics Foundation", "Srinivas Aki", "Carl Tashian"]
-  s.date = %q{2010-12-21}
+  s.date = %q{2011-02-01}
   s.description = %q{Govkit lets you quickly get encapsulated Ruby objects for common open government APIs. We're starting with Sunlight's Open States API and the Project Vote Smart API.}
   s.email = %q{develop@opencongress.org}
   s.extra_rdoc_files = [

data/lib/gov_kit/configuration.rb

@@ -21,7 +21,7 @@ module GovKit
       @wikipedia_base_url = 'en.wikipedia.org'
 
       # Permant home for contribution category mappings
-      @transparency_data_categories_url = 'assets.transparencydata.org.s3.amazonaws.com/docs/catcodes.csv'
+      @transparency_data_categories_url = 'http://assets.transparencydata.org.s3.amazonaws.com/docs/catcodes.csv'
     end
   end
 

data/lib/gov_kit/open_states.rb

@@ -18,9 +18,11 @@ module GovKit
     end
 
     class Bill < OpenStatesResource
-      # http://openstates.sunlightlabs.com/api/v1/bills/ca/20092010/AB667/
+      # http://openstates.sunlightlabs.com/api/v1/bills/ca/20092010/AB 667/
       def self.find(state_abbrev, session, bill_id, chamber = '')
-        response = get("/bills/#{state_abbrev}/#{session}/#{chamber.blank? ? '' : chamber + '/'}#{bill_id}/")
+        escaped_bill_id = bill_id.gsub(/ /, '%20')
+        escaped_session = session.gsub(/ /, '%20')
+        response = get("/bills/#{state_abbrev.downcase}/#{escaped_session}/#{chamber.blank? ? '' : chamber + '/'}#{escaped_bill_id}/")
         parse(response)
       end
 

data/lib/gov_kit/resource.rb

@@ -25,6 +25,10 @@ module GovKit
             raise ResourceNotFound, "404 Not Found"
           when Net::HTTPUnauthorized
             raise NotAuthorized, "401 Not Authorized; have you set up your API key?"
+          when Net::HTTPServerError
+            raise ServerError, '5xx server error'
+          when Net::HTTPClientError
+            raise ClientError, '4xx client error'
         end
       end
       
@@ -86,7 +90,7 @@ module GovKit
     end
 
     def find_or_create_resource_for(name)
-      resource_name = name.to_s.gsub(/^[_+]/,'').gsub(/^(\-?\d)/, "n#{$1}").gsub(/\s/, '').camelize
+      resource_name = name.to_s.gsub(/^[_\-+]/,'').gsub(/^(\-?\d)/, "n#{$1}").gsub(/(\s|-)/, '').camelize
       if self.class.parents.size > 1
         find_resource_in_modules(resource_name, self.class.parents)
       else

data/lib/gov_kit/transparency_data.rb

@@ -1,5 +1,3 @@
-require 'fastercsv'
-
 module GovKit
   class TransparencyDataResource < Resource
     default_params :apikey => GovKit::configuration.sunlight_apikey
@@ -25,14 +23,19 @@ module GovKit
     
     class Categories
       # Contribution category code mapping table, in CSV format
-      # Returns an array of hashes.
+      # Returns an array of hashes, each with the following keys:
+      # :source, :code, :name, :industry, :order
       def self.all
+        # This provides Ruby 1.8 & 1.9 CSV compatibility
+        if CSV.const_defined? :Reader
+          csv = FasterCSV
+        else
+          csv = CSV
+        end
         categories = []
         open(GovKit::configuration.transparency_data_categories_url) do |f|
-          f.each_line do |line|
-            FasterCSV.parse(line) do |row|
-              categories << row.fields
-            end
+          csv.parse(f.read, :headers => true, :header_converters => :symbol) do |row|
+           categories << row.to_hash
           end
         end
         categories

data/lib/gov_kit.rb

@@ -7,6 +7,11 @@ require 'httparty'
 require 'open-uri'
 require 'json'
 require 'gov_kit/configuration'
+require 'csv'
+
+if VERSION[0,3] == "1.8"
+  require 'fastercsv'
+end
 
 module GovKit
   autoload :Resource, 'gov_kit/resource'
@@ -30,4 +35,8 @@ module GovKit
   class InvalidRequest < GovKitError; end
 
   class ResourceNotFound < GovKitError; end
+  
+  class ServerError < GovKitError; end
+  
+  class ClientError < GovKitError; end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: govkit
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Participatory Politics Foundation
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -08:00
+date: 2011-02-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency