coppertone 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 739f6dacf79f523ba1cffcab857bd8e569260e48
-  data.tar.gz: ae128f802f7ab9ab04c3f953ccaf133bf1378ceb
+  metadata.gz: 0b252230ab963c880a9621e06ccab4e80228df66
+  data.tar.gz: 4429d3c99f23114ee76ae1a3ebb9e8523fabcac2
 SHA512:
-  metadata.gz: 6b299645448f6a340a39f608f69ebac56345fcd05296f17cf85bb78306154b51add899345853e5edfa95b157753e5cc8ae9e5e4f51922f6cf5d8f65cffcc96ec
-  data.tar.gz: d13f36a9a62cb95fd6961cc9716944afdc992706ea727818ebf8fbe3a4dcfb30b8bb6c93622bb7cdfc8f52e31f322398bbbe27789639dc2dd488eb2659dd8e8c
+  metadata.gz: a81f77d79f3f6892093d051db6056412fd1b11906e15a923e7dfb0ab8e027be83aedfd0a680d0b794cee045acf940717cc9695747d0607cab7fae560da34b9ce
+  data.tar.gz: f539aa4c5f74a5469cafb28a66aa58b056e6cd4a4c071f0e14dd8be1e780dd4f8df20997d5b1948e4230469e11d8381ddfa5f2a28c59a12be02d1e1b3f3ea98a

data/.rubocop.yml

@@ -4,6 +4,9 @@ AllCops:
 Metrics/AbcSize:
   Exclude:
     - 'Rakefile'
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
 Metrics/LineLength:
   Enabled: false
 Metrics/MethodLength:

data/.travis.yml

@@ -1,9 +1,12 @@
 sudo: false
 language: ruby
-env:
-  - CODECLIMATE_REPO_TOKEN=437199ed4348853fa1dd6561b2e17a5668a7a6e78485d7ac3a21d12670fb6f2f
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 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

data/Gemfile

@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in coppertone.gemspec
 gemspec
 
-gem 'simplecov', group: :test, require: false
 gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'simplecov', group: :test, require: false

data/circle.yml

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

data/lib/coppertone/mechanism/domain_spec_mechanism.rb

@@ -5,8 +5,10 @@ module Coppertone
       attr_reader :domain_spec
 
       def target_name_from_domain_spec(macro_context, request_context)
-        domain =
-          domain_spec.expand(macro_context, request_context) if domain_spec
+        if domain_spec
+          domain =
+            domain_spec.expand(macro_context, request_context)
+        end
         Coppertone::Utils::DomainUtils.macro_expanded_domain(domain)
       end
 

data/lib/coppertone/mechanism/ip_mechanism.rb

@@ -2,7 +2,7 @@ module Coppertone
   class Mechanism
     # Implements the ip4 mechanism.
     class IPMechanism < Mechanism
-      attr_reader :netblock
+      attr_reader :netblock, :cidr_length
       def self.create(attributes)
         new(attributes)
       end
@@ -11,7 +11,7 @@ module Coppertone
         super(attributes)
         unless attributes.blank?
           attributes = attributes[1..-1] if attributes[0] == ':'
-          @netblock = parse_netblock(attributes)
+          @netblock, @cidr_length = parse_netblock(attributes)
         end
         raise Coppertone::InvalidMechanismError if @netblock.nil?
       end
@@ -31,13 +31,18 @@ module Coppertone
 
       def parse_netblock(ip_as_s)
         validate_no_leading_zeroes_in_cidr(ip_as_s)
-        addr, cidr_length, dual = ip_as_s.split('/')
-        return nil if dual
+        addr, cidr_length_as_s, dual = ip_as_s.split('/')
+        return [nil, nil] if dual
         network = IPAddr.new(addr)
-        network = network.mask(cidr_length.to_i) unless cidr_length.blank?
-        network
+        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
+        [network, cidr_length]
       rescue IP_PARSE_ERROR
-        nil
+        [nil, nil]
+      end
+
+      def default_cidr(network)
+        network.ipv6? ? 128 : 32
       end
 
       def match?(macro_context, _request_context)

data/lib/coppertone/modifier/base.rb

@@ -12,8 +12,10 @@ module Coppertone
       end
 
       def target_name_from_domain_spec(macro_context, request_context)
