dns_one 0.4.13 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79142c91abe122159d5d386c53dd4cd4f070039e
-  data.tar.gz: 7363c5b5c19624bc95db6aade95b6873d329f16a
+  metadata.gz: 50cf0e24bbf380a428f8409061da2bc49087d2e4
+  data.tar.gz: 39660c4fb96db37f8f1d392a35860ed7a5c571ee
 SHA512:
-  metadata.gz: dd092911e6b2fa66c66dc048e1a6ee2ef25bdc30ffbdc9714147c27f0a54560eae3e0a6c5e4e1e8f9a7bb821f84795596a5ba55f231b4048ed6ddbba0f2136ff
-  data.tar.gz: b5e47c479221f77963a430ed42362c6a349dc629c773b25aadbadc8562e2780e52aa027ed955072379bc865a1a0b14c7d9c02e235b64febf0c70ca45f0bcb08a
+  metadata.gz: 3726f0e434e47ec467ee7f3e777faca6fe7826c74eec36c4aa8b43b7b0c0209abeac38bf3b224b35f7aea0818193ed80a913068449021bcddff49468ca4bfa73
+  data.tar.gz: 78aaeca54c29ae2a8824b9fa7ad426cc766a242cf4837d4f72afb293cc147b2fef71658eebee5136fa5ae54df9644f87be45ac28245c9c27885740fe6c4da723

data/dns_one.gemspec

@@ -25,9 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_runtime_dependency "thor", '~> 0.19.4'
+  spec.add_runtime_dependency "thor", '~> 0.19'
   spec.add_runtime_dependency "rubydns", '~> 1.0'
-  spec.add_runtime_dependency "activerecord", '~> 5.1'
   spec.add_runtime_dependency "rexec", '~> 1.6'
 
 end

data/lib/dns_one.rb

@@ -1,13 +1,13 @@
 # Core
 require 'syslog'
 require 'syslog/logger'
+require 'ostruct'
+require 'yaml'
+require 'singleton'
 
 # Gems
-require 'rubydns'
-require 'active_record'
-require 'yaml'
 require 'rexec'
-require 'ostruct'
+require 'rubydns'
 
 # DnsOne
 
@@ -67,12 +67,14 @@ module DnsOne; class DnsOne
 	end
 
 	private
-
+def symbolize_keys(hash)
+  hash.each_with_object({}) { |(k, v), h| h[k.to_sym] = v.is_a?(Hash) ? symbolize_keys(v) : v }
+end
 	def parse_conf conf_file
 		check_conf_file conf_file
 
 		conf = YAML.load_file conf_file
-		conf.deep_symbolize_keys!
+		conf = symbolize_keys conf
 
 		OpenStruct.new(
 			main: {

data/lib/dns_one/backend/db.rb

@@ -55,13 +55,12 @@ module Backend; class BackendDB
             Util.die "Database adapter '#{@conf[:adapter]}' not supported. Aborting."
         end
 
-        begin
-            require gem_name.to_s
-
-        rescue LoadError => e
-            Util.die "Error loading database dependency.\nMake sure #{gem_name} it is installed, if it is not, install with 'gem install #{gem_name}'\nError Details: #{e.desc}"
-        rescue => e
-            Util.die "Error loading database dependency.\n#{e.desc}"
+        ['active_record', gem_name].each do |req_name|
+            begin
+                require req_name
+            rescue => e
+                Util.die "Error on 'require #{req_name}', install with 'gem install #{req_name}'.\nError Details: #{e.desc}"
+            end
         end
 
         ActiveRecord::Base.establish_connection @conf

data/lib/dns_one/core_ext/blank.rb

@@ -112,9 +112,7 @@ class Hash
 end
 
 class String
-  unless BLANK_RE
-    BLANK_RE = /\A[[:space:]]*\z/
-  end
+  LOCAL_BLANK_RE = /\A[[:space:]]*\z/
 
   # A string is blank if it's empty or contains whitespaces only:
   #
@@ -132,7 +130,7 @@ class String
     # The regexp that matches blank strings is expensive. For the case of empty
     # strings we can speed up this method (~3.5x) with an empty? call. The
     # penalty for the rest of strings is marginal.
-    empty? || BLANK_RE.match?(self)
+    empty? || LOCAL_BLANK_RE.match?(self)
   end
 end
 

data/lib/dns_one/server.rb

@@ -12,15 +12,12 @@ module DnsOne; class Server # < RExec::Daemon::Base
 
     def initialize conf, conf_zone_search
         @conf = conf
-        ZoneSearch.instance.setup conf_zone_search
+        @zone_search = ZoneSearch.instance.setup conf_zone_search
     end
 
     def run
+        zone_search = @zone_search
         conf = @conf
-        zone_search = ZoneSearch.instance
-
-        # Find a dummy zone to make AR/pg load all dependencies
-        zone_search.query 'dummy.com.br', Resolv::DNS::Resource::IN, '1.2.3.4'
 
         RubyDNS::run_server(listen: dns_daemon_interfaces, logger: Log.logger) do
             on(:start) do

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.13"
+    VERSION = "0.4.14"
 end

data/lib/dns_one/zone_search.rb

@@ -10,14 +10,12 @@ module DnsOne; class ZoneSearch
         check_record_sets
         @backend = set_backend
         @cache = Cache.new @conf[:cache_max]
+        @ignore_subdomains_re = build_ignore_subdomains_re
 
-        @ignore_subdomains_re = nil
-        if ignore_subdomains = @conf[:ignore_subdomains]
-            unless ignore_subdomains.empty?
-                subdoms = ignore_subdomains.strip.split(/\s+/).map(&:downcase).join('|')
-                @ignore_subdomains_re = /^(#{ subdoms })\./i
-            end
-        end
+        # Find a dummy zone to make AR/pg load all dependencies
+        query 'dummy.com.br', Resolv::DNS::Resource::IN, '1.2.3.4'
+
+        self
     end
 
     def query dom_name, res_class, ip_address
@@ -63,6 +61,13 @@ module DnsOne; class ZoneSearch
 
     private
 
+    def build_ignore_subdomains_re
+        if i = @conf[:ignore_subdomains].presence
+            s = i.strip.split(/\s+/).map(&:downcase).join '|'
+            /^(#{ s })\./i
+        end
+    end
+
     def set_backend
         if file = @conf[:backend][:file]
             unless File.exists? file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
 platform: ruby
 authors:
 - Tom Lobato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rexec
   requirement: !ruby/object:Gem::Requirement