twimage 0.0.13 → 0.1.0

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/README.md

@@ -8,7 +8,11 @@ Add twimage to your Gemfile:
 
     gem 'twimage'
     
-Instantiate the appropriate service and give it the standard URL returned by that service:
+Of without bundler:
+
+    gem install twimage
+    
+Now simply take the standard URL that is posted to Twitter and tell Twimage to go get it:
 
     result = Twimage.get('http://instagr.am/p/EHqLG/')
     
@@ -18,7 +22,11 @@ Twimage will create a Ruby tempfile with the image. To get the tempfile:
     
 Save the image to your local system, upload to S3, etc. As soon as there are no more references to the
 tempfile in your code it will be unlinked (deleted). There are a couple additional instance variables
-you have access to--try result.inspect to take a look.
+you have access to...try `result.inspect` to take a look.
+
+Twimage will follow any redirects that eventually get you to any of the included services. So, if you
+have a Instagram image behind a Bitly shortened URL, just give the Bitly link to Twimage and he'll
+(she'll?) take care of the rest.
 
 Enjoy!
 

data/lib/twimage.rb

@@ -13,6 +13,7 @@ module Twimage
   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
   
+  USER_AGENT = "Twimage #{Twimage::VERSION} http://github.com/cannikin/twimage"
   SERVICES = [{ :name => :twitpic,
                 :service_match => /twitpic\.com/,
                 :full_url_modifier => lambda { |url| url + '/full' },
@@ -26,7 +27,7 @@ module Twimage
                 :image_css_match => '.photo'}]
                   
   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_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
     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
@@ -50,7 +51,7 @@ module Twimage
   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
+      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)"
     end
@@ -67,7 +68,7 @@ module Twimage
   # download the actual image and put into a tempfile
   def self.get_image(url)
     # get the image itself
-    response = HTTParty.get(url)
+    response = HTTParty.get(url, :headers => { 'User-Agent' => USER_AGENT })
     if response.code == 200
       return response.body.force_encoding('utf-8')
     else

data/lib/twimage/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: twimage
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors: 
 - Rob Cameron
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-14 00:00:00 -04:00
+date: 2011-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,6 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- .rvmrc
 - Gemfile
 - README.md
 - Rakefile

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.2@twimage && rvm wrapper 1.9.2@twimage textmate