twimage 0.0.11 → 0.0.12

data/lib/twimage.rb

@@ -4,18 +4,70 @@ require 'httparty'
 require 'tempfile'
 
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-  
 require 'twimage/version'
-require 'twimage/base'
-require 'twimage/twitpic'
-require 'twimage/yfrog'
+require 'twimage/image'
 
 module Twimage
   
   class ServiceURLInvalid < StandardError; end  # thrown if the service_url returns a 404
-  class ImageNotFound < StandardError; end      # thrown if the service_url doesn't contain an image
+  class ImageNotFound < StandardError; end      # thrown if the service_url doesn't contain an expected image tag
   class ImageURLInvalid < StandardError; end    # thrown if the image_url found in the service_url returns a 404
+  
+  SERVICES = [{ :name => :twitpic,
+                :service_match => /twitpic\.com/,
+                :full_url_modifier => lambda { |url| url + '/full' },
+                :image_css_match => 'body > img' },
+              { :name => :yfrog,
+                :service_match => /yfrog\.com/,
+                :full_url_modifier => lambda { |url| url.gsub(/\.com/, '.com/z') },
+                :image_css_match => '#the-image img' }]
+                  
+  def self.get(url)
+    service_url = HTTParty.get(url).request.path.to_s                                                                 # first point HTTParty at this URL and follow any redirects to get to the final page
+    service = find_service(service_url)                                                                               # check the resulting service_url for which service we're hitting
+    full_res_service_url = service[:full_url_modifier] ? service[:full_url_modifier].call(service_url) : service_url  # get the full res version of the service_url
+    image_url = get_image_url(service, full_res_service_url)                                                          # get the URL to the image
+    image = get_image(image_url)                                                                                      # get the image itself
+    
+    return Image.new(:service => service[:name], :service_url => service_url, :image_url => image_url, :image => image)
+  end
+  
+  
+  # figure out which service this is by matching against regexes
+  def self.find_service(url)
+    return SERVICES.find do |service|
+      url.match(service[:service_match])
+    end
+  end
+  
+  
+  # tear apart the HTML on the returned service page and find the source of the image
+  def self.get_image_url(service, url)
+    # get the content of the image page
+    begin
+      image_tag = Nokogiri::HTML(open(url)).css(service[:image_css_match]).first
+    rescue OpenURI::HTTPError
+      raise ServiceURLInvalid, "The service URL #{url} was not found (returned a 404)"
+    end
+    
+    # get the URL to the actual image file
+    if image_tag
+      return image_tag['src']
+    else
+      raise ImageNotFound, "The service URL #{url} did not contain an identifiable image"
+    end
+  end
+  
 
+  # download the actual image and put into a tempfile
+  def self.get_image(url)
+    # get the image itself
+    response = HTTParty.get(url)
+    if response.code == 200
+      return response.body.force_encoding('utf-8')
+    else
+      raise ImageURLInvalid, "The image_url #{url} was not found (returned a 404)"
+    end
+  end
+  
 end
-
-#puts Twimage::Yfrog.new('http://yfrog.com/hsjdhxqj').inspect

data/lib/twimage/image.rb

@@ -0,0 +1,17 @@
+module Twimage
+  class Image
+    
+    attr_reader :service, :service_url, :image_url, :tempfile
+    
+    def initialize(options)
+      @service      = options[:service]
+      @service_url  = options[:service_url]
+      @image_url    = options[:image_url]
+      
+      extension = @image_url.match(/(\.\w+)(\?|$)/)[1]
+      @tempfile = Tempfile.new(['twimage', extension])
+      @tempfile << options[:image]
+    end
+    
+  end
+end

data/lib/twimage/version.rb

@@ -1,3 +1,3 @@
 module Twimage
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -2,7 +2,7 @@
 name: twimage
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - Rob Cameron
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -04:00
+date: 2011-05-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,10 +51,8 @@ files:
 - README.md
 - Rakefile
 - lib/twimage.rb
-- lib/twimage/base.rb
-- lib/twimage/twitpic.rb
+- lib/twimage/image.rb
 - lib/twimage/version.rb
-- lib/twimage/yfrog.rb
 - twimage.gemspec
 has_rdoc: true
 homepage: ""

data/lib/twimage/base.rb

@@ -1,18 +0,0 @@
-module Twimage
-  class Base
-    
-    attr_accessor :tempfile, :image_url, :service_url, :extension
-    
-    def initialize(service_url)
-      response = HTTParty.get(@image_url)
-      @extension = @image_url.match(/(\.\w+)(\?|$)/)[1]
-      if response.code == 200
-        @tempfile = Tempfile.new(['twimage',@extension])
-        @tempfile << response.body.force_encoding('utf-8')
-      else
-        raise ImageURLInvalid, "The image_url #{@image_url} was not found (returned a 404)"
-      end
-    end
-    
-  end
-end

data/lib/twimage/twitpic.rb

@@ -1,22 +0,0 @@
-module Twimage
-  class Twitpic < Twimage::Base
-    
-    def initialize(service_url)
-      @service_url = service_url
-      full_res_service_url = @service_url + '/full'
-      begin
-        image_tag = Nokogiri::HTML(open(full_res_service_url)).css('body > img').first
-      rescue OpenURI::HTTPError
-        raise ServiceURLInvalid, "The service URL #{@service_url} was not found (returned a 404)"
-      end
-      
-      if image_tag
-        @image_url = image_tag['src']
-        super
-      else
-        raise ImageNotFound, "The service URL #{@service_url} did not contain an identifiable image"
-      end
-    end
-    
-  end
-end

data/lib/twimage/yfrog.rb

@@ -1,22 +0,0 @@
-module Twimage
-  class Yfrog < Twimage::Base
-    
-    def initialize(service_url)
-      @service_url = service_url
-      full_res_service_url = @service_url.gsub(/\.com/, '.com/z')
-      begin
-        image_tag = Nokogiri::HTML(open(full_res_service_url)).css('#the-image img').first
-      rescue OpenURI::HTTPError
-        raise ServiceURLInvalid, "The service URL #{@service_url} was not found (returned a 404)"
-      end
-      
-      if image_tag
-        @image_url = image_tag['src']
-        super
-      else
-        raise ImageNotFound, "The service URL #{@service_url} did not contain an identifiable image"
-      end
-    end
-    
-  end
-end