vast_api 0.0.1 → 0.0.4

data/Rakefile

@@ -13,7 +13,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "vast_api"
-  gem.homepage = "http://github.com/ryanong/vast_api"
+  gem.homepage = "http://github.com/carzen/vast_api"
   gem.license = "MIT"
   gem.summary = "A ruby wrapper for the http://www.vast.com/ api"
   gem.description = "A ruby wrapper for the http://www.vast.com/ api"

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.4

data/lib/vast_api/attributes/entry.rb

@@ -10,29 +10,29 @@ class VastApi
         end
       end
       
-      def author
-        @attributes['author'] ||= get_children(@doc.at('author'))
-      end
-    
       def attribute(var_name)
         @attributes[var_name] ||=
           if %W{author updated}.index(var_name)
             self.send(var_name)
           elsif %W{ title id content }.index(var_name)
-            get_var(var_name)
+            get_var('xmlns:'+var_name)
           else
-            get_var("//v:#{var_name}")
+            get_var("v:#{var_name}")
           end
       end
       
+      def author
+        @attributes['author'] ||= get_children(@doc.at_xpath('xmlns:author'))
+      end
+
       def updated
-        @attributes["updated"] ||= DateTime.strptime(@doc.at("updated").content)
+        @attributes["updated"] ||= DateTime.strptime(@doc.at_xpath('xmlns:updated').content)
       end
             
       private
 
       def get_var(var_name)
-        if var = @doc.at(var_name)
+        if var = @doc.at_xpath(var_name)
           var.text
         else
           nil

data/lib/vast_api/listings/entry.rb

@@ -1,6 +1,7 @@
 class VastApi
   class Listings
     class Entry
+      attr_reader :doc
       def initialize(doc)
         @doc = doc
         @attributes = {}
@@ -11,9 +12,9 @@ class VastApi
           if %W{id author link feeds updated published}.index(var_name)
             self.send(var_name)
           elsif %W{ title }.index(var_name)
-            get_var(var_name)
+            get_var('xmlns:'+var_name)
           else
-            get_var("//v:#{var_name}")
+            get_var("v:#{var_name}")
           end
       end
 
@@ -31,34 +32,39 @@ class VastApi
       end
       
       def id
-        @attributes['id'] ||= get_var('//v:item_id')
+        @attributes['id'] ||= get_var('v:item_id')
       end
 
       def link
-        @attributes['link'] ||= get_var('id')
+        @attributes['link'] ||= get_var('xmlns:id')
       end
 
       def author
-        @attributes['author'] ||= get_children(@doc.at('author'))
+        @attributes['author'] ||= get_children(@doc.at_xpath('xmlns:author'))
       end
 
       def updated
-        @attributes["updated"] ||= DateTime.strptime(@doc.at("updated").content)
+        @attributes["updated"] ||= DateTime.strptime(@doc.at_xpath('xmlns:updated').content)
       end
       
       def published
-        @attributes["published"] ||= DateTime.strptime(@doc.at("published").content)
+        @attributes["published"] ||= DateTime.strptime(@doc.at_xpath('xmlns:published').content)
       end
 
       def vast_links
-        @attributes["vast_links"] = @doc.css('link').map do |ln|
-          ln.attributes
+        if @attributes["vast_links"].nil?
+          @attributes["vast_links"] = {}
+          @doc.css('link').each do |ln|
+            attributes = ln.attributes
+            @attributes["vast_links"][attributes['rel']] = attributes
+          end
         end
+        @attributes["vast_links"]
       end
       private
 
       def get_var(var_name)
-        if var = @doc.at(var_name)
+        if var = @doc.at_xpath(var_name)
           var.text
         else
           nil

data/lib/vast_api/listings.rb

@@ -1,5 +1,38 @@
 class VastApi
-  class Listings < VastApi::Base
+  class Listings < Array
+    attr_reader :xml, :url, :vast
+
+    def initialize(vast)
+      @vast = vast
+      @url = "#{API_URL}#{self.class.to_s.split('::')[1].downcase}/-/#{@vast.category}?#{@vast.query}"
+      @xml = Nokogiri::XML(open(@url))
+      populate
+    end
+
+    def attr(var_name)
+      if var = @xml.at(var_name)
+        var.text 
+      elsif var = @xml.at('//v:'+var_name)
+        var.text
+      elsif var = @xml.at('//o:'+var_name)
+        var.text
+      else
+        nil
+      end
+    end
+
+    def attributes
+      @vast.attributes
+    end
+
+    def listings
+      @vast.listings
+    end
+
+    def categories
+      @vast.categories
+    end
+
     def query
       if @query.nil?
         @query = {}

data/lib/vast_api.rb

@@ -1,10 +1,11 @@
+require 'open-uri'
+require 'nokogiri'
 require 'active_support'
 begin
   require 'active_support/core_ext/object/to_query'
 rescue
 end
 
-require File.expand_path('../vast_api/base.rb', __FILE__)
 require File.expand_path('../vast_api/attributes.rb', __FILE__)
 require File.expand_path('../vast_api/attributes/entry.rb', __FILE__)
 require File.expand_path('../vast_api/categories.rb', __FILE__)
@@ -67,7 +68,21 @@ class VastApi
     @categories[@api_key] ||= Categories.new(self)
   end
 
-  def find(id, cat)
+  def find(id)
+    raise ArgumentError, "No category was entered" if @category.nil? || @category.empty?
+    if id.nil? || id.empty?
+      nil
+    else
+      Listings.get("#{API_URL}listings/#{id}/-/#{@category}")
+    end
+  end
+
+  def find!(id)
+    raise ArgumentError, "No id was entered" if id.nil? || id.empty?
+    find(id)  
+  end
+
+  def self.find(id, cat)
     Listings.get("#{API_URL}listings/#{id}/-/#{cat}")
   end