diff --git a/.rubocop_defaults.yml b/.rubocop_defaults.yml index 4d07840d..fa91f00b 100644 --- a/.rubocop_defaults.yml +++ b/.rubocop_defaults.yml @@ -63,11 +63,6 @@ Metrics/ParameterLists: Metrics/PerceivedComplexity: Enabled: false -# [codesmell] -# I don't really get the point of this cop. -Performance/RedundantMerge: - Enabled: false - # Do not use "and" or "or" in conditionals, but for readability we can use it # to chain executions. Just beware of operator order. Style/AndOr: @@ -123,12 +118,12 @@ Style/RescueStandardError: # Array indentation should be considered like MultilineMethodCallIndentation indentation # and use 4 spaces instead of 2. -Layout/IndentArray: +Layout/IndentFirstArrayElement: IndentationWidth: 4 # Hash indentation should be considered like MultilineMethodCallIndentation indentation # and use 4 spaces instead of 2. -Layout/IndentHash: +Layout/IndentFirstHashElement: IndentationWidth: 4 # Multi-line differs from standard indentation, they are indented twice. diff --git a/Gemfile b/Gemfile index 4face3d3..1339c9f9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + source "https://rubygems.org" gemspec diff --git a/Rakefile b/Rakefile index d304b662..502270a4 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "bundler/gem_tasks" # By default, run tests and linter. @@ -39,7 +41,7 @@ desc "Downloads the Public Suffix List file from the repository and stores it lo task :"update-list" do require "net/http" - DEFINITION_URL = "https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat".freeze + DEFINITION_URL = "https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat" File.open("data/list.txt", "w+") do |f| response = Net::HTTP.get_response(URI.parse(DEFINITION_URL)) diff --git a/bin/console b/bin/console index fd0f7392..c638bb43 100755 --- a/bin/console +++ b/bin/console @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true require "bundler/setup" require "public_suffix" diff --git a/lib/public_suffix.rb b/lib/public_suffix.rb index 4bdecb11..b607cd31 100644 --- a/lib/public_suffix.rb +++ b/lib/public_suffix.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # = Public Suffix # # Domain name parser based on the Public Suffix List. @@ -20,9 +22,9 @@ # but was originally created to meet the needs of browser manufacturers. module PublicSuffix - DOT = ".".freeze - BANG = "!".freeze - STAR = "*".freeze + DOT = "." + BANG = "!" + STAR = "*" # Parses +name+ and returns the {PublicSuffix::Domain} instance. # diff --git a/lib/public_suffix/domain.rb b/lib/public_suffix/domain.rb index 3f84bfac..352d110e 100644 --- a/lib/public_suffix/domain.rb +++ b/lib/public_suffix/domain.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # = Public Suffix # # Domain name parser based on the Public Suffix List. diff --git a/lib/public_suffix/errors.rb b/lib/public_suffix/errors.rb index 687befb4..244164b6 100644 --- a/lib/public_suffix/errors.rb +++ b/lib/public_suffix/errors.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # = Public Suffix # # Domain name parser based on the Public Suffix List. diff --git a/lib/public_suffix/list.rb b/lib/public_suffix/list.rb index 69173f7e..c5077e35 100644 --- a/lib/public_suffix/list.rb +++ b/lib/public_suffix/list.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # = Public Suffix # # Domain name parser based on the Public Suffix List. @@ -65,8 +67,8 @@ def self.default=(value) # @param private_domains [Boolean] whether to ignore the private domains section # @return [PublicSuffix::List] def self.parse(input, private_domains: true) - comment_token = "//".freeze - private_token = "===BEGIN PRIVATE DOMAINS===".freeze + comment_token = "//" + private_token = "===BEGIN PRIVATE DOMAINS===" section = nil # 1 == ICANN, 2 == PRIVATE new do |list| diff --git a/lib/public_suffix/rule.rb b/lib/public_suffix/rule.rb index ec2ecd0c..93540210 100644 --- a/lib/public_suffix/rule.rb +++ b/lib/public_suffix/rule.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # = Public Suffix # # Domain name parser based on the Public Suffix List. diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index c88cc01c..03a08cce 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -9,5 +9,5 @@ module PublicSuffix # The current library version. - VERSION = "3.0.3".freeze + VERSION = "3.0.3" end diff --git a/test/acceptance_test.rb b/test/acceptance_test.rb index ce53bb8f..660bdbc0 100644 --- a/test/acceptance_test.rb +++ b/test/acceptance_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" class AcceptanceTest < Minitest::Test diff --git a/test/psl_test.rb b/test/psl_test.rb index b1b2e5e6..20dc79a9 100644 --- a/test/psl_test.rb +++ b/test/psl_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" require "public_suffix" diff --git a/test/test_helper.rb b/test/test_helper.rb index 25bea200..1d5468c3 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + if ENV["COVERAGE"] require "simplecov" SimpleCov.start diff --git a/test/unit/domain_test.rb b/test/unit/domain_test.rb index 509ce1b5..968462d9 100644 --- a/test/unit/domain_test.rb +++ b/test/unit/domain_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" class PublicSuffix::DomainTest < Minitest::Test diff --git a/test/unit/errors_test.rb b/test/unit/errors_test.rb index 47ac592e..75099ba9 100644 --- a/test/unit/errors_test.rb +++ b/test/unit/errors_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" class ErrorsTest < Minitest::Test diff --git a/test/unit/list_test.rb b/test/unit/list_test.rb index 693945d1..98529352 100644 --- a/test/unit/list_test.rb +++ b/test/unit/list_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" class PublicSuffix::ListTest < Minitest::Test diff --git a/test/unit/public_suffix_test.rb b/test/unit/public_suffix_test.rb index a505ce1d..48a85e0f 100644 --- a/test/unit/public_suffix_test.rb +++ b/test/unit/public_suffix_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" class PublicSuffixTest < Minitest::Test diff --git a/test/unit/rule_test.rb b/test/unit/rule_test.rb index ed1c1320..ea5ec8c0 100644 --- a/test/unit/rule_test.rb +++ b/test/unit/rule_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" class PublicSuffix::RuleTest < Minitest::Test