govkit 0.7.2 → 0.7.3

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm:
+  - 1.9.2

data/Gemfile

@@ -1,13 +1,19 @@
 source 'http://rubygems.org'
 
-gemspec
-
-gem "activesupport", :require => 'active_support'
-gem "nokogiri"
-gem "httparty"
 gem "i18n"
+gem "activesupport", :require => 'active_support'
+gem "nokogiri", '~> 1.5.5'
+gem "httparty", '>= 0.7.4'
+gem "json", '>= 1.4.3'
+gem "fastercsv", '>= 1.5.3'
+
+group :development do
+  gem "jeweler"
+  gem "rake"
+end
 
 group :test do
+  gem "rake"
   gem "rspec"
   gem "fakeweb"
 end

data/README.md

@@ -1,4 +1,4 @@
-# Govkit
+# Govkit [![Build Status](https://secure.travis-ci.org/opengovernment/govkit.png)](http://travis-ci.org/opengovernment/govkit)
 
 Govkit is a Ruby gem that provides simple access to US open government APIs around the web, including:
 

data/Rakefile

@@ -22,10 +22,6 @@ begin
     gem.email = "develop@opencongress.org"
     gem.homepage = "http://github.com/opengovernment/govkit"
     gem.authors = ["Participatory Politics Foundation", "Srinivas Aki", "Carl Tashian"]
-    gem.add_dependency('httparty', '>= 0.7.4')
-    gem.add_dependency('json', '>= 1.4.3')
-    gem.add_dependency('nokogiri', '>= 1.4.4')
-    gem.add_dependency('fastercsv', '>= 1.5.3')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -60,23 +56,43 @@ Rake::RDocTask.new do |rdoc|
 end
 
 
-if defined?(Spec)
+if defined?(RSpec)
   desc 'Test the govkit plugin.'
-  Spec::Rake::SpecTask.new('spec') do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ["-c"]
+  RSpec::Core::RakeTask.new('spec') do |t|
+    t.rspec_opts = ["-c"]
   end
 
   desc 'Test the govkit plugin with specdoc formatting and colors'
-  Spec::Rake::SpecTask.new('specdoc') do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ["--format specdoc", "-c"]
+  RSpec::Core::RakeTask.new('specdoc') do |t|
+    t.rspec_opts = ["--format specdoc", "-c"]
   end
 
   desc "Run all examples with RCov"
-  Spec::Rake::SpecTask.new('examples_with_rcov') do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
+  RSpec::Core::RakeTask.new('examples_with_rcov') do |t|
     t.rcov = true
     t.rcov_opts = ['--exclude', 'spec,Library']
   end
 end
+
+desc "Generate RSpec fixtures"
+task :generate_rspec_fixtures do |t,args|
+  if ENV['APIKEY'].nil?
+    abort "Usage: APIKEY=12345... rake generate_rspec_fixtures"
+  end
+
+  { "/legislators/XXL123456/" => '401.response',
+    "/metadata/ca/?apikey=#{ENV['APIKEY']}" => 'state.response',
+    "/bills/ca/20092010/lower/AB%20667/?apikey=#{ENV['APIKEY']}" => 'bill.response',
+    "/bills/?apikey=#{ENV['APIKEY']}&q=cooperatives" => 'bill_find.response',
+    "/bills/?apikey=#{ENV['APIKEY']}&updated_since=2012-11-01&state=tx" => 'bill_query.response',
+    "/legislators/CAL000088/?apikey=#{ENV['APIKEY']}" => 'legislator_find.response',
+    "/legislators/CAL999999/?apikey=#{ENV['APIKEY']}" => '404.response',
+    "/legislators/?apikey=#{ENV['APIKEY']}&state=ca" => 'legislator_query.response',
+    "/legislators/?apikey=#{ENV['APIKEY']}&state=zz" => '404.response',
+    "/committees/MDC000012/?apikey=#{ENV['APIKEY']}" => 'committee_find.response',
+    "/committees/?apikey=#{ENV['APIKEY']}&state=md&chamber=upper" => 'committee_query.response',
+  }.each do |path,basename|
+    filepath = File.expand_path("../spec/fixtures/open_states/#{basename}", __FILE__)
+    `curl -s -i -o #{filepath} "http://openstates.org/api/v1#{path}"`
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/govkit.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{govkit}
-  s.version = "0.7.2"
+  s.name = "govkit"
+  s.version = "0.7.3"
 
   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{2012-01-23}
