coppertone 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 917311c72ae373052b881395ec48c4e6b24a0695
-  data.tar.gz: ee1e33eae825d36765f1fa6a345bbc1a7f5552d6
+  metadata.gz: 739f6dacf79f523ba1cffcab857bd8e569260e48
+  data.tar.gz: ae128f802f7ab9ab04c3f953ccaf133bf1378ceb
 SHA512:
-  metadata.gz: 0e197602cb1fcc52ce0897a77ad1321aa7e37ec6148268fb9736cefd83936d880cecc6b638ee06d839f4e0d1318a7a7e9b712cd75e0cd30a76f1cf42d95f6c9e
-  data.tar.gz: 1db1f121f8697504863b3332586755dbbcf47cf96e19541c89f99ea14c5d2508ecd6d4294a30eaec9f3f973900f1160c55d8edba17aed677fb90c0898b3e7911
+  metadata.gz: 6b299645448f6a340a39f608f69ebac56345fcd05296f17cf85bb78306154b51add899345853e5edfa95b157753e5cc8ae9e5e4f51922f6cf5d8f65cffcc96ec
+  data.tar.gz: d13f36a9a62cb95fd6961cc9716944afdc992706ea727818ebf8fbe3a4dcfb30b8bb6c93622bb7cdfc8f52e31f322398bbbe27789639dc2dd488eb2659dd8e8c

data/.rubocop.yml

@@ -0,0 +1,20 @@
+AllCops:
+  TargetRubyVersion: 2.2
+
+Metrics/AbcSize:
+  Exclude:
+    - 'Rakefile'
+Metrics/LineLength:
+  Enabled: false
+Metrics/MethodLength:
+  Exclude:
+    - 'Rakefile'
+Style/Documentation:
+  Enabled: false
+Rails/HttpPositionalArguments:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Style/FileName:
+  Exclude:
+    - 'spec/open_spf/**/*'

data/.travis.yml

@@ -1,12 +1,9 @@
+sudo: false
 language: ruby
 env:
-  - CODECLIMATE_REPO_TOKEN=c860bbaeb7a143f5ab6078e680fa1e210cfe39ab6a0a7a9f21f43162a30911f0
+  - CODECLIMATE_REPO_TOKEN=437199ed4348853fa1dd6561b2e17a5668a7a6e78485d7ac3a21d12670fb6f2f
 rvm:
-  - 2.0.0
-  - 2.1.2
-  - 2.2.1
-  - jruby-19mode
-  - rbx-2.2.10
-allow_failures:
-  - rvm: rbx-2.2.10
+  - 2.2.5
+  - 2.3.1
+  - jruby-9.1.5.0
 

data/README.md

@@ -1,8 +1,8 @@
 # Coppertone
 
