instagram 0.1.0 → 0.2.0

data/Rakefile

@@ -0,0 +1,10 @@
+task :app do
+  $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+  $LOAD_PATH.unshift File.dirname($LOAD_PATH.first)
+  require 'app'
+end
+
+task :clear => :app do
+  items = CachedInstagram.cache.clear
+  puts "#{items.size} removed"
+end

data/lib/instagram.rb

@@ -5,29 +5,44 @@ require 'instagram/models'
 
 module Instagram
   
+  extend self
+  
   Popular = Addressable::URI.parse 'http://instagr.am/api/v1/feed/popular/'
   UserFeed = Addressable::Template.new 'http://instagr.am/api/v1/feed/user/{user_id}/'
   UserInfo = Addressable::Template.new 'http://instagr.am/api/v1/users/{user_id}/info/'
   
-  def self.popular(params = {})
-    url = Popular.dup
-    parse_response(url, params, Timeline)
+  def popular(params = {}, options = {})
+    parse_response(Popular.dup, params, options.fetch(:parse_with, Timeline))
   end
   
-  def self.by_user(user_id, params = {})
+  def by_user(user_id, params = {}, options = {})
     url = UserFeed.expand :user_id => user_id
-    parse_response(url, params, Timeline)
+    parse_response(url, params, options.fetch(:parse_with, Timeline))
   end
   
-  def self.user_info(user_id, params = {})
+  def user_info(user_id, params = {}, options = {})
     url = UserInfo.expand :user_id => user_id
-    parse_response(url, params, UserWrap)
+    parse_response(url, params, options.fetch(:parse_with, UserWrap))
   end
   
-  def self.parse_response(url, params, parser)
+  private
+  
+  def parse_response(url, params, parser = nil)
     url.query_values = params
-    body = Net::HTTP.get url
-    parser.parse body
+    body = get_url url
+    parser ? parser.parse(body) : body
+  end
+  
+  def get_url(url)
+    response = Net::HTTP.start(url.host, url.port) { |http|
+      http.get url.request_uri
+    }
+    
+    if Net::HTTPSuccess === response
+      response.body
+    else
+      response.error!
+    end
   end
   
 end

data/lib/instagram/cached.rb

@@ -0,0 +1,25 @@
+require 'instagram'
+require 'instagram/failsafe_store'
+
+module Instagram
+  module Cached
+    extend Instagram
+    
+    class << self
+      attr_accessor :cache
+      
+      def setup(cache_dir, options = {})
+        self.cache = FailsafeStore.new(cache_dir, {
+          namespace: 'instagram',
+          exceptions: [Net::HTTPServerException, JSON::ParserError]
+        }.update(options))
+      end
+      
+      private
+      def get_url(url)
+        cache.fetch(url.to_s) { super }
+      end
+    end
+    
+  end
+end

data/lib/instagram/failsafe_store.rb

@@ -0,0 +1,52 @@
+require 'active_support/cache'
+
+module Instagram
+  class FailsafeStore < ActiveSupport::Cache::FileStore
+    # Reuses the stale cache if a known exception occurs while yielding to the block.
+    # The list of exception classes is read from the ":exceptions" array.
+    def fetch(name, options = nil)
+      options = merged_options(options)
+      key = namespaced_key(name, options)
+      entry = unless options[:force]
+        instrument(:read, name, options) do |payload|
+          payload[:super_operation] = :fetch if payload
+          read_entry(key, options)
+        end
+      end
+
+      if entry and not entry.expired?
+        instrument(:fetch_hit, name, options) { |payload| }
+        entry.value
+      else
+        reusing_stale = false
+        
+        result = begin
+          instrument(:generate, name, options) do |payload|
+            yield
+          end
+        rescue
+          if entry and ignore_exception?($!)
+            reusing_stale = true
+            instrument(:reuse_stale, name, options) do |payload|
+              payload[:exception] = $! if payload
+              entry.value
+            end
+          else
+            # TODO: figure out if deleting entries is ever necessary
+            # delete_entry(key, options) if entry
+            raise
+          end
+        end
+        
+        write(name, result, options) unless reusing_stale
+        result
+      end
+    end
+    
+    private
+    
+    def ignore_exception?(ex)
+      options[:exceptions] && options[:exceptions].any? { |klass| ex.is_a? klass }
+    end
+  end
+end

data/lib/instagram/models.rb

@@ -52,6 +52,8 @@ module Instagram
       element :type
       element :width
       element :height
+      
+      alias to_s url
     end
     
     def caption
@@ -60,6 +62,10 @@ module Instagram
         comments.first.text
       end
     end
+    
+    def image_url(size = 150)
+      self.images.find { |img| img.width == size }.to_s
+    end
   end
   
   class Timeline < NibblerJSON

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: instagram
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 +01:00
+date: 2010-12-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 2
@@ -71,11 +67,14 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Rakefile
+- lib/instagram/cached.rb
+- lib/instagram/failsafe_store.rb
 - lib/instagram/models.rb
 - lib/instagram.rb
 - README.md
 - MIT-LICENSE
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/mislav/instagram
 licenses: []
 
@@ -89,7 +88,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -98,7 +96,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"