selenium_tor 1.6.0 → 2.0.0

data/lib/tor/torrc.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'error'
 require_relative 'options'
 
 module Selenium
@@ -7,9 +8,7 @@ module Selenium
     module Tor
       # Respresentation of a torrc file
       class Torrc
-        class TorrcError < StandardError; end
-
-        DEFAULT_PORTS = { 'SocksPort' => 9150, 'ControlPort' => 9151 }.freeze
+        FIXED_CONFIG_KEYS    = %w[DataDirectory GeoIPFile GeoIPv6File SocksPort].freeze
         INVALID_OPTION_REGEX = %r{\[warn\] Failed to parse/validate config: (.*).$}
 
         attr_reader :path
@@ -29,20 +28,26 @@ module Selenium
           raise ArgumentError, 'Torrc#write_to_config takes a hash as argument' unless hash.is_a? Hash
 
           validate_torrc_options hash
-          @torrc_file.write hash_to_config_string(config.merge(hash))
+          @torrc_file.write hash_to_config_string(config.merge(hash).merge(fixed_config))
           @torrc_file.rewind
         end
 
         private
 
         def write_default_config
-          write_to_config DEFAULT_PORTS.merge(default_config)
+          write_to_config fixed_config
+        end
+
+        def fixed_config
+          @fixed_config ||= FIXED_CONFIG_KEYS.zip([@data_dir, geoip_file, geoip6_file, 'auto']).to_h
+        end
+
+        def geoip_file
+          File.join(TBB_TOR_DATA_DIR, 'geoip')
         end
 
-        def default_config
-          { 'DataDirectory' => @data_dir,
-            'GeoIPFile' => File.join(TBB_TOR_DATA_DIR, 'geoip'),
-            'GeoIPv6File' => File.join(TBB_TOR_DATA_DIR, 'geoip6') }
+        def geoip6_file
+          File.join(TBB_TOR_DATA_DIR, 'geoip6')
         end
 
         def validate_torrc_options(hash)

data/lib/tor/version.rb

@@ -3,7 +3,7 @@
 module Selenium
   module WebDriver
     module Tor
-      VERSION = '1.6.0'
+      VERSION = '2.0.0'
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: selenium_tor
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - MatzFan
 bindir: exe
 cert_chain: []
-date: 2024-12-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bsdiff
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.27'
+        version: '4.32'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.27'
+        version: '4.32'
 description: An extension for Selenium::WebDriver that automates Tor Browser
 executables: []
 extensions: []
@@ -51,6 +51,150 @@ files:
 - README.md
 - Rakefile
 - fonts/000_README.txt
+- fonts/Arimo-Bold.ttf
+- fonts/Arimo-BoldItalic.ttf
+- fonts/Arimo-Italic.ttf
+- fonts/Arimo-Regular.ttf
+- fonts/Cousine-Bold.ttf
+- fonts/Cousine-BoldItalic.ttf
+- fonts/Cousine-Italic.ttf
+- fonts/Cousine-Regular.ttf
+- fonts/NotoNaskhArabic-Regular.ttf
+- fonts/NotoSansAdlam-Regular.ttf
+- fonts/NotoSansArmenian-Regular.ttf
+- fonts/NotoSansBalinese-Regular.ttf
+- fonts/NotoSansBamum-Regular.ttf
+- fonts/NotoSansBassaVah-Regular.ttf
+- fonts/NotoSansBatak-Regular.ttf
+- fonts/NotoSansBengali-Regular.ttf
+- fonts/NotoSansBuginese-Regular.ttf
+- fonts/NotoSansBuhid-Regular.ttf
+- fonts/NotoSansCanadianAboriginal-Regular.ttf
+- fonts/NotoSansChakma-Regular.ttf
+- fonts/NotoSansCham-Regular.ttf
+- fonts/NotoSansCherokee-Regular.ttf
+- fonts/NotoSansCoptic-Regular.ttf
+- fonts/NotoSansDeseret-Regular.ttf
+- fonts/NotoSansDevanagari-Regular.ttf
+- fonts/NotoSansElbasan-Regular.ttf
+- fonts/NotoSansEthiopic-Regular.ttf
+- fonts/NotoSansGeorgian-Regular.ttf
+- fonts/NotoSansGrantha-Regular.ttf
+- fonts/NotoSansGujarati-Regular.ttf
+- fonts/NotoSansGunjalaGondi-Regular.ttf
+- fonts/NotoSansGurmukhi-Regular.ttf
+- fonts/NotoSansHanifiRohingya-Regular.ttf
+- fonts/NotoSansHanunoo-Regular.ttf
+- fonts/NotoSansHebrew-Regular.ttf
+- fonts/NotoSansJP-Regular.otf
+- fonts/NotoSansJavanese-Regular.ttf
+- fonts/NotoSansKR-Regular.otf
+- fonts/NotoSansKannada-Regular.ttf
+- fonts/NotoSansKayahLi-Regular.ttf
+- fonts/NotoSansKhmer-Regular.ttf
+- fonts/NotoSansKhojki-Regular.ttf
+- fonts/NotoSansKhudawadi-Regular.ttf
+- fonts/NotoSansLao-Regular.ttf
+- fonts/NotoSansLepcha-Regular.ttf
+- fonts/NotoSansLimbu-Regular.ttf
+- fonts/NotoSansLisu-Regular.ttf
+- fonts/NotoSansMahajani-Regular.ttf
+- fonts/NotoSansMalayalam-Regular.ttf
+- fonts/NotoSansMandaic-Regular.ttf
+- fonts/NotoSansMasaramGondi-Regular.ttf
+- fonts/NotoSansMedefaidrin-Regular.ttf
+- fonts/NotoSansMeeteiMayek-Regular.ttf
+- fonts/NotoSansMendeKikakui-Regular.ttf
+- fonts/NotoSansMiao-Regular.ttf
+- fonts/NotoSansModi-Regular.ttf
+- fonts/NotoSansMongolian-Regular.ttf
+- fonts/NotoSansMro-Regular.ttf
+- fonts/NotoSansMultani-Regular.ttf
+- fonts/NotoSansNKo-Regular.ttf
+- fonts/NotoSansNewTaiLue-Regular.ttf
+- fonts/NotoSansNewa-Regular.ttf
+- fonts/NotoSansOlChiki-Regular.ttf
+- fonts/NotoSansOriya-Regular.ttf
+- fonts/NotoSansOsage-Regular.ttf
+- fonts/NotoSansOsmanya-Regular.ttf
+- fonts/NotoSansPahawhHmong-Regular.ttf
+- fonts/NotoSansPauCinHau-Regular.ttf
+- fonts/NotoSansRejang-Regular.ttf
+- fonts/NotoSansRunic-Regular.ttf
+- fonts/NotoSansSC-Regular.otf
+- fonts/NotoSansSamaritan-Regular.ttf
+- fonts/NotoSansSaurashtra-Regular.ttf
+- fonts/NotoSansSharada-Regular.ttf
+- fonts/NotoSansShavian-Regular.ttf
+- fonts/NotoSansSinhala-Regular.ttf
+- fonts/NotoSansSoraSompeng-Regular.ttf
+- fonts/NotoSansSoyombo-Regular.ttf
+- fonts/NotoSansSundanese-Regular.ttf
+- fonts/NotoSansSylotiNagri-Regular.ttf
+- fonts/NotoSansSymbols-Regular.ttf
+- fonts/NotoSansSymbols2-Regular.ttf
+- fonts/NotoSansSyriac-Regular.ttf
+- fonts/NotoSansTC-Regular.otf
+- fonts/NotoSansTagalog-Regular.ttf
+- fonts/NotoSansTagbanwa-Regular.ttf
+- fonts/NotoSansTaiLe-Regular.ttf
+- fonts/NotoSansTaiTham-Regular.ttf
+- fonts/NotoSansTaiViet-Regular.ttf
+- fonts/NotoSansTakri-Regular.ttf
+- fonts/NotoSansTamil-Regular.ttf
+- fonts/NotoSansTelugu-Regular.ttf
+- fonts/NotoSansThaana-Regular.ttf
+- fonts/NotoSansThai-Regular.ttf
+- fonts/NotoSansTifinagh-Regular.ttf
+- fonts/NotoSansTifinaghAPT-Regular.ttf
+- fonts/NotoSansTifinaghAdrar-Regular.ttf
+- fonts/NotoSansTifinaghAgrawImazighen-Regular.ttf
+- fonts/NotoSansTifinaghAhaggar-Regular.ttf
+- fonts/NotoSansTifinaghAir-Regular.ttf
+- fonts/NotoSansTifinaghAzawagh-Regular.ttf
+- fonts/NotoSansTifinaghGhat-Regular.ttf
+- fonts/NotoSansTifinaghHawad-Regular.ttf
+- fonts/NotoSansTifinaghRhissaIxa-Regular.ttf
+- fonts/NotoSansTifinaghSIL-Regular.ttf
+- fonts/NotoSansTifinaghTawellemmet-Regular.ttf
+- fonts/NotoSansTirhuta-Regular.ttf
+- fonts/NotoSansVai-Regular.ttf
+- fonts/NotoSansWancho-Regular.ttf
+- fonts/NotoSansWarangCiti-Regular.ttf
+- fonts/NotoSansYi-Regular.ttf
+- fonts/NotoSansZanabazarSquare-Regular.ttf
+- fonts/NotoSerifArmenian-Regular.ttf
+- fonts/NotoSerifBalinese-Regular.ttf
+- fonts/NotoSerifBengali-Regular.ttf
+- fonts/NotoSerifDevanagari-Regular.ttf
+- fonts/NotoSerifDogra-Regular.ttf
+- fonts/NotoSerifEthiopic-Regular.ttf
+- fonts/NotoSerifGeorgian-Regular.ttf
+- fonts/NotoSerifGrantha-Regular.ttf
+- fonts/NotoSerifGujarati-Regular.ttf
+- fonts/NotoSerifGurmukhi-Regular.ttf
+- fonts/NotoSerifHebrew-Regular.ttf
+- fonts/NotoSerifKannada-Regular.ttf
+- fonts/NotoSerifKhmer-Regular.ttf
+- fonts/NotoSerifKhojki-Regular.ttf
+- fonts/NotoSerifLao-Regular.ttf
+- fonts/NotoSerifMalayalam-Regular.ttf
+- fonts/NotoSerifMyanmar-Regular.ttf
+- fonts/NotoSerifNPHmong-Regular.ttf
+- fonts/NotoSerifSinhala-Regular.ttf
+- fonts/NotoSerifTamil-Regular.ttf
+- fonts/NotoSerifTelugu-Regular.ttf
+- fonts/NotoSerifThai-Regular.ttf
+- fonts/NotoSerifTibetan-Regular.ttf
+- fonts/NotoSerifYezidi-Regular.ttf
+- fonts/Pyidaungsu-2.5.3_Regular.ttf
+- fonts/STIXTwoMath-Regular.otf
+- fonts/Tinos-Bold.ttf
+- fonts/Tinos-BoldItalic.ttf
+- fonts/Tinos-Italic.ttf
+- fonts/Tinos-Regular.ttf
+- fonts/TwemojiMozilla.ttf
+- fonts/fonts.conf
 - lib/driver.rb
 - lib/firefox_js_helpers.rb
 - lib/firefox_prefs.rb
@@ -58,11 +202,11 @@ files:
 - lib/selenium_tor.rb
 - lib/service.rb
 - lib/tor/driver.rb
+- lib/tor/error.rb
 - lib/tor/libxul_checksums.yml
 - lib/tor/libxul_patchable.rb
 - lib/tor/options.rb
 - lib/tor/profile.rb
-- lib/tor/system_tor.rb
 - lib/tor/tor_prefs.rb
 - lib/tor/tor_process.rb
 - lib/tor/torrc.rb
@@ -91,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 3.7.0.dev
 specification_version: 4
 summary: Selenium extension for Tor Browser
 test_files: []

data/lib/tor/system_tor.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Selenium
-  module WebDriver
-    module Tor
-      # DEPRECATED
-      class SystemTor
-        attr_reader :opts
-
-        def initialize(opts = {})
-          warn '[DEPRECATION] `SystemTor` options are deprecated in `selenium_tor` 2.0. Use `tor_opts` instead.'
-          @opts = opts
-        end
-      end
-    end
-  end
-end