bind9mgr 0.3.19 → 0.3.20

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5e6676cda9641fe24894d669edc034bc94b1fb8f
+  data.tar.gz: fb50b0700647050e082f8758a9dcb8a673f19f5f
+SHA512:
+  metadata.gz: 3e08996b3298969b0c62ea655beac4c2e5bf841220960b63c3fae127efc25bfea2d9a84f1a2c593579f91855c7457c83f8d18693a6875a47e9328e1e9bbeacf0
+  data.tar.gz: d1e3d45bc87a69e5b67604f3dc5606b1496bca31bff7c4e3d36e7033e325982333dfbd4f83567d7b873c2e69c2037283d0ebee4b4d4b166c0e4869488ed95233

data/lib/bind9mgr.rb

@@ -6,7 +6,7 @@ require File.join( File.dirname(__FILE__), 'resource_record' )
 require File.join( File.dirname(__FILE__), 'parser' )
 
 module Bind9mgr
-  VERSION = '0.3.19'
+  VERSION = '0.3.20'
 
   ZONES_BIND_SUBDIR = 'primary'
 

data/lib/zone.rb

@@ -155,16 +155,25 @@ zone "#{name}" {
 
     def ensure_rr record
       raise ArgumentError, "record expected to be Bind9mgr::ResourceRecord" unless record.kind_of? ResourceRecord
-      max_rr_cnt = (record.type == 'NS' ? 2 : 1)
-      cnt = @records.select{ |rr| (rr.owner == record.owner) && (rr.type == record.type) }.count
-      raise RuntimeError, "Multiple rr with same owner+type detected. zone:#{@origin}" if cnt > max_rr_cnt
-      return false if cnt == max_rr_cnt
+      current_record = @records.find{ |rr| (rr.owner == record.owner) && (rr.type == record.type) && (rr.rdata == record.rdata) }
+      return false if current_record
       @records.push record
       true
     end
 
     def self.domain_name_syntax_valid( string )
-      ! string.match(/^([\w\d\-]{2,}\.)+(\w{2,})\.?$/).nil?
+      # ! string.match(/^([\w\d\-]{2,}\.)+(\w{2,})\.?$/).nil?
+      # ! string.match(/^(((xn--)?[a-z0-9](-?[a-z0-9]+)*\.)+((xn--[a-z0-9](-?[a-z0-9]+)*)|([a-z]{2,})))?$/).nil?
+      # ! string.match(/^(([^\W_]+\.)*xn--)?[^\W_]+([-.][^\W_]+)*\.[a-z]{2,6}\.?$/).nil?
+
+      # TODO Постараться выразить в одном регулярном выражении
+      if string.match(/^xn--/)
+        ! string.match(/^xn--([a-z0-9](-?[a-z0-9]+)){2,}*\.((xn--[a-z0-9](-?[a-z0-9]+)*)|([a-z]{2,}))?\.?$/).nil?
+      elsif string.match(/(com|net|org|biz|me|pro)$/)
+        ! string.match(/^([\w\d\-]+\.)+(\w{2,})\.?$/).nil?
+      else
+        ! string.match(/^([\w\d\-]{2,}\.)+(\w{2,})\.?$/).nil?
+      end
     end
 
     def valid?

data/spec/zone_spec.rb

@@ -86,6 +86,10 @@ alias1  	IN	CNAME	ns
       Bind9mgr::Zone.domain_name_syntax_valid( "11qweqwe.ru" ).should be_true
       Bind9mgr::Zone.domain_name_syntax_valid( "q.r" ).should be_false
       Bind9mgr::Zone.domain_name_syntax_valid( "q.11" ).should be_false
+      Bind9mgr::Zone.domain_name_syntax_valid( "q.me" ).should be_true
+      Bind9mgr::Zone.domain_name_syntax_valid( "xn--d1acufc.xn--p1ai" ).should be_true # домен.рф в punycode
+      Bind9mgr::Zone.domain_name_syntax_valid( "xn--d1acufc.xn--p1ai." ).should be_true
+      Bind9mgr::Zone.domain_name_syntax_valid( "xn--l1a.xn--p1ai" ).should be_false # м.рф в punycode
     end
 
     it "should validate domain name" do

metadata

@@ -1,48 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bind9mgr
 version: !ruby/object:Gem::Version
-  version: 0.3.19
-  prerelease: 
+  version: 0.3.20
 platform: ruby
 authors:
 - Mikhail Barablin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '2.12'
 description: This gem contains some classes to manage bind9 zone files
 email:
 - mikhail@mad-box.ru
@@ -54,7 +35,8 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files:
-- .autotest
+- ".autotest"
+- ".gemtest"
 - History.txt
 - Manifest.txt
 - README.txt
@@ -62,39 +44,37 @@ files:
 - bin/bind9mgr
 - lib/bind9mgr.rb
 - lib/named_conf.rb
-- lib/zone.rb
 - lib/parser.rb
 - lib/resource_record.rb
+- lib/zone.rb
 - spec/named_conf_spec.rb
-- spec/zone_spec.rb
-- spec/spec_helper.rb
 - spec/parser_spec.rb
 - spec/resource_record_spec.rb
-- .gemtest
+- spec/spec_helper.rb
+- spec/zone_spec.rb
 homepage: https://github.com/madbox/bind9mgr
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.txt
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: bind9mgr
-rubygems_version: 1.8.24
+rubygems_version: 2.4.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem contains some classes to manage bind9 zone files
 test_files: []