coppertone 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98149a0b1ea7cda00c82becc04efa776fe05d04c
-  data.tar.gz: 4b5c342217d8ea99622fc3b7e0d75a2d49d008b5
+  metadata.gz: eab9d4a15947e26efa6ff34c18a0af365d26da20
+  data.tar.gz: 36a361ab1ce2daffd730e3ca7fa7057fea5ca1bf
 SHA512:
-  metadata.gz: 3e739ea5580ee84d251ffae5f170d1116e40a5c789b94320878727de04c4a3dc8e6ea00641e14a0454c8aba087b9579c133362b1075ca20d1a25cdbc3188e2ff
-  data.tar.gz: 89ce502d95dd1e60dafe3398d39788548f70758f3b435e3949f9fe7d62bc9356d12765b4898dd96d24eb6db76a6824dabbb74f0c5e05705c7ba015702092d9a3
+  metadata.gz: 089c7ed04c2396bb0f7aa2982b22eb471f68e5f1afa353a30489df75817714227b36aae6bf1afd6f9435f2d1e5af8d86ec8bdeb584f130e9134f423cf4ef48f5
+  data.tar.gz: ef9e3c6459a1b1900826fcdc37cd58f6e621ed56da3aa237dce3c97ae4cc18cf50e208474bbed400ef69340fcecacd9a5c3fdb1b835bfa99d78bc0e2d06ec2b9

data/.travis.yml

@@ -4,6 +4,7 @@ env:
 rvm:
   - 2.0.0
   - 2.1.2
+  - 2.2.1
   - jruby-19mode
   - rbx-2.2.10
 allow_failures:

data/lib/coppertone/utils/domain_utils.rb

@@ -7,7 +7,7 @@ module Coppertone
     class DomainUtils
       def self.valid?(domain)
         return false if domain.blank?
-        labels = to_labels(domain)
+        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) }
@@ -15,7 +15,22 @@ module Coppertone
       end
 
       def self.to_labels(domain)
-        Addressable::IDNA.to_ascii(domain).split('.')
+        domain.split('.')
+      end
+
+      def self.parent_domain(domain)
+        labels = to_labels(domain)
+        return '.' if labels.size == 1
+        labels.shift
+        return labels.join('.')
+      end
+
+      def self.to_ascii_labels(domain)
+        Addressable::IDNA.to_ascii(domain).split('.').map { |d| d.downcase }
+      end
+
+      def self.normalized_domain(domain)
+        to_ascii_labels(domain).join('.')
       end
 
       NO_DASH_REGEXP = /\A[a-zA-Z0-9]*[a-zA-Z]+[a-zA-Z0-9]*\z/
@@ -28,7 +43,7 @@ module Coppertone
 
       def self.valid_ldh_domain?(domain)
         return false unless valid?(domain)
-        to_labels(domain).all? { |l| valid_hostname_label?(l) }
+        to_ascii_labels(domain).all? { |l| valid_hostname_label?(l) }
       end
 
       def self.valid_label?(l)
@@ -37,7 +52,7 @@ module Coppertone
 
       def self.macro_expanded_domain(domain)
         return nil if domain.blank?
-        labels = to_labels(domain)
+        labels = to_ascii_labels(domain)
         domain = labels.join('.')
         while domain.length > 253
           labels = labels.drop(1)
@@ -47,8 +62,8 @@ module Coppertone
       end
 
       def self.subdomain_of?(subdomain_candidate, domain)
-        subdomain_labels = to_labels(subdomain_candidate)
-        domain_labels = to_labels(domain)
+        subdomain_labels = to_ascii_labels(subdomain_candidate)
+        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
@@ -56,7 +71,7 @@ module Coppertone
 
       def self.subdomain_or_same?(candidate, domain)
         return false unless valid?(domain) && valid?(candidate)
-        return true if domain == 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  # rubocop:disable Style/Documentation
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

data/spec/utils/domain_utils_spec.rb

@@ -42,6 +42,11 @@ describe Coppertone::Utils::DomainUtils do
         .to eq('fermion.mit.edu')
     end
 
+    it 'returns the downcased domain for an ASCII domain' do
+      expect(subject.macro_expanded_domain('FERMION.mIt.edu'))
+        .to eq('fermion.mit.edu')
+    end
+
     it 'returns the ASCII domain for an IDNA domain' do
       expect(subject.macro_expanded_domain('清华大学.cn'))
         .to eq('xn--xkry9kk1bz66a.cn')
@@ -57,4 +62,25 @@ describe Coppertone::Utils::DomainUtils do
         .to eq(truncated_domain)
     end
   end
+
+  context '#parent_domain' do
+    it 'should handle hostnames correctly' do
+      expect(subject.parent_domain('abc.xyz.example.com')).to eq('xyz.example.com')
+    end
+
+    it 'should handle TLDs correctly' do
+      expect(subject.parent_domain('com')).to eq('.')
+    end
+  end
+
+  context '#normalized_domain' do
+    it 'should handle ASCII hostnames correctly' do
+      expect(subject.normalized_domain('abc.xyz.example.com')).to eq('abc.xyz.example.com')
+      expect(subject.normalized_domain('ABc.xYz.exAMPle.COM')).to eq('abc.xyz.example.com')
+    end
+
+    it 'should handle Unicode domains correctly' do
+      expect(subject.normalized_domain('FERMIon.清华大学.cn')).to eq('fermion.xn--xkry9kk1bz66a.cn')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coppertone
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Peter M. Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dns_adapter
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Sender Policy Framework (SPF) toolkit