-        domain =
-          domain_spec.expand(macro_context, request_context) if domain_spec
+        if domain_spec
+          domain =
+            domain_spec.expand(macro_context, request_context)
+        end
         Coppertone::Utils::DomainUtils.macro_expanded_domain(domain)
       end
 

data/lib/coppertone/version.rb

@@ -1,3 +1,3 @@
 module Coppertone
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.8'.freeze
 end

data/spec/mechanism/ip4_spec.rb

@@ -23,6 +23,7 @@ describe Coppertone::Mechanism::IP4 do
     it 'should not fail if called with an IP v6' do
       mech = Coppertone::Mechanism::IP4.new(':fe80::202:b3ff:fe1e:8329')
       expect(mech.netblock).to eq(IPAddr.new('fe80::202:b3ff:fe1e:8329'))
+      expect(mech.cidr_length).to eq(128)
       expect(mech.to_s).to eq('ip4:fe80::202:b3ff:fe1e:8329')
       expect(mech).not_to be_includes_ptr
       expect(mech).not_to be_context_dependent
@@ -32,6 +33,7 @@ describe Coppertone::Mechanism::IP4 do
     it 'should work if called with an IP4' do
       mech = Coppertone::Mechanism::IP4.new(':1.2.3.4')
       expect(mech.netblock).to eq(IPAddr.new('1.2.3.4'))
+      expect(mech.cidr_length).to eq(32)
       expect(mech.to_s).to eq('ip4:1.2.3.4')
       expect(mech).not_to be_includes_ptr
       expect(mech).not_to be_context_dependent
@@ -41,6 +43,7 @@ describe Coppertone::Mechanism::IP4 do
     it 'should work if called with an IP4 with a pfxlen' do
       mech = Coppertone::Mechanism::IP4.new(':1.2.3.4/4')
       expect(mech.netblock).to eq(IPAddr.new('1.2.3.4/4'))
+      expect(mech.cidr_length).to eq(4)
       expect(mech.to_s).to eq('ip4:1.2.3.4/4')
       expect(mech).not_to be_includes_ptr
       expect(mech).not_to be_context_dependent

data/spec/mechanism/ip6_spec.rb

@@ -23,6 +23,7 @@ describe Coppertone::Mechanism::IP6 do
     it 'should not fail if called with an IP v4' do
       mech = Coppertone::Mechanism::IP6.new(':1.2.3.4')
       expect(mech.netblock).to eq(IPAddr.new('1.2.3.4'))
+      expect(mech.cidr_length).to eq(32)
       expect(mech).not_to be_dns_lookup_term
     end
 
@@ -30,6 +31,7 @@ describe Coppertone::Mechanism::IP6 do
       mech = Coppertone::Mechanism::IP6.new(':fe80::202:b3ff:fe1e:8329')
       expect(mech.netblock)
         .to eq(IPAddr.new('fe80::202:b3ff:fe1e:8329'))
+      expect(mech.cidr_length).to eq(128)
       expect(mech).not_to be_dns_lookup_term
     end
 
@@ -37,6 +39,7 @@ describe Coppertone::Mechanism::IP6 do
       mech = Coppertone::Mechanism::IP6.new(':fe80::202:b3ff:fe1e:8329/64')
       expect(mech.netblock)
         .to eq(IPAddr.new('fe80::202:b3ff:fe1e:8329/64'))
+      expect(mech.cidr_length).to eq(64)
       expect(mech).not_to be_dns_lookup_term
     end
 

data/spec/spec_helper.rb

@@ -1,6 +1,12 @@
 require 'simplecov'
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start || SimpleCov.start
+
+# save to CircleCI's artifacts directory if we're on CircleCI
+if ENV['CIRCLE_ARTIFACTS']
+  dir = File.join(ENV['CIRCLE_ARTIFACTS'], 'coverage')
+  SimpleCov.coverage_dir(dir)
+end
+
+SimpleCov.start
 
 require 'coppertone'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coppertone
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Peter M. Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dns_adapter
@@ -138,6 +138,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- circle.yml
 - coppertone.gemspec
 - lib/coppertone.rb
 - lib/coppertone/class_builder.rb
@@ -267,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A Sender Policy Framework (SPF) toolkit