coppertone 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ef116ba53f031efce0470d0e7b2650161fa44d4
-  data.tar.gz: f8080851318443517abd3ab0f7f84e26997c6f07
+SHA256:
+  metadata.gz: a8802307a322cafa013376ddb5f67bfd134996b4f51b9753f04c4c024158c6f5
+  data.tar.gz: 4a426ab5a166b4e896417bd004f2ea597d77074929f389f7f152698b65258c64
 SHA512:
-  metadata.gz: a2a5c2716e42eb0922f84e5d7cfd9d4612ac39d11398a2e6f64bd533fa5a33dbc8e95212eedba1d8156149f9fd2829ae9267581c78bd9a16f84f89b2f980283d
-  data.tar.gz: bf1c8f0e057f065d5f74de705685fc3634d3955cefbd8409e67ca8dde22dff31555a3aa0b21440a9ee7696414fb883622027751cd76b215dbd14e73418d15ffb
+  metadata.gz: 260ff1c6805f0f74cc9c8939b66b99ab903f83f548b22e3a05a8ed4fec45867549e4d8b01ea66b06fdf17096f1e08fb094c292070209684c5531ad9e481d37c4
+  data.tar.gz: c4753800b5357e24aed9a964d00ea0f7ae5a91056407edd38b325a5b6dee1c0fdc33edfa5c79644b6dee00b4104cca2497d7933fd18e89eabc21216888281308

data/.circleci/config.yml

@@ -0,0 +1,91 @@
+version: 2
+aliases:
+  - &current_ruby_image
+    circleci/ruby:2.5.1
+
+  - &previous_ruby_image
+    circleci/ruby:2.4.4
+
+  - &defaults
+    working_directory: ~/repo
+    docker:
+      - image: *current_ruby_image
+
+  - &step_install_root_dependencies
+    run:
+      name: install root dependencies
+      command: |
+        gem install bundler && bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+  - &step_make_test_output_directory
+    run:
+      name: create test metadata directory
+      command: mkdir /tmp/test-results
+
+  - &step_run_rspec_tests
+    run:
+      name: run rspec with simplecov
+      command: |
+        TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
+
+        COVERAGE=true bundle exec rspec \
+                          --format progress \
+                          --format RspecJunitFormatter \
+                          --out /tmp/test-results/rspec.xml \
+                          ${TEST_FILES}
+
+  - &step_store_test_results
+    store_test_results:
+      path: /tmp/test-results
+
+  - &step_store_test_artifacts
+    store_artifacts:
+      path: /tmp/test-results
+      destination: test-results
+
+  - &step_store_coverage_artifacts
+    store_artifacts:
+      path: coverage
+      destination: coverage
+
+jobs:
+  code-quality-job:
+    <<: *defaults
+    steps:
+      - checkout
+      - *step_install_root_dependencies
+      - run:
+          name: Run Rubocop
+          command: |
+            bundle exec rubocop
+
+  current_ruby-job:
+    working_directory: ~/repo
+    docker:
+      - image: *current_ruby_image
+    steps: &test_run_steps
+      - checkout
+      - *step_install_root_dependencies
+      - *step_make_test_output_directory
+      - *step_run_rspec_tests
+      - *step_store_test_results
+      - *step_store_test_artifacts
+      - *step_store_coverage_artifacts
+
+  previous_ruby-job:
+    working_directory: ~/repo
+    docker:
+      - image: *previous_ruby_image
+    steps: *test_run_steps
+
+workflows:
+    version: 2
+    build-test_current-ruby:
+      jobs:
+        - current_ruby-job
+        - code-quality-job:
+            requires:
+              - current_ruby-job # let primary job fetch all dependencies first
+    build-test_previous-ruby:
+      jobs:
+        - previous_ruby-job

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.5
 
 Metrics/AbcSize:
   Exclude:
@@ -18,7 +18,7 @@ Rails/HttpPositionalArguments:
   Enabled: false
 Style/FrozenStringLiteralComment:
   Enabled: false
-Style/FileName:
+Naming/FileName:
   Exclude:
     - 'spec/open_spf/**/*'
 Style/FormatStringToken:
@@ -26,3 +26,7 @@ Style/FormatStringToken:
 Style/SymbolArray:
   Exclude:
     - 'spec/open_spf/**/*'
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+Lint/UriEscapeUnescape:
+  Enabled: false

data/.travis.yml

