lifestream 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/lifestream/channel/rss2.rb

@@ -9,11 +9,11 @@ module Lifestream
     def parse
       @feed = RSS::Parser.parse(@raw_data, false)
     rescue => e
-      raise Lifestream::Channel::Rss2::MalformedFeed.new("The feed from #{@url} could not be parsed") if Lifestream.options[:whiny]
+      raise Lifestream::Channel::Rss2::MalformedFeed.new("The feed from #{@request.url} could not be parsed #{e}") if Lifestream.options[:whiny]
     end
   
     def feed_to_a
-      @feed.items || []
+      @feed.items
     end
   
     def to_branch(branch)

data/lib/lifestream/channel.rb

@@ -15,11 +15,27 @@ module Lifestream
     protected
     
     def download
-      response = @request.get
-      raise unless response.kind_of?(Net::HTTPSuccess)
-      @raw_data = response.body
+      response_with_cache do
+        response = @request.get
+        raise unless response.kind_of?(Net::HTTPSuccess)
+        @raw_data = response.body
+      end
     rescue => e
-      Lifestream::Channel::DownloadError.new("The URL #{@request.url} failed to download") if Lifestream.options[:whiny]
+      raise Lifestream::Channel::DownloadError.new("The URL #{@request.url} failed to download. #{e}") if Lifestream.options[:whiny]
+    end
+    
+    def response_with_cache
+      yield and return unless Lifestream.options[:cache]
+      cache_path = File.join(Lifestream.options[:cache], "#{name}.xml")
+      if !File.exist?(cache_path) || File.mtime(cache_path) + Lifesteam.options[:cache_expiration] < Time.now
+        yield
+        cache = File.new(cache_path, 'wb')
+        cache.flock(File::LOCK_EX)
+        cache.write(@raw_data)
+        cache.flock(File::LOCK_UN)
+      else
+        @raw_data = File.read(cache_path)
+      end
     end
     
     def create_branches
@@ -45,7 +61,7 @@ module Lifestream
     private
     
     def raise_method_error method
-      raise Lifestream::Channel::MethodError, "Method `#{method}` must be overriden in the child class"
+      raise Lifestream::Channel::MethodError, "Method `#{method}' must be overriden in the child class"
     end
     
     class MethodError < StandardError; end

data/lib/lifestream.rb

@@ -8,10 +8,16 @@ module Lifestream
   #   Defaults to true 
   # * config: Path to the lifestream.yml file that contains the feeds to download.
   #   Defaults to gem location, you will probably want to set this
+  # * cache: The path that the downloaded feeds should be cached in, defaults to tmp
+  #   Set cache to false to disable it
+  # * cache_expiration: The amount of time that the cache is fresh for
+  #   Defaults to 1 hour
   def self.options
     @options ||= {
       :config => 'lifestream.yml',
-      :whiny  => true
+      :whiny  => true,
+      :cache  => 'tmp',
+      :cache_expiration => (60 * 60 * 1)
     }
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lifestream
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Adam Hunter