feedtools 0.2.7 → 0.2.8

data/CHANGELOG

@@ -1,3 +1,7 @@
+== FeedTools 0.2.8
+ * fixed bug with http headers being loaded from invalid YAML
+ * fixed uninitialized constant bug (you shouldn't have RUBYOPT set)
+ * cleaned up inspect methods
 == FeedTools 0.2.7
  * added support for Atom 1.0 output
  * improved support for Atom parsing and handling

data/lib/feed_tools.rb

@@ -21,18 +21,20 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+if Object.const_defined?(:FEED_TOOLS_ENV)
+  raise "Double-require attempted, aborting.  This may be caused " +
+    "by the presence of the RUBYOPT environment variable."
+end
+
 FEED_TOOLS_ENV = ENV['FEED_TOOLS_ENV'] ||
                  ENV['RAILS_ENV'] ||
                  'production' # :nodoc:
 
-FEED_TOOLS_VERSION = "0.2.7"
+FEED_TOOLS_VERSION = "0.2.8"
 
 $:.unshift(File.dirname(__FILE__))
-$:.unshift(File.dirname(__FILE__) + "/../../activerecord/lib")
 $:.unshift(File.dirname(__FILE__) + "/feed_tools/vendor")
-
-require 'rubygems'
-require 'active_record'
+$:.unshift(File.dirname(__FILE__) + "/../../activerecord/lib")
 
 begin
   require 'builder'
@@ -62,6 +64,9 @@ require 'cgi'
 require 'pp'
 require 'yaml'
 
+require 'rubygems'
+require_gem('activerecord', '>= 1.10.1')
+
 #= feed_tools.rb
 #
 # FeedTools was designed to be a simple XML feed parser, generator, and translator with a built-in
@@ -569,6 +574,9 @@ module FeedTools
       raise ArgumentError, "Expected Time, got #{date.class.name}"
     end
     tag_uri = normalize_url(url)
+    unless FeedTools.is_uri?(tag_uri)
+      raise ArgumentError, "Must supply a valid URL."
+    end
     host = URI.parse(tag_uri).host
     tag_uri.gsub!(/^(http|ftp|file):\/*/, "")
     tag_uri.gsub!(/#/, "/")
@@ -576,6 +584,20 @@ module FeedTools
       "#{tag_uri[(tag_uri.index(host) + host.size)..-1]}"
     return tag_uri
   end
+
+  # Converts a url into a urn:uuid: uri
+#  def FeedTools.build_urn_uri(url)
+#    unless url.kind_of? String
+#      raise ArgumentError, "Expected String, got #{url.class.name}"
+#    end
+#    normalized_url = normalize_url(url)
+#    unless FeedTools.is_uri?(normalized_url)
+#      raise ArgumentError, "Must supply a valid URL."
+#    end
+#    require 'uuidtools'
+#    tag_uri = UUID.sha1_create(normalized_url).to_uri_string
+#    return tag_uri
+#  end
   
   # Returns true if the parameter appears to be a valid uri
   def FeedTools.is_uri?(url)
@@ -865,13 +887,14 @@ module FeedTools
       feed.update!
       return feed
     end
-        
+
     # Loads the feed from the remote url if the feed has expired from the cache or cannot be
     # retrieved from the cache for some reason.
     def update!
       if self.http_headers.nil? && !(self.cache_object.nil?) &&
           !(self.cache_object.http_headers.nil?)
         @http_headers = YAML.load(self.cache_object.http_headers)
+        @http_headers = {} unless @http_headers.kind_of? Hash
       end
       if expired? && !FeedTools.cache_only?
         load_remote_feed!
@@ -2622,11 +2645,18 @@ module FeedTools
           end
           xml_builder.generator("FeedTools - " +
             "http://www.sporkmonger.com/projects/feedtools")
-          unless self.id.nil?
+          if self.id != nil
             unless FeedTools.is_uri? self.id
-              raise "The unique id must be a URI."
+#              if self.link != nil
+#                xml_builder.id(FeedTools.build_urn_uri(self.link))
+#              else
+                raise "The unique id must be a valid URI."
+#              end
+            else
+              xml_builder.id(self.id)
             end
-            xml_builder.id(self.id)
+#          elsif self.link != nil
+#            xml_builder.id(FeedTools.build_urn_uri(self.link))
           else
             raise "Cannot build feed, missing feed unique id."
           end
@@ -2696,6 +2726,11 @@ module FeedTools
       end
       return result
     end
+    
+    # Returns a simple representation of the feed object's state.
+    def inspect
+      return "#<FeedTools::Feed:0x#{self.object_id.to_s(16)} URL:#{self.url}>"
+    end
   end
   
   class FeedItem
@@ -4272,6 +4307,8 @@ module FeedTools
             unless FeedTools.is_uri? self.id
               if self.time != nil && self.link != nil
                 xml_builder.id(FeedTools.build_tag_uri(self.link, self.time))
+              elsif self.link != nil
+                xml_builder.id(FeedTools.build_urn_uuid_uri(self.link))
               else
                 raise "The unique id must be a URI. " +
                   "(Attempted to generate id, but failed.)"
@@ -4308,6 +4345,12 @@ module FeedTools
     alias_method :guid=, :id=
     alias_method :published, :issued
     alias_method :published=, :issued=
+    
+    # Returns a simple representation of the feed item object's state.
+    def inspect
+      return "#<FeedTools::FeedItem:0x#{self.object_id.to_s(16)} " +
+        "LINK:#{self.link}>"
+    end
   end
 end
 

data/rakefile

@@ -7,7 +7,7 @@ require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
 PKG_NAME      = 'feedtools'
-PKG_VERSION   = '0.2.7'
+PKG_VERSION   = '0.2.8'
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: feedtools
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
-date: 2005-09-02 00:00:00 -04:00
+  version: 0.2.8
+date: 2005-09-13 00:00:00 -04:00
 summary: "Parsing, generation, and caching system for xml news feeds."
 require_paths: 
   - lib