urifetch 0.0.5 → 0.1.0.rc1

data/Gemfile

@@ -10,6 +10,8 @@ gem 'addressable'
 gem 'hashie'
 gem 'nokogiri'
 gem 'imagesize'
+gem 'activesupport'
+gem 'actionpack'
 
 group :development do
   gem "rspec"

data/Gemfile.lock

@@ -1,25 +1,52 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    actionpack (3.2.0)
+      activemodel (= 3.2.0)
+      activesupport (= 3.2.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.0)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.0)
+      activesupport (= 3.2.0)
+      builder (~> 3.0.0)
+    activesupport (3.2.0)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     addressable (2.2.6)
+    builder (3.0.0)
     coderay (0.9.8)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
     git (1.2.5)
     hashie (1.2.0)
+    hike (1.2.1)
+    i18n (0.6.0)
     imagesize (0.1.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    journey (1.0.1)
     json (1.6.4)
     method_source (0.6.7)
       ruby_parser (>= 2.3.1)
+    multi_json (1.0.4)
     nokogiri (1.5.0)
     pry (0.9.7.4)
       coderay (~> 0.9.8)
       method_source (~> 0.6.7)
       ruby_parser (>= 2.3.1)
       slop (~> 2.1.0)
+    rack (1.4.1)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-test (0.6.1)
+      rack (>= 1.0)
     rake (0.9.2.2)
     rcov (0.9.11)
     rdoc (3.12)
@@ -36,11 +63,18 @@ GEM
       sexp_processor (~> 3.0)
     sexp_processor (3.0.9)
     slop (2.1.0)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  actionpack
+  activesupport
   addressable
   bundler (= 1.1.rc)
   hashie

data/lib/urifetch/ext/opengraph.rb

@@ -0,0 +1,70 @@
+module OpenGraph
+  # Fetch Open Graph data from the specified URI. Makes an
+  # HTTP GET request and returns an OpenGraph::Object if there
+  # is data to be found or <tt>false</tt> if there isn't.
+  #
+  # Pass <tt>false</tt> for the second argument if you want to
+  # see invalid (i.e. missing a required attribute) data.
+  
+  def self.parse(doc, strict = true)
+    page = OpenGraph::Object.new
+    doc.css('meta').each do |m|
+      if m.attribute('property') && m.attribute('property').to_s.match(/^og:(.+)$/i)
+        page[$1.gsub('-','_')] = m.attribute('content').to_s
+      end
+    end
+    return false if page.keys.empty?
+    return false unless page.valid? if strict
+    page
+  end
+  
+  TYPES = {
+    'activity' => %w(activity sport),
+    'business' => %w(bar company cafe hotel restaurant),
+    'group' => %w(cause sports_league sports_team),
+    'organization' => %w(band government non_profit school university),
+    'person' => %w(actor athlete author director musician politician public_figure),
+    'place' => %w(city country landmark state_province),
+    'product' => %w(album book drink food game movie product song tv_show),
+    'website' => %w(blog website)
+  }
+  
+  # The OpenGraph::Object is a Hash with method accessors for
+  # all detected Open Graph attributes.
+  class Object < Hashie::Mash
+    MANDATORY_ATTRIBUTES = %w(title type image url)
+    
+    # The object type.
+    def type
+      self['type']
+    end
+    
+    # The schema under which this particular object lies. May be any of
+    # the keys of the TYPES constant.
+    def schema
+      OpenGraph::TYPES.each_pair do |schema, types| 
+        return schema if types.include?(self.type)
+      end
+      nil
+    end
+    
+    OpenGraph::TYPES.values.flatten.each do |type|
+      define_method "#{type}?" do
+        self.type == type
+      end
+    end
+    
+    OpenGraph::TYPES.keys.each do |scheme|
+      define_method "#{scheme}?" do
+        self.type == scheme || OpenGraph::TYPES[scheme].include?(self.type)
+      end
+    end
+    
+    # If the Open Graph information for this object doesn't contain
+    # the mandatory attributes, this will be <tt>false</tt>.
+    def valid?
+      MANDATORY_ATTRIBUTES.each{|a| return false unless self[a]}
+      true
+    end
+  end
+end

data/lib/urifetch/response.rb

@@ -2,12 +2,20 @@ module Urifetch
 
   class Response
     
-    attr_reader :status, :strategy, :data
+    attr_accessor :status, :strategy_key, :data
     
-    def initialize(args={})
-      @status       = args[:status]       || ['0','']
-      @strategy     = args[:strategy]     || Strategy.new(:test,"".match(//))
-      @data         = args[:data]         || Hashie::Mash.new
+    def initialize(status,strategy_key,data)
+      @status         = status
+      @strategy_key   = strategy_key
+      @data           = data
+    end
+    
+    def to_h
+      @data
+    end
+    
+    def to_json
+      to_h.to_json
     end
     
   end

data/lib/urifetch/router.rb

@@ -0,0 +1,57 @@
+module Urifetch
+  
+  class Router
+    
+    attr_reader :routes
+    
+    def initialize(options={},&block)
+      
+      options = default_options = {
+        strategy_key:    "base",
+        class_name:   "Urifetch::Strategy::Base"
+      }.merge(options)
+      
+      @routes = Hash.new(options)
+      
+      instance_eval(&block) if block_given?
+      
+      @routes[/(?<base>(?<match_id>.*))/i] = @routes[""]
+    end
+    
+    def find(uri)
+      
+      # Tries to find a match
+      match_data = @routes.keys.map{|r|r.match(uri.to_s)}.reject{|r|r.nil?}[0]
+      
+      # Fetches route data for given regex
+      route_data = @routes[match_data.regexp]
+            
+      begin
+        # Spawns strategy instance by constantizing strategy name
+        class_name = route_data[:strategy_class] || "Urifetch::Strategy::" + route_data[:strategy_key].classify
+        strategy = class_name.constantize.new(uri,match_data,route_data)
+        
+      rescue NameError
+        # Spawns base strategy instance
+        strategy = Strategy::Base.new(uri,match_data,route_data)
+      end
+      
+      return strategy
+      
+    end
+    
+    private
+    
+    def match(string,strategy_key,args={})
+      
+      # Raises an ArgumentError if a non supported filetype is supplied.
+      raise ArgumentError "matcher ('#{string.class}') needs to be either 'String' or 'Regexp'" unless [String,Regexp].include?(string.class)
+      raise ArgumentError "strategy_key ('#{strategy_key.class}') needs to be either 'String' or 'Symbol'" unless [String,Symbol].include?(strategy_key.class)
+      # Stores the arguments in memory
+      routes[string] = { strategy_key: strategy_key.to_s }.merge(args)
+      
+    end
+    
+  end
+  
+end

data/lib/urifetch/strategy/base.rb

@@ -0,0 +1,101 @@
+module Urifetch
+
+  module Strategy
+    
+    class Base
+      
+      attr_reader :uri, :match_data, :route_data, :response
+      
+      def initialize(uri,match_data,route_data={})
+        @uri = uri
+        @match_data = match_data
+        @route_data = route_data
+        @response = Response.new(['0',''],route_data[:strategy_key],{})
+      end
+      
+      def execute!
+        perform_request
+        process_request if response.status == ["200","OK"]
+        response
+      end
+      
+      def perform_request
+        begin
+          timeout(30) { @request  = open(@uri.to_s,'rb') }
+          set_status  @request.status
+        rescue OpenURI::HTTPError => error
+          set_status error.message.split(" ",2)
+        rescue SocketError => error
+          set_status ["400","Bad Request"]
+        rescue Errno::ENOENT => error
+          set_status ["404","File not Found"]
+        rescue Errno::ECONNREFUSED => error
+          set_status ["401","Unauthorized"]
+        rescue Errno::EADDRINUSE
+          set_status ["401","Unauthorized"]
+        rescue RuntimeError => error
+          set_status ["400","Bad Request"]
+        rescue Exception => e
+          set_status ["500","Server Error",e]
+        rescue TimeOutError
+          set_status ["408","Request Timeout"]
+        else
+          set_status ["200","OK"]
+        end
+      end
+      
+      def process_request
+                
+        # Start by setting the URI
+        set :url, uri.to_s
+        
+        doc = Nokogiri::HTML.parse(@request)
+                
+        # Open Auth data
+        if og = OpenGraph.parse(doc)
+          set :url,         og.url, override: true
+          set :title,       og.title
+          set :image,       og.image
+          set :description, og.description
+        end
+                
+        # Custom CSS data
+        unless set? :title
+          t = doc.css('title').first
+          set :title, t.nil? ? match_data[0] : t.content.strip
+        end
+        
+        favicon = doc.css('link[rel="shortcut icon"], link[rel="icon shortcut"], link[rel="shortcut"], link[rel="icon"]').first
+        favicon = favicon.nil? ? nil : favicon['href'].strip
+        if favicon
+          if favicon.match(/^https?:\/\//i).nil?
+            favicon = uri.scheme + "://" + uri.host.sub(/\/$/,"") + "/" + favicon.sub(/^\//,"")
+          end
+          set :favicon, favicon
+        end
+        
+      end
+      
+      private
+      
+      def set_status(status_array)
+        response.status = status_array
+      end
+      
+      def get(key)
+        response.data[key.to_s]
+      end
+            
+      def set(key,value,args={})
+        response.data[key.to_s] = value if (args[:override] == true) or response.data[key.to_s].nil? unless value.nil?
+      end
+      
+      def set?(key)
+        !response.data[key.to_s].nil?
+      end
+            
+    end
+    
+  end
+
+end

data/lib/urifetch/strategy/image.rb

@@ -0,0 +1,57 @@
+class Urifetch::Strategy::Image < Urifetch::Strategy::Base
+  
+  def process_request
+        
+    # Works for ["PCX", "PSD", "XPM", "TIFF", "XBM", "PGM", "PBM", "PPM", "BMP", "JPEG", "PNG", "GIF", "SWF"]
+    
+    # Preview File Source
+    set :image, @request.base_uri.to_s
+    set :url, @request.base_uri.to_s    
+    
+    # Title
+    set :title, File.basename(@request.base_uri.to_s)
+    
+    # File Type
+    set :mime_type, @request.meta['content-type']
+    
+    # File Size
+    set :image_size, number_to_human_size(@request.size)
+    
+    unless get(:mime_type).match(/text\/html/i).nil?
+      doc = Nokogiri::HTML.parse(@request)
+              
+      # Open Auth data
+      if og = OpenGraph.parse(doc)
+        set :url,         og.url,   override: true
+        set :title,       og.title, override: true
+        set :image,       og.image, override: true
+      end
+      
+      unless set? :title
+        t = doc.css('title').first
+        set :title, t.nil? ? match_data[0] : t.content.strip
+      end
+      
+    else
+    
+      # Image Size
+      sizes = [nil,nil]
+      3.times do |i|
+        begin
+          sizes = ImageSize.new(@request).get_size
+        rescue NoMethodError => e
+          sizes = ImageSize.new(@request.read).get_size
+        end
+        break if sizes != [nil,nil]
+      end
+    
+      unless sizes == [nil,nil]
+        set :image_height, sizes[1]
+        set :image_width, sizes[0]
+      end
+    
+    end
+    
+  end
+  
+end

data/lib/urifetch/strategy.rb

@@ -1,92 +1,9 @@
 module Urifetch
   
-  require 'open-uri'
-  require 'nokogiri'
-  require 'image_size'
-  require 'stringio'
-  
-  class Strategy
-    
-    autoload :Layout, 'urifetch/strategy/layout'
-    
-    @@layouts = Hashie::Mash.new
-    def self.layouts
-      @@layouts
-    end
-    
-    attr_reader :layout, :match_data, :layout_key, :uri, :filehead, :skip_request
-    
-    def initialize(layout_key,match_data,args={})
-      @skip_request = args[:skip_request] || false
-      @layout_key = layout_key
-      @match_data = match_data
-      @layout = @@layouts[layout_key]
-      raise "no matching layouts found on #{layout_key}" unless @layout
-    end
-    
-    def self.layout(layout_key,&block)
-      layouts[layout_key] = Layout.new(layout_key,&block)
-    end
-    
-    def self.apply(layout_key,args={})
-      m_data = args[:with] || "".match(//)
-      Strategy.new(layout_key,m_data)
-    end
-    
-    def self.apply!(layout_key,args={})
-      apply(layout_key,args).execute!
-    end
-    
-    def execute!
-      run_before!
-      if skip_request
-        begin
-          @uri = Addressable::URI.heuristic_parse(match_data.string)
-          request = open(@uri.to_s,'rb')
-          status  = request.status
-          run_on_success!(request)
-        rescue OpenURI::HTTPError => error
-          status  = (error.message.split(" ",2))
-          run_on_failure!(error)
-        rescue SocketError => error
-          status  = (["400","Bad Request"])
-          run_on_failure!(error)
-        rescue Errno::ENOENT => error
-          status  = (["404","File not Found"])
-          run_on_failure!(error)
-        rescue Errno::ECONNREFUSED => error
-          status  = (["401","Unauthorized"])
-          run_on_failure!(error)
-        rescue RuntimeError => error
-          status  = (["400","Bad Request"])
-          run_on_failure!(error)
-        rescue Exception => e
-          status  = (["500","Server Error",e])
-        end
-      else
-        status  = (["200","OK"])
-      end
-      return Response.new(status: status, strategy: self, data: @data)
-    end
-    
-    private
-    
-    def run_before!
-      instance_exec(&layout.before) unless layout.before.nil?
-    end
-    
-    def run_on_success!(request)
-      @uri = request.base_uri
-      instance_exec(request,&layout.success) unless layout.before.nil?
-    end
-    
-    def run_on_failure!(error)
-      instance_exec(error,&layout.failure) unless layout.before.nil?
-    end
+  module Strategy
     
-    def data
-      @data ||= Hashie::Mash.new
-    end
+    autoload :Base, 'urifetch/strategy/base'
+    autoload :Image, 'urifetch/strategy/image'
     
   end
   

data/lib/urifetch/version.rb

@@ -3,9 +3,9 @@ module Urifetch
   module Version
     
     MAJOR = 0
-    MINOR = 0
-    PATCH = 5
-    BUILD = nil
+    MINOR = 1
+    PATCH = 0
+    BUILD = 'rc1'
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
     

data/lib/urifetch.rb

@@ -1,139 +1,51 @@
-require 'hashie/mash'
+require 'hashie'
+require 'open-uri'
+require 'nokogiri'
+require 'image_size'
+require 'stringio'
 require 'addressable/uri'
-#require 'pry'
+require 'active_support/inflector'
+require 'timeout'
+
+require 'action_view'
+include ActionView::Helpers::NumberHelper
+
+# require 'pry'
 
 module Urifetch
   
-  DEFAULT_MATCH_STRING = /(.*)/i
-  DEFAULT_STRATEGY = :default
-  
-  autoload :Handler,  'urifetch/handler'
-  autoload :Strategy, 'urifetch/strategy'
   autoload :Response, 'urifetch/response'
+  autoload :Strategy, 'urifetch/strategy'
+  autoload :Router,   'urifetch/router'
+  autoload :Version,  'urifetch/version'
+
+  autoload :OpenGraph, 'urifetch/ext/opengraph'
   
-  @@handler = Handler.new(DEFAULT_STRATEGY)
-  
-  def self.fetch_from(url,args={})
-    find_strategy_from(url).execute!
-  end
+  @@router = Router.new()
   
-  def self.find_strategy_from(url,args={})
+  def self.fetch(url,args={})
     if valid_url?(url)
-      @@handler.find(url)
+      uri = Addressable::URI.heuristic_parse(url.to_s)
+      @@router.find(uri).execute!
     else
-      raise ArgumentError, "invalid url"
+      raise ArgumentError, "Invalid URL"
     end
   end
   
   def self.valid_url?(url)
+    # Validates URL according to Cloudsdale.org standards
     !(url =~ /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix).nil?
   end
   
-  def self.register(&block)
-    @@handler.instance_eval(&block)
-  end
-  
-end
-
-Urifetch.register do
-  match /\.(PCX|PSD|XPM|TIFF|XBM|PGM|PBM|PPM|BMP|JPEG|JPG||PNG|GIF|SWF)$/i, :image
-end
-
-Urifetch::Strategy.layout(:test) do
-  
-  before_request do
-  end
-  
-  after_success do |request|
-  end
-  
-  after_failure do |error|
+  def self.route(args={},&block)
+    @@router = Router.new(args) do
+      instance_eval(&block)
+    end
   end
   
 end
 
-Urifetch::Strategy.layout(:default) do
-  
-  before_request do 
-  end
-  
-  after_success do |request|
-    doc = Nokogiri::HTML(request)
-
-    # Title
-    title = doc.css('title').first
-    data.title = title.nil? ? match_data[0] : title.content.strip
-    
-    # Favicon
-    favicon = doc.css('link[rel="shortcut icon"], link[rel="icon shortcut"], link[rel="shortcut"], link[rel="icon"]').first
-    favicon = favicon.nil? ? nil : favicon['href'].strip
-    if favicon
-      if favicon.match(/^https?:\/\//i).nil?
-        favicon = uri.scheme + "://" + uri.host + favicon
-      end
-      data.favicon = favicon
-    end
-  end
-  
-  after_failure do |error|
-  end
-  
+Urifetch.route do
+  match /(?<image>(?<match_id>\.(?<file_type>PCX|PSD|XPM|TIFF|XBM|PGM|PBM|PPM|BMP|JPEG|JPG||PNG|GIF|SWF))$)/i, :image, strategy_class: 'Urifetch::Strategy::Image'
 end
 
-Urifetch::Strategy.layout(:image) do
-  
-  before_request do
-  end
-  
-  after_success do |request|
-    # Works for ["PCX", "PSD", "XPM", "TIFF", "XBM", "PGM", "PBM", "PPM", "BMP", "JPEG", "PNG", "GIF", "SWF"]
-    
-    # Match ID
-    data.match_id = request.base_uri.to_s
-    
-    # Title
-    data.title = File.basename(request.base_uri.to_s)
-    
-    # File Type
-    data.mime_type = request.meta['content-type']
-    
-    # Preview File Source
-    data.preview_image = request.base_uri.to_s
-    
-    unless data.mime_type.match(/text\/html/i).nil?
-      doc = Nokogiri::HTML(request)
-      t = data.title.sub(/^.*\:/i,'')
-      t2 = t.sub(/\./i,"\\.")
-      src = doc.search('img').map(&:attributes).map{|h|h["src"].to_s}.reject{|u|u.match(/#{t2}/i).nil?}.first
-      src.sub!(/^\/\//i,'http://')
-      if src
-        data.title = t
-        @uri = Addressable::URI.heuristic_parse(src)
-        data.match_id = @uri.to_s
-        request = open(@uri.to_s,'rb')
-        data.mime_type = request.meta['content-type']
-      end
-    end
-    
-    # Image Size
-    data.image_size = [nil,nil]
-    3.times do |i|
-      begin
-        data.image_size = ImageSize.new(request).get_size
-      rescue NoMethodError => e
-        data.image_size = ImageSize.new(request.read).get_size#  unless e.message.match(/undefined method `type' for/).nil?
-      end
-      break if data.image_size != [nil,nil]
-    end
-    
-  end
-  
-  after_failure do |error|
-    # File Type
-    data.mime_type = 'unknown'
-    
-    # Image Size
-    data.image_size = [0,0]
-  end
-  
-end

data/spec/urifetch_spec.rb

@@ -2,108 +2,11 @@ require 'spec_helper'
 
 describe Urifetch do
   
-  describe 'self.fetch_from' do
-    
-    it 'should return a Urifetch::Response' do
-      Urifetch.fetch_from(Urifetch::Test::UrlHelpers.generate_valid_url).should be_a_kind_of(Urifetch::Response)
-    end
-    
-    it 'should raise an error if url is invalid according to configuration' do
-      -> { Urifetch.fetch_from(Urifetch::Test::UrlHelpers.generate_invalid_url) }.should raise_error ArgumentError, "invalid url"
-    end
-    
-  end
-  
-  describe 'self.find_strategy_from' do
-    
-    it 'should an instance of Urifetch::Strategy' do
-      Urifetch.find_strategy_from("http://www.google.com").should be_an_instance_of Urifetch::Strategy
-    end
-    
-  end
-  
-  describe 'strategy' do
-    
-    describe 'default' do
-      
-      it 'should return title and favicon for valid path' do
-        @response = Urifetch.fetch_from("http://www.youtube.com")
-        @response.data.should have_key(:title)
-        @response.data.should have_key(:favicon)
-      end
-      
-      it 'should return title and NOT favicon for valid path' do
-        @response = Urifetch.fetch_from("http://www.google.com")
-        @response.data.should have_key(:title)
-        @response.data.should_not have_key(:favicon)
-      end
-
-    end
-    
-    describe 'image' do
-      
-      it 'should return image properties and file name for valid png file' do
-        @url = "http://www.google.com/intl/en_com/images/srpr/logo3w.png"
-        @title = "logo3w.png"
-        @match_id = "http://www.google.com/intl/en_com/images/srpr/logo3w.png"
-        @mime_type = "image/png"
-        @image_size = [275, 95]
-      end
-      
-      it 'should return image properties and file name for valid jpg file' do
-        @url = "http://i.imgur.com/ab9Gd.jpg"
-        @title = "ab9Gd.jpg"
-        @match_id = "http://i.imgur.com/ab9Gd.jpg"
-        @mime_type = "image/jpeg"
-        @image_size = [492, 362]
-      end
-      
-      it 'should return image properties and file name for valid gif file' do
-        @url = "http://upload.wikimedia.org/wikipedia/commons/2/2c/Rotating_earth_%28large%29.gif"
-        @title = "Rotating_earth_%28large%29.gif"
-        @match_id = "http://upload.wikimedia.org/wikipedia/commons/2/2c/Rotating_earth_%28large%29.gif"
-        @mime_type = "image/gif"
-        @image_size = [400, 400]
-      end
-      
-      it 'should return image properties and file name for valid bmp file' do
-        @url = "http://www.gonmad.co.uk/satnav/bmp_blank.bmp"
-        @title = "bmp_blank.bmp"
-        @match_id = "http://www.gonmad.co.uk/satnav/bmp_blank.bmp"
-        @mime_type = "image/bmp"
-        @image_size = [16, 16]
-      end
-      
-      it 'should return image properties and file name for valid gif file even though the initial minetype is html' do
-        @url = "http://en.wikipedia.org/wiki/File:Sunflower_as_gif_small.gif"
-        @title = "Sunflower_as_gif_small.gif"
-        @match_id = "http://upload.wikimedia.org/wikipedia/commons/e/e2/Sunflower_as_gif_small.gif"
-        @mime_type = "image/gif"
-        @image_size = [250, 297]
-      end
-      
-      after(:each) do
-        @response = Urifetch.fetch_from(@url)
-
-        # Check Title
-        @response.data.should have_key(:title)
-        @response.data[:title].should == @title
-        
-        # Check Match ID
-        @response.data.should have_key(:match_id)
-        @response.data[:match_id].should == @match_id
-        
-        # Check FileType
-        @response.data.should have_key(:mime_type)
-        @response.data[:mime_type].should == @mime_type
-        
-        # Check ImageSize
-        @response.data.should have_key(:image_size)
-        @response.data[:image_size].should == @image_size
-      end
-      
-    end
-    
+  it 'should return a response' do
+    mlfw = Urifetch.fetch("http://mylittlefacewhen.com/f/2446/") #.should be_a(Urifetch::Response)
+    goog = Urifetch.fetch("http://www.google.com") #.should be_a(Urifetch::Response)
+    tube = Urifetch.fetch("http://www.youtube.com/watch?v=xPfMb50dsOk")
+    jpeg = Urifetch.fetch("http://www.dreamincode.net/forums/uploads/monthly_05_2010/post-380028-12747928967239.jpg.pagespeed.ce.yRppR_j7ae.jpg")
   end
   
 end

data/urifetch.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "urifetch"
-  s.version = "0.0.5"
+  s.version = "0.1.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philip Vieira"]
-  s.date = "2012-01-24"
+  s.date = "2012-02-15"
   s.description = "Urifetch allows you to fetch data from any URL using pattern matching. The library allows for dynamically adding match handlers as well as build your own strategies."
   s.email = "philip@vallin.se"
   s.extra_rdoc_files = [
@@ -27,17 +27,15 @@ Gem::Specification.new do |s|
     "Rakefile",
     "lib/.DS_Store",
     "lib/urifetch.rb",
-    "lib/urifetch/handler.rb",
+    "lib/urifetch/ext/opengraph.rb",
     "lib/urifetch/response.rb",
+    "lib/urifetch/router.rb",
     "lib/urifetch/strategy.rb",
-    "lib/urifetch/strategy/layout.rb",
+    "lib/urifetch/strategy/base.rb",
+    "lib/urifetch/strategy/image.rb",
     "lib/urifetch/version.rb",
     "spec/helpers/url_helpers.rb",
     "spec/spec_helper.rb",
-    "spec/urifetch/handler_spec.rb",
-    "spec/urifetch/response_spec.rb",
-    "spec/urifetch/strategy/layout_spec.rb",
-    "spec/urifetch/strategy_spec.rb",
     "spec/urifetch_spec.rb",
     "urifetch.gemspec"
   ]
@@ -55,6 +53,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<hashie>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<imagesize>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<actionpack>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["= 1.1.rc"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -66,6 +66,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<hashie>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<imagesize>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<actionpack>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, ["= 1.1.rc"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -78,6 +80,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<hashie>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<imagesize>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<actionpack>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, ["= 1.1.rc"])
     s.add_dependency(%q<jeweler>, [">= 0"])

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: urifetch
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.1.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Philip Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000Z
+date: 2012-02-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70237495253880 !ruby/object:Gem::Requirement
+  requirement: &70202067777280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237495253880
+  version_requirements: *70202067777280
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70237495253280 !ruby/object:Gem::Requirement
+  requirement: &70202067776560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237495253280
+  version_requirements: *70202067776560
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70237495252700 !ruby/object:Gem::Requirement
+  requirement: &70202067775820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237495252700
+  version_requirements: *70202067775820
 - !ruby/object:Gem::Dependency
   name: imagesize
-  requirement: &70237495252100 !ruby/object:Gem::Requirement
+  requirement: &70202067775080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237495252100
+  version_requirements: *70202067775080
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70202067774280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70202067774280
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70202067773580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70202067773580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70237495251520 !ruby/object:Gem::Requirement
+  requirement: &70202067772780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237495251520
+  version_requirements: *70202067772780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70237495250860 !ruby/object:Gem::Requirement
+  requirement: &70202067772000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +98,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70237495250860
+  version_requirements: *70202067772000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70237495250260 !ruby/object:Gem::Requirement
+  requirement: &70202067771360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237495250260
+  version_requirements: *70202067771360
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70237495249620 !ruby/object:Gem::Requirement
+  requirement: &70202067752040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237495249620
+  version_requirements: *70202067752040
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70237495248960 !ruby/object:Gem::Requirement
+  requirement: &70202067751460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237495248960
+  version_requirements: *70202067751460
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70237495248320 !ruby/object:Gem::Requirement
+  requirement: &70202067750840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237495248320
+  version_requirements: *70202067750840
 description: Urifetch allows you to fetch data from any URL using pattern matching.
   The library allows for dynamically adding match handlers as well as build your own
   strategies.
@@ -141,17 +163,15 @@ files:
 - Rakefile
 - lib/.DS_Store
 - lib/urifetch.rb
-- lib/urifetch/handler.rb
+- lib/urifetch/ext/opengraph.rb
 - lib/urifetch/response.rb
+- lib/urifetch/router.rb
 - lib/urifetch/strategy.rb
-- lib/urifetch/strategy/layout.rb
+- lib/urifetch/strategy/base.rb
+- lib/urifetch/strategy/image.rb
 - lib/urifetch/version.rb
 - spec/helpers/url_helpers.rb
 - spec/spec_helper.rb
-- spec/urifetch/handler_spec.rb
-- spec/urifetch/response_spec.rb
-- spec/urifetch/strategy/layout_spec.rb
-- spec/urifetch/strategy_spec.rb
 - spec/urifetch_spec.rb
 - urifetch.gemspec
 homepage: http://github.com/zeeraw/Urifetch
@@ -169,13 +189,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4158633268281007023
+      hash: -4352591540806531180
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/lib/urifetch/handler.rb

@@ -1,31 +0,0 @@
-module Urifetch
-  
-  
-  class Handler
-    
-    def initialize(strategy_key,&block)
-      @handlers = {}
-      raise ArgumentError "strategy ('#{strategy.class}') needs to be a 'Symbol'" unless strategy_key.kind_of?(Symbol)
-      @strategy_key = strategy_key || DEFAULT_STRATEGY
-      instance_eval(&block) if block_given?
-    end
-    
-    def find(url,previous_match=nil)
-      previous_match = url.match(DEFAULT_MATCH_STRING) if previous_match.nil?
-      @handlers.each do |key,val|
-        m = url.match(key)
-        return val.find(url,m) if m != 0 and !m.nil?
-      end
-      return Urifetch::Strategy.apply(@strategy_key, with: previous_match)
-    end
-    
-    private
-    
-    def match(string,strategy,&block)
-      raise ArgumentError "matcher ('#{key.class}') needs to be either 'String' or 'Regexp'" unless [String,Regexp].include?(string.class)
-      @handlers[string] = Handler.new(strategy,&block)
-    end
-    
-  end
-  
-end

data/lib/urifetch/strategy/layout.rb

@@ -1,35 +0,0 @@
-module Urifetch
-
-  class Strategy
-    
-    class Layout
-      
-      attr_reader :before, :success, :failure
-      
-      def initialize(args={},&block)
-        @success  = nil
-        @failure  = nil
-        @before   = nil
-        instance_exec(args,&block) if block_given?
-      end
-      
-      def after_success(&block)
-        raise ArgumentError unless block_given?
-        @success = block
-      end
-      
-      def after_failure(&block)
-        raise ArgumentError unless block_given?
-        @failure = block
-      end
-      
-      def before_request(&block)
-        raise ArgumentError unless block_given?
-        @before = block
-      end
-      
-    end
-    
-  end
-
-end

data/spec/urifetch/handler_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe Urifetch::Handler do
-  
-  describe '#initialize' do
-    
-    it 'should return Urifetch::Handler' do
-      Urifetch::Handler.new(:default).should be_a_kind_of Urifetch::Handler
-    end
-    
-    it 'should have a default value of a Hash on @handlers' do
-      @handlers = Urifetch::Handler.new(:default).instance_variable_get(:@handlers)
-      @handlers.should_not be_nil
-      @handlers.should be_a_kind_of Hash
-    end
-    
-  end
-  
-end

data/spec/urifetch/response_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe Urifetch::Response do
-
-  describe '#initialize' do
-    
-    before do
-      @response = Urifetch::Response.new()
-    end
-  
-    it 'should contain status as an array' do
-      @response.status.should_not be_nil
-      @response.status.should be_a_kind_of(Array)
-    end
-  
-    it 'should contain the strategy used when matching' do
-      @response.strategy.should_not be_nil
-      @response.strategy.should be_a_kind_of(Urifetch::Strategy)
-    end
-  
-    it 'should contain data as a hashie/mash' do
-      @response.data.should_not be_nil
-      @response.data.should be_a_kind_of(Hashie::Mash)
-    end
-    
-  end
-
-end

data/spec/urifetch/strategy/layout_spec.rb

@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe Urifetch::Strategy::Layout do
-  
-  before do
-    @layout = Urifetch::Strategy::Layout.new do
-      
-      after_success do
-        some_method
-      end
-      
-      after_failure do
-        some_method
-      end
-      
-      before_request do
-        some_method
-      end
-      
-    end
-  end
-
-  describe 'after_success' do
-    
-    it 'should overwrite the value proc' do
-      proc = @layout.instance_variable_get(:@success)
-      @layout.after_success do
-        some_method
-      end
-      proc.should_not eq(@layout.instance_variable_get(:@success))
-    end
-    
-    it 'should overwrite the value proc' do
-      proc = @layout.instance_variable_get(:@failure)
-      @layout.after_failure do
-        some_method
-      end
-      proc.should_not eq(@layout.instance_variable_get(:@failure))
-    end
-    
-    it 'should overwrite the value proc' do
-      proc = @layout.instance_variable_get(:@before)
-      @layout.before_request do
-        some_method
-      end
-      proc.should_not eq(@layout.instance_variable_get(:@before))
-    end
-    
-  end
-  
-end

data/spec/urifetch/strategy_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-describe Urifetch::Strategy do
-
-  describe 'self.layouts' do
-    
-    it 'should return an Hashie::Mash' do
-      Urifetch::Strategy.layouts.should be_a_kind_of Hashie::Mash
-    end
-    
-  end
-
-  describe 'self.layout' do
-    
-    it 'should return a Urifetch::Strategy::Layout instance and make it accessible through .layouts' do
-      @layout = Urifetch::Strategy.layout(:test) do; end
-      @layout.should be_an_instance_of Urifetch::Strategy::Layout
-      Urifetch::Strategy.layouts[:test].should == @layout
-    end
-    
-  end
-  
-  describe 'self.apply' do
-    
-    it 'should return an instance of Urifetch::Strategy' do
-      Urifetch::Strategy.apply(:test).should be_an_instance_of Urifetch::Strategy
-    end
-    
-  end
-  
-  describe 'self.apply!' do
-    
-    it 'should return an instance of Urifetch::Response' do
-      Urifetch::Strategy.apply!(:test).should be_an_instance_of Urifetch::Response
-    end
-    
-  end
-  
-  before do
-    @strategy = Urifetch::Strategy.new(:test,"".match(//i))
-  end
-
-  describe '#initialize' do
-    
-    it 'should return an error if layout was not found' do
-      -> { Urifetch::Strategy.new(:not_found,"".match(//i)) }.should raise_error(RuntimeError, /no matching layouts found/i)
-    end
-    
-    it 'should contain match data as a MatchData object' do
-      @strategy.match_data.should be_a_kind_of MatchData
-    end
-    
-    it 'should have a layout as a Urifetch::Strategy::Layout' do
-      @strategy.layout.should be_an_instance_of Urifetch::Strategy::Layout
-    end
-    
-  end
-  
-  describe 'execute!' do
-    
-    it 'should return an instance of Urifetch::Response' do
-      @strategy.execute!.should be_an_instance_of Urifetch::Response
-    end
-    
-  end
-
-end