-[![Build Status](https://travis-ci.org/petergoldstein/coppertone.svg?branch=master)](https://travis-ci.org/petergoldstein/coppertone)
-[![Test Coverage](https://codeclimate.com/github/petergoldstein/coppertone/badges/coverage.svg)](https://codeclimate.com/github/petergoldstein/coppertone)
-[![Code Climate](https://codeclimate.com/github/petergoldstein/coppertone/badges/gpa.svg)](https://codeclimate.com/github/petergoldstein/coppertone)
+[![Build Status](https://travis-ci.org/ValiMail/coppertone.svg?branch=master)](https://travis-ci.org/ValiMail/coppertone)
+[![Test Coverage](https://codeclimate.com/github/ValiMail/coppertone/badges/coverage.svg)](https://codeclimate.com/github/ValiMail/coppertone)
+[![Code Climate](https://codeclimate.com/github/ValiMail/coppertone/badges/gpa.svg)](https://codeclimate.com/github/ValiMail/coppertone)
 
 A Sender Policy Framework (SPF) toolkit for Ruby.
 
@@ -23,7 +23,7 @@ If you'd like to suggest amending these guidelines, please open an issue for dis
 
 ## Requirements
 
-Coppertone supports MRI 2.0 and up - earlier MRI rubies are not supported.  JRuby 1.7.16+ and Rubinius 2.2+ are also supported.
+Coppertone supports MRI 2.2 and up - earlier MRI rubies are not supported.  JRuby 9.1.5.0+ is also supported.
 
 Coppertone does not require Rails, although it does depend on ActiveSupport.
 

data/Rakefile

@@ -24,18 +24,18 @@ desc 'Parse OpenSPF tests'
 def spec_file_name(doc, output_path)
   description = doc['description']
   file_name = description.gsub(/[^\w\s_-]+/, '')
-    .gsub(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
-    .gsub(/\s+/, '_') + '_spec.rb'
+                         .gsub(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
+                         .gsub(/\s+/, '_') + '_spec.rb'
   File.join(output_path, file_name)
 end
 
-INDENT_STRING = '  '
+INDENT_STRING = '  '.freeze
 def indented_string(num_indents = 1)
-  num_indents.times.map { INDENT_STRING }.join('')
+  Array.new(num_indents) { INDENT_STRING }.join('')
 end
 
 def puts_prefixed_string(f, s, indent = 0)
-  f.write indented_string(indent) unless indent == 0
+  f.write indented_string(indent) unless indent.zero?
   f.puts s
 end
 
@@ -62,7 +62,7 @@ end
 
 def clean_description(description)
   return unless description
-  description.gsub("\n", ' ').gsub("'", '')
+  description.tr("\n", ' ').delete("'")
 end
 
 def as_array(val)

data/coppertone.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/petergoldstein/coppertone'
   spec.license       = 'Apache'
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'dns_adapter'

data/lib/coppertone/directive.rb

@@ -24,7 +24,7 @@ module Coppertone
     end
 
     def target_domain
-      fail NeedsContextError unless dns_lookup_term?
+      raise NeedsContextError unless dns_lookup_term?
       mechanism.target_domain
     end
 

data/lib/coppertone/domain_spec.rb

@@ -15,10 +15,10 @@ module Coppertone
 
     def validate_domain_spec_restrictions
       return if only_allowed_macros? && ends_in_allowed_term?
-      fail Coppertone::DomainSpecParsingError
+      raise Coppertone::DomainSpecParsingError
     end
 
-    EXP_ONLY_MACRO_LETTERS = %w(c r t)
+    EXP_ONLY_MACRO_LETTERS = %w(c r t).freeze
     def only_allowed_macros?
       @macros.select { |m| m.is_a?(Coppertone::MacroString::MacroExpand) }
              .none? { |m| EXP_ONLY_MACRO_LETTERS.include?(m.macro_letter) }
@@ -37,7 +37,7 @@ module Coppertone
       ends_with = ends_with[0..-2] if ends_with[-1] == '.'
       _, match, tail = ends_with.rpartition('.')
       return false if match.blank?
-      hostname = Coppertone::Utils::DomainUtils.valid_hostname_label?(tail)
+      hostname = Coppertone::Utils::DomainUtils.valid_tld?(tail)
       return false unless hostname
       true
     end

data/lib/coppertone/ip_address_wrapper.rb

@@ -12,16 +12,16 @@ module Coppertone
     attr_reader :string_representation, :ip
     def initialize(s)
       @ip = self.class.parse(s)
-      fail ArgumentError unless @ip
+      raise ArgumentError unless @ip
       @string_representation = s
     end
 
     # Hack for JRuby - remove when JRuby moves to 2.0.x
-    if RUBY_VERSION < '2.0'
-      IP_PARSE_ERROR = ArgumentError
-    else
-      IP_PARSE_ERROR = IPAddr::InvalidAddressError
-    end
+    IP_PARSE_ERROR = if RUBY_VERSION < '2.0'
+                       ArgumentError
+                     else
+                       IPAddr::InvalidAddressError
+                     end
 
     def self.parse(s)
       return nil unless s
@@ -44,12 +44,12 @@ module Coppertone
         @ip.to_s
       end
     end
-    alias_method :i, :to_dotted_notation
+    alias i to_dotted_notation
 
     def to_human_readable
       @ip.to_s
     end
-    alias_method :c, :to_human_readable
+    alias c to_human_readable
 
     def v
       original_ipv4? ? 'in-addr' : 'ip6'

data/lib/coppertone/macro_context.rb

@@ -10,11 +10,11 @@ module Coppertone
     attr_reader :domain, :ip_address_wrapper, :sender_identity, :helo_domain
 
     delegate :s, :l, :o, to: :sender_identity
-    alias_method :d, :domain
+    alias d domain
     delegate :i, :v, :c, to: :ip_address_wrapper
     delegate :ip_v4, :ip_v6, :original_ipv4?, :original_ipv6?,
              to: :ip_address_wrapper
-    alias_method :h, :helo_domain
+    alias h helo_domain
 
     attr_reader :hostname
     def initialize(domain, ip_as_s, sender, helo_domain = 'unknown',
@@ -26,7 +26,7 @@ module Coppertone
       @hostname = options[:hostname]
     end
 
-    UNKNOWN_HOSTNAME = 'unknown'
+    UNKNOWN_HOSTNAME = 'unknown'.freeze
     def r
       valid = Coppertone::Utils::DomainUtils.valid?(raw_hostname)
       valid ? raw_hostname : UNKNOWN_HOSTNAME
@@ -46,8 +46,9 @@ module Coppertone
 
     def raw_hostname
       @raw_hostname ||=
-        (hostname || Coppertone.config.hostname ||
-         Coppertone::Utils::HostUtils.hostname)
+        begin
+          hostname || Coppertone.config.hostname || Coppertone::Utils::HostUtils.hostname
+        end
     end
 
     # Generates a new MacroContext with all the same info, but a new

data/lib/coppertone/macro_string/macro_expand.rb

@@ -8,18 +8,18 @@ module Coppertone
     # 7.2, as well as against the set of delimiters, transformers, and
     # grammer defined in section 7.1.
     class MacroExpand
-      MACRO_LETTER_CHAR_SET = '[slodiphcrtvSLODIPHCRTV]'
-      PTR_MACRO_CHAR_SET = %w(p P)
-      DELIMITER_CHAR_SET = '[\.\-\+\,\/\_\=]'
+      MACRO_LETTER_CHAR_SET = '[slodiphcrtvSLODIPHCRTV]'.freeze
+      PTR_MACRO_CHAR_SET = %w(p P).freeze
+      DELIMITER_CHAR_SET = '[\.\-\+\,\/\_\=]'.freeze
       VALID_BODY_REGEXP =
         /\A(#{MACRO_LETTER_CHAR_SET})(\d*)(r?)(#{DELIMITER_CHAR_SET}*)\z/
 
       attr_reader :macro_letter, :digit_transformers, :reverse,
                   :delimiter_regexp
-      alias_method :reverse?, :reverse
+      alias reverse? reverse
       def initialize(s)
         matches = VALID_BODY_REGEXP.match(s)
-        fail Coppertone::MacroStringParsingError if matches.nil?
+        raise Coppertone::MacroStringParsingError if matches.nil?
         @macro_letter = matches[1]
         initialize_digit_transformers(matches[2])
         @reverse = (matches[3] == 'r')
@@ -29,9 +29,9 @@ module Coppertone
 
       def initialize_digit_transformers(raw_value)
         return unless raw_value
-        @digit_transformers = raw_value.to_i if raw_value.length > 0
+        @digit_transformers = raw_value.to_i unless raw_value.empty?
         return unless @digit_transformers
-        fail Coppertone::MacroStringParsingError if @digit_transformers == 0
+        raise Coppertone::MacroStringParsingError if @digit_transformers.zero?
       end
 
       def ptr_macro?
@@ -42,7 +42,7 @@ module Coppertone
         context.send(@macro_letter) if context.respond_to?(@macro_letter)
         ptr =
           Coppertone::Utils::ValidatedDomainFinder
-            .new(context, request, false).find(context.d)
+          .new(context, request, false).find(context.d)
         return 'unknown' unless ptr
         @macro_letter == 'P' ? ::Addressable::URI.encode_component(ptr) : ptr
       end
@@ -69,7 +69,7 @@ module Coppertone
 
       private
 
-      DEFAULT_DELIMITER = '.'
+      DEFAULT_DELIMITER = '.'.freeze
       def initialize_delimiter(raw_delimiter)
         delimiter_chars =
           if raw_delimiter && raw_delimiter.length >= 1

data/lib/coppertone/macro_string/macro_parser.rb

@@ -16,7 +16,7 @@ module Coppertone
       end
 
       def parse_macro_array
-        while @s && @s.length > 0
+        while @s && !@s.empty?
           if starting_macro?
             parse_interpolated_macro
           else
@@ -30,17 +30,17 @@ module Coppertone
       end
 
       def parse_contextual_interpolated_macro
-        fail MacroStringParsingError unless @s[1] == '{'
+        raise MacroStringParsingError unless @s[1] == '{'
         closing_index = @s.index('}')
-        fail MacroStringParsingError unless closing_index
+        raise MacroStringParsingError unless closing_index
         interpolated_body = @s[2, closing_index - 2]
         @macros << MacroExpand.new(interpolated_body)
         @s = @s[(closing_index + 1)..-1]
       end
 
-      SIMPLE_MACRO_LETTERS = %w(% _ -)
+      SIMPLE_MACRO_LETTERS = %w(% _ -).freeze
       def parse_interpolated_macro
-        fail MacroStringParsingError if @s.length == 1
+        raise MacroStringParsingError if @s.length == 1
         macro_code = @s[0, 2]
         if MacroStaticExpand.exists_for?(macro_code)
           @macros << MacroStaticExpand.macro_for(macro_code)

data/lib/coppertone/macro_string/macro_static_expand.rb

@@ -35,7 +35,7 @@ module Coppertone
       end
 
       def self.macro_for(x)
-        fail Coppertone::MacroStringParsingError unless exists_for?(x)
+        raise Coppertone::MacroStringParsingError unless exists_for?(x)
         case x[1]
         when '%'
           PERCENT_MACRO

data/lib/coppertone/macro_string.rb

@@ -41,7 +41,7 @@ module Coppertone
       return false unless other.instance_of? self.class
       macro_text == other.macro_text
     end
-    alias_method :eql?, :==
+    alias eql? ==
 
     def hash
       macro_text.hash

data/lib/coppertone/mechanism/a.rb

@@ -2,7 +2,7 @@ require 'coppertone/mechanism/domain_spec_with_dual_cidr'
 require 'coppertone/utils/ip_in_domain_checker'
 
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
     # Implements the A mechanism.
     class A < DomainSpecWithDualCidr
       def match_target_name(macro_context, request_context, target_name)

data/lib/coppertone/mechanism/all.rb

@@ -1,10 +1,10 @@
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
     # Implements the All mechanism.  To reduce unnecessary object creation, this
     # class is a singleton since all All mechanisms behave identically.
     class All < Mechanism
       def self.create(attributes)
-        fail InvalidMechanismError unless attributes.blank?
+        raise InvalidMechanismError unless attributes.blank?
         SINGLETON
       end
 

data/lib/coppertone/mechanism/cidr_parser.rb

@@ -1,11 +1,12 @@
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
+    # Parses a CIDR parameter subject to a max_val (32 for IPv4, 128 for IPv6)
     class CidrParser
       def self.parse(raw_length, max_val)
         return if raw_length.blank?
         length_as_i = raw_length.to_i
         if length_as_i < 0 || length_as_i > max_val
-          fail Coppertone::InvalidMechanismError
+          raise Coppertone::InvalidMechanismError
         end
         length_as_i
       end

data/lib/coppertone/mechanism/domain_spec_mechanism.rb

@@ -1,5 +1,6 @@
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
+    # Parent class for mechanisms that use a domain spec.
     class DomainSpecMechanism < Mechanism
       attr_reader :domain_spec
 
@@ -29,7 +30,7 @@ module Coppertone
       end
 
       def target_domain
-        fail Coppertone::NeedsContextError if context_dependent?
+        raise Coppertone::NeedsContextError if context_dependent?
         domain_spec.to_s
       end
 
@@ -37,7 +38,7 @@ module Coppertone
         return false unless other.instance_of? self.class
         domain_spec == other.domain_spec
       end
-      alias_method :eql?, :==
+      alias eql? ==
 
       def hash
         domain_spec.hash

data/lib/coppertone/mechanism/domain_spec_optional.rb

@@ -1,7 +1,8 @@
 require 'coppertone/mechanism/domain_spec_mechanism'
 
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
+    # Parent class for mechanisms that use an optional domain spec.
     class DomainSpecOptional < DomainSpecMechanism
       def self.create(attributes)
         new(attributes)
@@ -35,7 +36,7 @@ module Coppertone
       end
 
       def handle_invalid_domain(_macro_context, _options)
-        fail RecordParsingError
+        raise RecordParsingError
       end
     end
   end

data/lib/coppertone/mechanism/domain_spec_required.rb

@@ -1,5 +1,6 @@
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
+    # Parent class for mechanisms that use a required.
     class DomainSpecRequired < DomainSpecMechanism
       def self.create(attributes)
         new(attributes)
@@ -8,7 +9,7 @@ module Coppertone
       def initialize(attributes)
         super(attributes)
         raw_domain_spec = trim_domain_spec(attributes)
-        fail InvalidMechanismError if raw_domain_spec.blank?
+        raise InvalidMechanismError if raw_domain_spec.blank?
         @domain_spec = Coppertone::DomainSpec.new(raw_domain_spec)
       rescue Coppertone::MacroStringParsingError
         raise Coppertone::InvalidMechanismError
@@ -26,7 +27,7 @@ module Coppertone
       end
 
       def handle_invalid_domain(_macro_context, _options)
-        fail RecordParsingError
+        raise RecordParsingError
       end
     end
   end

data/lib/coppertone/mechanism/domain_spec_with_dual_cidr.rb

@@ -3,7 +3,9 @@ require 'ipaddr'
 require 'coppertone/mechanism/cidr_parser'
 
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
+    # Parent class for mechanisms that use a domain spec, and permit
+    # specification of an optional IPv4 CIDR and optional IPv6 CIDR.
     class DomainSpecWithDualCidr < DomainSpecMechanism
       def self.create(attributes)
         new(attributes)
@@ -37,9 +39,9 @@ module Coppertone
 
       CIDR_REGEXP = %r{(/(\d*))?(//(\d*))?\z}
       def parse_argument(attributes)
-        fail InvalidMechanismError if attributes.blank?
+        raise InvalidMechanismError if attributes.blank?
         cidr_matches = CIDR_REGEXP.match(attributes)
-        fail InvalidMechanismError unless cidr_matches
+        raise InvalidMechanismError unless cidr_matches
         macro_string, raw_ip_v4_cidr_length, raw_ip_v6_cidr_length =
           clean_matches(attributes, cidr_matches)
         process_matches(macro_string, raw_ip_v4_cidr_length,
@@ -53,7 +55,7 @@ module Coppertone
         cand = trim_domain_spec(cand)
         # At this point we've ascertained that there is
         # a body to the domain spec
-        fail InvalidMechanismError if cand.blank?
+        raise InvalidMechanismError if cand.blank?
         cand
       end
 
@@ -90,16 +92,16 @@ module Coppertone
       end
 
       def handle_invalid_domain(_macro_context, _options)
-        fail RecordParsingError
+        raise RecordParsingError
       end
 
       def ==(other)
         return false unless other.instance_of? self.class
         domain_spec == other.domain_spec &&
-        ip_v4_cidr_length == other.ip_v4_cidr_length &&
-        ip_v6_cidr_length == other.ip_v6_cidr_length
+          ip_v4_cidr_length == other.ip_v4_cidr_length &&
+          ip_v6_cidr_length == other.ip_v6_cidr_length
       end
-      alias_method :eql?, :==
+      alias eql? ==
 
       def hash
         domain_spec.hash ^ ip_v4_cidr_length.hash ^ ip_v6_cidr_length.hash

data/lib/coppertone/mechanism/exists.rb

@@ -1,7 +1,7 @@
 require 'coppertone/mechanism/domain_spec_required'
 
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
     # Implements the exists mechanism.
     class Exists < DomainSpecRequired
       def match_target_name(_macro_context, request_context, target_name)

data/lib/coppertone/mechanism/include.rb

@@ -3,14 +3,14 @@ require 'coppertone/mechanism/include_matcher'
 require 'coppertone/record_finder'
 
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
     # Implements the include mechanism.
     class Include < DomainSpecRequired
       def match_target_name(macro_context, request_context, target_name)
         record = included_record(request_context, target_name)
         IncludeMatcher.new(record)
-          .match?(context_for_include(macro_context, target_name),
-                  request_context)
+                      .match?(context_for_include(macro_context, target_name),
+                              request_context)
       end
 
       def context_for_include(macro_context, target_name)

data/lib/coppertone/mechanism/include_matcher.rb

@@ -1,7 +1,7 @@
 require 'coppertone/record_evaluator'
 
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
     # Implements the include mechanism.
     class IncludeMatcher
       # Evaluates records that are referenced via an include
@@ -13,7 +13,7 @@ module Coppertone
         def evaluate_none_result(result, m, r)
           new_result = super
           return new_result unless new_result.none?
-          fail Coppertone::NoneIncludeResultError
+          raise Coppertone::NoneIncludeResultError
         end
       end
 
@@ -23,10 +23,10 @@ module Coppertone
       end
 
       def match?(macro_context, request_context)
-        fail Coppertone::NoneIncludeResultError if record.nil?
+        raise Coppertone::NoneIncludeResultError if record.nil?
         record_result =
           IncludeRecordEvaluator.new(record)
-            .evaluate(macro_context, request_context)
+                                .evaluate(macro_context, request_context)
         record_result.pass?
       end
     end

data/lib/coppertone/mechanism/ip4.rb

@@ -1,7 +1,7 @@
 require 'coppertone/mechanism/ip_mechanism'
 
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
     # Implements the ip4 mechanism.
     class IP4 < IPMechanism
       def ip_for_match(macro_context)

data/lib/coppertone/mechanism/ip6.rb

@@ -1,7 +1,7 @@
 require 'coppertone/mechanism/ip_mechanism'
 
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
     # Implements the ip6 mechanism.
     class IP6 < IPMechanism
       def ip_for_match(macro_context)

data/lib/coppertone/mechanism/ip_mechanism.rb

@@ -1,5 +1,5 @@
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
     # Implements the ip4 mechanism.
     class IPMechanism < Mechanism
       attr_reader :netblock
@@ -13,21 +13,21 @@ module Coppertone
           attributes = attributes[1..-1] if attributes[0] == ':'
           @netblock = parse_netblock(attributes)
         end
-        fail Coppertone::InvalidMechanismError if @netblock.nil?
+        raise Coppertone::InvalidMechanismError if @netblock.nil?
       end
 
-      LEADING_ZEROES_IN_CIDR_REGEXP = /\/0\d/
+      LEADING_ZEROES_IN_CIDR_REGEXP = %r{\/0\d}
       def validate_no_leading_zeroes_in_cidr(ip_as_s)
         return unless LEADING_ZEROES_IN_CIDR_REGEXP.match(ip_as_s)
-        fail Coppertone::InvalidMechanismError
+        raise Coppertone::InvalidMechanismError
       end
 
       # Hack for JRuby - remove when JRuby moves to 2.0.x
-      if RUBY_VERSION < '2.0'
-        IP_PARSE_ERROR = ArgumentError
-      else
-        IP_PARSE_ERROR = IPAddr::Error
-      end
+      IP_PARSE_ERROR = if RUBY_VERSION < '2.0'
+                         ArgumentError
+                       else
+                         IPAddr::Error
+                       end
 
       def parse_netblock(ip_as_s)
         validate_no_leading_zeroes_in_cidr(ip_as_s)

data/lib/coppertone/mechanism/mx.rb

@@ -1,7 +1,7 @@
 require 'coppertone/mechanism/domain_spec_with_dual_cidr'
 
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
     # Implements the MX mechanism.
     class MX < DomainSpecWithDualCidr
       def match_target_name(macro_context, request_context, target_name)
@@ -32,7 +32,7 @@ module Coppertone
       def check_a_record_limit(request_context, count)
         limit = request_context.dns_lookups_per_mx_mechanism_limit
         return unless limit && count > limit
-        fail Coppertone::MXLimitExceededError
+        raise Coppertone::MXLimitExceededError
       end
 
       def self.label

data/lib/coppertone/mechanism/ptr.rb

@@ -1,14 +1,14 @@
 require 'coppertone/mechanism/domain_spec_optional'
 
 module Coppertone
-  class Mechanism  # rubocop:disable Style/Documentation
+  class Mechanism
     # Implements the ptr mechanism.
     class Ptr < DomainSpecOptional
       def match_target_name(macro_context, request_context, target_name)
         matching_name =
           Coppertone::Utils::ValidatedDomainFinder
-            .new(macro_context, request_context)
-            .find(target_name)
+          .new(macro_context, request_context)
+          .find(target_name)
         !matching_name.nil?
       end