overlord 0.1.6 → 0.1.7

data/README.rdoc

@@ -16,7 +16,7 @@ In case it doesn't install dependencies:
 
 === Settings
 This gem requires some configuration before it will work in your Rails application:
-You will need a global_config file with 'google_ajax_api_key' and 'google_ajax_referer' defined.  You can set it up thus:
+You will need a global_config file with 'google_ajax_api_key' and 'request_referer' defined.  You can set it up thus:
 
   # Load a global constant so the initializers can use them
   require 'ostruct'
@@ -42,11 +42,11 @@ Then in global_config.yml:
 
     # Google related
     google_ajax_api_key:            # Google ajax api key
-    google_ajax_referer:            # Website making the request.  Required by Google.
+    request_referer:                # Website making the request.  Required by Google.
     show_google_search: true        # Determines whether or not a google search is displayed on the topic page
     load_feeds_on_server: false     # Determines whether feeds on a topic page are loaded on the server or the client.  Loading on the server can take a while
     combine_feeds_on_server: false  # Combines feeds loaded on the server
-
+   
   production:
     <<: *DEFAULT
   

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/overlord/google_base.rb

@@ -27,13 +27,20 @@ module Overlord
       query_options[:key] = key if key
       query_options
     end
-  
+    
+    # Gets and parses json from a given url
+    # uri:      Uri from which to obtain json
+    # options:  Options to be sent
+    #           :query - query
+    #           :headers - headers 
     def self.get(uri, options)
       header_params = { "UserAgent" => "Ruby/#{RUBY_VERSION}" }
-      ref = self.referer || GlobalConfig.google_ajax_referer rescue nil
+      ref = self.referer || GlobalConfig.request_referer rescue nil
       header_params["Referer"] = ref if ref
+      header_params = header_params.merge(options[:headers]) if options[:headers]
       # to_params comes from the httparty gem
-      buffer = open("#{uri}?#{options[:query].to_params}", header_params).read
+      params = "?#{options[:query].to_params}" if options[:query]
+      buffer = open("#{uri}#{params}", header_params).read
       
       # Try the standard parser
       begin
@@ -52,6 +59,14 @@ module Overlord
       {}
     end
     
+    def self.parse_name(name)
+      return '' if name.blank?
+      names = name.split(' ')
+      return '' if names.length <= 0
+      return [names[0], names[0]] if names.length == 1
+      [names[0], names.slice(1, names.length).join(' ')]
+    end
+    
   end
   
   

data/overlord.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{overlord}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2009-12-10}
+  s.date = %q{2009-12-23}
   s.description = %q{Code to interact with the google ajax apis on the server and the client.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

data/test/rails_root/config/global_config.yml

@@ -15,7 +15,7 @@ default: &DEFAULT
 
   # Google related
   google_ajax_api_key:            # A google ajax api key - http://code.google.com/apis/ajaxsearch/signup.html
-  google_ajax_referer:            # The url of the site making the request.
+  request_referer:            # The url of the site making the request.
   show_google_search: true        # Determines whether or not a google search is displayed on the topic page
   load_feeds_on_server: false     # Determines whether feeds on a topic page are loaded on the server or the client.  Loading on the server can take a while
   combine_feeds_on_server: false  # Combines feeds loaded on the server

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: overlord
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 -07:00
+date: 2009-12-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency