split 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6b66f4b21c4201228d9622d5e00ff2a2e957714edfce11316316a2ca3e405ce
-  data.tar.gz: 6a441cf39a14ef9e36b805e7728f34029db7f7d1e1e90f3389168942b7b77f60
+  metadata.gz: f1c97063d4d1ccf4c2cd5dfd2e83b98b3f55a934b9dfa9b5862ede3ee5b8c58c
+  data.tar.gz: 28e30003a6d2059baf91482f5ac9a97b0b7d2e37c61a425710cbf1adf21a4a83
 SHA512:
-  metadata.gz: bc46df4b6f301b8bdaf99ba4648f7363ad2c1234b3be7586e078b9772fec9a2bae3c9e15335c0c207e88c45113a1348a0dcd608a9dcfee654846753ba59c6696
-  data.tar.gz: 53dffc60d0f0617f1a1e943170f7702eff6ec5d00381b9d3b19380ef50aaef4c76956974a94a645bfb288eddd75486f24c2c2d3c56e7465f85f68791f1aeda31
+  metadata.gz: 988f115f0f96870188221552cca45f6a7207f548500dbf2a5446abaa47ac7365571644a5a231443ca7616182b68c3139f8d62fdcf18d1593fca8898092a332e2
+  data.tar.gz: b6a668159d8b6fe9529bae5bc650f120b9de1bdf593bc89d0d949a2e07e8cfda7c96b4c12e5e4615696cf31b845215f95ce60b4abcb9ff3d7ef056669a4ae51d

data/.github/workflows/ci.yml

@@ -34,8 +34,8 @@ jobs:
           - gemfile: 7.0.gemfile
             ruby: '3.0'
 
-          # - gemfile: 7.0.gemfile
-          #   ruby: '3.1'
+          - gemfile: 7.0.gemfile
+            ruby: '3.1'
 
 
     runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: ruby/setup-ruby@v1
         with:
@@ -69,3 +69,6 @@ jobs:
         run: bundle exec rspec
         env:
           REDIS_URL: redis:6379
+
+      - name: Rubocop
+        run: bundle exec rubocop

data/.rubocop.yml

@@ -1,12 +1,9 @@
-inherit_from: .rubocop_todo.yml
-
 AllCops:
   TargetRubyVersion: 2.5
   DisabledByDefault: true
+  SuggestExtensions: false
   Exclude:
-    - 'Appraisals'
     - 'gemfiles/**/*'
-    - 'spec/**/*.rb'
 
 Style/AndOr:
   Enabled: true
@@ -114,7 +111,7 @@ Layout/SpaceInsideParens:
   Enabled: true
 
 Style/StringLiterals:
-  Enabled: false
+  Enabled: true
   EnforcedStyle: double_quotes
 
 Layout/IndentationStyle:

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+# 4.0.2 (December 2nd, 2022)
+
+Bugfixes:
+- Stop crashing on non-hash json (@knarewski, #697)
+- Handle when Rails is partially loaded as a Gem (@TSMMark, #687)
+
+Features:
+- Add support for redis-client, which does not automatically cast types to strings (@knarewski, #696)
+- Add ability to initialize experiments (@robin-phung, #673)
+
+Misc:
+- Fix default branch name and gem metadata indentation (@ursm, #693)
+- Update actions/checkout to v3 (@andrehjr, #683)
+- Enforce double quotes (@andrehjr, #682)
+- Fix Rubocop Style/* Offenses (@andrehjr, #681)
+- Enable rubocop on Github Actions (@andrehjr, #680)
+- Fix all Layout issues on the project (@andrehjr, #679)
+- Fix Style/HashSyntax offenses (@andrehjr, #678)
+- Remove usage of deprecated implicit block expectation from specs (@andrehjr, #677)
+- Remove appraisals configuration (@andrehjr, #676)
+- Add Ruby 3.1 (@andrehjr, #675)
+- Encapsulate Split::Algorithms at our own module to avoid explicit calling rubystats everywhere (@andrehjr, #674)
+
 ## 4.0.1 (December 30th, 2021)
 
 Bugfixes:

data/CONTRIBUTING.md

@@ -25,7 +25,7 @@ Want to contribute to Split? That's great! Here are a couple of guidelines that
 
 ## Setup instructions
 
-You can find in-depth instructions to install in our [README](https://github.com/splitrb/split/blob/master/README.md).
+You can find in-depth instructions to install in our [README](https://github.com/splitrb/split/blob/main/README.md).
 
 *Note*: Split requires Ruby 1.9.2 or higher.
 

data/Gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "appraisal"
+gem "rubocop", require: false
+gem "matrix"
 gem "codeclimate-test-reporter"

data/README.md

@@ -19,11 +19,13 @@ Split is designed to be hacker friendly, allowing for maximum customisation and
 
 ### Requirements
 
-Split currently requires Ruby 1.9.3 or higher. If your project requires compatibility with Ruby 1.8.x and Rails 2.3, please use v0.8.0.
+Split v4.0+ is currently tested with Ruby >= 2.5 and Rails >= 5.2.
+
+If your project requires compatibility with Ruby 2.4.x or older Rails versions. You can try v3.0 or v0.8.0(for Ruby 1.9.3)
 
 Split uses Redis as a datastore.
 
-Split only supports Redis 2.0 or greater.
+Split only supports Redis 4.0 or greater.
 
 If you're on OS X, Homebrew is the simplest way to install Redis:
 

data/Rakefile

@@ -1,10 +1,9 @@
 #!/usr/bin/env rake
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'appraisal'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new('spec')
+RSpec::Core::RakeTask.new("spec")
 
-task :default => :spec
+task default: :spec

data/gemfiles/5.2.gemfile

@@ -1,8 +1,6 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "appraisal"
+gem "rubocop", require: false
 gem "codeclimate-test-reporter"
 gem "rails", "~> 5.2"
 

data/gemfiles/6.0.gemfile

@@ -1,8 +1,6 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "appraisal"
+gem "rubocop", require: false
 gem "codeclimate-test-reporter"
 gem "rails", "~> 6.0"
 

data/gemfiles/6.1.gemfile

@@ -1,8 +1,6 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "appraisal"
+gem "rubocop", require: false
 gem "codeclimate-test-reporter"
 gem "rails", "~> 6.1"
 

data/gemfiles/7.0.gemfile

@@ -1,9 +1,8 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "appraisal"
+gem "rubocop", require: false
 gem "codeclimate-test-reporter"
 gem "rails", "~> 7.0"
+gem "matrix"
 
 gemspec path: "../"

data/lib/split/algorithms/block_randomization.rb

@@ -12,12 +12,11 @@ module Split
         end
 
         private
-
-        def minimum_participant_alternatives(alternatives)
-          alternatives_by_count = alternatives.group_by(&:participant_count)
-          min_group = alternatives_by_count.min_by { |k, v| k }
-          min_group.last
-        end
+          def minimum_participant_alternatives(alternatives)
+            alternatives_by_count = alternatives.group_by(&:participant_count)
+            min_group = alternatives_by_count.min_by { |k, v| k }
+            min_group.last
+          end
       end
     end
   end

data/lib/split/algorithms/whiplash.rb

@@ -2,7 +2,6 @@
 
 # A multi-armed bandit implementation inspired by
 # @aaronsw and victorykit/whiplash
-require 'rubystats'
 
 module Split
   module Algorithms
@@ -13,26 +12,25 @@ module Split
         end
 
         private
+          def arm_guess(participants, completions)
+            a = [participants, 0].max
+            b = [participants-completions, 0].max
+            Split::Algorithms.beta_distribution_rng(a + fairness_constant, b + fairness_constant)
+          end
 
-        def arm_guess(participants, completions)
-          a = [participants, 0].max
-          b = [participants-completions, 0].max
-          Rubystats::BetaDistribution.new(a+fairness_constant, b+fairness_constant).rng
-        end
-
-        def best_guess(alternatives)
-          guesses = {}
-          alternatives.each do |alternative|
-            guesses[alternative.name] = arm_guess(alternative.participant_count, alternative.all_completed_count)
+          def best_guess(alternatives)
+            guesses = {}
+            alternatives.each do |alternative|
+              guesses[alternative.name] = arm_guess(alternative.participant_count, alternative.all_completed_count)
+            end
+            gmax = guesses.values.max
+            best = guesses.keys.select { |name| guesses[name] ==  gmax }
+            best.sample
           end
-          gmax = guesses.values.max
-          best = guesses.keys.select { |name| guesses[name] ==  gmax }
-          best.sample
-        end
 
-        def fairness_constant
-          7
-        end
+          def fairness_constant
+            7
+          end
       end
     end
   end

data/lib/split/algorithms.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+begin
+  require "matrix"
+rescue LoadError => error
+  if error.message.match?(/matrix/)
+    $stderr.puts "You don't have matrix installed in your application. Please add it to your Gemfile and run bundle install"
+    raise
+  end
+end
+
+require "rubystats"
+
+module Split
+  module Algorithms
+    class << self
+      def beta_distribution_rng(a, b)
+        Rubystats::BetaDistribution.new(a, b).rng
+      end
+    end
+  end
+end

data/lib/split/alternative.rb

@@ -38,11 +38,11 @@ module Split
     end
 
     def participant_count
-      Split.redis.hget(key, 'participant_count').to_i
+      Split.redis.hget(key, "participant_count").to_i
     end
 
     def participant_count=(count)
-      Split.redis.hset(key, 'participant_count', count.to_i)
+      Split.redis.hset(key, "participant_count", count.to_i)
     end
 
     def completed_count(goal = nil)
@@ -67,13 +67,13 @@ module Split
     def set_field(goal)
       field = "completed_count"
       field += ":" + goal unless goal.nil?
-      return field
+      field
     end
 
     def set_prob_field(goal)
       field = "p_winner"
       field += ":" + goal unless goal.nil?
-      return field
+      field
     end
 
     def set_completed_count(count, goal = nil)
@@ -82,7 +82,7 @@ module Split
     end
 
     def increment_participation
-      Split.redis.hincrby key, 'participant_count', 1
+      Split.redis.hincrby key, "participant_count", 1
     end
 
     def increment_completion(goal = nil)
@@ -112,7 +112,7 @@ module Split
       control = experiment.control
       alternative = self
 
-      return 'N/A' if control.name == alternative.name
+      return "N/A" if control.name == alternative.name
 
       p_a = alternative.conversion_rate(goal)
       p_c = control.conversion_rate(goal)
@@ -121,13 +121,13 @@ module Split
       n_c = control.participant_count
 
       # can't calculate zscore for P(x) > 1
-      return 'N/A' if p_a > 1 || p_c > 1
+      return "N/A" if p_a > 1 || p_c > 1
 
       Split::Zscore.calculate(p_a, n_a, p_c, n_c)
     end
 
     def extra_info
-      data = Split.redis.hget(key, 'recorded_info')
+      data = Split.redis.hget(key, "recorded_info")
       if data && data.length > 1
         begin
           JSON.parse(data)
@@ -149,24 +149,24 @@ module Split
         @recorded_info[k] = value
       end
 
-      Split.redis.hset key, 'recorded_info', (@recorded_info || {}).to_json
+      Split.redis.hset key, "recorded_info", (@recorded_info || {}).to_json
     end
 
     def save
-      Split.redis.hsetnx key, 'participant_count', 0
-      Split.redis.hsetnx key, 'completed_count', 0
-      Split.redis.hsetnx key, 'p_winner', p_winner
-      Split.redis.hsetnx key, 'recorded_info', (@recorded_info || {}).to_json
+      Split.redis.hsetnx key, "participant_count", 0
+      Split.redis.hsetnx key, "completed_count", 0
+      Split.redis.hsetnx key, "p_winner", p_winner
+      Split.redis.hsetnx key, "recorded_info", (@recorded_info || {}).to_json
     end
 
     def validate!
       unless String === @name || hash_with_correct_values?(@name)
-        raise ArgumentError, 'Alternative must be a string'
+        raise ArgumentError, "Alternative must be a string"
       end
     end
 
     def reset
-      Split.redis.hmset key, 'participant_count', 0, 'completed_count', 0, 'recorded_info', nil
+      Split.redis.hmset key, "participant_count", 0, "completed_count", 0, "recorded_info", ""
       unless goals.empty?
         goals.each do |g|
           field = "completed_count:#{g}"
@@ -180,13 +180,12 @@ module Split
     end
 
     private
+      def hash_with_correct_values?(name)
+        Hash === name && String === name.keys.first && Float(name.values.first) rescue false
+      end
 
-    def hash_with_correct_values?(name)
-      Hash === name && String === name.keys.first && Float(name.values.first) rescue false
-    end
-
-    def key
-      "#{experiment_name}:#{name}"
-    end
+      def key
+        "#{experiment_name}:#{name}"
+      end
   end
 end

data/lib/split/cache.rb

@@ -2,7 +2,6 @@
 
 module Split
   class Cache
-
     def self.clear
       @cache = nil
     end

data/lib/split/combined_experiments_helper.rb

@@ -29,10 +29,10 @@ module Split
     end
 
     def find_combined_experiment(metric_descriptor)
-      raise(Split::InvalidExperimentsFormatError, 'Invalid descriptor class (String or Symbol required)') unless metric_descriptor.class == String || metric_descriptor.class == Symbol
-      raise(Split::InvalidExperimentsFormatError, 'Enable configuration') unless Split.configuration.enabled
-      raise(Split::InvalidExperimentsFormatError, 'Enable `allow_multiple_experiments`') unless Split.configuration.allow_multiple_experiments
-      Split::configuration.experiments[metric_descriptor.to_sym]
+      raise(Split::InvalidExperimentsFormatError, "Invalid descriptor class (String or Symbol required)") unless metric_descriptor.class == String || metric_descriptor.class == Symbol
+      raise(Split::InvalidExperimentsFormatError, "Enable configuration") unless Split.configuration.enabled
+      raise(Split::InvalidExperimentsFormatError, "Enable `allow_multiple_experiments`") unless Split.configuration.allow_multiple_experiments
+      Split.configuration.experiments[metric_descriptor.to_sym]
     end
   end
 end

data/lib/split/configuration.rb

@@ -39,83 +39,83 @@ module Split
     def bots
       @bots ||= {
         # Indexers
-        'AdsBot-Google' => 'Google Adwords',
-        'Baidu' => 'Chinese search engine',
-        'Baiduspider' => 'Chinese search engine',
-        'bingbot' => 'Microsoft bing bot',
-        'Butterfly' => 'Topsy Labs',
-        'Gigabot' => 'Gigabot spider',
-        'Googlebot' => 'Google spider',
-        'MJ12bot' => 'Majestic-12 spider',
-        'msnbot' => 'Microsoft bot',
-        'rogerbot' => 'SeoMoz spider',
-        'PaperLiBot' => 'PaperLi is another content curation service',
-        'Slurp' => 'Yahoo spider',
-        'Sogou' => 'Chinese search engine',
-        'spider' => 'generic web spider',
-        'UnwindFetchor' => 'Gnip crawler',
-        'WordPress' => 'WordPress spider',
-        'YandexAccessibilityBot' => 'Yandex accessibility spider',
-        'YandexBot' => 'Yandex spider',
-        'YandexMobileBot' => 'Yandex mobile spider',
-        'ZIBB' => 'ZIBB spider',
+        "AdsBot-Google" => "Google Adwords",
+        "Baidu" => "Chinese search engine",
+        "Baiduspider" => "Chinese search engine",
+        "bingbot" => "Microsoft bing bot",
+        "Butterfly" => "Topsy Labs",
+        "Gigabot" => "Gigabot spider",
+        "Googlebot" => "Google spider",
+        "MJ12bot" => "Majestic-12 spider",
+        "msnbot" => "Microsoft bot",
+        "rogerbot" => "SeoMoz spider",
+        "PaperLiBot" => "PaperLi is another content curation service",
+        "Slurp" => "Yahoo spider",
+        "Sogou" => "Chinese search engine",
+        "spider" => "generic web spider",
+        "UnwindFetchor" => "Gnip crawler",
+        "WordPress" => "WordPress spider",
+        "YandexAccessibilityBot" => "Yandex accessibility spider",
+        "YandexBot" => "Yandex spider",
+        "YandexMobileBot" => "Yandex mobile spider",
+        "ZIBB" => "ZIBB spider",
 
         # HTTP libraries
-        'Apache-HttpClient' => 'Java http library',
-        'AppEngine-Google' => 'Google App Engine',
-        'curl' => 'curl unix CLI http client',
-        'ColdFusion' => 'ColdFusion http library',
-        'EventMachine HttpClient' => 'Ruby http library',
-        'Go http package' => 'Go http library',
-        'Go-http-client' => 'Go http library',
-        'Java' => 'Generic Java http library',
-        'libwww-perl' => 'Perl client-server library loved by script kids',
-        'lwp-trivial' => 'Another Perl library loved by script kids',
-        'Python-urllib' => 'Python http library',
-        'PycURL' => 'Python http library',
-        'Test Certificate Info' => 'C http library?',
-        'Typhoeus' => 'Ruby http library',
-        'Wget' => 'wget unix CLI http client',
+        "Apache-HttpClient" => "Java http library",
+        "AppEngine-Google" => "Google App Engine",
+        "curl" => "curl unix CLI http client",
+        "ColdFusion" => "ColdFusion http library",
+        "EventMachine HttpClient" => "Ruby http library",
+        "Go http package" => "Go http library",
+        "Go-http-client" => "Go http library",
+        "Java" => "Generic Java http library",
+        "libwww-perl" => "Perl client-server library loved by script kids",
+        "lwp-trivial" => "Another Perl library loved by script kids",
+        "Python-urllib" => "Python http library",
+        "PycURL" => "Python http library",
+        "Test Certificate Info" => "C http library?",
+        "Typhoeus" => "Ruby http library",
+        "Wget" => "wget unix CLI http client",
 
         # URL expanders / previewers
-        'awe.sm' => 'Awe.sm URL expander',
-        'bitlybot' => 'bit.ly bot',
-        'bot@linkfluence.net' => 'Linkfluence bot',
-        'facebookexternalhit' => 'facebook bot',
-        'Facebot' => 'Facebook crawler',
-        'Feedfetcher-Google' => 'Google Feedfetcher',
-        'https://developers.google.com/+/web/snippet' => 'Google+ Snippet Fetcher',
-        'LinkedInBot' => 'LinkedIn bot',
-        'LongURL' => 'URL expander service',
-        'NING' => 'NING - Yet Another Twitter Swarmer',
-        'Pinterestbot' => 'Pinterest Bot',
-        'redditbot' => 'Reddit Bot',
-        'ShortLinkTranslate' => 'Link shortener',
-        'Slackbot' => 'Slackbot link expander',
-        'TweetmemeBot' => 'TweetMeMe Crawler',
-        'Twitterbot' => 'Twitter URL expander',
-        'UnwindFetch' => 'Gnip URL expander',
-        'vkShare' => 'VKontake Sharer',
+        "awe.sm" => "Awe.sm URL expander",
+        "bitlybot" => "bit.ly bot",
+        "bot@linkfluence.net" => "Linkfluence bot",
+        "facebookexternalhit" => "facebook bot",
+        "Facebot" => "Facebook crawler",
+        "Feedfetcher-Google" => "Google Feedfetcher",
+        "https://developers.google.com/+/web/snippet" => "Google+ Snippet Fetcher",
+        "LinkedInBot" => "LinkedIn bot",
+        "LongURL" => "URL expander service",
+        "NING" => "NING - Yet Another Twitter Swarmer",
+        "Pinterestbot" => "Pinterest Bot",
+        "redditbot" => "Reddit Bot",
+        "ShortLinkTranslate" => "Link shortener",
+        "Slackbot" => "Slackbot link expander",
+        "TweetmemeBot" => "TweetMeMe Crawler",
+        "Twitterbot" => "Twitter URL expander",
+        "UnwindFetch" => "Gnip URL expander",
+        "vkShare" => "VKontake Sharer",
 
         # Uptime monitoring
-        'check_http' => 'Nagios monitor',
-        'GoogleStackdriverMonitoring' => 'Google Cloud monitor',
-        'NewRelicPinger' => 'NewRelic monitor',
-        'Panopta' => 'Monitoring service',
-        'Pingdom' => 'Pingdom monitoring',
-        'SiteUptime' => 'Site monitoring services',
-        'UptimeRobot' => 'Monitoring service',
+        "check_http" => "Nagios monitor",
+        "GoogleStackdriverMonitoring" => "Google Cloud monitor",
+        "NewRelicPinger" => "NewRelic monitor",
+        "Panopta" => "Monitoring service",
+        "Pingdom" => "Pingdom monitoring",
+        "SiteUptime" => "Site monitoring services",
+        "UptimeRobot" => "Monitoring service",
 
         # ???
-        'DigitalPersona Fingerprint Software' => 'HP Fingerprint scanner',
-        'ShowyouBot' => 'Showyou iOS app spider',
-        'ZyBorg' => 'Zyborg? Hmmm....',
-        'ELB-HealthChecker' => 'ELB Health Check'
+        "DigitalPersona Fingerprint Software" => "HP Fingerprint scanner",
+        "ShowyouBot" => "Showyou iOS app spider",
+        "ZyBorg" => "Zyborg? Hmmm....",
+        "ELB-HealthChecker" => "ELB Health Check"
       }
     end
 
-    def experiments= experiments
-      raise InvalidExperimentsFormatError.new('Experiments must be a Hash') unless experiments.respond_to?(:keys)
+    def experiments=(experiments)
+      raise InvalidExperimentsFormatError.new("Experiments must be a Hash") unless experiments.respond_to?(:keys)
       @experiments = experiments
     end
 
@@ -157,8 +157,8 @@ module Split
 
       @experiments.each do |experiment_name, settings|
         alternatives = if (alts = value_for(settings, :alternatives))
-                         normalize_alternatives(alts)
-                       end
+          normalize_alternatives(alts)
+        end
 
         experiment_data = {
           alternatives: alternatives,
@@ -213,14 +213,14 @@ module Split
 
     def initialize
       @ignore_ip_addresses = []
-      @ignore_filter = proc{ |request| is_robot? || is_ignored_ip_address? }
+      @ignore_filter = proc { |request| is_robot? || is_ignored_ip_address? }
       @db_failover = false
-      @db_failover_on_db_error = proc{|error|} # e.g. use Rails logger here
-      @on_experiment_reset = proc{|experiment|}
-      @on_experiment_delete = proc{|experiment|}
-      @on_before_experiment_reset = proc{|experiment|}
-      @on_before_experiment_delete = proc{|experiment|}
-      @on_experiment_winner_choose = proc{|experiment|}
+      @db_failover_on_db_error = proc { |error| } # e.g. use Rails logger here
+      @on_experiment_reset = proc { |experiment| }
+      @on_experiment_delete = proc { |experiment| }
+      @on_before_experiment_reset = proc { |experiment| }
+      @on_before_experiment_delete = proc { |experiment| }
+      @on_experiment_winner_choose = proc { |experiment| }
       @db_failover_allow_parameter_override = false
       @allow_multiple_experiments = false
       @enabled = true
@@ -232,20 +232,19 @@ module Split
       @include_rails_helper = true
       @beta_probability_simulations = 10000
       @winning_alternative_recalculation_interval = 60 * 60 * 24 # 1 day
-      @redis = ENV.fetch(ENV.fetch('REDIS_PROVIDER', 'REDIS_URL'), 'redis://localhost:6379')
+      @redis = ENV.fetch(ENV.fetch("REDIS_PROVIDER", "REDIS_URL"), "redis://localhost:6379")
       @dashboard_pagination_default_per_page = 10
     end
 
     private
-
-    def value_for(hash, key)
-      if hash.kind_of?(Hash)
-        hash.has_key?(key.to_s) ? hash[key.to_s] : hash[key.to_sym]
+      def value_for(hash, key)
+        if hash.kind_of?(Hash)
+          hash.has_key?(key.to_s) ? hash[key.to_s] : hash[key.to_sym]
+        end
       end
-    end
 
-    def escaped_bots
-      bots.map { |key, _| Regexp.escape(key) }
-    end
+      def escaped_bots
+        bots.map { |key, _| Regexp.escape(key) }
+      end
   end
 end