-  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.date = "2012-11-20"
+  s.description = "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 = "develop@opencongress.org"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "LICENSE",
     "README.md",
@@ -30,7 +31,6 @@ Gem::Specification.new do |s|
     "generators/govkit/templates/govkit.rb",
     "generators/govkit/templates/mention.rb",
     "govkit.gemspec",
-    "init.rb",
     "lib/generators/govkit/govkit_generator.rb",
     "lib/generators/govkit/templates/create_mentions.rb",
     "lib/generators/govkit/templates/govkit.rb",
@@ -60,6 +60,7 @@ Gem::Specification.new do |s|
     "lib/gov_kit/transparency_data.rb",
     "lib/gov_kit/vote_smart.rb",
     "lib/govkit.rb",
+    "rails/init.rb",
     "spec/fixtures/bing/news_search.response",
     "spec/fixtures/bing/no_results.response",
     "spec/fixtures/follow_the_money/business-page0.response",
@@ -73,12 +74,12 @@ Gem::Specification.new do |s|
     "spec/fixtures/open_congress/person.response",
     "spec/fixtures/open_states/401.response",
     "spec/fixtures/open_states/404.response",
-    "spec/fixtures/open_states/410.response",
     "spec/fixtures/open_states/bill.response",
+    "spec/fixtures/open_states/bill_find.response",
     "spec/fixtures/open_states/bill_query.response",
     "spec/fixtures/open_states/committee_find.response",
     "spec/fixtures/open_states/committee_query.response",
-    "spec/fixtures/open_states/legislator.response",
+    "spec/fixtures/open_states/legislator_find.response",
     "spec/fixtures/open_states/legislator_query.response",
     "spec/fixtures/open_states/state.response",
     "spec/fixtures/search_engines/google_news.response",
@@ -95,54 +96,42 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/transparency_data_spec.rb"
   ]
-  s.homepage = %q{http://github.com/opengovernment/govkit}
+  s.homepage = "http://github.com/opengovernment/govkit"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Simple access to open government APIs around the web}
-  s.test_files = [
-    "spec/follow_the_money_spec.rb",
-    "spec/open_congress_spec.rb",
-    "spec/open_states_spec.rb",
-    "spec/search_engines_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/transparency_data_spec.rb"
-  ]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Simple access to open government APIs around the web"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<govkit>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.5"])
       s.add_runtime_dependency(%q<httparty>, [">= 0.7.4"])
       s.add_runtime_dependency(%q<json>, [">= 1.4.3"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_runtime_dependency(%q<fastercsv>, [">= 1.5.3"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
     else
-      s.add_dependency(%q<govkit>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, ["~> 1.5.5"])
       s.add_dependency(%q<httparty>, [">= 0.7.4"])
       s.add_dependency(%q<json>, [">= 1.4.3"])
-      s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_dependency(%q<fastercsv>, [">= 1.5.3"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
     end
   else
-    s.add_dependency(%q<govkit>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, ["~> 1.5.5"])
     s.add_dependency(%q<httparty>, [">= 0.7.4"])
     s.add_dependency(%q<json>, [">= 1.4.3"])
-    s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
     s.add_dependency(%q<fastercsv>, [">= 1.5.3"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
   end
 end
 

data/lib/gov_kit.rb

@@ -1,18 +1,29 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'csv'
 require 'digest/md5'
-require 'nokogiri'
 require 'iconv'
-require 'httparty'
-require 'open-uri'
 require 'json'
-require 'gov_kit/configuration'
-require 'csv'
+require 'open-uri'
 
 if RUBY_VERSION[0,3] == "1.8"
   require 'fastercsv'
 end
 
+require 'nokogiri'
+require 'httparty'
+
+# String#singularize in Resource#resource_for_collection
+require 'active_support/inflector'
+# String#last in Resource#method_missing
+require 'active_support/core_ext/string'
+# Object#blank? in Resource#parse
+# Object#duplicable? in Resource#unload
+require 'active_support/core_ext/object'
+
+require 'gov_kit/railtie'
+require 'gov_kit/configuration'
+
 module GovKit
   autoload :Resource, 'gov_kit/resource'
   autoload :OpenStates, 'gov_kit/open_states'

data/lib/gov_kit/configuration.rb

@@ -11,11 +11,11 @@ module GovKit
 
     def initialize
       @sunlight_apikey = @openstates_apikey = @votesmart_apikey = @ftm_apikey = ''
-      @openstates_base_url = 'openstates.sunlightlabs.com/api/v1/'
-      @transparency_data_base_url = 'transparencydata.com/api/1.0/'
-      @votesmart_base_url = 'api.votesmart.org/'
-      @ftm_base_url = 'api.followthemoney.org/'
-      @opencongress_base_url = 'www.opencongress.org/'
+      @openstates_base_url = 'openstates.org/api/v1'
+      @transparency_data_base_url = 'transparencydata.com/api/1.0'
+      @votesmart_base_url = 'api.votesmart.org'
+      @ftm_base_url = 'api.followthemoney.org'
+      @opencongress_base_url = 'api.opencongress.org'
       @technorati_base_url = 'api.technorati.com'
       @bing_base_url = 'api.search.live.net'
       @google_blog_base_url = 'blogsearch.google.com'

data/lib/gov_kit/follow_the_money.rb

@@ -6,8 +6,8 @@ module GovKit
   #
   # For the details on the FollowTheMoney queries, see {http://www.followthemoney.org/services/methods.phtml the FollowTheMoney API documentation}.
   class FollowTheMoneyResource < Resource
-    default_params :key => GovKit::configuration.ftm_apikey
     base_uri GovKit::configuration.ftm_base_url
+    format :xml
 
     # Common method used by subclasses to get data from the service.
     #
@@ -19,7 +19,10 @@ module GovKit
     #   doc = get_xml("/base_level.industries.list.php", :query => {:page => page_num})
     #
     def self.get_xml(path, options)
-      doc = Nokogiri::XML(get(path, options))
+      options[:query] ||= {}
+      options[:query][:key] = GovKit::configuration.ftm_apikey
+
+      doc = Nokogiri::XML(get(path, options).body)
 
       e = doc.search("//error")
 

data/lib/gov_kit/open_congress.rb

@@ -1,7 +1,7 @@
 require 'nokogiri'
 require 'open-uri'
 require 'json'
-require 'CGI'
+require 'cgi'
 
 module GovKit::OpenCongress
   autoload :Bill,               'gov_kit/open_congress/bill'
@@ -33,7 +33,7 @@ module GovKit::OpenCongress
     def self.construct_url(api_method, params)
       url = nil
       getkey = GovKit::configuration.opencongress_apikey.nil? ? "" : "&key=#{GovKit::configuration.opencongress_apikey}"
-      url = "http://#{GovKit::configuration.opencongress_base_url}api/#{api_method}?format=json#{hash2get(params)}#{getkey}"
+      url = "http://#{GovKit::configuration.opencongress_base_url}/#{api_method}?format=json#{hash2get(params)}#{getkey}"
       return url
     end
 
@@ -111,15 +111,7 @@ module GovKit::OpenCongress
     #
     # @return the returned data, as an array of hashes.
     def self.make_call(this_url)
-      result = nil
-      begin
-        result = JSON.parse(open(this_url).read)
-      rescue => e
-        puts e
-      end
-    
-      return result
-    
+      JSON.parse(open(this_url).read)
     end
   end
 end

data/lib/gov_kit/open_congress/bill.rb

@@ -123,46 +123,49 @@ module GovKit
       def self.parse_results(result)
       
         bills = []
-        result["bills"].each do |bill|
-        
-          these_recent_blogs = bill["recent_blogs"]
-          blogs = []
-
-          if these_recent_blogs
-            these_recent_blogs.each do |trb|
-              blogs << BlogPost.new(trb)
+        if Hash === result
+          result["bills"].each do |bill|
+            bill = bill['bill']
+
+            these_recent_blogs = bill["recent_blogs"]
+            blogs = []
+
+            if these_recent_blogs
+              these_recent_blogs.each do |trb|
+                blogs << BlogPost.new(trb)
+              end
             end
-          end
 
-          bill["recent_blogs"] = blogs
+            bill["recent_blogs"] = blogs
 
 
-          these_recent_news = bill["recent_news"]
-          news = []
-          if these_recent_news
-            these_recent_news.each do |trb|
-              news << NewsPost.new(trb)
+            these_recent_news = bill["recent_news"]
+            news = []
+            if these_recent_news
+              these_recent_news.each do |trb|
+                news << NewsPost.new(trb)
+              end
             end
-          end
 
-          bill["recent_news"] = news
+            bill["recent_news"] = news
 
-          these_co_sponsors = bill["co_sponsors"]
-          co_sponsors = []
-          if these_co_sponsors
-            these_co_sponsors.each do |tcs|
-              co_sponsors << Person.new(tcs)
+            these_co_sponsors = bill["co_sponsors"]
+            co_sponsors = []
+            if these_co_sponsors
+              these_co_sponsors.each do |tcs|
+                co_sponsors << Person.new(tcs)
+              end
             end
-          end
 
-          bill["co_sponsors"] = co_sponsors
+            bill["co_sponsors"] = co_sponsors
 
-        
-          bill["sponsor"] = Person.new(bill["sponsor"]) if bill["sponsor"]
-        
-        
-          bills << Bill.new(bill)
+
+            bill["sponsor"] = Person.new(bill["sponsor"]) if bill["sponsor"]
+
+            bills << Bill.new(bill)
+          end
         end
+
         bills
       end
 

data/lib/gov_kit/open_congress/person.rb

@@ -105,30 +105,31 @@ module GovKit
       def self.parse_results(result)
 
           people = []
-          result["people"].each do |person|
-          
-            these_recent_blogs = person["recent_blogs"]
-            blogs = []
-            these_recent_blogs.each do |trb|
-              blogs << BlogPost.new(trb)
-            end
+          if Hash === result
+            result["people"].each do |person|
+              person = person['person']
+
+              these_recent_blogs = person["recent_blogs"]
+              blogs = []
+              these_recent_blogs.each do |trb|
+                blogs << BlogPost.new(trb)
+              end
+              person["recent_blogs"] = blogs
 
-            person["recent_blogs"] = blogs
+              these_recent_news = person["recent_news"]
+              news = []
+              these_recent_news.each do |trb|
+                news << NewsPost.new(trb)
+              end
 
+              person["person_stats"] = PersonStat.new(person["person_stats"]) if person["person_stats"]
 
-            these_recent_news = person["recent_news"]
-            news = []
-            these_recent_news.each do |trb|
-              news << NewsPost.new(trb)
+              person["recent_news"] = news
+
+              people << Person.new(person)
             end
-          
-            person["person_stats"] = PersonStat.new(person["person_stats"]) if person["person_stats"]
-          
-            person["recent_news"] = news
-          
-            people << Person.new(person)
-          end      
-        
+          end
+
           people
             
       end