reserved_subdomain 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b946c00cb63fbfe39ad7f7dd2ad0e7b52a230d7211fda09c7f704c5992e0529
-  data.tar.gz: 78c931d69d132e534dd0cff37ac714e393f467b6bd4aeab93c3e2a96d6136b75
+  metadata.gz: 355678eb8d873df7becf4aaa09ea241d0438a30854e4bb2cec412c9cdc5b784a
+  data.tar.gz: a94bb8ac2fdacd693c3253513d91c187d953853cf31cdc2a4a84f328b20f4c60
 SHA512:
-  metadata.gz: 6aeb84bdd1db6ad923aa25cb1f7419ca63e958fd7551261a19fef8b3a2f51f7722a0cc415e5f137990422f2b2187c2f4fb118805fdf1cfe0c9f0d382cebd8b21
-  data.tar.gz: 57412ff3901d113ee036d369665350febdbeed325f8ec3b2c3adbbfe3af6f688330efd4390fbe79d73f1efa67a6ffb0fed4b80d62663449790ae33e862ecf5f3
+  metadata.gz: 13432bfe336ff699c89859c353cf08a67febb0ed2c2bba24cf0d11f1bb1c912d69ba4758d7c023946ea74664e88cbe903929fbdd9a97056f00da0ce1b57b684a
+  data.tar.gz: c90a5b7730222259e61caabf684b5b028ee2652218dbad90c4292256e8d8eff088e878a86eb1c4fda62e9c524a52695a773918d4e90e29afb169070c981a1e41

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Change Log
+
+## [Unreleased](https://github.com/dominicsayers/reserved_subdomain/tree/HEAD)
+
+**Merged pull requests:**
+
+- New build [\#4](https://github.com/dominicsayers/reserved_subdomain/pull/4) ([dominicsayers](https://github.com/dominicsayers))
+- Add Simplecov and report to CodeClimate from Travis [\#3](https://github.com/dominicsayers/reserved_subdomain/pull/3) ([dominicsayers](https://github.com/dominicsayers))
+- Initial commit [\#1](https://github.com/dominicsayers/reserved_subdomain/pull/1) ([dominicsayers](https://github.com/dominicsayers))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/bin/build_literals

@@ -4,42 +4,29 @@
 lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require 'csv'
 require 'open-uri'
 require 'reserved_subdomain'
 
-def write_file(content, filename)
-  filepath = File.join(__dir__, '..', 'lib', 'reserved_subdomain', 'literals', filename)
-  File.open(filepath, 'w') { |f| f.write content.join("\n") }
-end
-
-# Remove existing literals that exist in content
-def remove_literals(content)
-  literals = ReservedSubdomain::Literal.load_literals.dup
-  literals.select! { |literal| !content.include?(literal) }
-  write_file literals, 'reserved_subdomains.txt'
-end
-
 # TLDs
 uri = URI.parse('http://data.iana.org/TLD/tlds-alpha-by-domain.txt')
-tlds = uri.read.downcase.split("\n")
-remove_literals(tlds)
-
-tlds.select! do |tld|
-  (tld !~ /^#/) &&
-    !ReservedSubdomain::Prefix.new(tld).reserved? &&
-    !ReservedSubdomain::Pattern.new(tld).reserved?
-end
-
-write_file tlds, 'tlds.txt'
+file = ReservedSubdomain::File.new(:tlds)
+file.literals = uri.read.downcase.split("\n")
+content = file.remove_reserved!.save.literals
+ReservedSubdomain::File.new(:miscellaneous).dedupe!(content).save
 
 # Country codes
-# TODO: Find source of ISO-3166-1 country codes and add them to the list of literals
-filepath = File.join(__dir__, '..', 'lib', 'reserved_subdomain', 'literals', 'iso-3166-1.txt')
-country_codes = File.read(filepath).split("\n").compact
-remove_literals(country_codes)
+uri = URI.parse('https://datahub.io/core/country-list/r/data.csv')
+io = uri.open
+csv = CSV.parse(io, headers: true)
+
+file = ReservedSubdomain::File.new(:iso_3166_1)
+file.literals = csv.map { |row| row["Code"].downcase }
+content = file.remove_reserved!.save.literals
+ReservedSubdomain::File.new(:miscellaneous).dedupe!(content).save
 
 # Language codes
 # TODO: Find a source of ISO-639 language codes and add them to the list of literals
-filepath = File.join(__dir__, '..', 'lib', 'reserved_subdomain', 'literals', 'iso-639-1.txt')
-language_codes = File.read(filepath).split("\n").compact
-remove_literals(language_codes)
+file = ReservedSubdomain::File.new(:iso_639_1)
+content = file.remove_reserved!.save.literals
+ReservedSubdomain::File.new(:miscellaneous).dedupe!(content).save

data/lib/reserved_subdomain/file.rb

@@ -0,0 +1,48 @@
+class ReservedSubdomain
+  class File
+    DIRECTORY = ::File.join(__dir__, 'literals')
+
+    class << self
+      def load(fileroot = '*')
+        new(fileroot).literals
+      end
+    end
+
+    attr_reader :fileroot, :literals
+
+    def initialize(fileroot = '*')
+      @fileroot = fileroot
+      @literals = files.map { |filename| ::File.read(filename).split("\n") }.compact.flatten
+    end
+
+    def literals=(list)
+      @literals = list.sort.uniq
+    end
+
+    def save
+      ::File.open(files.first, 'w') { |f| f.write literals.join("\n") }
+      self
+    end
+
+    def dedupe!(content)
+      literals.reject! { |literal| content.include?(literal) }
+      self
+    end
+
+    def remove_reserved!
+      literals.reject! do |literal|
+        (literal =~ /^#/) ||
+          ReservedSubdomain::Prefix.new(literal).reserved? ||
+          ReservedSubdomain::Pattern.new(literal).reserved?
+      end
+
+      self
+    end
+
+    private
+
+    def files
+      Dir.glob(::File.join(DIRECTORY, "#{fileroot}.txt"))
+    end
+  end
+end

data/lib/reserved_subdomain/literal.rb

@@ -13,17 +13,7 @@ class ReservedSubdomain
       end
 
       def load_literals
-        literals_files.map { |filename| File.read(filename).split("\n") }.compact.flatten
-      end
-
-      private
-
-      def literals_files
-        Dir.glob(File.join(literals_directory, '*'))
-      end
-
-      def literals_directory
-        @literals_directory ||= File.join(__dir__, 'literals')
+        ReservedSubdomain::File.load('*')
       end
     end
 

data/lib/reserved_subdomain/literals/iso_3166_1.txt

@@ -0,0 +1,248 @@
+ad
+ae
+af
+ag
+ai
+al
+am
+ao
+aq
+ar
+as
+at
+au
+aw
+ax
+az
+ba
+bb
+bd
+be
+bf
+bg
+bh
+bi
+bj
+bl
+bm
+bn
+bo
+bq
+br
+bs
+bt
+bv
+bw
+by
+bz
+ca
+cc
+cd
+cf
+cg
+ch
+ci
+ck
+cl
+cm
+cn
+co
+cr
+cu
+cv
+cw
+cx
+cy
+cz
+de
+dj
+dk
+dm
+do
+dz
+ec
+ee
+eg
+eh
+er
+es
+et
+fi
+fj
+fk
+fm
+fo
+fr
+ga
+gb
+gd
+ge
+gf
+gg
+gh
+gi
+gl
+gm
+gn
+gp
+gq
+gr
+gs
+gt
+gu
+gw
+gy
+hk
+hm
+hn
+hr
+ht
+hu
+id
+ie
+il
+im
+in
+io
+iq
+ir
+is
+it
+je
+jm
+jo
+jp
+ke
+kg
+kh
+ki
+km
+kn
+kp
+kr
+kw
+ky
+kz
+la
+lb
+lc
+li
+lk
+lr
+ls
+lt
+lu
+lv
+ly
+ma
+mc
+md
+me
+mf
+mg
+mh
+mk
+ml
+mm
+mn
+mo
+mp
+mq
+mr
+ms
+mt
+mu
+mv
+mw
+my
+mz
+na
+nc
+ne
+nf
+ng
+ni
+nl
+no
+np
+nr
+nu
+nz
+om
+pa
+pe
+pf
+pg
+ph
+pk
+pl
+pm
+pn
+pr
+ps
+pt
+pw
+py
+qa
+re
+ro
+rs
+ru
+rw
+sa
+sb
+sc
+sd
+se
+sg
+sh
+si
+sj
+sk
+sl
+sm
+sn
+so
+sr
+ss
+st
+sv
+sx
+sy
+sz
+tc
+td
+tf
+tg
+th
+tj
+tk
+tl
+tm
+tn
+to
+tr
+tt
+tv
+tw
+tz
+ua
+ug
+um
+us
+uy
+uz
+va
+vc
+ve
+vg
+vi
+vn
+vu
+wf
+ws
+ye
+yt
+za
+zm
+zw

data/lib/reserved_subdomain/literals/{iso-639-1.txt → iso_639_1.txt}

@@ -1,2 +1,3 @@
 de
 en
+en-GB

data/lib/reserved_subdomain/literals/{reserved_subdomains.txt → miscellaneous.txt}

@@ -139,7 +139,6 @@ ecommerce
 edit
 editor
 edits
-eh
 embed
 embedded
 employment
@@ -321,6 +320,7 @@ msn
 mssql
 music
 musicas
+mx
 mysql
 nagios
 named
@@ -447,7 +447,6 @@ spanish
 speedtest
 sports
 sql
-ss
 ssh
 ssl
 ssladmin

data/lib/reserved_subdomain/literals/tlds.txt

@@ -611,6 +611,7 @@ imdb
 immo
 immobilien
 in
+inc
 industries
 infiniti
 info

data/lib/reserved_subdomain/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ReservedSubdomain
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

data/lib/reserved_subdomain.rb

@@ -1,3 +1,4 @@
+require 'reserved_subdomain/file'
 require 'reserved_subdomain/literal'
 require 'reserved_subdomain/pattern'
 require 'reserved_subdomain/prefix'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reserved_subdomain
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dominic Sayers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -21,6 +21,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.local.example
 - LICENSE
@@ -31,10 +32,11 @@ files:
 - bin/rspec
 - bin/rubocop
 - lib/reserved_subdomain.rb
+- lib/reserved_subdomain/file.rb
 - lib/reserved_subdomain/literal.rb
-- lib/reserved_subdomain/literals/iso-3166-1.txt
-- lib/reserved_subdomain/literals/iso-639-1.txt
-- lib/reserved_subdomain/literals/reserved_subdomains.txt
+- lib/reserved_subdomain/literals/iso_3166_1.txt
+- lib/reserved_subdomain/literals/iso_639_1.txt
+- lib/reserved_subdomain/literals/miscellaneous.txt
 - lib/reserved_subdomain/literals/tlds.txt
 - lib/reserved_subdomain/pattern.rb
 - lib/reserved_subdomain/prefix.rb

data/lib/reserved_subdomain/literals/iso-3166-1.txt

@@ -1,2 +0,0 @@
-gb
-us