junkie 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 299b760e5856e465a123191575aa2f0709eafa75
-  data.tar.gz: e364723f5af594b340f312982e4f934af65af0ef
+  metadata.gz: 728c1f06bb30b73b2560183c18be33eac3ec38df
+  data.tar.gz: 2347ce511acf6f802a14ed434c002205eb7ac539
 SHA512:
-  metadata.gz: 982562006b5265fbea20ea56858a374d8dd52b0541df29d99bc1162060081ecc476f06d9c20ad153ea809be6acdc522b4d84c9999c1c3fd814b5ac6f223b3fe1
-  data.tar.gz: 094de64cf493a05b3f99a08cda652a89b0b1e4719d048912bb954684e309f687a94548ed089e56597352dbc8fe33ab7226f4e1acbbbd69ddfc94613d0e9fa68c
+  metadata.gz: ea56196f84c2276994100080b7bc7843d34f502a0f904040da3f6e9720576735f15f6ede249fb056fa29d6050a0a093c172cc52256771ae9256b4c6141ce9d81
+  data.tar.gz: 21a931fb9ddd8d0267850db69da03416024d7bb391a53d1a0e98811a50a2924a85ec9899591c0ae4c2ac707ee71841f209a38da4265a38ad8e6e925c2dce9dc0

data/lib/junkie/resolver/redirect.rb

@@ -23,41 +23,36 @@ module Junkie
         end
       end
 
+      def is_resolvable(link)
+        @patterns.index { |p| link.include?(p) }
+      end
+
       # resolve links that matches any pattern by issuing a HEAD request and
       # using the Location response header instead of the original supplied header
       def resolve_links(episode)
-        multi = EventMachine::MultiRequest.new
-        request_count = 0
-
-        episode.links.each_with_index do |link, index|
-          next unless @patterns.index { |p| link.include?(p) }
-
-          request_count += 1
-          multi.add(index, EventMachine::HttpRequest.new(link).head)
-        end
+        resolvable, resolved = episode.links.partition { |link| is_resolvable(link) }
+        episode.links = resolved
 
-        if request_count == 0
+        if resolvable.empty?
           send_episode(episode)
         else
-          multi.callback do
-            links = episode.links.clone
-
-            responses = multi.responses[:callback]
-            responses.each do |index, value|
-              location = value.response_header.fetch("LOCATION") { nil }
-
-              unless location.nil?
-                links[index] = location
-              end
-            end
-
-            episode.links = links
+          EM::Iterator.new(resolvable, 2).map( proc { |url, iter|
+            res = EventMachine::HttpRequest.new(url).head
+            res.callback {
+              iter.return(res.response_header.fetch("LOCATION") { nil })
+            }
+            res.errback {
+              iter.return(nil)
+            }
+          }, proc { |links|
+            episode.links += links.select {|l| !l.nil? }
             send_episode(episode)
-          end
+          })
         end
       end
 
       def send_episode(episode)
+        log.debug('Resolved links: ' + episode.links.to_s)
         episode.status = :resolved
         @channels[:episodes].push(episode)
       end

data/lib/junkie/version.rb

@@ -1,3 +1,3 @@
 module Junkie
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junkie
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Philipp Böhm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine