twimage 0.0.12 → 0.0.13

data/README.md

@@ -10,14 +10,17 @@ Add twimage to your Gemfile:
     
 Instantiate the appropriate service and give it the standard URL returned by that service:
 
-    result = Twimage::Twitpic.new('http://twitpic.com/4w30yx')
+    result = Twimage.get('http://instagr.am/p/EHqLG/')
     
 Twimage will create a Ruby tempfile with the image. To get the tempfile:
 
     result.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). Enjoy!
+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.
+
+Enjoy!
 
 ## Support
 
@@ -25,9 +28,11 @@ Twimage currently supports the following services:
 
 * twitpic - http://twitpic.com
 * yfrog - http://yfrog.com
+* instagram - http://instagr.am
 
 ## Contributing
 
-To add a parser, fork this repo and then send me a pull request. Your parser should make a reasonable attempt to
-retrieve the highest resolution image possible and return errors if the service URL returns a 404 or the proper 
-image tag couldn't be found (see twitpic.rb for an example).
+To add a parser, fork this repo and then send me a pull request. You should attempt to get the highest resolution
+version of the image possible, which isn't always available at the link posted to Twitter. Check out the `SERVICES`
+constant in `twimage.rb` for examples of `lambda`s used to modify the original `service_url` to get to the full res
+version's URL.

data/lib/twimage.rb

@@ -20,7 +20,10 @@ module Twimage
               { :name => :yfrog,
                 :service_match => /yfrog\.com/,
                 :full_url_modifier => lambda { |url| url.gsub(/\.com/, '.com/z') },
-                :image_css_match => '#the-image img' }]
+                :image_css_match => '#the-image img' },
+              { :name => :instagram,
+                :service_match => [/instagr\.am/, /instagram\.com/],
+                :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
@@ -36,7 +39,9 @@ module Twimage
   # 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])
+      [service[:service_match]].flatten.find do |regex|
+        url.match(regex)
+      end
     end
   end
   

data/lib/twimage/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: twimage
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Rob Cameron