marauder 0.1.1.2 → 0.1.1.3

data/README.rdoc

@@ -16,10 +16,18 @@ Check out the Google Base API Documentation for more info: http://code.google.co
 	
 	Marauder.search(query)
 	
-Returns an array of OpenStruct objects with getters for all data provided by the Google Base.
+Or:
+
+	Marauder::SearchRequest.new(query).process
+	
+Returns an array of Results containing all data provided by Google Base.
 
 	Marauder.find_by_google_id(google_id)
+	
+Or:
+
+	Marauder::ItemRequest.new(google_id).process
 
-Returns OpenStruct object of object.
+Returns Result.
 	
 	

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('marauder', '0.1.1.2') do |p|
+Echoe.new('marauder', '0.1.1.3') do |p|
   p.description               = "Wrapper for the Google Base product search API."
   p.url                       = "http://github.com/samueljamesbell/marauder"
   p.author                    = "Sam Bell"

data/lib/marauder.rb

@@ -1,66 +1,91 @@
+require 'net/http'
+require 'rexml/document'
+
 module Marauder
-  require 'net/http'
-  require 'rexml/document'
-  require 'ostruct'
-  
   
-  def self.search(query)
-    formatted_query = query.gsub(/[ ]/, '+')
-    url = "http://www.google.com/base/feeds/snippets?bq=#{formatted_query}"
-    xml_data = Net::HTTP.get_response(URI.parse(url)).body
-    
-    self.process_xml(xml_data)
+  def self.search(query, params = {})
+    extra_params = []
+    unless params.nil?
+      params.each {|attribute, value| extra_params << "[#{attribute}:#{value}]"}
+    end
+    SearchRequest.new(query, extra_params).process
   end
-  
-  def self.search_by_attribute(query, attribute, value)
-    formatted_query = query.gsub(/[ ]/, '+')
-    url = "http://www.google.com/base/feeds/snippets?q=#{formatted_query}&bq=[#{attribute}:#{value}]"
-    xml_data = Net::HTTP.get_response(URI.parse(url)).body
-      
-    self.process_xml(xml_data)
+
+  def self.find_by_google_id(google_id)
+    ItemRequest.new(google_id).process
   end
   
-  def self.find_by_google_id(google_id)
-    xml_data = Net::HTTP.get_response(URI.parse(google_id)).body
-    doc = REXML::Document.new(xml_data)
+  class ItemRequest
+    attr_accessor :url
     
-    entry = doc.elements['entry']
+    def initialize(google_id)
+      self.url = google_id
+    end
     
-    self.create_ostruct(entry)
+    def process
+      xml_data = Net::HTTP.get_response(URI.parse(url)).body
+      doc = REXML::Document.new(xml_data)
+      entry = doc.elements['entry']
+      
+      Result.new(entry)
+    end
   end
-  
-  private
-  
-  def self.process_xml(xml_data)
-    doc = REXML::Document.new(xml_data)
 
-    entries = []
-    doc.elements.each('feed/entry') {|element| entries << element}
+  class SearchRequest
+    attr_accessor :url
     
-    results = []    
-    entries.each do |entry|
-      r = self.create_ostruct(entry)
-      results << r
+    def initialize(query, extra_params = [])
+      formatted_query = format_query(query)
+      if extra_params.empty?
+        self.url = "http://www.google.com/base/feeds/snippets?q=#{formatted_query}"
+      else
+        formatted_params = extra_params.join(",")
+        self.url = "http://www.google.com/base/feeds/snippets?q=#{formatted_query}&bq=#{formatted_params}"
+      end
     end
     
-    return results
+    def process
+      xml_data = Net::HTTP.get_response(URI.parse(url)).body
+      doc = REXML::Document.new(xml_data)
+      
+      results = []
+      doc.elements.each("feed/entry") do |entry|
+        results << Result.new(entry) 
+      end
+
+      results
+    end
+        
+    private
+        
+    def format_query(query)
+      return query.gsub(/[ ]/, '+')
+    end
+  
   end
   
-  def self.create_ostruct(entry)
-    r = OpenStruct.new
-    entry.elements.each do |element|
-      if element.name == 'id'
-        r.google_id = entry.elements['id'].text
-      elsif element.name.gsub(/g:/,'') == 'author'
-        r.author_name = entry.elements['author'].elements['name'].text
-      else
-        m = element.name.gsub(/g:/,'').to_s
-        method = m + "="
-        r.send method.to_sym, element.text
+  class Result
+    attr_accessor :hash
+    
+    def initialize(entry)
+      self.hash = {}
+
+      entry.elements.each do |element|        
+        case element.name
+        when /id/
+          hash['google_id'] = entry.elements['id'].text
+        when 'g:author'
+          hash['author_name'] = entry.elements['author'].elements['name'].text
+        else
+          hash[element.name.gsub(/g:/, '')] = element.text 
+        end
       end
     end
-    
-    return r
+
+    def method_missing(method, *args)
+      puts hash.inspect
+      hash.has_key?(method.to_s) ? hash[method.to_s] : super
+    end
   end
   
 end

data/marauder.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{marauder}
-  s.version = "0.1.1.2"
+  s.version = "0.1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Bell"]
-  s.date = %q{2010-07-22}
+  s.date = %q{2010-07-26}
   s.description = %q{Wrapper for the Google Base product search API.}
   s.email = %q{samueljamesbell@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "README.rdoc", "lib/marauder.rb"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: marauder
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: false
   segments: 
   - 0
   - 1
   - 1
-  - 2
-  version: 0.1.1.2
+  - 3
+  version: 0.1.1.3
 platform: ruby
 authors: 
 - Sam Bell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 +01:00
+date: 2010-07-26 00:00:00 +01:00
 default_executable: 
 dependencies: []