snip-snap 0.1.3 → 0.1.4

data/README.rdoc

@@ -5,7 +5,7 @@
 SnipSnap is a Ruby library that will allow you to extract the URL of an image from
 one of many popular image sharing services.  Just give it the shortened URL and it can
 give you the full URL to the embedded image.  This library currently supports Img.ly,
-Skitch, Twitpic, Flickr, and Yfrog - others are coming.
+Skitch, Twitpic, Flickr, Yfrog, and Twitgoo - others are coming.
 
 == Installation
 

data/Rakefile

@@ -14,7 +14,7 @@ spec = Gem::Specification.new do |s|
   s.author           = 'Patrick Reagan'
   s.email            = 'reaganpr@gmail.com'
   s.homepage         = 'http://sneaq.net'
-  s.files            = %w(README.rdoc Rakefile) + Dir.glob("{lib,test}/**/*")
+  s.files            = %w(README.rdoc Rakefile) + Dir.glob("{lib,test}/**/*") - ['test/flickr_api_key']
   # s.executables    = ['snip-snap']
   
   s.add_dependency('curb', '>= 0.5.1.0')

data/lib/snip_snap.rb

@@ -11,6 +11,7 @@ require 'snip_snap/imgly'
 require 'snip_snap/yfrog'
 require 'snip_snap/twitpic'
 require 'snip_snap/flickr'
+require 'snip_snap/twitgoo'
 require 'snip_snap/image'
 
 # = SnipSnap
@@ -23,6 +24,7 @@ require 'snip_snap/image'
 # * Twitpic
 # * Yfrog
 # * Flickr
+# * Twitgoo
 #
 # To use, just point it at a URL:
 # 
@@ -38,11 +40,12 @@ module SnipSnap
   
   def self.host_map # :nodoc:
     {
-      /^(www\.)?skitch.com/           => 'Skitch',
-      /img.ly\/[0-9a-z]+$/i           => 'Imgly',
-      /^twitpic.com/                  => 'Twitpic',
-      /yfrog\.(com|us)/               => 'Yfrog',
-      /^(flic.kr|(www\.)?flickr.com)/ => 'Flickr' 
+      /^(www\.)?skitch\.com/           => 'Skitch',
+      /img\.ly\/[0-9a-z]+$/i           => 'Imgly',
+      /^twitpic\.com/                  => 'Twitpic',
+      /yfrog\.(com|us)/                => 'Yfrog',
+      /^(flic\.kr|(www\.)?flickr.com)/ => 'Flickr',
+      /^twitgoo\.com/                  => 'Twitgoo'
     }
   end
 

data/lib/snip_snap/flickr.rb

@@ -5,11 +5,18 @@ module SnipSnap
 
     request_method :head
     
+    def endpoint_url
+      response.last_effective_url
+    end
+    
     def identifier
-      url = response.last_effective_url
-      url.match(/([^\/]+)\/$/)[1]
+      pattern = /^http:\/\/(?:www\.)?flickr.com\/photos\/[^\/]+\/(\d+)/
+      match = endpoint_url.match(pattern)
+      
+      match[1] unless match.nil?
     end
     
+    # TODO: Handle case when this fetch fails (e.g. invalid photo ID)
     def photo
       Fleakr::Objects::Photo.find_by_id(identifier)
     end

data/lib/snip_snap/twitgoo.rb

@@ -0,0 +1,17 @@
+module SnipSnap
+  class Twitgoo
+    
+    include Client
+    
+    def url
+      identifier = @url.match(/([^\/]+)$/)[1]
+      "http://twitgoo.com/api/message/info/#{identifier}"
+    end
+    
+    def image_url
+      body = response.body_str
+      body.match(/<imageurl>(.+)<\/imageurl>/)[1]
+    end
+    
+  end
+end

data/lib/snip_snap/version.rb

@@ -3,7 +3,7 @@ module SnipSnap
     
     MAJOR = 0
     MINOR = 1
-    TINY  = 3
+    TINY  = 4
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

data/test/fixtures/twitgoo.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><rsp status="ok">
+    <username>darthapo</username>
+    <mediaid>2r5hv</mediaid>
+    <mediaurl>http://twitgoo.com/</mediaurl>
+    <imageurl>http://i29.tinypic.com/9sxqpx.png</imageurl>
+    <thumburl>http://i29.tinypic.com/9sxqpx_th.png</thumburl>
+</rsp>

data/test/integration/response_test.rb

@@ -16,7 +16,7 @@ class ResponseTest < Test::Unit::TestCase
     
     should "be able to find the image in a Skitch URL" do
       client = SnipSnap.from_url('http://skitch.com/reagent/bh4ei/inbox-gmail-29466-messages-130-unread')
-      client.image_url.should == 'http://img.skitch.com/20090909-bw3tnhse6rhn68erk6wpa882ea.jpg'
+      client.image_url.should =~ /^http:\/\/img\.skitch\.com\/\d{8}-bw3tnhse6rhn68erk6wpa882ea\.jpg$/
     end
     
     should "be able to find an image in a shortened Yfrog URL" do
@@ -49,11 +49,26 @@ class ResponseTest < Test::Unit::TestCase
       client.image_url.should == 'http://farm4.static.flickr.com/3449/3212555327_14d2d3f8b0.jpg'
     end
     
+    should "be able to find an image in an expanded Flickr URL without a trailing slash" do
+      client = SnipSnap.from_url('http://www.flickr.com/photos/sares/3579062921')
+      client.image_url.should == 'http://farm3.static.flickr.com/2439/3579062921_d5da30b0a9.jpg'
+    end
+    
+    should "be able to find an image in an expanded Flickr photo's set URL" do
+      client = SnipSnap.from_url('http://www.flickr.com/photos/viget/3852378037/in/set-72157621982815973/')
+      client.image_url.should == 'http://farm3.static.flickr.com/2482/3852378037_11e9e3b14b.jpg'
+    end
+    
     should "be able to find an image in an img.ly URL" do
       client = SnipSnap.from_url('http://img.ly/3ey')
       client.image_url.should =~ /http:\/\/img\.ly\/media\/12434\/large_ChillPill13\.jpg/
     end
     
+    should "be able to find an image in a Twitgoo URL" do
+      client = SnipSnap.from_url('http://twitgoo.com/2r5hv')
+      client.image_url.should == 'http://i29.tinypic.com/9sxqpx.png'
+    end
+    
     should "be able to find an image from a URL with a correct MIME type" do
       client = SnipSnap.from_url('http://img.ly/media/12434/large_ChillPill13.jpg')
       client.image_url.should == 'http://img.ly/media/12434/large_ChillPill13.jpg'

data/test/unit/snip_snap/flickr_test.rb

@@ -14,16 +14,48 @@ module SnipSnap
         f.should be_image
       end
       
-      should "know the identifier for the photo" do
+      should "know the endpoint URL" do
         response = stub()
         response.stubs(:last_effective_url).with().returns(@expanded_url)
-        
+
         f = SnipSnap::Flickr.new(@url)
         f.stubs(:response).with().returns(response)
+
+        f.endpoint_url.should == @expanded_url
+      end
+      
+      should "know the identifier for the basic photo URL" do
+        f = SnipSnap::Flickr.new('')
+        f.stubs(:endpoint_url).with().returns('http://www.flickr.com/photos/northernraven/3317998738/')
+        
+        f.identifier.should == '3317998738'
+      end
+      
+      should "know the identifier for the basic photo URL without a trailing slash" do
+        f = SnipSnap::Flickr.new('')
+        f.stubs(:endpoint_url).with().returns('http://www.flickr.com/photos/northernraven/3317998738')
         
         f.identifier.should == '3317998738'
       end
       
+      should "return nil if it can't find the identifier in the URL" do
+        url = 'http://www.flickr.com/photos/viget'
+        
+        f = SnipSnap::Flickr.new('')
+        f.stubs(:endpoint_url).with().returns(url)
+        
+        f.identifier.should be_nil
+      end
+      
+      should "know the identifier for the photo URL as part of a set" do
+        url = 'http://www.flickr.com/photos/viget/3852378037/in/set-72157621982815973/'
+
+        f = SnipSnap::Flickr.new(@url)
+        f.stubs(:endpoint_url).with().returns(url)
+        
+        f.identifier.should == '3852378037'
+      end
+      
       should "be able to find the photo for the identifier" do
         identifier = '3317998738'
         photo      = stub()

data/test/unit/snip_snap/twitgoo_test.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+module SnipSnap
+  class TwitgooTest < Test::Unit::TestCase
+    
+    context "An instance of the Twitgoo class" do
+      setup do
+        @url          = 'http://twitgoo.com/2r5hv'
+        @expanded_url = 'http://twitgoo.com/api/message/info/2r5hv'
+      end
+      
+      should "know that it's an image" do
+        t = SnipSnap::Twitgoo.new(@url)
+        t.should be_image
+      end
+      
+      should "have a URL derived from the source URL" do
+        t = SnipSnap::Twitgoo.new(@url)
+        t.url.should == @expanded_url
+      end
+      
+      should "know the image URL" do
+        response = stub()
+        response.stubs(:body_str).with().returns(read_fixture('twitgoo.xml'))
+        
+        t = SnipSnap::Twitgoo.new(@url)
+        t.stubs(:response).with().returns(response)
+        
+        t.image_url.should == 'http://i29.tinypic.com/9sxqpx.png'
+      end
+      
+      
+    end
+    
+  end
+end

data/test/unit/snip_snap_test.rb

@@ -2,90 +2,56 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class SnipSnapTest < Test::Unit::TestCase
 
-  context "The SnipSnap module" do
+  def self.should_know_the_class_name_for(matcher)
+    url        = matcher.keys.first
+    class_name = matcher.values.first
 
-    should "know the correct class name for a Skitch URL" do
-      url = 'http://skitch.com/reagent/bh4ei/bleeergh'
-      SnipSnap.class_name_for(url).should == 'Skitch'
-    end
-    
-    should "know the correct class name for an Imgly URL" do
-      url = 'http://img.ly/3ey'
-      SnipSnap.class_name_for(url).should == 'Imgly'
-    end
-    
-    should "know the correct class name for a Twitpic URL" do
-      url = 'http://twitpic.com/203o0'
-      SnipSnap.class_name_for(url).should == 'Twitpic'
-    end
-    
-    should "know the correct class name for a Yfrog.com URL" do
-      url = 'http://yfrog.com/ahb97j'
-      SnipSnap.class_name_for(url).should == 'Yfrog'
-    end
-    
-    should "know the correct class name for a Yfrog.us URL" do
-      url = 'http://yfrog.us/ahb97j'
-      SnipSnap.class_name_for(url).should == 'Yfrog'
-    end
-    
-    should "know the correct class name for an expanded Yfrog URL" do
-      url = 'http://img377.yfrog.com/i/b97.jpg/'
-      SnipSnap.class_name_for(url).should == 'Yfrog'
-    end
-    
-    should "know the correct class name for a Flickr URL" do
-      url = 'http://flic.kr/p/64cBqN'
-      SnipSnap.class_name_for(url).should == 'Flickr'
-    end
-    
-    should "use the default class when it can't match on other URLs" do
-      url = 'http://example.com/image.jpg'
-      SnipSnap.class_name_for(url).should == 'Image'
-    end
-    
-    should "be able to create an instance of the Skitch class with the supplied URL" do
-      url = 'http://skitch.com/reagent/bh4ei/bleeergh'
-      SnipSnap::Skitch.expects(:new).with(url).returns('skitch')
-      
-      SnipSnap.from_url(url).should == 'skitch'
+    should "know that the class name for #{url} is #{class_name}" do
+      SnipSnap.class_name_for(url).should == class_name
     end
+  end
+  
+  def self.should_create_an_instance_for(matcher)
+    url        = matcher.keys.first
+    class_name = matcher.values.first
     
-    should "be able to create an instance of the Imgly class with the supplied URL" do
-      url = 'http://img.ly/3ey'
-      SnipSnap::Imgly.expects(:new).with(url).returns('imgly')
+    should "be able to create an instance of the #{class_name} class for the url: '#{url}'" do
+      klass = SnipSnap.const_get(class_name)
+      klass.expects(:new).with(url).returns('instance')
       
-      SnipSnap.from_url(url).should == 'imgly'
+      SnipSnap.from_url(url).should == 'instance'
     end
     
-    should "be able to create an instance of the Twitpic class with the supplied URL" do
-      url = 'http://twitpic.com/203o0'
-      SnipSnap::Twitpic.expects(:new).with(url).returns('twitpic')
-
-      SnipSnap.from_url(url).should == 'twitpic'
-    end
+  end
 
-    should "be able to create an instance of the Yfrog class with the supplied URL" do
-      url = 'http://yfrog.com/ahb97j'
-      SnipSnap::Yfrog.expects(:new).with(url).returns('yfrog')
+  context "The SnipSnap module" do
 
