thornbed 0.3.0 → 0.3.1

data/lib/thornbed/providers/imgur.rb

@@ -6,37 +6,28 @@ module Thornbed::Providers
     attr_accessor :pattern
 
     def initialize
-      self.pattern = /^http(s)?:\/\/((i\.)|(www\.))?imgur.com\/(gallery\/)?(\w){5}(s|l|b|m|t)?(\.gif|\.jpg|.jpeg|\.png)?(\?full)?$/
+      self.pattern = /^https?:\/\/(www\.|i\.)?imgur\.com\/(gallery\/)?(?<pid>\w{5,})(s|l|b|m|t)?(?<ptype>\.gif|\.jpg|\.jpeg|\.png)?(\?full)?$/
     end
 
     def get(url)
       raise Thornbed::NotValid, url if !valid?(url)
-      url = URI.parse(url)
-      gallery = /gallery/ =~ url.path
-      direct = /\/(\w){5}(\.gif|\.jpg|\.jpeg|\.png)$/.match(url.path)
-      thumb = /\/(\w){5}(s|l|b|m|t)(\.gif|\.jpg|\.jpeg|\.png)$/.match(url.path)
-      page = /\/(\w){5}$/ =~ url.path
-      ptype = "jpg"
+      res = pattern.match(url)
+      pid = res[:pid]
+      md = /(?<pid>\w{5,})(s|l|b|m|t)$/.match(pid)
+      pid = md[:pid] if md else pid
+      ptype = res[:ptype] || ".jpg"
 
-      if page || gallery
-        pic_id = /(\/gallery\/)?\/(\w)*$/.match(url.path)[0][1..-1]
-      elsif thumb
-        pic_id = thumb[0][1..5]
-      elsif direct
-        pic_id = direct[0][1..5]
-        ptype = /(\.gif|\.jpg|\.jpeg|\.png)$/.match(url.path)[0][1..-1]
-      else
-        raise Thornbed::NotValid, url
-      end
+
+      raise Thornbed::NotValid, url if not pid
 
       {
-        url: "http://i.imgur.com/#{pic_id}.#{ptype}",
+        url: "http://i.imgur.com/#{pid}#{ptype}",
         type: "photo",
         provider_name: provider_name,
         provider_url: "http://imgur.com",
-        thumbnail_url: "http://i.imgur.com/#{pic_id}s.#{ptype}",
+        thumbnail_url: "http://i.imgur.com/#{pid}s#{ptype}",
         version: "1.0",
-        page: "http://imgur.com/#{pic_id}",
+        page: "http://imgur.com/#{pid}",
         width: nil,
         height: nil
       }

data/lib/thornbed/version.rb

@@ -1,3 +1,3 @@
 module Thornbed
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/providers/imgur_spec.rb

@@ -17,6 +17,7 @@ describe "Imgur" do
     imgur.valid?('http://i.imgur.com/N2IDN.gif').should be_true
     imgur.valid?('http://i.imgur.com/A0TP9s.jpg').should be_true
     imgur.valid?('http://www.imgur.com/RUUuR.jpeg').should be_true
+    imgur.valid?('http://imgur.com/LcbbCHv').should be_true
     imgur.valid?('http://imgur.com/none').should be_false
     imgur.valid?('http://imgur.com/none.jpg').should be_false
     imgur.valid?('http://imgur.com/a/pq0N2').should be_false
@@ -25,6 +26,7 @@ describe "Imgur" do
   it "should return OEmbed hash for imgur urls" do
     imgur = Thornbed::Providers::Imgur.new
     res = imgur.get('http://imgur.com/gallery/A0TP9')
+    puts "*** #{res}"
     res.should include(url: 'http://i.imgur.com/A0TP9.jpg')
 
     res = imgur.get('http://i.imgur.com/A0TP9.png')
@@ -54,6 +56,12 @@ describe "Imgur" do
     res = imgur.get('http://www.imgur.com/RUUuR.jpeg')
     res.should include(url: 'http://i.imgur.com/RUUuR.jpeg')
 
+    res = imgur.get('http://imgur.com/LcbbCHv')
+    res.should include(url: 'http://i.imgur.com/LcbbCHv.jpg')
+
+    res = imgur.get('http://i.imgur.com/LcbbCHvs.jpg')
+    res.should include(url: 'http://i.imgur.com/LcbbCHv.jpg')
+
     lambda { imgur.get('http://imgur.com/none') }.should raise_error(Thornbed::NotValid)
     lambda { imgur.get('http://imgur.com/none.jpg') }.should raise_error(Thornbed::NotValid)
     lambda { imgur.get('http://imgur.com/a/pq0N2') }.should raise_error(Thornbed::NotValid)

data/spec/thornbed_spec.rb

@@ -2,22 +2,7 @@ require "spec_helper"
 
 describe Thornbed do
   it "should rely on ruby-oembed when querying for a oembed provider" do
-    good_response = {
-      "provider_url"=>"http://www.youtube.com/",
-      "thumbnail_url"=>"http://i1.ytimg.com/vi/xJbJayhYxG4/hqdefault.jpg",
-      "title"=>"How can I know if God Exists?",
-      "html"=>
-      "<iframe width=\"459\" height=\"344\" src=\"http://www.youtube.com/embed/xJbJayhYxG4?fs=1&feature=oembed\" frameborder=\"0\" allowfullscreen></iframe>",
-      "author_name"=>"radhanathswamionline",
-      "height"=>344,
-      "thumbnail_width"=>480,
-      "width"=>459,
-      "version"=>"1.0",
-      "author_url"=>"http://www.youtube.com/user/radhanathswamionline",
-      "provider_name"=>"YouTube",
-      "type"=>"video",
-      "thumbnail_height"=>360
-    }
+    good_response = {"thumbnail_width"=>480, "author_url"=>"http://www.youtube.com/user/radhanathswamionline", "version"=>"1.0", "type"=>"video", "thumbnail_height"=>360, "provider_url"=>"http://www.youtube.com/", "thumbnail_url"=>"http://i1.ytimg.com/vi/xJbJayhYxG4/hqdefault.jpg", "html"=>"<iframe width=\"459\" height=\"344\" src=\"http://www.youtube.com/embed/xJbJayhYxG4?feature=oembed\" frameborder=\"0\" allowfullscreen></iframe>", "provider_name"=>"YouTube", "height"=>344, "title"=>"How can I know if God Exists?", "width"=>459, "author_name"=>"Balarama Lila Das"}
     FakeWeb.register_uri(:get, /http(s)?:\/\/*(\.)?google\.com\/*/, body: good_response)
     url = "http://www.youtube.com/watch?v=xJbJayhYxG4&feature=g-vrec"
     res = Thornbed.get(url)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thornbed
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-oembed
@@ -170,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1111310976437943127
+      hash: -3319635208009761846
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1111310976437943127
+      hash: -3319635208009761846
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24