twimage 0.1.0 → 0.1.2

data/README.md

@@ -32,11 +32,12 @@ Enjoy!
 
 ## Support
 
-Twimage currently supports the following services:
+Twimage currently supports the following photo services:
 
 * twitpic - http://twitpic.com
 * yfrog - http://yfrog.com
 * instagram - http://instagr.am
+* twitter - http://twitter.com
 
 ## Contributing
 

data/lib/twimage.rb

@@ -17,14 +17,18 @@ module Twimage
   SERVICES = [{ :name => :twitpic,
                 :service_match => /twitpic\.com/,
                 :full_url_modifier => lambda { |url| url + '/full' },
-                :image_css_match => 'body > img' },
+                :image_css_match => '#media-full img' },
               { :name => :yfrog,
                 :service_match => /yfrog\.com/,
                 :full_url_modifier => lambda { |url| url.gsub(/\.com/, '.com/z') },
                 :image_css_match => '#the-image img' },
               { :name => :instagram,
                 :service_match => [/instagr\.am/, /instagram\.com/],
-                :image_css_match => '.photo'}]
+                :image_css_match => '.photo' },
+              { :name => :twitter,
+                #:full_url_modifier => lambda { |url| url + '/large' },
+                :service_match => /twitter\.com/,
+                :image_regex_match => /"media_url_https":"(.*?)"/}]
                   
   def self.get(url)
     service_url = HTTParty.get(url, :headers => { 'User-Agent' => USER_AGENT }).request.path.to_s                                                                 # first point HTTParty at this URL and follow any redirects to get to the final page
@@ -41,6 +45,8 @@ module Twimage
   def self.find_service(url)
     return SERVICES.find do |service|
       [service[:service_match]].flatten.find do |regex|
+        puts url
+        puts regex
         url.match(regex)
       end
     end
@@ -49,16 +55,27 @@ module Twimage
   
   # tear apart the HTML on the returned service page and find the source of the image
   def self.get_image_url(service, url)
+    image_url = nil
     # get the content of the image page
-    begin
-      image_tag = Nokogiri::HTML(open(url, 'User-Agent' => USER_AGENT)).css(service[:image_css_match]).first
-    rescue OpenURI::HTTPError
-      raise ServiceURLInvalid, "The service URL #{url} was not found (returned a 404)"
+    if service[:image_css_match]
+      begin
+        image_tag = Nokogiri::HTML(open(url, 'User-Agent' => USER_AGENT)).css(service[:image_css_match]).first
+        image_url = image_tag['src']
+      rescue OpenURI::HTTPError
+        raise ServiceURLInvalid, "The service URL #{url} was not found (returned a 404)"
+      end
+      # get the URL to the actual image file
+      
+    elsif service[:image_regex_match]
+      begin
+        image_url = HTTParty.get(url, :headers => {'User-Agent' => USER_AGENT}).body.match(service[:image_regex_match])[1]
+      rescue OpenURI::HTTPError
+        raise ServiceURLInvalid, "The service URL #{url} was not found (returned a 404)"
+      end
     end
     
-    # get the URL to the actual image file
-    if image_tag
-      return image_tag['src']
+    if image_url
+      return image_url
     else
       raise ImageNotFound, "The service URL #{url} did not contain an identifiable image"
     end
@@ -77,3 +94,5 @@ module Twimage
   end
   
 end
+
+puts Twimage.get 'http://pic.twitter.com/GQk2RNI'

data/lib/twimage/version.rb

@@ -1,3 +1,3 @@
 module Twimage
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: twimage
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Rob Cameron
@@ -10,17 +14,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-28 00:00:00 -07:00
+date: 2012-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -28,10 +33,11 @@ dependencies:
   name: httparty
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -63,21 +69,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: twimage
-rubygems_version: 1.6.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A gem for pulling images from various Twitter image services