@@ -1,12 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-  - jruby-9.1.5.0
-addons:
-  code_climate:
-    repo_token: 437199ed4348853fa1dd6561b2e17a5668a7a6e78485d7ac3a21d12670fb6f2f
-after_success:
-  - bundle exec codeclimate-test-reporter
+  - 2.4.4
+  - 2.5.1

data/Gemfile

@@ -3,5 +3,13 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in coppertone.gemspec
 gemspec
 
-gem 'codeclimate-test-reporter', group: :test, require: nil
-gem 'simplecov', group: :test, require: false
+group :development, :test do
+  gem 'brakeman', require: false
+  gem 'rubocop', require: false
+end
+
+group :test do
+  gem 'codecov', require: false
+  gem 'rspec_junit_formatter'
+  gem 'simplecov'
+end

data/Rakefile

@@ -57,21 +57,25 @@ end
 
 def escape_quote(val)
   return unless val
+
   val.gsub(/'/) { |_s| "\\'" }
 end
 
 def clean_description(description)
   return unless description
+
   description.tr("\n", ' ').delete("'")
 end
 
 def as_array(val)
   return [] unless val
+
   val.is_a?(Array) ? val : [val]
 end
 
 def write_comment(f, comment, indent)
   return unless comment
+
   comment.lines do |comment_line|
     puts_prefixed_string(f, "# #{comment_line}", indent)
   end
@@ -89,6 +93,7 @@ def write_expects(f, results, explanation, indent)
   code_expect = "expect(#{results_array}).to include(result.code)"
   puts_prefixed_string(f, code_expect, indent)
   return unless explanation
+
   exp_expect = "expect(result.explanation).to eq('#{explanation}')"
   puts_prefixed_string(f, exp_expect, indent)
 end
@@ -116,7 +121,7 @@ def write_spec(f, spec, indent = 1)
 end
 
 def write_doc(doc, output_path)
-  open(spec_file_name(doc, output_path), 'w') do |f|
+  File.open(spec_file_name(doc, output_path), 'w') do |f|
     puts_prefixed_string(f, "require 'spec_helper'")
     empty_line(f)
     description = doc['description']

data/coppertone.gemspec

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'coppertone/version'
 
@@ -18,12 +16,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'activesupport', '>= 3.0'
+  spec.add_runtime_dependency 'addressable'
   spec.add_runtime_dependency 'dns_adapter'
   spec.add_runtime_dependency 'i18n'
-  spec.add_runtime_dependency 'addressable'
-  spec.add_runtime_dependency 'activesupport', '>= 3.0'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'flay'
+  spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '>= 3.0'
-  spec.add_development_dependency 'rubocop'
 end

data/lib/coppertone/class_builder.rb

@@ -12,8 +12,10 @@ module Coppertone
 
     def build(type, attributes)
       return nil unless type
+
       klass = map[type]
       return nil unless klass
+
       klass.create(attributes)
     end
   end

data/lib/coppertone/directive.rb

@@ -25,6 +25,7 @@ module Coppertone
 
     def target_domain
       raise NeedsContextError unless dns_lookup_term?
+
       mechanism.target_domain
     end
 
@@ -37,17 +38,20 @@ module Coppertone
       qualifier.default? ? mechanism_s : "#{qualifier}#{mechanism_s}"
     end
 
-    DIRECTIVE_REGEXP = /\A([\+\-\~\?]?)([a-zA-Z0-9]*)((:?)\S*)\z/
+    DIRECTIVE_REGEXP = /\A([\+\-\~\?]?)([a-zA-Z0-9]*)((:?)\S*)\z/.freeze
     def self.matching_term(text)
       return nil if text.include?('=')
+
       matches = DIRECTIVE_REGEXP.match(text)
       return nil unless matches
+
       qualifier_txt = matches[1]
       mechanism_type = matches[2].downcase
       attributes = matches[3]
       qualifier = Qualifier.find_by_text(qualifier_txt)
       mechanism = Mechanism.build(mechanism_type, attributes)
       return nil unless qualifier && mechanism
+
       new(qualifier, mechanism)
     end
   end

data/lib/coppertone/domain_spec.rb

@@ -15,6 +15,7 @@ module Coppertone
 
     def validate_domain_spec_restrictions
       return if only_allowed_macros? && ends_in_allowed_term?
+
       raise Coppertone::DomainSpecParsingError
     end
 
@@ -29,6 +30,7 @@ module Coppertone
       return true unless lm
       return false if lm.is_a?(Coppertone::MacroString::MacroStaticExpand)
       return true if lm.is_a?(Coppertone::MacroString::MacroExpand)
+
       ends_with_top_label?
     end
 
@@ -37,8 +39,10 @@ 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_tld?(tail)
       return false unless hostname
+
       true
     end
   end

data/lib/coppertone/ip_address_wrapper.rb

@@ -13,6 +13,7 @@ module Coppertone
     def initialize(s)
       @ip = self.class.parse(s)
       raise ArgumentError unless @ip
+
       @string_representation = s
     end
 
@@ -26,6 +27,7 @@ module Coppertone
     def self.parse(s)
       return nil unless s
       return nil if s.index('/')
+
       ip_addr = IPAddr.new(s)
       normalize_ip(ip_addr)
     rescue IP_PARSE_ERROR
@@ -33,7 +35,8 @@ module Coppertone
     end
 
     def self.normalize_ip(parsed_ip)
-      return parsed_ip unless parsed_ip && parsed_ip.ipv6?
+      return parsed_ip unless parsed_ip&.ipv6?
+
       parsed_ip.ipv4_mapped? ? parsed_ip.native : parsed_ip
     end
 

data/lib/coppertone/macro_string.rb

@@ -39,6 +39,7 @@ module Coppertone
 
     def ==(other)
       return false unless other.instance_of? self.class
+
       macro_text == other.macro_text
     end
     alias eql? ==

data/lib/coppertone/macro_string/macro_expand.rb

@@ -12,7 +12,7 @@ module Coppertone
       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/
+        /\A(#{MACRO_LETTER_CHAR_SET})(\d*)(r?)(#{DELIMITER_CHAR_SET}*)\z/.freeze
 
       attr_reader :macro_letter, :digit_transformers, :reverse,
                   :delimiter_regexp
@@ -20,6 +20,7 @@ module Coppertone
       def initialize(s)
         matches = VALID_BODY_REGEXP.match(s)
         raise Coppertone::MacroStringParsingError if matches.nil?
+
         @macro_letter = matches[1]
         initialize_digit_transformers(matches[2])
         @reverse = (matches[3] == 'r')
@@ -29,6 +30,7 @@ module Coppertone
 
       def initialize_digit_transformers(raw_value)
         return unless raw_value
+
         @digit_transformers = raw_value.to_i unless raw_value.empty?
         return unless @digit_transformers
         raise Coppertone::MacroStringParsingError if @digit_transformers.zero?
@@ -44,6 +46,7 @@ module Coppertone
           Coppertone::Utils::ValidatedDomainFinder
           .new(context, request, false).find(context.d)
         return 'unknown' unless ptr
+
         @macro_letter == 'P' ? ::Addressable::URI.encode_component(ptr) : ptr
       end
 
@@ -64,6 +67,7 @@ module Coppertone
 
       def ==(other)
         return false unless other.instance_of? self.class
+
         to_s == other.to_s
       end
 

data/lib/coppertone/macro_string/macro_literal.rb

@@ -17,6 +17,7 @@ module Coppertone
 
       def ==(other)
         return false unless other.instance_of? self.class
+
         to_s == other.to_s
       end
     end

data/lib/coppertone/macro_string/macro_parser.rb

@@ -31,8 +31,10 @@ module Coppertone
 
       def parse_contextual_interpolated_macro
         raise MacroStringParsingError unless @s[1] == '{'
+
         closing_index = @s.index('}')
         raise MacroStringParsingError unless closing_index
+
         interpolated_body = @s[2, closing_index - 2]
         @macros << MacroExpand.new(interpolated_body)
         @s = @s[(closing_index + 1)..-1]
@@ -41,6 +43,7 @@ module Coppertone
       SIMPLE_MACRO_LETTERS = %w[% _ -].freeze
       def parse_interpolated_macro
         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

@@ -31,11 +31,13 @@ module Coppertone
       SIMPLE_INTERPOLATED_MACRO_LETTERS = %w[% _ -].freeze
       def self.exists_for?(x)
         return false unless x && (x.length == 2) && (x[0] == '%')
+
         SIMPLE_INTERPOLATED_MACRO_LETTERS.include?(x[1])
       end
 
       def self.macro_for(x)
         raise Coppertone::MacroStringParsingError unless exists_for?(x)
+
         case x[1]
         when '%'
           PERCENT_MACRO

data/lib/coppertone/mechanism.rb

@@ -18,6 +18,7 @@ module Coppertone
 
     def self.register(klass)
       raise ArgumentError unless klass < self
+
       class_builder.register(klass.label, klass)
     end
 

data/lib/coppertone/mechanism/all.rb

@@ -5,6 +5,7 @@ module Coppertone
     class All < Mechanism
       def self.create(attributes)
         raise InvalidMechanismError unless attributes.blank?
+
         SINGLETON
       end
 

data/lib/coppertone/mechanism/cidr_parser.rb

@@ -4,10 +4,10 @@ module Coppertone
     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
-          raise Coppertone::InvalidMechanismError
-        end
+        raise Coppertone::InvalidMechanismError if length_as_i.negative? || length_as_i > max_val
+
         length_as_i
       end
     end

data/lib/coppertone/mechanism/domain_spec_mechanism.rb

@@ -14,6 +14,7 @@ module Coppertone
 
       def trim_domain_spec(raw_domain_spec)
         return nil if raw_domain_spec.blank?
+
         raw_domain_spec[1..-1]
       end
 
@@ -23,21 +24,25 @@ module Coppertone
 
       def context_dependent?
         return true unless domain_spec
+
         domain_spec.context_dependent?
       end
 
       def includes_ptr?
         return false unless domain_spec
+
         domain_spec.includes_ptr?
       end
 
       def target_domain
         raise Coppertone::NeedsContextError if context_dependent?
+
         domain_spec.to_s
       end
 
       def ==(other)
         return false unless other.instance_of? self.class
+
         domain_spec == other.domain_spec
       end
       alias eql? ==

data/lib/coppertone/mechanism/domain_spec_optional.rb

@@ -11,6 +11,7 @@ module Coppertone
       def initialize(attributes)
         super(attributes)
         return if attributes.blank?
+
         raw_domain_spec = trim_domain_spec(attributes)
         @domain_spec = Coppertone::DomainSpec.new(raw_domain_spec)
       rescue Coppertone::MacroStringParsingError

data/lib/coppertone/mechanism/domain_spec_required.rb

@@ -10,6 +10,7 @@ module Coppertone
         super(attributes)
         raw_domain_spec = trim_domain_spec(attributes)
         raise InvalidMechanismError if raw_domain_spec.blank?
+
         @domain_spec = Coppertone::DomainSpec.new(raw_domain_spec)
       rescue Coppertone::MacroStringParsingError
         raise Coppertone::InvalidMechanismError

data/lib/coppertone/mechanism/domain_spec_with_dual_cidr.rb

@@ -14,6 +14,7 @@ module Coppertone
       def initialize(attributes)
         super(attributes)
         return if attributes.blank?
+
         parse_argument(attributes)
       rescue Coppertone::MacroStringParsingError
         raise Coppertone::InvalidMechanismError
@@ -37,11 +38,13 @@ module Coppertone
         end
       end
 
-      CIDR_REGEXP = %r{(/(\d*))?(//(\d*))?\z}
+      CIDR_REGEXP = %r{(/(\d*))?(//(\d*))?\z}.freeze
       def parse_argument(attributes)
         raise InvalidMechanismError if attributes.blank?
+
         cidr_matches = CIDR_REGEXP.match(attributes)
         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,
@@ -50,12 +53,15 @@ module Coppertone
 
       def parse_domain_spec(attributes, domain_spec_end)
         return nil if attributes.blank?
+
         cand = attributes[0..domain_spec_end]
         return nil if cand.blank?
+
         cand = trim_domain_spec(cand)
         # At this point we've ascertained that there is
         # a body to the domain spec
         raise InvalidMechanismError if cand.blank?
+
         cand
       end
 
@@ -97,6 +103,7 @@ module Coppertone
 
       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

data/lib/coppertone/mechanism/include_matcher.rb

@@ -13,6 +13,7 @@ module Coppertone
         def evaluate_none_result(result, m, r)
           new_result = super
           return new_result unless new_result.none?
+
           raise Coppertone::NoneIncludeResultError
         end
       end
@@ -24,6 +25,7 @@ module Coppertone
 
       def match?(macro_context, request_context)
         raise Coppertone::NoneIncludeResultError if record.nil?
+
         record_result =
           IncludeRecordEvaluator.new(record)
                                 .evaluate(macro_context, request_context)

data/lib/coppertone/mechanism/ip_mechanism.rb

@@ -16,9 +16,10 @@ module Coppertone
         raise Coppertone::InvalidMechanismError if @netblock.nil?
       end
 
-      LEADING_ZEROES_IN_CIDR_REGEXP = %r{\/0\d}
+      LEADING_ZEROES_IN_CIDR_REGEXP = %r{\/0\d}.freeze
       def validate_no_leading_zeroes_in_cidr(ip_as_s)
-        return unless LEADING_ZEROES_IN_CIDR_REGEXP.match(ip_as_s)
+        return unless LEADING_ZEROES_IN_CIDR_REGEXP.match?(ip_as_s)
+
         raise Coppertone::InvalidMechanismError
       end
 
@@ -33,6 +34,7 @@ module Coppertone
         validate_no_leading_zeroes_in_cidr(ip_as_s)
         addr, cidr_length_as_s, dual = ip_as_s.split('/')
         return [nil, nil] if dual
+
         network = IPAddr.new(addr)
         network = network.mask(cidr_length_as_s.to_i) unless cidr_length_as_s.blank?
         cidr_length = cidr_length_as_s.blank? ? default_cidr(network) : cidr_length_as_s.to_i
@@ -49,11 +51,13 @@ module Coppertone
         ip = ip_for_match(macro_context)
         return false unless ip
         return false unless ip.ipv4? == @netblock.ipv4?
+
         @netblock.include?(ip)
       end
 
       def ==(other)
         return false unless other.instance_of? self.class
+
         netblock == other.netblock
       end
     end

data/lib/coppertone/mechanism/mx.rb

@@ -32,6 +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
+
         raise Coppertone::MXLimitExceededError
       end
 

data/lib/coppertone/modifier.rb

@@ -14,10 +14,11 @@ module Coppertone
       class_builder.register(klass.label, klass)
     end
 
-    MODIFIER_REGEXP = /\A([a-zA-Z]+[a-zA-Z0-9\-\_\.]*)=(\S*)\z/
+    MODIFIER_REGEXP = /\A([a-zA-Z]+[a-zA-Z0-9\-\_\.]*)=(\S*)\z/.freeze
     def self.matching_term(text)
       matches = MODIFIER_REGEXP.match(text)
       return nil unless matches
+
       type = matches[1]
       attributes = matches[2]
       build(type, attributes) || build_unknown(type, attributes)

data/lib/coppertone/modifier/base.rb

@@ -6,6 +6,7 @@ module Coppertone
       def initialize(attributes)
         super(attributes)
         raise InvalidModifierError if attributes.blank?
+
         @domain_spec = Coppertone::DomainSpec.new(attributes)
       rescue Coppertone::MacroStringParsingError
         raise Coppertone::InvalidModifierError
@@ -29,6 +30,7 @@ module Coppertone
 
       def ==(other)
         return false unless other.instance_of? self.class
+
         domain_spec == other.domain_spec
       end
     end

data/lib/coppertone/modifier/exp.rb

@@ -8,15 +8,18 @@ module Coppertone
         new(attributes)
       end
 
-      ASCII_REGEXP = /\A[[:ascii:]]*\z/
+      ASCII_REGEXP = /\A[[:ascii:]]*\z/.freeze
       def evaluate(macro_context, request_context)
         target_name =
           target_name_from_domain_spec(macro_context, request_context)
         return nil unless target_name
+
         macro_string = lookup_macro_string(target_name, request_context)
         return nil unless macro_string
+
         expanded = macro_string.expand(macro_context, request_context)
-        return nil unless ASCII_REGEXP.match(expanded)
+        return nil unless ASCII_REGEXP.match?(expanded)
+
         expanded
       rescue DNSAdapter::Error
         nil
@@ -27,6 +30,7 @@ module Coppertone
           request_context.dns_client.fetch_txt_records(target_name)
         return nil if records.empty?
         return nil if records.size > 1
+
         MacroString.new(records.first[:text])
       end
 

data/lib/coppertone/modifier/redirect.rb

@@ -19,6 +19,7 @@ module Coppertone
 
       def target_domain
         raise NeedsContextError if context_dependent?
+
         arguments
       end
 

data/lib/coppertone/record.rb

@@ -67,6 +67,7 @@ module Coppertone
 
     def netblocks_only?
       return false if redirect
+
       directives.reject(&:all?).reject do |d|
         d.mechanism.is_a?(Coppertone::Mechanism::IPMechanism)
       end.empty?
@@ -74,7 +75,8 @@ module Coppertone
 
     def context_dependent_evaluation?
       return true if directives.any?(&:context_dependent?)
-      redirect && redirect.context_dependent?
+
+      redirect&.context_dependent?
     end
 
     def exp
@@ -82,7 +84,7 @@ module Coppertone
     end
 
     def context_dependent_explanation?
-      exp && exp.context_dependent?
+      exp&.context_dependent?
     end
 
     KNOWN_MODS =
@@ -95,6 +97,7 @@ module Coppertone
     def find_modifier(klass)
       arr = modifiers.select { |m| m.is_a?(klass) }
       raise DuplicateModifierError if arr.size > 1
+
       arr.first
     end
 

data/lib/coppertone/record_evaluator.rb

@@ -9,6 +9,7 @@ module Coppertone
     def evaluate(macro_context, request_context)
       result = directive_result(macro_context, request_context)
       return result unless result.none? || result.fail?
+
       if result.fail?
         evaluate_fail_result(result, macro_context, request_context)
       else
@@ -30,6 +31,7 @@ module Coppertone
     def add_exp_to_result(result, macro_context, request_context)
       result = add_default_exp(result)
       return result unless record.exp
+
       computed_exp = record.exp.evaluate(macro_context, request_context)
       result.explanation = computed_exp if computed_exp
       result
@@ -50,10 +52,12 @@ module Coppertone
 
     def evaluate_none_result(result, macro_context, request_context)
       return result unless follow_redirect?
+
       finder =
         Coppertone::RedirectRecordFinder.new(record.redirect, macro_context,
                                              request_context)
       raise InvalidRedirectError unless finder.target && finder.record
+
       rc = macro_context.with_domain(finder.target)
       RecordEvaluator.new(finder.record).evaluate(rc, request_context)
     end

data/lib/coppertone/record_finder.rb

@@ -13,6 +13,7 @@ module Coppertone
           validate_txt_records
           spf_dns_record = txt_records.first
           return nil unless spf_dns_record
+
           Record.new(spf_dns_record)
         end
     end

data/lib/coppertone/record_term_parser.rb

@@ -2,18 +2,20 @@ module Coppertone
   # Parses a record into terms
   class RecordTermParser
     VERSION_STR = 'v=spf1'.freeze
-    RECORD_REGEXP = /\A#{VERSION_STR}(\s|\z)/i
-    ALLOWED_CHARACTERS = /\A([\x21-\x7e ]+)\z/
+    RECORD_REGEXP = /\A#{VERSION_STR}(\s|\z)/i.freeze
+    ALLOWED_CHARACTERS = /\A([\x21-\x7e ]+)\z/.freeze
 
     def self.record?(text)
       return false if text.blank?
-      RECORD_REGEXP.match(text.strip) ? true : false
+
+      RECORD_REGEXP.match?(text.strip) ? true : false
     end
 
     attr_reader :text, :terms
     def initialize(text)
       raise RecordParsingError unless self.class.record?(text)
-      raise RecordParsingError unless ALLOWED_CHARACTERS.match(text)
+      raise RecordParsingError unless ALLOWED_CHARACTERS.match?(text)
+
       @text = text
       @terms = Coppertone::TermsParser.new(terms_segment).terms
     end

data/lib/coppertone/redirect_record_finder.rb

@@ -9,11 +9,12 @@ module Coppertone
     end
 
     def target
-      @redirect_target ||= redirect.evaluate(macro_context, request_context)
+      @target ||= redirect.evaluate(macro_context, request_context)
     end
 
     def record
       return unless target
+
       @record ||= RecordFinder.new(request_context.dns_client, target).record
     end
   end

data/lib/coppertone/request.rb

@@ -16,13 +16,15 @@ module Coppertone
 
     def process_helo
       check_spf_for_helo
-      return nil if helo_result && helo_result.none?
+      return nil if helo_result&.none?
+
       helo_result
     end
 
     def process_mailfrom
       check_spf_for_mailfrom
-      return nil if mailfrom_result && mailfrom_result.none?
+      return nil if mailfrom_result&.none?
+
       mailfrom_result
     end
 
@@ -34,25 +36,6 @@ module Coppertone
       helo_result.nil? && mailfrom_result.nil?
     end
 
-    def check_spf_for_helo
-      @helo_result ||= check_spf_for_context(helo_context, 'helo')
-    end
-
-    def check_spf_for_mailfrom
-      @mailfrom_result ||= check_spf_for_context(mailfrom_context, 'mailfrom')
-    end
-
-    def check_spf_for_context(macro_context, identity)
-      record = spf_record(macro_context)
-      @result = spf_request(macro_context, record, identity) if record
-    rescue DNSAdapter::Error => e
-      Result.temperror(e.message)
-    rescue Coppertone::TemperrorError => e
-      Result.temperror(e.message)
-    rescue Coppertone::PermerrorError => e
-      Result.permerror(e.message)
-    end
-
     def request_context
       @request_context ||= RequestContext.new(options)
     end
@@ -72,9 +55,31 @@ module Coppertone
 
     def spf_request(macro_context, record, identity)
       return Result.new(:none) if record.nil?
+
       r = RecordEvaluator.new(record).evaluate(macro_context, request_context)
       r.identity = identity
       r
     end
+
+    private
+
+    def check_spf_for_helo
+      @helo_result = check_spf_for_context(helo_context, 'helo')
+    end
+
+    def check_spf_for_mailfrom
+      @mailfrom_result = check_spf_for_context(mailfrom_context, 'mailfrom')
+    end
+
+    def check_spf_for_context(macro_context, identity)
+      record = spf_record(macro_context)
+      @result = spf_request(macro_context, record, identity) if record
+    rescue DNSAdapter::Error => e
+      Result.temperror(e.message)
+    rescue Coppertone::TemperrorError => e
+      Result.temperror(e.message)
+    rescue Coppertone::PermerrorError => e
+      Result.permerror(e.message)
+    end
   end
 end

data/lib/coppertone/request_context.rb

@@ -60,6 +60,7 @@ module Coppertone
 
     def config_value(k)
       return @options[k] if @options.key?(k)
+
       Coppertone.config.send(k)
     end
   end

data/lib/coppertone/request_count_limiter.rb

@@ -26,6 +26,7 @@ module Coppertone
 
     def exceeded?
       return false unless limited?
+
       count > limit
     end
 

data/lib/coppertone/sender_identity.rb

@@ -4,7 +4,7 @@ module Coppertone
   # for the macro letters.
   class SenderIdentity
     DEFAULT_LOCALPART = 'postmaster'.freeze
-    EMAIL_ADDRESS_SPLIT_REGEXP = /^(.*)@(.*?)$/
+    EMAIL_ADDRESS_SPLIT_REGEXP = /^(.*)@(.*?)$/.freeze
 
     attr_reader :sender, :localpart, :domain
     def initialize(sender)

data/lib/coppertone/term.rb

@@ -7,6 +7,7 @@ module Coppertone
   class Term
     def self.build_from_token(token)
       return nil unless token
+
       Directive.matching_term(token) || Modifier.matching_term(token)
     end
   end

data/lib/coppertone/terms_parser.rb

@@ -17,6 +17,7 @@ module Coppertone
     def parse_token(token)
       term = Term.build_from_token(token)
       raise RecordParsingError unless term
+
       term
     end
   end

data/lib/coppertone/utils/domain_utils.rb

@@ -7,12 +7,17 @@ module Coppertone
     class DomainUtils
       def self.valid?(domain)
         return false if domain.blank?
-        labels = to_ascii_labels(domain)
-        return false if labels.length <= 1
         return false if domain.length > 253
-        return false if labels.any? { |l| !valid_label?(l) }
+
+        labels_valid?(to_ascii_labels(domain))
+      end
+
+      def self.labels_valid?(labels)
+        return false if labels.length <= 1
+        return false if labels.first == '*'
         return false unless valid_tld?(labels.last)
-        true
+
+        labels.all? { |l| valid_label?(l) }
       end
 
       def self.to_labels(domain)
@@ -22,6 +27,7 @@ module Coppertone
       def self.parent_domain(domain)
         labels = to_labels(domain)
         return '.' if labels.size == 1
+
         labels.shift
         labels.join('.')
       end
@@ -34,24 +40,28 @@ module Coppertone
         to_ascii_labels(domain).join('.')
       end
 
-      NO_DASH_NONNUMERIC_REGEXP = /\A[a-zA-Z0-9]*[a-zA-Z]+[a-zA-Z0-9]*\z/
-      NO_DASH_REGEXP = /\A[a-zA-Z0-9]+\z/
-      DASH_REGEXP = /\A[a-zA-Z0-9]+\-[a-zA-Z0-9\-]*[a-zA-Z0-9]+\z/
+      NO_DASH_NONNUMERIC_REGEXP = /\A[a-zA-Z0-9]*[a-zA-Z]+[a-zA-Z0-9]*\z/.freeze
+      NO_DASH_REGEXP = /\A[a-zA-Z0-9]+\z/.freeze
+      DASH_REGEXP = /\A[a-zA-Z0-9]+\-[a-zA-Z0-9\-]*[a-zA-Z0-9]+\z/.freeze
 
       def self.valid_hostname_label?(l)
         return false unless valid_label?(l)
+
         NO_DASH_REGEXP.match(l) || DASH_REGEXP.match(l)
       end
 
       def self.valid_tld?(l)
         return false unless valid_label?(l)
+
         NO_DASH_NONNUMERIC_REGEXP.match(l) || DASH_REGEXP.match(l)
       end
 
       def self.valid_ldh_domain?(domain)
         return false unless valid?(domain)
+
         labels = to_ascii_labels(domain)
         return false unless valid_tld?(labels.last)
+
         labels.all? { |l| valid_hostname_label?(l) }
       end
 
@@ -61,6 +71,7 @@ module Coppertone
 
       def self.macro_expanded_domain(domain)
         return nil if domain.blank?
+
         labels = to_ascii_labels(domain)
         domain = labels.join('.')
         while domain.length > 253
@@ -75,12 +86,14 @@ module Coppertone
         domain_labels = to_ascii_labels(domain)
         num_labels_in_domain = domain_labels.length
         return false if subdomain_labels.length <= domain_labels.length
+
         subdomain_labels.last(num_labels_in_domain) == domain_labels
       end
 
       def self.subdomain_or_same?(candidate, domain)
         return false unless valid?(domain) && valid?(candidate)
         return true if normalized_domain(domain) == normalized_domain(candidate)
+
         subdomain_of?(candidate, domain)
       end
     end

data/lib/coppertone/version.rb

@@ -1,3 +1,3 @@
 module Coppertone
-  VERSION = '0.0.10'.freeze
+  VERSION = '0.0.11'.freeze
 end

data/spec/macro_string/macro_static_expand_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Coppertone::MacroString::MacroStaticExpand do
   context '#exists_for?' do
-    %w[%% %_ %-].each do |x|
+    ['%%', '%_', '%-'].each do |x|
       it "should resolve a macro for the key #{x}" do
         expect(Coppertone::MacroString::MacroStaticExpand.exists_for?(x))
           .to eq(true)
@@ -16,7 +16,7 @@ describe Coppertone::MacroString::MacroStaticExpand do
   end
 
   context 'macro_for' do
-    %w[%% %_ %-].each do |x|
+    ['%%', '%_', '%-'].each do |x|
       it "should resolve a macro for the key #{x}" do
         expect(Coppertone::MacroString::MacroStaticExpand.macro_for(x))
           .not_to be_nil

data/spec/open_spf/Initial_processing_spec.rb

@@ -1,5 +1,3 @@
-# -- encoding : utf-8 --
-
 require 'spec_helper'
 
 describe 'Initial processing' do

data/spec/open_spf/Semantics_of_exp_and_other_modifiers_spec.rb

@@ -1,5 +1,3 @@
-# -- encoding : utf-8 --
-
 require 'spec_helper'
 
 describe 'Semantics of exp and other modifiers' do

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
 require 'simplecov'
 
+if ENV['CI'] == 'true'
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end
+
 # save to CircleCI's artifacts directory if we're on CircleCI
 if ENV['CIRCLE_ARTIFACTS']
   dir = File.join(ENV['CIRCLE_ARTIFACTS'], 'coverage')

data/spec/utils/domain_utils_spec.rb

@@ -1,5 +1,3 @@
-# -- encoding : utf-8 --
-
 require 'spec_helper'
 
 describe Coppertone::Utils::DomainUtils do
@@ -46,6 +44,11 @@ describe Coppertone::Utils::DomainUtils do
       expect(subject.valid?('abcd._domainkey.gmail.com')).to eq(true)
     end
 
+    it 'should reject wildcard domains while allowing interstitial asterisks' do
+      expect(subject.valid?('*.axb.longshot.com')).to eq(false)
+      expect(subject.valid?('rst.*.example.com')).to eq(true)
+    end
+
     it 'should reject IP addresses' do
       expect(subject.valid?('192.38.7.14')).to eq(false)
     end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: coppertone
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Peter M. Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dns_adapter
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: dns_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -81,47 +81,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: flay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Coppertone includes tools for parsing SPF DNS records, evaluating the
   result of SPF checks for received emails, and creating appropriate email headers
   from SPF results.
@@ -131,6 +131,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".codeclimate.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -139,7 +140,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- circle.yml
 - coppertone.gemspec
 - lib/coppertone.rb
 - lib/coppertone/class_builder.rb
@@ -268,8 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A Sender Policy Framework (SPF) toolkit

data/circle.yml

@@ -1,3 +0,0 @@
-machine:
-  ruby:
-    version: 2.4.0