image-dumper 0.7 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06a97439e109b4b00205dc78978c35e810ad4990
-  data.tar.gz: e564cf847b687c07c3e7496377e57f3a7d40265a
+  metadata.gz: 842814feef29c32ef1ea263398c3f0e1a2b111f1
+  data.tar.gz: 9f2d5eac6650d75194b35cbda92ca5c44fe86541
 SHA512:
-  metadata.gz: e213fdd13e3318788c99a60b4ad749a60927c561e03802f834b4d7d29371f08a07c04c68fa8e3fba16ded775ff211f388397400c989580522920f90ddef7b68f
-  data.tar.gz: c0e9703a9be61dfe13d948b5b45d0bf512725579d2f807e00e7e5da014a72d4def01992985f89a37747b80a7ac41c3b35a9854b5e01c34b031692f3cf82ca6ee
+  metadata.gz: d7914aa0844dc2bda79491109dfa9c339577527472545a9a77b1c395bf861683f15ec3f75dbcbf9ea9bf7801ed0329bb5cf6e87036d4f2304d08855dceb71942
+  data.tar.gz: e77a85c6490164e94f82045b480b22b9564a4796beb41c288d564b92eb237b81bb5c0a659adf4c1cea5527759b730c1b998008e507fcef505c69cebd31ef61d9

data/lib/dumper.rb

@@ -28,7 +28,7 @@ require 'certified'
 require 'addressable/uri'
 require 'json'
 require 'thread/pool'
-require 'observer'
+require 'alakazam'
 
 require 'dumper/utils'
 require 'dumper/logger'
@@ -41,4 +41,4 @@ Dir.glob(File.expand_path("../dumper/profiles/*.rb", __FILE__)).each { |f|
   require "dumper/profiles/#{File.basename(f).split(?.)[0]}"
 }
 
-Dumper.add_observer Dumper::Logger.new
+Dumper.is_observed_by Dumper::Logger.new, when_change: false

data/lib/dumper/dumper.rb

@@ -38,7 +38,7 @@ module Dumper
     alias_method :muted?, :mute?
 
   class << self
-    include Observable
+    include Alakazam
 
     def pool_size=(min, max = nil)
       @min = min
@@ -81,10 +81,8 @@ module Dumper
           url.gsub /data:image\/png;base64,/, ''
 
           if File.exists? filename
-            changed
             notify_observers error:  "File #{filename} already exists."
           else
-            changed
             notify_observers status: "Downloading base64 image as #{filename}..."
             File.open(filename, 'wb') { |f|
               f.write Base64.decode64(url)
@@ -95,11 +93,9 @@ module Dumper
           filename.gsub! File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR
 
           if File.exists? filename
-            changed
             notify_observers error:  "File #{filename} already exists."
           else
             filename = File.join(path, rand(1000).to_s + '.jpg') unless filename[-4] == ?. || filename[-5] == ?.
-            changed
             notify_observers status: "Downloading #{url} as #{filename}..."
 
             File.open(filename, 'wb') { |f|
@@ -116,7 +112,6 @@ module Dumper
           sleep 3
           retry
         else
-          changed
           notify_observers critical_error: "Error downloading #{url}.", critical_error_dump: e
           return false
         end

data/lib/dumper/profile.rb

@@ -20,7 +20,7 @@
 module Dumper
   class Profile
     include Dumper
-    include Observable
+    include Alakazam
 
     def initialize(&block)
       add_observer Dumper::Logger.new
@@ -29,7 +29,6 @@ module Dumper
       max = pool_size[:max]
 
       @pool = Thread.pool min, max
-      changed
       notify_observers error:  "Using #{min}:#{max || min} threads..."
 
       instance_eval &block

data/lib/dumper/profiles/booru.rb

@@ -25,7 +25,6 @@ module Dumper
         page = 0
         
         from.upto(to) { |i|
-          changed
           notify_observers status: "--- Page #{i} ---"
 
           Nokogiri::HTML(open("#{url}&pid=#{page}")).xpath('//span[@class="thumb"]').each { |u|

data/lib/dumper/profiles/gelbooru.rb

@@ -25,7 +25,6 @@ module Dumper
         page = 0
         
         from.upto(to) { |i|
-          changed
           notify_observers status: "--- Page #{i} ---"
           
           Nokogiri::HTML(open("#{url}&pid=#{page}")).xpath('//span[@class="thumb"]').each { |u|

data/lib/dumper/profiles/yande.rb

@@ -23,7 +23,6 @@ module Dumper
     class YandeRe < Profile
       def dump(url, path, from, to)
         from.upto(to) { |i|
-          changed
           notify_observers status: "--- Page #{i} ---"
 
           Nokogiri::HTML(open("#{url}&page=#{i}", 'User-Agent' => Dumper::USER_AGENT, 'Referer' => url)).xpath('//a[@class="thumb"]/@href').each { |p|

data/lib/dumper/version.rb

@@ -19,6 +19,6 @@
 
 module Dumper
   def self.version
-    '0.7'
+    '0.7.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image-dumper
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: 0.7.1
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: alakazam
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement