snip-snap 0.1.1 → 0.1.2

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/image'
 
 # = SnipSnap
 #
@@ -37,11 +38,11 @@ module SnipSnap
   
   def self.host_map # :nodoc:
     {
-      'skitch.com'  => 'Skitch',
-      'img.ly'      => 'Imgly',
-      'twitpic.com' => 'Twitpic',
-      'yfrog.com'   => 'Yfrog',
-      'flic.kr'     => 'Flickr'
+      'Skitch'  => ['skitch.com'],
+      'Imgly'   => ['img.ly'],
+      'Twitpic' => ['twitpic.com'],
+      'Yfrog'   => ['yfrog.com', 'yfrog.us'],
+      'Flickr'  => ['flic.kr']
     }
   end
 
@@ -52,7 +53,9 @@ module SnipSnap
   
   def self.class_name_for(url) # :nodoc:
     uri = URI.parse(url)
-    host_map[uri.host]
+    match = host_map.detect {|k,v| v.include?(uri.host) }
+
+    match.nil? ? 'Image' : match[0]
   end
   
   # Set the Flickr API key for use by the underlying Flickr API library

data/lib/snip_snap/client.rb

@@ -8,6 +8,10 @@ module SnipSnap
       def initialize(url)
         @url = url
       end
+
+      def image?
+        true
+      end
       
       def fetch
         client = Curl::Easy.new(url) do |config|

data/lib/snip_snap/image.rb

@@ -0,0 +1,31 @@
+module SnipSnap
+  class Image
+    
+    MIME_TYPES = %w(image/jpeg image/gif image/pjpeg image/png)
+    EXTENSIONS = %w(jpeg jpg gif png)
+    
+    include Client
+    
+    request_method :head
+    
+    def mime_type
+      response.content_type
+    end
+    
+    def extension
+      uri = URI.parse(url)
+      extension = File.extname(uri.path).sub(/./, '')
+      
+      extension unless extension == ''
+    end
+    
+    def image?
+      MIME_TYPES.include?(mime_type) || EXTENSIONS.include?(extension)
+    end
+    
+    def image_url
+      url if image?
+    end
+    
+  end
+end

data/lib/snip_snap/version.rb

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

data/test/unit/snip_snap/flickr_test.rb

@@ -9,6 +9,11 @@ module SnipSnap
         @expanded_url = 'http://www.flickr.com/photos/northernraven/3317998738/'
       end
       
+      should "know that it is an image" do
+        f = SnipSnap::Flickr.new(@url)
+        f.should be_image
+      end
+      
       should "know the identifier for the photo" do
         response = stub()
         response.stubs(:last_effective_url).with().returns(@expanded_url)

data/test/unit/snip_snap/image_test.rb

@@ -0,0 +1,84 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+module SnipSnap
+  class ImageTest < Test::Unit::TestCase
+
+    MIME_TYPES = %w(image/jpeg image/gif image/pjpeg image/png)
+    EXTENSIONS = %w(jpeg jpg gif png)
+
+    context "An instance of the Image class" do
+      setup { @url = 'http://example.com/image.jpg' }
+
+      should "know the MIME type of the file referenced by the URL" do
+        response = stub() {|r| r.stubs(:content_type).with().returns('image/jpeg') }
+
+        i = SnipSnap::Image.new(@url)
+        i.stubs(:response).with().returns(response)
+
+        i.mime_type.should == 'image/jpeg'
+      end
+
+      should "know the extension of the file referenced by the URL" do
+        i = SnipSnap::Image.new('http://example.com/image.jpg')
+        i.extension.should == 'jpg'
+      end
+      
+      should "know that the extension is nil if the URL has no file extension" do
+        i = SnipSnap::Image.new('http://example.com/path')
+        i.extension.should be_nil
+      end
+
+      should "know that the URL is not an image if it is of type 'text/html'" do
+        i = SnipSnap::Image.new(@url)
+        i.stubs(:extension).with().returns(nil)
+        i.stubs(:mime_type).with().returns('text/html')
+
+        i.should_not be_image
+      end
+      
+      should "know that the URL is not an image if it has a '.html' extension" do
+        i = SnipSnap::Image.new(@url)
+        i.stubs(:extension).with().returns('html')
+        i.stubs(:mime_type).with().returns(nil)
+
+        i.should_not be_image
+      end
+
+      MIME_TYPES.each do |type|
+        should "know that the URL is an image if it is of type '#{type}'" do
+          i = SnipSnap::Image.new(@url)
+          i.stubs(:mime_type).with().returns(type)
+          i.stubs(:extension).with().returns(nil)
+          
+          i.should be_image
+        end
+      end
+      
+      EXTENSIONS.each do |extension|
+        should "know that the URL is an image if it has a '.#{extension}' extension" do
+          i = SnipSnap::Image.new(@url)
+          i.stubs(:mime_type).with().returns(nil)
+          i.stubs(:extension).with().returns(extension)
+          
+          i.should be_image
+        end
+      end
+
+      should "know the URL for the image" do
+        i = SnipSnap::Image.new(@url)
+        i.stubs(:image?).with().returns(true)
+        
+        i.image_url.should == @url
+      end
+      
+      should "return nil for the image's URL if it is not an image" do
+        i = SnipSnap::Image.new(@url)
+        i.stubs(:image?).with().returns(false)
+        
+        i.image_url.should be_nil
+      end
+      
+    end
+
+  end
+end

data/test/unit/snip_snap/imgly_test.rb

@@ -9,6 +9,11 @@ module SnipSnap
         @expanded_url = 'http://img.ly/show/large/3aa'
       end
 
+      should "know that it is an image" do
+        i = SnipSnap::Imgly.new(@url)
+        i.should be_image
+      end
+
       should "have a url expanded from the source" do
         i = SnipSnap::Imgly.new(@url)
         i.url.should == @expanded_url

data/test/unit/snip_snap/skitch_test.rb

@@ -6,6 +6,11 @@ module SnipSnap
     context "An instance of the Skitch class" do
       setup { @url = 'http://skitch.com/example' }
       
+      should "know that it is an image" do
+        s = SnipSnap::Skitch.new(@url)
+        s.should be_image
+      end
+      
       should "have a URL" do
         s = SnipSnap::Skitch.new(@url)
         s.url.should == @url

data/test/unit/snip_snap/yfrog_test.rb

@@ -9,6 +9,11 @@ module SnipSnap
         @expanded_url = 'http://yfrog.com/api/xmlInfo?path=ahb97j'
       end
 
+      should "know that it is an image" do
+        y = SnipSnap::Yfrog.new(@url)
+        y.should be_image
+      end
+
       should "have a url derived from the source URL" do
         y = SnipSnap::Yfrog.new(@url)
         y.url.should == @expanded_url

data/test/unit/snip_snap_test.rb

@@ -19,16 +19,26 @@ class SnipSnapTest < Test::Unit::TestCase
       SnipSnap.class_name_for(url).should == 'Twitpic'
     end
     
-    should "know the correct class name for a Yfrog URL" do
+    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 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')
@@ -64,6 +74,13 @@ class SnipSnapTest < Test::Unit::TestCase
       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')
+
+      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.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-06 00:00:00 -04:00
+date: 2009-09-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ files:
 - Rakefile
 - lib/snip_snap/client.rb
 - lib/snip_snap/flickr.rb
+- lib/snip_snap/image.rb
 - lib/snip_snap/imgly.rb
 - lib/snip_snap/skitch.rb
 - lib/snip_snap/twitpic.rb
@@ -56,6 +57,7 @@ files:
 - test/test_helper.rb
 - test/unit/snip_snap/client_test.rb
 - test/unit/snip_snap/flickr_test.rb
+- 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/twitpic_test.rb