From ad4549b4e27bd229ae6ad24bdc956a485272e894 Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 27 Jul 2011 15:43:24 -0400 Subject: [PATCH] Use autoload instead of require. General cleanup. Fix a typo. --- lib/linked_in/api.rb | 6 ++++++ lib/linked_in/client.rb | 6 ------ lib/linked_in/errors.rb | 8 ++++---- lib/linked_in/helpers.rb | 6 ++++++ lib/linked_in/helpers/authorization.rb | 6 +++--- lib/linked_in/search.rb | 6 +++--- lib/linkedin.rb | 12 +++++++----- 7 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 lib/linked_in/api.rb create mode 100644 lib/linked_in/helpers.rb diff --git a/lib/linked_in/api.rb b/lib/linked_in/api.rb new file mode 100644 index 00000000..cb1b0dcd --- /dev/null +++ b/lib/linked_in/api.rb @@ -0,0 +1,6 @@ +module LinkedIn + module Api + autoload :QueryMethods, "linked_in/api/query_methods" + autoload :UpdateMethods, "linked_in/api/update_methods" + end +end diff --git a/lib/linked_in/client.rb b/lib/linked_in/client.rb index 417560cd..fdf99dca 100644 --- a/lib/linked_in/client.rb +++ b/lib/linked_in/client.rb @@ -1,9 +1,3 @@ -require 'linked_in/helpers/request' -require 'linked_in/helpers/authorization' -require 'linked_in/api/query_methods' -require 'linked_in/api/update_methods' -require 'linked_in/search' - require 'cgi' module LinkedIn diff --git a/lib/linked_in/errors.rb b/lib/linked_in/errors.rb index f6c71fbb..61dfac0f 100644 --- a/lib/linked_in/errors.rb +++ b/lib/linked_in/errors.rb @@ -13,8 +13,8 @@ class RateLimitExceededError < LinkedInError; end class UnauthorizedError < LinkedInError; end class GeneralError < LinkedInError; end - class UnavailableError < StandardError; end - class InformLinkedInError < StandardError; end - class NotFoundError < StandardError; end + class UnavailableError < StandardError; end + class InformLinkedInError < StandardError; end + class NotFoundError < StandardError; end -end \ No newline at end of file +end diff --git a/lib/linked_in/helpers.rb b/lib/linked_in/helpers.rb new file mode 100644 index 00000000..b8bbf315 --- /dev/null +++ b/lib/linked_in/helpers.rb @@ -0,0 +1,6 @@ +module LinkedIn + module Helpers + autoload :Authorization, "linked_in/helpers/authorization" + autoload :Request, "linked_in/helpers/request" + end +end diff --git a/lib/linked_in/helpers/authorization.rb b/lib/linked_in/helpers/authorization.rb index c77f6bee..01e1091f 100644 --- a/lib/linked_in/helpers/authorization.rb +++ b/lib/linked_in/helpers/authorization.rb @@ -7,8 +7,8 @@ module Authorization :request_token_path => "/uas/oauth/requestToken", :access_token_path => "/uas/oauth/accessToken", :authorize_path => "/uas/oauth/authorize", - :api_host => 'https://api.linkedin.com', - :auth_host => 'https://www.linkedin.com' + :api_host => "https://api.linkedin.com", + :auth_host => "https://www.linkedin.com" } def consumer @@ -64,4 +64,4 @@ def full_oauth_url_for(url_type, host_type) end end -end \ No newline at end of file +end diff --git a/lib/linked_in/search.rb b/lib/linked_in/search.rb index 5bcb9c28..34ee4227 100644 --- a/lib/linked_in/search.rb +++ b/lib/linked_in/search.rb @@ -18,12 +18,12 @@ def search(options={}) def format_options_for_query(opts) opts.inject({}) do |list, kv| key, value = kv.first.to_s.gsub("_","-"), kv.last - list[key] = sanatize_value(value) + list[key] = sanitize_value(value) list end end - def sanatize_value(value) + def sanitize_value(value) value = value.join("+") if value.is_a?(Array) value = value.gsub(" ", "+") if value.is_a?(String) value @@ -31,4 +31,4 @@ def sanatize_value(value) end -end \ No newline at end of file +end diff --git a/lib/linkedin.rb b/lib/linkedin.rb index 1e48f320..e6137897 100644 --- a/lib/linkedin.rb +++ b/lib/linkedin.rb @@ -22,9 +22,11 @@ def configure end end + autoload :Api, "linked_in/api" + autoload :Client, "linked_in/client" + autoload :Mash, "linked_in/mash" + autoload :Errors, "linked_in/errors" + autoload :Helpers, "linked_in/helpers" + autoload :Search, "linked_in/search" + autoload :Version, "linked_in/version" end - -require 'linked_in/mash' -require 'linked_in/errors' -require 'linked_in/client' -require 'linked_in/version'