link_thumbnailer 1.0.2 → 1.0.3

data/lib/link_thumbnailer/fetcher.rb

@@ -4,18 +4,20 @@ module LinkThumbnailer
 
   class Fetcher
 
+    attr_accessor :url
+
     def fetch(url, redirect_count = 0)
       if redirect_count > LinkThumbnailer.configuration.redirect_limit
         raise ArgumentError,
           "too many redirects (#{redirect_count})"
       end
 
-      uri = url.is_a?(URI) ? url : URI(url)
+      self.url = url.is_a?(URI) ? url : URI(url)
 
-      if uri.is_a?(URI::HTTP)
+      if self.url.is_a?(URI::HTTP)
         http = Net::HTTP::Persistent.new('linkthumbnailer')
         http.headers['User-Agent'] = 'linkthumbnailer'
-        resp = http.request(uri)
+        resp = http.request(self.url)
         case resp
           when Net::HTTPSuccess; resp.body
           when Net::HTTPRedirection; fetch(resp['location'], redirect_count + 1)

data/lib/link_thumbnailer/version.rb

@@ -1,3 +1,3 @@
 module LinkThumbnailer
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/link_thumbnailer.rb

@@ -49,22 +49,15 @@ module LinkThumbnailer
 
       doc = self.doc_parser.parse(self.fetcher.fetch(url), url)
 
-      self.object[:url] = doc.source_url
+      self.object[:url] = self.fetcher.url.to_s
       opengraph(doc) || custom(doc)
     end
 
     private
 
     def set_options(options)
-      LinkThumbnailer.configure {|config|
-        config.mandatory_attributes = options[:mandatory_attributes]  if options[:mandatory_attributes]
-        config.strict               = options[:strict]                if options[:strict]
-        config.redirect_limit       = options[:redirect_limit].to_i   if options[:redirect_limit]
-        config.blacklist_urls       = options[:blacklist_urls]        if options[:blacklist_urls]
-        config.rmagick_attributes   = options[:rmagick_attributes]    if options[:rmagick_attributes]
-        config.limit                = options[:limit].to_i            if options[:limit]
-        config.top                  = options[:top].to_i              if options[:top]
-      }
+      config
+      options.each {|k, v| config[k] = v }
     end
 
     def instantiate_classes

data/spec/fetcher_spec.rb

@@ -3,8 +3,11 @@ require 'spec_helper'
 describe LinkThumbnailer::Fetcher do
 
   it { should respond_to :fetch }
+  it { should respond_to :url }
+  it { should respond_to :url= }
 
   let(:fetcher) { LinkThumbnailer::Fetcher.new }
+  let(:url) { 'http://foo.com' }
 
   describe ".fetch" do
 
@@ -14,29 +17,54 @@ describe LinkThumbnailer::Fetcher do
 
     context "when redirect_count is more than config" do
 
-      it { lambda { fetcher.fetch('http://foo.com', 10) }.should raise_exception(ArgumentError) }
+      it { lambda { fetcher.fetch(url, 10) }.should raise_exception(ArgumentError) }
 
     end
 
     context "when no http error" do
 
       before do
-        stub_request(:get, 'http://foo.com/').to_return(:status => 200, :body => 'foo', :headers => {})
+        stub_request(:get, url).to_return(:status => 200, :body => 'foo', :headers => {})
       end
 
-      subject { fetcher.fetch('http://foo.com') }
+      it "returns body response" do
+        fetcher.fetch(url).should eq('foo')
+      end
+
+      it "sets fetcher url" do
+        fetcher.fetch(url)
+        fetcher.url.to_s.should eq(url)
+      end
+
+    end
+
+    context "when http redirection" do
+
+      let(:another_url) { 'http://bar.com' }
 
-      it { should eq('foo') }
+      before do
+        stub_request(:get, url).to_return(:status => 300, :body => 'foo', :headers => { 'Location' =>  another_url})
+        stub_request(:get, another_url).to_return(:status => 200, :body => 'bar', :headers => {})
+      end
+
+      it "returns body response" do
+        fetcher.fetch(url).should eq('bar')
+      end
+
+      it "sets fetcher url" do
+        fetcher.fetch(url)
+        fetcher.url.to_s.should eq(another_url)
+      end
 
     end
 
     context "when http error" do
 
       before do
-        stub_request(:get, 'http://foo.com/').to_return(:status => 500, :body => 'foo', :headers => {})
+        stub_request(:get, url).to_return(:status => 500, :body => 'foo', :headers => {})
       end
 
-      it { lambda { fetcher.fetch('http://foo.com') }.should raise_exception(Net::HTTPFatalError) }
+      it { lambda { fetcher.fetch(url) }.should raise_exception(Net::HTTPFatalError) }
 
     end
 

data/spec/link_thumbnailer_spec.rb

@@ -10,41 +10,37 @@ describe LinkThumbnailer do
   it { should respond_to :config }
   it { should respond_to :generate }
 
-  describe "configuration" do
+  describe ".configure" do
 
-    context "#configure" do
-
-      it "should yields self" do
-        LinkThumbnailer.should_receive(:configure).and_yield(LinkThumbnailer)
-        LinkThumbnailer.configure {|config|}
-      end
-
-      before do
-        LinkThumbnailer.configure {|config|
-          config.mandatory_attributes = %w(foo bar)
-          config.strict = false
-          config.redirect_limit = 5
-          config.blacklist_urls = []
-          config.rmagick_attributes = []
-          config.limit = 5
-          config.top = 10
-        }
-      end
-
-      after do
-        LinkThumbnailer.configuration = nil
-      end
+    it "should yields self" do
+      LinkThumbnailer.should_receive(:configure).and_yield(LinkThumbnailer)
+      LinkThumbnailer.configure {|config|}
+    end
 
-      specify { LinkThumbnailer.configuration.mandatory_attributes.should eq(%w(foo bar)) }
-      specify { LinkThumbnailer.configuration.strict.should be_false }
-      specify { LinkThumbnailer.configuration.redirect_limit.should eq(5) }
-      specify { LinkThumbnailer.configuration.blacklist_urls.should eq([]) }
-      specify { LinkThumbnailer.configuration.rmagick_attributes.should eq([]) }
-      specify { LinkThumbnailer.configuration.limit.should eq(5) }
-      specify { LinkThumbnailer.configuration.top.should eq(10) }
+    before do
+      LinkThumbnailer.configure {|config|
+        config.mandatory_attributes = %w(foo bar)
+        config.strict = false
+        config.redirect_limit = 5
+        config.blacklist_urls = []
+        config.rmagick_attributes = []
+        config.limit = 5
+        config.top = 10
+      }
+    end
 
+    after do
+      LinkThumbnailer.configuration = nil
     end
 
+    specify { LinkThumbnailer.configuration.mandatory_attributes.should eq(%w(foo bar)) }
+    specify { LinkThumbnailer.configuration.strict.should be_false }
+    specify { LinkThumbnailer.configuration.redirect_limit.should eq(5) }
+    specify { LinkThumbnailer.configuration.blacklist_urls.should eq([]) }
+    specify { LinkThumbnailer.configuration.rmagick_attributes.should eq([]) }
+    specify { LinkThumbnailer.configuration.limit.should eq(5) }
+    specify { LinkThumbnailer.configuration.top.should eq(10) }
+
   end
 
   context "default values" do
@@ -68,7 +64,12 @@ describe LinkThumbnailer do
 
   end
 
-  context ".generate" do
+  describe ".generate" do
+
+    it "should set default options" do
+      LinkThumbnailer.should_receive(:config)
+      LinkThumbnailer.generate('foo')
+    end
 
     context "with valid arguments" do
 
@@ -79,7 +80,27 @@ describe LinkThumbnailer do
         end
 
         it "should set limit option" do
-          expect { LinkThumbnailer.generate('foo', :limit => 20).to change(LinkThumbnailer.configuration.top).from(10).to(20) }
+          expect { LinkThumbnailer.generate('foo', :limit => 20).to change(LinkThumbnailer.configuration.limit).from(10).to(20) }
+        end
+
+        it "should set mandatory_attributes option" do
+          expect { LinkThumbnailer.generate('foo', :mandatory_attributes => %w(one two)).to change(LinkThumbnailer.configuration.mandatory_attributes).from(%w(url title images)).to(%w(one two)) }
+        end
+
+        it "should set strict option" do
+          expect { LinkThumbnailer.generate('foo', :strict => false).to change(LinkThumbnailer.configuration.strict).from(true).to(false) }
+        end
+
+        it "should set redirect_limit option" do
+          expect { LinkThumbnailer.generate('foo', :redirect_limit => 5).to change(LinkThumbnailer.configuration.redirect_limit).from(3).to(5) }
+        end
+
+        it "should set blacklist_urls option" do
+          expect { LinkThumbnailer.generate('foo', :blacklist_urls => [%r{^http://foo\.bar\.com/}]).to change(LinkThumbnailer.configuration.blacklist_urls).to([%r{^http://foo\.bar\.com/}]) }
+        end
+
+        it "should set rmagick_attributes option" do
+          expect { LinkThumbnailer.generate('foo', :rmagick_attributes => %w(one two)).to change(LinkThumbnailer.configuration.rmagick_attributes).to(%w(one two)) }
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: link_thumbnailer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri