thornbed 0.3.1 → 0.3.2

data/lib/thornbed/provider.rb

@@ -1,9 +1,11 @@
 require "thornbed/errors"
+require "thornbed/version"
 
 module Thornbed
   module Providers
     class Provider
       @providers = []
+      USER_AGENT = "Thornbed/#{Thornbed::VERSION}"
 
       class << self
         attr_reader :providers

data/lib/thornbed/providers/imgur.rb

@@ -1,25 +1,41 @@
 require "uri"
 require "thornbed"
+require "httparty"
+
 
 module Thornbed::Providers
   class Imgur < Thornbed::Providers::Provider
     attr_accessor :pattern
 
     def initialize
-      self.pattern = /^https?:\/\/(www\.|i\.)?imgur\.com\/(gallery\/)?(?<pid>\w{5,})(s|l|b|m|t)?(?<ptype>\.gif|\.jpg|\.jpeg|\.png)?(\?full)?$/
+      self.pattern = /^https?:\/\/(www\.|i\.)?imgur\.com\/(gallery\/)?(?<pid>\w{5,})(?<ptype>\.gif|\.jpg|\.jpeg|\.png)?(\?full)?$/
     end
 
     def get(url)
       raise Thornbed::NotValid, url if !valid?(url)
-      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"
 
+      # imgur pic_id is ambiguous since the chars for thumb etc... can be part of the id
+      # so we check the embed page
+      # first get the pseudo id
+      md = pattern.match(url)
+      pid = md[:pid]
+      # TODO: improve this code
+      if pid.length > 5
+        pid = pid.gsub(/(h|m|l|s)?$/, '')
+      end
+      raise Thornbed::NotValid, url if not pid
+
+      res = HTTParty.get("http://imgur.com/#{pid}?tags", headers: {"User-Agent" => USER_AGENT})
+
+      # now get the real pid and ptype from that page
+      md = /id\=\"nondirect\"[ ]+value\=\"http:\/\/imgur.com\/(?<pid>\w+)/.match(res.body)
+      pid = md[:pid]
 
       raise Thornbed::NotValid, url if not pid
 
+      md = /id\=\"direct\"[ ]+value\=\"http:\/\/i.imgur.com\/\w+(?<ptype>\.jpg|\.jpeg|\.png|\.gif)/.match(res.body)
+      ptype = md[:ptype] || ".jpg"
+
       {
         url: "http://i.imgur.com/#{pid}#{ptype}",
         type: "photo",

data/lib/thornbed/version.rb

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

data/spec/providers/imgur_spec.rb

@@ -18,6 +18,7 @@ describe "Imgur" do
     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/0TczaPb').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
@@ -26,14 +27,13 @@ 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')
-    res.should include(url: 'http://i.imgur.com/A0TP9.png')
+    res.should include(url: 'http://i.imgur.com/A0TP9.jpg')
 
     res = imgur.get('http://i.imgur.com/A0TP9.gif')
-    res.should include(url: 'http://i.imgur.com/A0TP9.gif')
+    res.should include(url: 'http://i.imgur.com/A0TP9.jpg')
 
     res = imgur.get('http://i.imgur.com/A0TP9.jpg')
     res.should include(url: 'http://i.imgur.com/A0TP9.jpg')
@@ -54,13 +54,16 @@ describe "Imgur" do
     res.should include(url: 'http://i.imgur.com/A0TP9.jpg')
 
     res = imgur.get('http://www.imgur.com/RUUuR.jpeg')
-    res.should include(url: 'http://i.imgur.com/RUUuR.jpeg')
+    res.should include(url: 'http://i.imgur.com/RUUuR.jpg')
 
     res = imgur.get('http://imgur.com/LcbbCHv')
-    res.should include(url: 'http://i.imgur.com/LcbbCHv.jpg')
+    res.should include(url: 'http://i.imgur.com/LcbbCHv.png')
 
     res = imgur.get('http://i.imgur.com/LcbbCHvs.jpg')
-    res.should include(url: 'http://i.imgur.com/LcbbCHv.jpg')
+    res.should include(url: 'http://i.imgur.com/LcbbCHv.png')
+
+    res = imgur.get('http://imgur.com/0TczaPb')
+    res.should include(url: 'http://i.imgur.com/0TczaPb.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)
@@ -69,7 +72,7 @@ describe "Imgur" do
 
   it "should discover Imgur provider" do
     res = Thornbed.get('http://imgur.com/N2IDN')
-    res.should include(url: 'http://i.imgur.com/N2IDN.jpg')
+    res.should include(url: 'http://i.imgur.com/N2IDN.gif')
     res.should include(provider_name: "Imgur")
   end
 end

data/thornbed.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_runtime_dependency "ruby-oembed", "~> 0.8.7"
+  gem.add_runtime_dependency "httparty", "~> 0.10.2"
   gem.add_development_dependency "rspec", "~> 2.12.0"
   gem.add_development_dependency "guard-rspec", "~> 2.1.1"
   gem.add_development_dependency "rb-fsevent", "~> 0.9.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thornbed
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-oembed
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3319635208009761846
+      hash: 2668191655535075852
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -179,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3319635208009761846
+      hash: 2668191655535075852
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24