image-dumper 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b548a213f8c821767f5fd654bec37d4e107628d1
-  data.tar.gz: e7bb501fbb0c5730c4dec92a776b00dd8c11d586
+  metadata.gz: 142125bfd86802635caf3776cfd19bc7feae04fb
+  data.tar.gz: 280d4de2b98d1794ac97cfaf6e38537c06e86d2d
 SHA512:
-  metadata.gz: f1ab03832e03a3aaef4354746b898380380ac929185b35c70586e8f8a8d3d0fff149d3b4f2a2b83b4324010e02bb0777d6bb9cfc8866b0edf5c636d955d91186
-  data.tar.gz: 2345abf3659d0cd1c33daf1a54fed23b717586b4131f35069b055e79b47aa00b942510cf5ad952231143a4b26984aa7668ea032719ef874881e71dbf2d6aed54
+  metadata.gz: 6f8e8b131e24836e9e34a6699b401f4ce38a0ee3a664c64cfd943455292af7bf170b6f0fbba23c32a2a07da61ce1e946fb28ba41fe8f0c4b7ae48e2aea691ff8
+  data.tar.gz: 030273ac86759b0b3affff3cd0d2eed119e0a24c6ed6809610feb65995b558a5ed2763cde53bb0abdf9e2f187d8708cbe65e49e5d0b290946417fc6544aa1852

data/lib/dumper.rb

@@ -37,8 +37,8 @@ require 'dumper/profiles'
 require 'dumper/dumper'
 require 'dumper/version'
 
-Dir.glob(File.expand_path("../dumper/profiles/*.rb", __FILE__)).each { |f|
+Dir.glob(File.expand_path("../dumper/profiles/*.rb", __FILE__)).each do |f|
   require "dumper/profiles/#{File.basename(f).split(?.)[0]}"
-}
+end
 
 Dumper.is_observed_by Dumper::Logger.new, on_fire: false

data/lib/dumper/dumper.rb

@@ -52,7 +52,7 @@ module Dumper
     def shut_up!
       @verbose == false
     end
-      alias_method :mute!,   :shut_up!
+      alias_method :mute!, :shut_up!
 
     def verbose!
       @verbose == true
@@ -64,15 +64,15 @@ module Dumper
     end
 
     def list
-      Dir.glob(File.expand_path('../profiles/*.rb', __FILE__)).sort { |a, b| b <=> a }.map { |f|
+      Dir.glob(File.expand_path('../profiles/*.rb', __FILE__)).sort { |a, b| b <=> a }.map do |f|
         f = File.basename(f).split(?.)[0]
-      }
+      end
     end
-    
+
     def get(path, url, options = {})
       url    = url.to_s
       errors = 0
-      
+
       begin
         if url.start_with? 'data:image/'
           filename = File.join path, options[:filename] || rand(1000).to_s + '.' + url.split('data:image/')[1].split(?;)[0]
@@ -81,12 +81,10 @@ module Dumper
           url.gsub /data:image\/png;base64,/, ''
 
           if File.exists? filename
-            notify_observers error:  "File #{filename} already exists."
+            notify_observers error: "File #{filename} already exists."
           else
             notify_observers status: "Downloading base64 image as #{filename}..."
-            File.open(filename, 'wb') { |f|
-              f.write Base64.decode64(url)
-            }
+            File.open(filename, 'wb') { |f| f.write Base64.decode64(url) }
           end
         else
           filename = File.join path, options[:filename] || File.basename(url)
@@ -98,13 +96,20 @@ module Dumper
             filename = File.join(path, rand(1000).to_s + '.jpg') unless filename[-4] == ?. || filename[-5] == ?.
             notify_observers status: "Downloading #{url} as #{filename}..."
 
-            File.open(filename, 'wb') { |f|
-              f.write open(url,
-                ssl_verify: OpenSSL::SSL::VERIFY_NONE,
-                'User-Agent' => options[:user_agent] || USER_AGENT,
-                'Referer'    => options[:referer   ] || url
-              ).read
+            url.prepend('http:') if url.start_with?('//')
+            uri = URI(url)
+            http_options = {
+              'User-Agent' => options[:user_agent] || USER_AGENT,
+              'Referer'    => options[:referer   ] || url
             }
+
+            http = Net::HTTP.start(uri.host, uri.port)
+            http.use_ssl = uri.scheme == 'https'
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+            File.open(filename, 'wb') do |f|
+              f.write http.get(uri.path, http_options).body
+            end
           end
         end
       rescue Exception => e
@@ -117,22 +122,23 @@ module Dumper
           return false
         end
       end
-      
+
       true
     end
 
     def get_generic(url, path, xpath)
       uri = nil
-      Nokogiri::HTML(open(url)).xpath(xpath).each { |p|
+      Nokogiri::HTML(open(url)).xpath(xpath).each do |p|
         if p.to_s.start_with? ?/
           uri = URI(url) if uri.nil?
           p   = "#{uri.scheme}://#{uri.host}#{p}"
         end
+
         get path, p
-      }
+      end
     end
   end
-  
+
   def method_missing(method, *args, &block)
     "'#{method.split('get_')[1]}' profile not found."
   end

data/lib/dumper/logger.rb

@@ -35,13 +35,13 @@ module Dumper
       end
 
       def log_on_screen(data)
-        data.each { |status, message|
+        data.each do |status, message|
           if status == :critical_error_dump
-            p    message
+            p message
           else
             puts message
           end
-        }
+        end
       end
     end
 
@@ -58,4 +58,4 @@ module Dumper
     end
 
   end
-end
+end

data/lib/dumper/profiles/4chan.rb

@@ -47,4 +47,4 @@ module Dumper
     end
 
   end
-end
+end

data/lib/dumper/profiles/behoimi.rb

@@ -46,4 +46,4 @@ module Dumper
     end
 
   end
-end
+end

data/lib/dumper/profiles/booru.rb

@@ -23,7 +23,7 @@ module Dumper
     class Booru < Profile
       def dump(url, path, from, to)
         page = 0
-        
+
         from.upto(to) { |i|
           notify_observers status: "--- Page #{i} ---"
 
@@ -32,7 +32,7 @@ module Dumper
               Dumper.get path, u.child.child['src'].gsub(/thumbs/, 'img').gsub(/thumbnails\//, 'images/').gsub(/thumbnail_/, '')
             }
           }
-          
+
           page += 40
         }
       end
@@ -52,4 +52,4 @@ module Dumper
     end
 
   end
-end
+end

data/lib/dumper/profiles/fakku.rb

@@ -24,12 +24,12 @@ module Dumper
       def dump(url, path, from, to)
         url    += '/read' unless url.end_with? '/read'
         errors = 0
-        
+
         cdn = open(url).read.split('window.params.thumbs')[1].split('\/thumbs\/')[0].gsub(/\\\//m, ?/)[5..-1] + '/images/'
 
         from.upto(to) { |i|
           return if errors == 3
-          
+
           file     = "%03d.jpg" % i
           filename =  "#{cdn}#{file}"
 
@@ -37,7 +37,7 @@ module Dumper
             unless Dumper.get path, URI.parse(URI.encode(filename, '[]')), { referer: url }
               sleep 3
               errors += 1
-              
+
               file = File.join(path, file).gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR)
               File.delete(file) if File.exists? file
             end
@@ -60,4 +60,4 @@ module Dumper
     end
 
   end
-end
+end

data/lib/dumper/version.rb

@@ -19,6 +19,6 @@
 
 module Dumper
   def self.version
-    '0.7.6'
+    '0.7.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image-dumper
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri