mloughran-api_cache 0.1.1 → 0.1.2

data/README.markdown

@@ -1,5 +1,26 @@
-api_cache
-=========
+APICache (aka api_cache)
+========================
+
+For the impatient
+-----------------
+
+    # Install
+    sudo gem install mloughran-api_cache -s http://gems.github.com
+    
+    # Require
+    require 'rubygems'
+    gem 'mloughran-api_cache'
+    require 'api_cache'
+    
+    # Configure
+    APICache.start(APICache::MemoryStore)
+    
+    # Use
+    APICache.get("http://twitter.com/statuses/public_timeline.rss")
+
+For everyone else
+-----------------
+
 You want to use the Twitter API but you don't want to die? I have the solution to API caching:
 
     APICache.get("http://twitter.com/statuses/public_timeline.rss")
@@ -49,9 +70,9 @@ Currently there are two stores available: `MemcacheStore` and `MemoryStore`. `Me
 
     APICache.start(APICache::MemoryStore)
 
-I suppose you'll want to get your hands on this magic. For now just grab the source from [github](http://github.com/mloughran/api_cache/tree/master) and `rake install`. I'll get a gem sorted soon.
+I suppose you'll want to get your hands on this magic! Just take a look at the instructions above for the impatient. Well done for reading this first!
 
-Please send feedback if you think of any other functionality that would be handy.
+Please send feedback to me [at] mloughran [dot] com if you think of any other functionality that would be handy.
 
 Copyright
 =========

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 1

data/lib/api_cache/api.rb

@@ -46,20 +46,25 @@ class APICache::API
         get_via_http(key, timeout)
       end
     end
-  rescue Timeout::Error, APICache::Invalid
-    raise APICache::CannotFetch
+  rescue Timeout::Error, APICache::Invalid => e
+    raise APICache::CannotFetch, e.message
   end
   
 private
   
   def get_via_http(key, timeout)
-    response = Net::HTTP.get_response(URI.parse(key))
+    response = redirecting_get(key)
     case response
     when Net::HTTPSuccess
       # 2xx response code
       response.body
     else
-      raise APICache::Invalid
+      raise APICache::Invalid, "Invalid http response: #{response.code}"
     end
   end
+
+  def redirecting_get(url)
+    r = Net::HTTP.get_response(URI.parse(url))
+    r.header['location'] ? redirecting_get(r.header['location']) : r
+  end
 end

data/lib/api_cache.rb

@@ -51,13 +51,14 @@ class APICache
         value = api.get(key, options[:timeout], &block)
         cache.set(key, value)
         value
-      rescue APICache::CannotFetch
-        APICache.logger.log "Failed to fetch new data from API"
+      rescue APICache::CannotFetch => e
+        APICache.logger.log "Failed to fetch new data from API because " \
+          "#{e.class}: #{e.message}"
         if cache_state == :refetch
           cache.get(key)
         else
           APICache.logger.log "Data not available in the cache or from API"
-          raise APICache::NotAvailableError
+          raise APICache::NotAvailableError, e.message
         end
       end
     end

data/spec/api_cache_spec.rb

@@ -2,7 +2,6 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe APICache do
   before :each do
-    APICache.start(APICache::MemoryStore)
     @key = 'random_key'
     @encoded_key = "1520171c64bfb71a95c97d310eea3492"
     @data = 'some bit of data'

data/spec/api_spec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe APICache::API do
+  it "should handle redirecting get requests" do
+    api = APICache::API.new
+    lambda {
+      api.get('http://froogle.google.com', 5)
+    }.should_not raise_error(APICache::CannotFetch)
+  end
+end

data/spec/spec_helper.rb

@@ -3,3 +3,5 @@ $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 require "rubygems"
 require "api_cache"
 require "spec"
+
+APICache.start(APICache::MemoryStore)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mloughran-api_cache
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Martyn Loughran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 -08:00
+date: 2009-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - lib/api_cache/memory_store.rb
 - lib/api_cache.rb
 - spec/api_cache_spec.rb
+- spec/api_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/mloughran/api_cache