ap 0.1.1

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Alex Coomans
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,53 @@
+= AP - Associated Press API Gem http://travis-ci.org/drcapulet/ap.png
+
+This is a Ruby API wrapper for the Assosciated Press API v2. This code was based on version 1.1 of the documentation, which was last revised 06/15/2010
+
+== Usage
+
+   require 'ap'
+   AP.configure do |config|
+     config.api_key = "your_api_key"
+   end
+   # Categories & Articles
+   categories = AP.categories
+     => [#<AP::Category:0x10226e118 @content="AP Online Top General Short Headlines", @id="category id", @title="AP Online Top General Short Headlines", @updated=Sat Apr 30 01:25:10 UTC 2011>, ....]
+   category = categories.first
+     => #<AP::Category:0x10226e118 @content="AP Online Top General Short Headlines", @id="category id", @title="AP Online Top General Short Headlines", @updated=Sat Apr 30 01:25:10 UTC 2011>
+   articles = category.articles
+     => [#<AP::Article:0x101e15440 @content="...html content..." @id="...AP Article ID....", @tags=["Property damage", "Tornados", "Humanitarian crises", ...,  "North America"], @link="...link to AP hosted version...", @title="...article title...", @updated=Sat Apr 30 00:07:01 UTC 2011, @authors=["Author 1", "Author 2"]>
+   articles.first.similar
+     => #<AP::Search:0x1018aa618 @query={:count=>20, :searchTerms=>"...article id...", :startPage=>1}, @search_type="similar", @total_results=0>
+   # Searching
+   search = AP::Search.new
+     => #<AP::Search:0x1018bb760 @query={:count=>20, :searchTerms=>[], :startPage=>1}, @search_type="request", @total_results=0>
+   search.contains("Obama").and.contains("Iraq")
+     => #<AP::Search:0x101891870 @query={:count=>20, :searchTerms=>["Obama", "AND", "Iraq"], :startPage=>1}, @search_type="request", @total_results=0>
+   search.fetch
+     => An array of AP::Articles
+   search.next_page?
+     => true
+   search.next_page
+     => An array of AP::Articles
+   search.clear
+   search.scoped do |s|
+     s.contains("Obama").or.contains("Iraq")
+   end.and.contains("Iran")
+   search.to_s
+     => "( Obama OR Iraq ) AND Iran"
+
+Why is all the inofrmation missing? I'm not sure exactly what I can share, so I'm being careful. Either way it gets the information across.
+
+== Contributing to ap
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+== Copyright
+
+Copyright (c) 2011 Alex Coomans. See LICENSE.txt for further details.
+

data/Rakefile

@@ -0,0 +1,40 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+Bundler::GemHelper.install_tasks
+
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+
+  task :test => :spec
+  task :default => :spec
+
+  # require 'rcov/rcovtask'
+  # Rcov::RcovTask.new do |test|
+  #   test.libs << 'test'
+  #   test.pattern = 'test/**/test_*.rb'
+  #   test.verbose = true
+  # end
+
+  require 'rake/rdoctask'
+  Rake::RDocTask.new do |rdoc|
+    version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = "ap #{version}"
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+rescue LoadError => e
+  puts e
+end

data/VERSION

@@ -0,0 +1 @@
+0.1.1

data/ap.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ap}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Alex Coomans"]
+  s.date = %q{2011-05-10}
+  s.description = %q{Ruby gem for interfacing with the Associated Press Breaking News API}
+  s.email = %q{alex@alexcoomans.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "ap.gemspec",
+    "lib/ap.rb",
+    "lib/ap/api.rb",
+    "lib/ap/article.rb",
+    "lib/ap/category.rb",
+    "lib/ap/client.rb",
+    "lib/ap/client/category.rb",
+    "lib/ap/configuration.rb",
+    "lib/ap/parser.rb",
+    "lib/ap/search.rb",
+    "lib/ap/version.rb",
+    "spec/ap/api_spec.rb",
+    "spec/ap/article_spec.rb",
+    "spec/ap/category_spec.rb",
+    "spec/ap/client/category_spec.rb",
+    "spec/ap/client_spec.rb",
+    "spec/ap/parser_spec.rb",
+    "spec/ap/search_spec.rb",
+    "spec/ap_spec.rb",
+    "spec/fixtures/categories-31990.xml",
+    "spec/fixtures/categories.xml",
+    "spec/fixtures/search-obama.xml",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/drcapulet/ap}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.1}
+  s.summary = %q{Ruby Associated Press API Gem}
+  s.test_files = [
+    "spec/ap/api_spec.rb",
+    "spec/ap/article_spec.rb",
+    "spec/ap/category_spec.rb",
+    "spec/ap/client/category_spec.rb",
+    "spec/ap/client_spec.rb",
+    "spec/ap/parser_spec.rb",
+    "spec/ap/search_spec.rb",
+    "spec/ap_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  
+  s.required_rubygems_version = ">= 1.3.6"
+  s.add_runtime_dependency(%q<httparty>, [">= 0.7.7"])
+  s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
+  s.add_development_dependency(%q<webmock>, [">= 1.6.2"])
+  s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+end
+

data/lib/ap.rb

@@ -0,0 +1,31 @@
+require 'httparty'
+require 'crack/xml'
+require 'cgi'
+
+require 'ap/version'
+require 'ap/parser'
+require 'ap/category'
+require 'ap/article'
+require 'ap/api'
+require 'ap/client'
+require 'ap/configuration'
+require 'ap/search'
+
+
+module AP
+  extend Configuration
+  
+  # Alias for AP::Client.new
+  def self.client(options = {})
+    AP::Client.new(options)
+  end
+
+  def self.method_missing(method, *args, &block)
+    return super unless client.respond_to?(method)
+    client.send(method, *args, &block)
+  end
+
+  def self.respond_to?(method, include_private = false)
+    client.respond_to?(method, include_private) || super(method, include_private)
+  end
+end

data/lib/ap/api.rb

@@ -0,0 +1,19 @@
+module AP
+  class API
+    include HTTParty
+    format :ap_xml
+    base_uri 'developerapi.ap.org'
+
+    class MissingAPIKeyError < StandardError; def to_s; "You didn't provide an API key"; end; end
+
+    def initialize(options = {})
+      options = AP.options.merge(options)
+      self.class.default_params :apiKey => options[:api_key]
+    end    
+    
+    def self.get(*args)
+      raise MissingAPIKeyError if default_params.nil? || default_params[:apiKey].nil? || default_params[:apiKey].empty?
+      super
+    end
+  end 
+end

data/lib/ap/article.rb

@@ -0,0 +1,40 @@
+module AP
+  class Article
+    attr_accessor :id, :title, :authors, :tags, :link, :content, :updated
+    
+    # Creates a new AP::Article object given the following attributes
+    # - id: the article id as reported by the AP
+    # - title: the title of the article
+    # - authors: an Array of the name(s) of the author(s) of this article
+    # - tags: and array of tags or categories that have been attached to this article
+    # - link: string with the hosted version on the AP site
+    # - content: the article content
+    # - updated: Time object of when the article was last updated
+    def initialize(opts = {})
+      @id = opts[:id]
+      @title = opts[:title]
+      @tags = opts[:tags] || []
+      @authors = opts[:authors] || []
+      @link = opts[:link]
+      @content = opts[:content]
+      @updated = opts[:updated]
+    end
+    
+    # Creates a new object from data returned by the API
+    def self.new_from_api_data(data)
+      if data["author"].is_a?(Hash)
+        authors = [ data["author"]["name"] ]
+      elsif data["author"].is_a?(Array)
+        authors = data["author"].collect{ |x| x["name"] }
+      end
+      categories = data["category"] ? data["category"].collect { |x| x["label"] } : []
+      return new(:id => data["id"].split(":").last, :title => data["title"], :authors => authors, :tags => categories, :link => data["link"]["href"], :content => data["content"], :updated => Time.parse(data["updated"]))
+    end
+    
+    # Returns a search object that when fetched, will find articles
+    # similar to this one. Refer to AP::Search for more information
+    def similar
+      return AP::Search.similar(@id)
+    end
+  end
+end

data/lib/ap/category.rb

@@ -0,0 +1,28 @@
+module AP
+  class Category
+    attr_accessor :id, :title, :content, :updated
+    
+    
+    # Creates a new AP::Category object given the following attributes
+    # - id: the category id as reported by the AP
+    # - title: the title/name of the category
+    # - content: the category content. most often is the same as the title
+    # - updated: Time object of when the article was last updated
+    def initialize(opts = {})
+      @id = opts[:id]
+      @title = opts[:title]
+      @content = opts[:content]
+      @updated = opts[:updated]
+    end
+    
+    # Creates a new object from data returned by the API
+    def self.new_from_api_data(data)
+      return new(:id => data["id"].split(":").last, :title => data["title"], :content => data["content"], :updated => Time.parse(data["updated"]))
+    end
+    
+    # Returns an array of AP::Article objects that represent recent news in this category
+    def articles
+      return AP.category(@id)
+    end
+  end
+end

data/lib/ap/client.rb

@@ -0,0 +1,8 @@
+module AP
+  # Wrapper for the Associated Press API
+  class Client < API
+    require 'ap/client/category'
+    
+    include AP::Client::Category
+  end
+end

data/lib/ap/client/category.rb

@@ -0,0 +1,15 @@
+module AP
+  class Client
+    module Category
+      # Returns an array of AP::Category objects representing the news categories
+      def categories
+        self.class.get("/v2/categories.svc/")["feed"]["entry"].collect { |e| AP::Category.new_from_api_data(e) }
+      end
+
+      # Returns an array of AP::Articles objects representing recent news in a category
+      def category(id)
+        self.class.get("/v2/categories.svc/#{id}")["feed"]["entry"].collect { |e| AP::Article.new_from_api_data(e) }
+      end
+    end
+  end
+end

data/lib/ap/configuration.rb

@@ -0,0 +1,47 @@
+module AP
+  # thanks to jnunemaker's twitter gem for this
+  # Defines constants and methods related to configuration
+  module Configuration
+    # An array of valid keys in the options hash
+    VALID_OPTIONS_KEYS = [
+      :api_key,
+      :user_agent,
+      :search_query_defaults].freeze
+      
+    # @private
+    attr_accessor *VALID_OPTIONS_KEYS
+
+    # When this module is extended, set all configuration options to their default values
+    def self.extended(base)
+      base.reset
+    end
+
+    # Convenience method to allow configuration options to be set in a block
+    def configure
+      yield self
+    end
+
+    # Create a hash of options and their values
+    def options
+      options = {}
+      VALID_OPTIONS_KEYS.each{|k| options[k] = send(k) }
+      options
+    end
+    
+    DEFAULT_API_KEY = nil
+    
+    DEFAULT_USER_AGENT = "Ruby AP Gem #{::AP::VERSION}".freeze
+    
+    DEFAULT_SEARCH_SETTINGS = {
+      :count => 20
+    }.freeze
+
+    # Reset all configuration options to defaults
+    def reset
+      self.api_key                = DEFAULT_API_KEY
+      self.user_agent             = DEFAULT_USER_AGENT
+      self.search_query_defaults  = DEFAULT_SEARCH_SETTINGS
+      self
+    end
+  end
+end

data/lib/ap/parser.rb

@@ -0,0 +1,19 @@
+# This is a monkey-patch to HTTParty because the AP API doesn't return the HTML in the <content>
+# tag in CDATA tags, so we need to gsub the response to add them before being parsed
+class HTTParty::Parser
+  SupportedFormats.merge!(
+    {
+      'text/xml'               => :ap_xml,
+      'application/xml'        => :ap_xml
+    }
+  )
+  
+  # Fixes and parses the XML returned by the AP
+  # Why is it broken? The HTML content doesn't include CDATA tags
+  def ap_xml
+    # other gsub could be negaitve /<content?([A-Za-z "=]+)>(?!<\!\[CDATA\[)/
+    # but CS theory says that isn't a good idea, and so does running time tests
+    Crack::XML.parse(body.gsub(/<content?([A-Za-z "=]+)><\!\[CDATA\[/, '<content>').gsub(/\]\]><\/content>/, "</content>").gsub(/<content?([A-Za-z "=]+)>/, "<content><![CDATA[").gsub(/<\/content>/, "]]></content>"))
+    # Crack::XML.parse(body.gsub(/<content?([A-Za-z "=]+)>(?!<\!\[CDATA\[)/, "<content><![CDATA[").gsub(/<\/content>/, "]]></content>"))
+  end
+end

data/lib/ap/search.rb

@@ -0,0 +1,275 @@
+module AP
+  class Search < API
+    attr_reader :query, :search_type
+    
+    # Error class for when unsupported methords are called on searches that
+    # don't have the seach_type to "request" (that is the default). This error
+    # is railed on objects obtained by the similar(id) method
+    class UnsupportedSearchMethod < StandardError; def to_s; "This method isn't supported for this search type"; end; end
+    class InvalidGeocodinates < StandardError; def to_s; "Latitude must be between -90 and 90 and longitude must be between -180 and 180"; end; end
+    
+    # Returns a new Search object
+    def initialize
+      clear
+      super
+    end
+    
+    # Returns a new Search object that will search for articled
+    # similar to the one provided by the id parameter
+    # The id parameter will the same as the id returned by an AP::Article
+    # object. Supports limited functionality compared to a standard object:
+    #  - clear
+    #  - geocode
+    #  - location
+    #  - sort_by_locaation
+    #  - to_s
+    #  - per_page
+    #  - page
+    #  - next_page?
+    #  - next_page
+    #  - fetch
+    def self.similar(id)
+      obj = self.new
+      obj.instance_variable_set(:@search_type, "similar")
+      obj.instance_variable_set(:@query, obj.query.merge!(AP.search_query_defaults).merge!({ :searchTerms => id }))
+      return obj
+    end
+    
+    # Resets every parameter of a Search object
+    # When called upon a Search object with a search type of similar
+    # it will reset it a request search
+    def clear
+      @query = {}
+      @query[:searchTerms] = []
+      @query[:startPage] = 1
+      @query[:count] = 20
+      @total_results = 0
+      @search_type = "request"
+      self
+    end
+    
+    # Basic Keyword Search
+    # A basic query contains one or more words and no operators.
+    # Sample Query        Returned Results
+    # Iraq                Returns all documents containing the word “Iraq” and related word variations, such as “Iraqi”, but not “Iran”.
+    # iraq                Returns the same results as Iraq (case is ignored).
+    # Obama Iraq Obama    Returns the same results as Obama Iraq (repeated words are ignored).
+    # Example Usage:
+    #   search.containing("obama")
+    #   search.containing("iraq")
+    #   search.contains("iraq")
+    #   search.q("iraq")
+    # Aliased as contains and q
+    def containing(query)
+      raise UnsupportedSearchMethod unless @search_type == "request"
+      @query[:searchTerms] << query
+      return self
+    end
+    alias :contains :containing
+    alias :q :containing
+    
+    # Exact Keyword Search (quotation marks)
+    # Sample Query          Returned Results
+    # "Iraq"                Returns all documents containing the word “Iraq”. Since stemming is not applied to the words in quotation marks, the query will match “Iraq” but not “Iraqi”.
+    # "iraq"                Returns the same results as Iraq (case is still ignored in quoted text).
+    # "Barack Obama" Iraq   Returns all documents containing “Barack Obama” and “Iraq”. Stemming is applied to “Iraq”, so the query will match “Barack Obama announces Iraqi elections”, but will not match “President Obama visits Iraq”.
+    # "The Who" Performed   Stop words are not ignored in the quoted text. This query will match “The Who performed at MSG”, but will not match “Who performed at MSG?”
+    # Example Usage:
+    # For the query "Iraq":
+    #   search.exact("Iraq")
+    # For the query "Barack Obama" Iraq:
+    #   search.exact("Brack Obama")
+    #   search.contains("Iraq")
+    def exact(query)
+      raise UnsupportedSearchMethod unless @search_type == "request"
+      @query[:searchTerms] << "\"#{query}\""
+      return self
+    end
+    
+    # Wildcard search for one character
+    # Sample Query        Returned Results
+    # Ira?                This query matches any four-letter word beginning with “ira.” It matches “Iraq” and “Iran,” but does not match “Iris,” “IRA,” “miracle,” “IRAAM” or “Aardvark.”
+    # Obama AND ira?      This search returns any document containing “Obama” and any four-letter word beginning with “ira.” This query will match “Obama visits Iraq” or “Obama visits Iran.” It will not match “Will Obama meet the IRA?”
+    # Obama AND	"ira?"    Wildcards are considered even when the term is enclosed in quotation marks. This query is equivalent to Obama AND ira?
+    # Example usage:
+    # For the query Ira?
+    #   search.matches("Ira")
+    def matches(prefix)
+      raise UnsupportedSearchMethod unless @search_type == "request"
+      @query[:searchTerms] << prefix.to_s + "?"
+      return self
+    end
+    
+    # Matches words beginning with passed string
+    # Sample Query    Returned Results
+    # ira*            This query matches any word beginning with “ira.” It matches “Iraq,” “Iran,” “IRA” and “IRAAM.” It does not match “Iris,” “miracle” or “aardvark.”
+    # Example usage:
+    #   search.loose_match("ira")
+    def loose_match(str) # loose match
+      raise UnsupportedSearchMethod unless @search_type == "request"
+      @query[:searchTerms] << str.to_s + "*"
+      return self
+    end
+    
+    # Filter search results to latitude & longitude
+    # within a specific radius
+    # Parameters:
+    # - latitude: The latitude of the location. The range of possible values is -90 to 90.
+    # - longitude: The longitude of the location. The range of possible values is -180 to 180. (Note: If both latitude and longitude are specified, they wil take priority over all other location parameters - for example the location method)
+    # - radius: The distance in miles from the specified location. The default is 50
+    # Example:
+    #   search.geocode(37.760401, -122.416534)
+    # The example above would limit results to the San Francisco bay area, shown by this map[http://www.freemaptools.com/radius-around-point.htm?clat=37.760401&clng=-122.41653400000001&r=80.47&lc=FFFFFF&lw=1&fc=00FF00]
+    def geocode(latitude, longitude, radius = 50)
+      raise InvalidGeocodinates unless (-90 <= latitude && latitude <= 90 && -180 <= longitude && longitude <= 180)
+      @query[:latitude] = latitude
+      @query[:longitude] = longitude
+      @query[:radius] = radius
+      return self
+    end
+    
+    # Filter a search around a City/State/Zip Code
+    # Valid combinations:
+    # - US zip code
+    # - City, State
+    # - City, State, Zip
+    # Note: If zip code is specified, it will take priority over city and state.
+    # The options hash takes three parameters:
+    # - :city
+    # - :state should be in two letter form; e.g. TX for Texas, AZ for Arizona
+    # - :zip_code
+    # Examples:
+    #   search.location(:city => "Fremont", :state => "CA", :zip_code => "94536")
+    #   search.location(:city => "Los Angeles", :state => "CA")
+    #   search.location(:zip_code => "99652")
+    def location(opts = {})
+      if opts[:city] && opts[:state] && opts[:zip_code]
+        @query[:location] = opts[:city] + ", " + opts[:state] + ", " + opts[:zip_code].to_s
+      elsif opts[:zip_code]
+        @query[:location] = opts[:zip_code].to_s
+      elsif opts[:city] && opts[:state]
+        @query[:location] = opts[:city] + ", " + opts[:state]
+      end
+      return self
+    end
+    
+    # Orders results by proximity to the specified location
+    # Default parameter is true
+    # Examples:
+    #   search.sort_by_location # will sort by location
+    #   search.sort_by_location(true) # same as above
+    #   search.sort_by_location(false) # will not sort by proximity
+    def sort_by_location(sort = true)
+      @query[:sortByLocation] = sort
+      return self
+    end
+    
+    # Scopes all of the following commands in parentheses to specify order.
+    # It yields itself during the block, so it's the exact same object you
+    # have been working with
+    # Examples:
+    #   search.scoped do |s|
+    #     s.contains("Obama")
+    #     s.or()
+    #     s.contains("Iraq")
+    #   end
+    #   search.and()
+    #   search.contains("Iran")
+    # Will produce the query: (Obama OR Iraq) AND Iran
+    def scoped(&block)
+      raise UnsupportedSearchMethod unless @search_type == "request"
+      @query[:searchTerms] << "("
+      yield self
+      @query[:searchTerms] << ")"
+      return self
+    end
+    
+    # Returns the query represented in string form
+    # the way it will be submitted to the api
+    def to_s
+      return @query[:searchTerms].join(" ")
+    end
+    
+    # Represents the AND boolean operator in the query
+    # Sample Query                  Returned Results
+    # Obama AND Iraq AND election   Returns all documents containing all of the words “Obama,” “Iraq,” and “election.” This is equivalent to Obama Iraq Election.
+    # Example:
+    #   search.contains("Obama")
+    #   search.and()
+    #   search.contains("Iraq")
+    # Produces: Obama AND Iraw
+    def and
+      raise UnsupportedSearchMethod unless @search_type == "request"
+      @query[:searchTerms] << "AND" unless(@query[:searchTerms].last == "(" || @query[:searchTerms].last == nil || @query[:searchTerms].last == "OR" || @query[:searchTerms].last == "AND" || @query[:searchTerms].last == "AND NOT")
+      return self
+    end
+    
+    # Represents the OR boolean operator in the query
+    # Sample Query      Returned Results
+    # Obama OR Iraq     Returns all documents containing either “Obama” or “Iraq.” The query will match both “Barack Obama” and “Iraqi elections.”
+    # Example:
+    #   search.contains("Obama")
+    #   search.or()
+    #   search.contains("Iraq")
+    # Produces: Obama OR Iraq
+    def or
+      raise UnsupportedSearchMethod unless @search_type == "request"
+      @query[:searchTerms] << "OR" unless(@query[:searchTerms].last == "(" || @query[:searchTerms].last == nil || @query[:searchTerms].last == "OR" || @query[:searchTerms].last == "AND" || @query[:searchTerms].last == "AND NOT")
+      return self
+    end
+    
+    # Represents the AND NOT boolean operator in the query
+    # Sample Query                    Returned Results
+    # Obama AND Iraq AND NOT Iran     Returns all documents that contain both “Obama” and “Iraq,” but not “Iran.”
+    # Example:
+    #   search.contains("Obama")
+    #   search.and()
+    #   search.contains("Iraq")
+    #   search.and_not()
+    #   search.contains("Iran")
+    # Produces: Obama AND Iraq AND NOT Iran
+    def and_not
+      raise UnsupportedSearchMethod unless @search_type == "request"
+      @query[:searchTerms] << "AND NOT" unless(@query[:searchTerms].last == "(" || @query[:searchTerms].last == nil || @query[:searchTerms].last == "OR" || @query[:searchTerms].last == "AND" || @query[:searchTerms].last == "AND NOT")
+      return self
+    end
+   
+    # Sets the number of results to return per page
+    # Defaults to 20
+    def per_page(pp = 20)
+      @query[:count] = pp
+      return self
+    end
+    
+    # Sets the page to the parameter so you can fetch it
+    def page(p = 1)
+      @query[:startPage] = p
+      return self
+    end
+    
+    # Returns whether or not there is a next page
+    def next_page?
+      return (@query[:startPage] * (@query[:count] + 1)) < @total_results
+    end
+    
+    # Returns the next page if next_page? is true
+    def next_page
+      if next_page?
+        @query[:startPage] += 1
+        fetch
+      end
+    end
+    alias :fetch_next_page :next_page
+    
+    # Fetches and parses the search response. An array of AP::Article objects
+    # are returned
+    # Example:
+    #   search.contains("Obama").and.contains("Iraq").fetch
+    def fetch
+      data = self.class.get("/v2/search.svc/#{@search_type}/", :query => @query.merge({ :searchTerms => CGI.escape(@query[:searchTerms].join(" ")) }))
+      r = data["feed"]["entry"].collect { |e| AP::Article.new_from_api_data(e) }
+      @total_results = data["feed"]["opensearch:totalResults"].to_i
+      return r
+    end
+  end
+end