imgur_url 0.1 → 0.2

data/README.md

@@ -1,4 +1,4 @@
-Ruby gem for dealing with [imgur](http://imgur.com) image URLs.
+Ruby gem for dealing with [imgur](http://imgur.com) image URLs. Install with `gem install imgur_url`
 
 [![Build Status](https://secure.travis-ci.org/6/imgur_url.png?branch=master)](http://travis-ci.org/6/imgur_url)
 
@@ -22,7 +22,6 @@ i.permalink_url
 - `http://imgur.com/{image_id}`
 - `http://i.imgur.com/{image_id}.jpg`
 - `http://imgur.com/download/{image_id}`
-- `http://imgur.com/gallery/{image_id}`
 
 #### Supported `url` sizes
 - `:original` (default)

data/lib/imgur_url/image.rb

@@ -9,17 +9,18 @@ module ImgurUrl
       :original => '',
     }
 
-    ALBUM_PATH = "a"
+    IGNORE_PATHS = %w[
+      gallery
+      removalrequest
+    ]
 
     def initialize(url)
       @original_url = url
-      unless id.present? && id != ALBUM_PATH
-        raise InvalidUrl
-      end
+      raise InvalidUrl  unless id.present? && !IGNORE_PATHS.include?(id)
     end
 
     def id
-      @id ||= @original_url.match(%r{imgur\.com/(?:(?:gallery|download)/)?([^.#?/]+)}).andand[1]
+      @id ||= @original_url.match(%r{^http://(?:i\.)?imgur\.com/(?:download/)?([^.#?/]{5,})}).andand[1]
     end
 
     def url(size = :original)

data/lib/imgur_url/version.rb

@@ -1,3 +1,3 @@
 module ImgurUrl
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

data/spec/lib/image_spec.rb

@@ -43,11 +43,6 @@ module ImgurUrl
       it_behaves_like "with a valid imgur image URL"
     end
 
-    context "a gallery URL" do
-      let(:url) { "http://imgur.com/gallery/dhuY8" }
-      it_behaves_like "with a valid imgur image URL"
-    end
-
     context "a download URL" do
       let(:url) { "http://imgur.com/download/dhuY8" }
       it_behaves_like "with a valid imgur image URL"
@@ -59,9 +54,20 @@ module ImgurUrl
       end
     end
 
-    context "with an imgur album URL" do
-      let(:url) { "http://imgur.com/a/CrSqu" }
-      it_behaves_like "with an invalid URL"
+    %w[
+      http://imgur.com/a/CrSqu
+      http://imgur.com/blog
+      http://imgur.com/blog/2013/06/11/tech-tuesday-real-time-messaging/
+      http://imgur.com/user/alan
+      http://imgur.com/new/time
+      http://imgur.com/removalrequest
+      http://imgur.com/gallery
+      https://imgur.com/signin
+    ].each do |url|
+      context "with the non-image imgur url: #{url}" do
+        let(:url) { url }
+        it_behaves_like "with an invalid URL"
+      end
     end
 
     context "with a non-imgur URL" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imgur_url
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: andand