rypper 0.0.1 → 0.0.2

data/lib/rypper/cli.rb

@@ -43,10 +43,13 @@ module Rypper
         puts " * #{html_uri} ..."
         html = Rypper::Loader.get(html_uri)
         if html.is_a?(String)
-          extractor.extract!(html).each do |image_uri|
+          extractor.extract!(html_uri, html).each do |image_uri|
             if image_uri.is_a?(String)
-              print "   * #{image_uri} ..."
               image_path = uri.to_path(File.extname(image_uri))
+              if opts.has_key?(:output)
+                image_path = File.join(opts[:output], image_path)
+              end
+              print "   * #{image_uri} --> #{image_path} ..."
               if !File.exists?(image_path) || opts.has_key?(:overwrite)
                 Rypper::Loader.mkdir!(File.dirname(image_path))
                 image_file = File.open(image_path, 'w')

data/lib/rypper/extractor.rb

@@ -4,13 +4,27 @@ module Rypper
   class Extractor
     attr_reader :selector
 
+    def self.dirname(uri)
+      uri = uri.to_s
+      dirname = nil
+      if File.extname(uri).empty?
+        dirname = uri
+      else
+        dirname = File.dirname(uri)
+      end
+      dirname.chomp!('/')
+      dirname.concat('/')
+      dirname
+    end
+
     def initialize(selector)
       @selector = selector
     end
 
-    def extract!(html)
+    def extract!(uri, html)
+      uri = uri.to_s
       unless html.kind_of?(Nokogiri::HTML::Document)
-        html = Nokogiri::HTML(html)
+        html = Nokogiri::HTML(html.to_s)
       end
       res = []
       elems = html.search(self.selector)
@@ -26,6 +40,20 @@ module Rypper
       else
         res = elems
       end
+      res.map! do |elem|
+        if elem.is_a?(String)
+          elem_uri = ::URI.parse(elem)
+          if !elem_uri.absolute?
+            elem_uri = ::URI.join(self.dirname(uri), elem)
+          elsif elem_uri.instance_of?(::URI::Generic) # absolute path only
+            elem_uri = ::URI.parse(uri)
+            elem_uri.path = elem
+          end
+          elem_uri.to_s
+        else
+          elem
+        end
+      end
       res
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Michael Nowak