-      SnipSnap.from_url(url).should == 'yfrog'
-    end
+    should_know_the_class_name_for 'http://skitch.com/reagent/bh4ei/bleeergh'       => 'Skitch'
+    should_know_the_class_name_for 'http://img.ly/3ey'                              => 'Imgly'
+    should_know_the_class_name_for 'http://twitpic.com/203o0'                       => 'Twitpic'
+    should_know_the_class_name_for 'http://yfrog.com/ahb97j'                        => 'Yfrog'
+    should_know_the_class_name_for 'http://yfrog.us/ahb97j'                         => 'Yfrog'
+    should_know_the_class_name_for 'http://img377.yfrog.com/i/b97.jpg/'             => 'Yfrog'
+    should_know_the_class_name_for 'http://flic.kr/p/64cBqN'                        => 'Flickr'
+    should_know_the_class_name_for 'http://www.flickr.com/photos/viget/3852378037/' => 'Flickr'
+    should_know_the_class_name_for 'http://twitgoo.com/2r5hv'                       => 'Twitgoo'
+    should_know_the_class_name_for 'http://example.com/image.jpg'                   => 'Image'
     
-    should "be able to create an instance of the Flickr class with the supplied URL" do
-      url = 'http://flic.kr/p/64cBqN'
-      SnipSnap::Flickr.expects(:new).with(url).returns('flickr')
+    should_know_the_class_name_for 'http://www.flickr.com/photos/viget/3852378037/in/set-72157621982815973/' => 'Flickr'
 
-      SnipSnap.from_url(url).should == 'flickr'
-    end
-    
-    should "be able to create an instance of the Image class with the supplied URL" do
-      url = 'http://example.com/image.jpg'
-      SnipSnap::Image.expects(:new).with(url).returns('image')
+    should_create_an_instance_for 'http://skitch.com/reagent/bh4ei/bleeergh'       => 'Skitch'
+    should_create_an_instance_for 'http://img.ly/3ey'                              => 'Imgly'
+    should_create_an_instance_for 'http://twitpic.com/203o0'                       => 'Twitpic'
+    should_create_an_instance_for 'http://yfrog.com/ahb97j'                        => 'Yfrog'
+    should_create_an_instance_for 'http://yfrog.us/ahb97j'                         => 'Yfrog'
+    should_create_an_instance_for 'http://img377.yfrog.com/i/b97.jpg/'             => 'Yfrog'
+    should_create_an_instance_for 'http://flic.kr/p/64cBqN'                        => 'Flickr'
+    should_create_an_instance_for 'http://www.flickr.com/photos/viget/3852378037/' => 'Flickr'
+    should_create_an_instance_for 'http://twitgoo.com/2r5hv'                       => 'Twitgoo'
+    should_create_an_instance_for 'http://example.com/image.jpg'                   => 'Image'
+
+    should_create_an_instance_for 'http://www.flickr.com/photos/viget/3852378037/in/set-72157621982815973/' => 'Flickr'
 
-      SnipSnap.from_url(url).should == 'image'
-    end
-    
     should "be able to set the Flickr API key" do
       key = 'abc123'
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: snip-snap
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-09 00:00:00 -04:00
+date: 2009-11-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,13 +48,14 @@ files:
 - lib/snip_snap/image.rb
 - lib/snip_snap/imgly.rb
 - lib/snip_snap/skitch.rb
+- lib/snip_snap/twitgoo.rb
 - lib/snip_snap/twitpic.rb
 - lib/snip_snap/version.rb
 - lib/snip_snap/yfrog.rb
 - lib/snip_snap.rb
 - test/fixtures/skitch.html
+- test/fixtures/twitgoo.xml
 - test/fixtures/yfrog.html
-- test/flickr_api_key
 - test/flickr_api_key.example
 - test/integration/response_test.rb
 - test/test_helper.rb
@@ -63,6 +64,7 @@ files:
 - test/unit/snip_snap/image_test.rb
 - test/unit/snip_snap/imgly_test.rb
 - test/unit/snip_snap/skitch_test.rb
+- test/unit/snip_snap/twitgoo_test.rb
 - test/unit/snip_snap/twitpic_test.rb
 - test/unit/snip_snap/yfrog_test.rb
 - test/unit/snip_snap_test.rb

data/test/flickr_api_key

@@ -1 +0,0 @@
-4e9e84830598c4e546e11a6746a58545