meta_hari 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bf357320156f76fbf4f7a8b2f685732560b89f3
-  data.tar.gz: ebe62d8cc103cb7630a7d2cf5c970140c57ea691
+  metadata.gz: 1d588a4900a63c06626caa3b9474757320d223f6
+  data.tar.gz: e5129bc542ec83386fc0c372fff7a0c093b1a475
 SHA512:
-  metadata.gz: 9656b5d8333933c4288c7cf16940594f2806e19b471ddaef9b1d62017431146b54b26009840721e1330a2037adcf710c59db0e685d6dbc15ed4cb12fdbb51908
-  data.tar.gz: 4f59956d9d64177f16da24637b0237e06b38f258b1c147c9d1e706f6f4b666a271843304bfaae6280134483442410ff29cfc0bf8238ef5f9de4df3dec3c7d27e
+  metadata.gz: 345088ec4c31789da877a5987fa82fc71e2cbcc92e6867c7df4807d9d492f70754e82c8c2791bc8d4882e7f8d500cdcd3c907cc9650802c29bff3aac90e49d75
+  data.tar.gz: e5748efbcfa759d3181c0eef50f4da419347f618d3be997001aee3e19ab59fb1362c2886d26df098d9ba99170dcf1243251b23d1667a490e9c81363508eb22e2

data/README.md

@@ -1,5 +1,9 @@
 # MetaHari
 
+[ ![Codeship Status for spieker/meta_hari](https://codeship.com/projects/82a2a250-dfbd-0132-10c4-5a00e6f9bcb3/status?branch=master)](https://codeship.com/projects/80646)
+[![Dependency Status](https://gemnasium.com/spieker/meta_hari.svg)](https://gemnasium.com/spieker/meta_hari)
+[![Code Climate](https://codeclimate.com/github/spieker/meta_hari/badges/gpa.svg)](https://codeclimate.com/github/spieker/meta_hari)
+
 Meta Hari is receiving product informations from a given product link
 (i.e. from Amazon).
 

data/lib/meta_hari/redirect_loop.rb

@@ -0,0 +1,2 @@
+class RedirectLoop < Exception
+end

data/lib/meta_hari/redirect_notification.rb

@@ -0,0 +1,9 @@
+class RedirectNotification < Exception
+  attr_reader :uri
+  attr_reader :iteration
+
+  def initialize(uri, iteration)
+    @uri       = uri
+    @iteration = iteration
+  end
+end

data/lib/meta_hari/spyglass/base.rb

@@ -4,13 +4,15 @@ module MetaHari
   module Spyglass
     class Base
       attr_reader :uri
+      attr_reader :iteration
 
       def self.suitable?(uri)
         fail StandardError.new, "not implemented for '#{uri.host}'"
       end
 
-      def initialize(uri)
-        @uri = uri
+      def initialize(uri, iteration = 0)
+        @uri       = uri
+        @iteration = iteration
       end
 
       def spy
@@ -21,11 +23,7 @@ module MetaHari
       protected
 
       def spy_list
-        [
-          :spy_json_ld,
-          :spy_microdata,
-          :spy_open_graph
-        ]
+        %i(spy_json_ld spy_microdata spy_open_graph)
       end
 
       def user_agent
@@ -47,12 +45,14 @@ module MetaHari
         end
       end
 
-      def fetch_data(limit = 10)
+      def fetch_data
         return @_data if @_data
-        fail ArgumentError.new, 'HTTP redirect too deep' if limit == 0
         case res = fetch_response
-        when Net::HTTPSuccess     then @_data = res.body
-        when Net::HTTPRedirection then fetch_data res['location'], limit - 1
+        when Net::HTTPSuccess
+          @_data = res.body
+        when Net::HTTPRedirection
+          notification = RedirectNotification.new res['location'], iteration + 1
+          fail notification, 'Redirection'
         else res.error!
         end
       end

data/lib/meta_hari/version.rb

@@ -1,4 +1,4 @@
 # MetaHari version
 module MetaHari
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/meta_hari.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'uri'
 require 'net/http'
 require 'microdata'
+require 'meta_hari/redirect_notification'
 require 'meta_hari/version'
 require 'meta_hari/helpers'
 require 'meta_hari/product'
@@ -19,17 +20,20 @@ require 'meta_hari/spyglass'
 # ```
 module MetaHari
   class <<self
-    def spy(url)
-      uri = URI.parse url
-      spyglass = suitable_spyglass_instance uri
+    def spy(uri, iteration = 0)
+      uri = URI.parse uri unless uri.is_a? URI
+      spyglass = suitable_spyglass_instance uri, iteration
       spyglass.spy
+    rescue RedirectNotification => redirect
+      raise RedirectLoop.new, 'to many redirects' if redirect.iteration > 5
+      spy redirect.uri, redirect.iteration
     end
 
     private
 
-    def suitable_spyglass_instance(uri)
+    def suitable_spyglass_instance(uri, iteration = 0)
       klass = find_suitable_spyglass(uri)
-      klass.new(uri)
+      klass.new(uri, iteration)
     end
 
     # Finding a suitable spyglass for the given URL. If no suitable spyglass

data/spec/lib/meta_hari/spyglass/base_spec.rb

@@ -26,12 +26,6 @@ describe MetaHari::Spyglass::Base do
       subject.send :fetch_data
     end
 
-    it 'fails when redirection limit is zero' do
-      expect do
-        subject.send :fetch_data, 0
-      end.to raise_exception
-    end
-
     it 'fires an http request' do
       http = OpenStruct.new request: nil
       fetch_request = subject.send :fetch_request
@@ -42,6 +36,38 @@ describe MetaHari::Spyglass::Base do
       ).and_yield(http).and_return OpenStruct.new(:'error!' => nil)
       subject.send :fetch_data
     end
+
+    context 'with redirect' do
+      before :each do
+        redirect = Net::HTTPRedirection.new({}, 301, 'foo')
+        redirect['location'] = 'http://example.com/new'
+        allow(subject).to receive(:fetch_response).and_return redirect
+      end
+
+      it 'throws a redirection notification' do
+        expect do
+          subject.send :fetch_data
+        end.to raise_error(RedirectNotification)
+      end
+
+      context 'RedirectNotification' do
+        it 'contains the target url' do
+          begin
+            subject.send :fetch_data
+          rescue RedirectNotification => redirect
+            expect(redirect.uri).to match 'http://example.com/new'
+          end
+        end
+
+        it 'contains the iteration' do
+          begin
+            subject.send :fetch_data
+          rescue RedirectNotification => redirect
+            expect(redirect.iteration).to match 1
+          end
+        end
+      end
+    end
   end
 
   describe '#spy' do

data/spec/lib/meta_hari_spec.rb

@@ -26,7 +26,7 @@ describe MetaHari do
 
     it 'creates an instance of the suitable class' do
       uri = URI.parse 'http://example.com'
-      expect(MetaHari::Spyglass::Base).to receive(:new).with(uri)
+      expect(MetaHari::Spyglass::Base).to receive(:new).with(uri, 0)
       MetaHari.send :suitable_spyglass_instance, uri
     end
 
@@ -36,4 +36,30 @@ describe MetaHari do
       expect(spyglass).to be_instance_of MetaHari::Spyglass::Base
     end
   end
+
+  describe '#spy' do
+    context 'with redirect' do
+      it 'calls the spy method again with the new location' do
+        redirect = Net::HTTPRedirection.new({}, 301, 'foo')
+        redirect['location'] = 'http://example.com/new'
+        original_spy = MetaHari.method(:spy)
+        allow(MetaHari).to receive(:spy) { |a| original_spy.call(a) }
+        expect(MetaHari).to receive(:spy).with('http://example.com/new', 1)
+        did_once = false
+        allow_any_instance_of(MetaHari::Spyglass::Base).to(
+          receive(:fetch_response)
+        ) do
+          if did_once
+            success = Net::HTTPSuccess.new({}, 200, 'foo')
+            allow(success).to receive(:body).and_return('')
+            success
+          else
+            did_once = true
+            redirect
+          end
+        end
+        MetaHari.spy('http://example.com')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meta_hari
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Paul Spieker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: microdata
@@ -170,6 +170,8 @@ files:
 - lib/meta_hari/helpers/microdata.rb
 - lib/meta_hari/helpers/open_graph.rb
 - lib/meta_hari/product.rb
+- lib/meta_hari/redirect_loop.rb
+- lib/meta_hari/redirect_notification.rb
 - lib/meta_hari/spyglass.rb
 - lib/meta_hari/spyglass/amazon_de.rb
 - lib/meta_hari/spyglass/base.rb