fireeagle.rb in jnewland-fireeagle-0.8.0.1

- old
+ new

@@ -3,14 +3,22 @@
 require 'rubygems'
 gem 'oauth', ">= 0.2.4"
 require 'oauth/helper'
 require 'oauth/client/helper'
 require 'oauth/request_proxy/net_http'
-require 'hpricot'
 require 'geo_ruby'
+require 'happymapper'
 
-class FireEagle
+require File.dirname(__FILE__) + '/fireeagle/client'
+require File.dirname(__FILE__) + '/fireeagle/location'
+require File.dirname(__FILE__) + '/fireeagle/locations'
+require File.dirname(__FILE__) + '/fireeagle/location_hierarchy'
+require File.dirname(__FILE__) + '/fireeagle/user'
+require File.dirname(__FILE__) + '/fireeagle/error'
+require File.dirname(__FILE__) + '/fireeagle/response'
+
+module FireEagle
   API_SERVER = "https://fireeagle.yahooapis.com"
   AUTH_SERVER = "https://fireeagle.yahoo.net"
   REQUEST_TOKEN_PATH = "/oauth/request_token"
   ACCESS_TOKEN_PATH  = "/oauth/access_token"
   AUTHORIZATION_URL  = "#{AUTH_SERVER}/oauth/authorize"
@@ -23,18 +31,15 @@
   FORMAT_XML         = "xml"
   UPDATE_PARAMS      = :lat, :lon, :woeid, :place_id, :address, :mnc, :mcc, :lac, :cellid, :postal, :city, :state, :country, :q, :label
                         # not yet supported
                         #,:geom, :upcoming_venue_id, :yahoo_local_id, :plazes_id
 
-  class Error < RuntimeError #:nodoc:
+  class ArgumentError < StandardError #:nodoc:
   end
 
-  class ArgumentError < Error #:nodoc:
+  class FireEagleException < StandardError #:nodoc:
   end
-
-  class FireEagleException < Error #:nodoc:
-  end
 end
 
 # FireEagle additions to the <code>Hash</code> class
 class Hash
   # Returns <code>true</code> if the ALL or NONE of the given keys are present in <i>my_keys</i>.
@@ -57,10 +62,5 @@
     http_object.verify_mode = OpenSSL::SSL::VERIFY_NONE if uri.scheme=="https"
     http_object
   end
   alias_method :create_http, :create_http_without_verify
 end
-
-require File.dirname(__FILE__) + '/fireeagle/client'
-require File.dirname(__FILE__) + '/fireeagle/location'
-require File.dirname(__FILE__) + '/fireeagle/user'
-require File.dirname(__FILE__) + '/fireeagle/response'