govkit 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/govkit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{govkit}
-  s.version = "0.2.0"
+  s.version = "0.3.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-08-31}
+  s.date = %q{2010-09-10}
   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{carl@ppolitics.org}
   s.extra_rdoc_files = [

data/lib/gov_kit/configuration.rb

@@ -7,7 +7,7 @@ module GovKit
 
     def initialize
       @openstates_apikey = @votesmart_apikey = @ftm_apikey = ''
-      @openstates_base_url = 'fiftystates-dev.sunlightlabs.com/api'
+      @openstates_base_url = 'openstates.sunlightlabs.com/api/v1/'
       @votesmart_base_url = 'api.votesmart.org/'
       @ftm_base_url = 'api.followthemoney.org/'
       @opencongress_base_url = 'www.opencongress.org/'

data/lib/gov_kit/open_states.rb

@@ -12,20 +12,20 @@ module GovKit
 
     class State < OpenStatesResource
       def self.find_by_abbreviation(abbreviation)
-        response = get("/#{abbreviation}/")
+        response = get("/metadata/#{abbreviation}/")
         instantiate_record(response)
       end
     end
 
     class Bill < OpenStatesResource
-      # http://fiftystates-dev.sunlightlabs.com/api/ca/20092010/lower/bills/AB667/
+      # http://openstates.sunlightlabs.com/api/v1/ca/20092010/lower/bills/AB667/
       def self.find(state_abbrev, session, chamber, bill_id)
         response = get("/#{state_abbrev}/#{session}/#{chamber}/bills/#{bill_id}/")
         instantiate_record(response)
       end
 
       def self.search(query, options = {})
-        response = get('/bills/search/', :query => {:q => query}.merge(options))
+        response = get('/bills/', :query => {:q => query}.merge(options))
         instantiate_collection(response)
       end
 
@@ -42,10 +42,23 @@ module GovKit
       end
 
       def self.search(options = {})
-        response = get('/legislators/search/', :query => options)
+        response = get('/legislators/', :query => options)
         instantiate_collection(response)
       end
     end
+    
+    class Committee < OpenStatesResource
+      def self.find(committee_id)
+        response = get("/committees/#{committee_id}/")
+        instantiate_record(response)
+      end
+
+      def self.search(options = {})
+        response = get('/committees/', :query => options)
+        instantiate_collection(response)
+      end
+    end
+    
 
     class Role < OpenStatesResource; end
 

data/lib/gov_kit/resource.rb

@@ -3,10 +3,12 @@ module GovKit
     include HTTParty
     format :json
 
-    attr_accessor :attributes
+    attr_reader :attributes
+    attr_reader :raw_response
 
     def initialize(attributes = {})
       @attributes = {}
+      @raw_response = attributes
       unload(attributes)
     end
 
@@ -72,7 +74,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/vote_smart.rb

@@ -22,6 +22,10 @@ module GovKit
     class Bio < VoteSmartResource
       def self.find(candidate_id)
         response = get("/CandidateBio.getBio", :query => {"candidateId" => candidate_id})
+        
+        # Sometimes this returns nil if no one is found!
+        raise(ResourceNotFound, 'Could not find bio for candidate ' + candidate_id.to_s) if response.blank? || response['error']
+
         instantiate_record(response['bio']['candidate'])
       end
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Participatory Politics Foundation
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -07:00
+date: 2010-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency