spidy 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 177e6b5e3b4f864251d7071d23b2b42b219d8193673a5b57ee9b376e393092a9
-  data.tar.gz: 92b39a277d752eb5b1944f822702eae803356f7f5e3211b1f91e2d9ad635090e
+  metadata.gz: 43e5538d56f4d4115a1bb2cb662f0722d688ad44d8212506436492f0ee3e0570
+  data.tar.gz: b0db640263836c7244876a50219ed4f916c6c2f7777e11c7e13d11c2142714dc
 SHA512:
-  metadata.gz: b4078e3d1ad9813b0273f267d99bf7a9bf4473bb86b6cfa4fa283e6c5b060fa248e0b6fb517bede448f94e0dcebbb90ee71ef4eeb4bd5a45b1405c50005985fe
-  data.tar.gz: 00aa2cd512cf3a083082227234f59148d86e8ee0e4f602e07d1c67cbf9f3e8160b9144ebd29f3a67efded607c1705c2ce3008df235325afc7f3a715a6dd7527d
+  metadata.gz: 3d6dcfea624a7710eec941e55238334596edced66d60a09b046c5b057de06c2fb7d279c3d912a8e054ef206d9d5c148ee1e43d3394d6d8c30d364fa17fcc69fb
+  data.tar.gz: fe42ba4880e255aa2a09d360cfec59aaf199ec60407d045641d8ac3cad8319fb3277f2b3e91760e24ab879ec224860628c30fce2282e8c4467a6bfc75826fee5

data/lib/spidy/connector.rb

@@ -10,6 +10,18 @@ module Spidy::Connector
   autoload :Json
   autoload :Xml
 
+  #
+  # default user agent
+  #
+  USER_AGENT = [
+    'Mozilla/5.0',
+    '(Macintosh; Intel Mac OS X 10_12_6)',
+    'AppleWebKit/537.36',
+    '(KHTML, like Gecko)',
+    'Chrome/64.0.3282.186',
+    'Safari/537.36'
+  ].join(' ')
+
   module StaticAccessor
     extend ActiveSupport::Concern
     class_methods do
@@ -34,17 +46,31 @@ module Spidy::Connector
     end
   end
 
-  #
-  # default user agent
-  #
-  USER_AGENT = [
-    'Mozilla/5.0',
-    '(Macintosh; Intel Mac OS X 10_12_6)',
-    'AppleWebKit/537.36',
-    '(KHTML, like Gecko)',
-    'Chrome/64.0.3282.186',
-    'Safari/537.36'
-  ].join(' ')
+  class Builder
+    attr_reader :origin_connector, :proxy_connector
+
+    def initialize(connector, socks_proxy)
+      @socks_proxy = socks_proxy
+      @origin_connector = connector
+      @proxy_connector =
+        lambda do |url, &block|
+          Socksify::proxy(socks_proxy[:host], socks_proxy[:port]) do
+            connector.call(url, &block)
+          end
+        end
+    end
+
+    def proxy_disabled?
+      !tor?
+    end
+
+    def tor?
+      Tor::Controller.new(host: @socks_proxy[:host], port: @socks_proxy[:port]).close
+      true
+    rescue Errno::ECONNREFUSED
+      false
+    end
+  end
 
   #
   # get connection handller
@@ -52,13 +78,9 @@ module Spidy::Connector
   def self.get(value, wait_time: nil, user_agent: nil, socks_proxy: nil)
     return value if value.respond_to?(:call)
 
-    connector = const_get(value.to_s.classify).new(wait_time: wait_time || 5, user_agent: user_agent || USER_AGENT)
-    return connector if socks_proxy.nil?
+    builder = Builder.new(const_get(value.to_s.classify).new(wait_time: wait_time || 5, user_agent: user_agent || USER_AGENT), socks_proxy)
+    return builder.origin_connector if socks_proxy.nil? || builder.proxy_disabled?
 
-    lambda do |url, &block|
-      Socksify::proxy(socks_proxy[:host], socks_proxy[:port]) do
-        connector.call(url, &block)
-      end
-    end
+    builder.proxy_connector
   end
 end

data/lib/spidy/definition.rb

@@ -28,10 +28,6 @@ module Spidy::Definition
     @socks_proxy = { host: host, port: port }
   end
 
-  def tor?
-    Tor.running?
-  end
-
   def each(source = nil, name: :default, &yielder)
     name = name.presence || :default
     spidy = @namespace[:"#{name}_spider"]

data/lib/spidy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spidy
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spidy
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - aileron
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler