votesmart 0.3.3 → 0.4.0

data/Rakefile

@@ -18,17 +18,17 @@ end
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+# require 'spec/rake/spectask'
+# Spec::Rake::SpecTask.new(:spec) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.spec_files = FileList['spec/**/*_spec.rb']
+# end
+# 
+# Spec::Rake::SpecTask.new(:rcov) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.pattern = 'spec/**/*_spec.rb'
+#   spec.rcov = true
+# end
 
 task :spec => :check_dependencies
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 3
-:build: 
 :major: 0
-:minor: 3
+:minor: 4
+:patch: 0
+:build: 

data/lib/vote_smart.rb

@@ -1,21 +1,19 @@
-require 'rubygems'
-require 'ym4r/google_maps/geocoding'
 require 'active_support'
-include Ym4r::GoogleMaps
 
 module VoteSmart
   API_URL = "http://api.votesmart.org/"
   API_FORMAT = "JSON"
-  
-  mattr_accessor :api_key
-  
-  class RequestFailed < Exception; end
+
+  class << self
+    attr_accessor :api_key
+  end
+
+  class RequestFailed < StandardError; end
 end
 
 VoteSmart.api_key = "key"
 
-require "#{File.dirname(__FILE__)}/mcll4r/mcll4r.rb"
-require "#{File.dirname(__FILE__)}/vote_smart/common.rb"
+require "#{File.dirname(__FILE__)}/vote_smart/common"
 
 Dir["#{File.dirname(__FILE__)}/vote_smart/*.rb"].each do |source_file| 
   require source_file unless source_file == "#{File.dirname(__FILE__)}/vote_smart/common.rb"

data/lib/vote_smart/common.rb

@@ -1,7 +1,6 @@
 require 'json'
 require 'cgi'
 require 'patron'
-require 'ym4r/google_maps/geocoding'
 
 module VoteSmart
   module ParallelQueries

data/lib/vote_smart/official.rb

@@ -48,7 +48,9 @@ module VoteSmart
     end
     
     def self.find_all_by_address address, city, state, zip
-      placemark = Geocoding.get("#{address} #{city}, #{state} #{zip}").first
+      require 'ym4r/google_maps/geocoding'
+
+      placemark = Ym4r::GoogleMaps::Geocoding.get("#{address} #{city}, #{state} #{zip}").first
       
       return [] unless placemark
       
@@ -58,6 +60,8 @@ module VoteSmart
     end
 
     def self.find_all_by_state_and_latitude_and_longitude state, latitude, longitude
+      require "#{File.dirname(__FILE__)}/../mcll4r/mcll4r"
+
       response = Mcll4r.new.district_lookup(latitude, longitude)
       response = response["response"] if response
 

data/spec/vote_smart/official_spec.rb

@@ -41,7 +41,7 @@ module VoteSmart
     describe "find by address" do
       before :each do
         mcll4r = {"response" => {"state_lower" => {"district" => "1"}, "state_upper" => {"district" => "2"}}}
-        Geocoding.should_receive(:get).once.and_return([mock("placemark", :latitude => 2, :longitude => 10)])
+        Ym4r::GoogleMaps::Geocoding.should_receive(:get).once.and_return([mock("placemark", :latitude => 2, :longitude => 10)])
         Mcll4r.should_receive(:new).once.and_return(mock("mcll4r", :district_lookup => mcll4r))
       end
       

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: votesmart
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Dan Cunning
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -07:00
+date: 2010-11-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         - 4
@@ -44,7 +42,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - History.txt
 - README.rdoc
 - Rakefile
@@ -118,8 +115,8 @@ homepage: http://github.com/Empact/votesmart
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -127,7 +124,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -136,7 +132,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/.gitignore

@@ -1 +0,0 @@
-pkg/