bind9mgr 0.3.1 → 0.3.2

data/History.txt

@@ -28,5 +28,11 @@
 
 === 0.3.1 / 2011-09-20
 
-* light bugfixs
+* light bugfixes
 * more descriptive errors when parsing 'bad' files.
+
+=== 0.3.2 / 2011-09-21
+
+* light bugfixes
+* adds dot to origin if there is no one
+* new specs

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.1'
+  VERSION = '0.3.2'
 
   ZONES_BIND_SUBDIR = 'primary'
 

data/lib/named_conf.rb

@@ -99,7 +99,7 @@ module Bind9mgr
       if zone_or_name.kind_of?( Zone )
         raise ArgumentError, "file_name should be nil if instance of Zone supplied" unless file_name.nil?
         zone = zone_or_name
-      elsif zone_or_name.kind_of?( String ) && ( zone_or_name.length > 3 ) # at last 'a.a'
+      elsif zone_or_name.kind_of?( String ) && ( zone_or_name.length > 4 ) # at last 'a.a.'
         raise ArgumentError, "Main ns not secified" unless @main_ns
         # raise ArgumentError, "Secondary ns not secified" unless @secondary_ns
         raise ArgumentError, "Support email not secified" unless @support_email

data/lib/zone.rb

@@ -11,12 +11,12 @@ module Bind9mgr
                 'PTR'
               ]
 
-    attr_accessor :origin, :default_ttl
+    attr_accessor :default_ttl
     attr_accessor :file, :options
     attr_reader :records
 
     def initialize( zone_name = nil, zone_db_file = nil, options = { } )
-      @origin = zone_name
+      self.origin = zone_name
       @file = zone_db_file
       @options = options
 
@@ -30,6 +30,20 @@ module Bind9mgr
       clear_records
     end
 
+    def origin
+      @origin
+    end
+
+    def origin= zone_origin
+      if zone_origin.kind_of?( String ) && zone_origin.length > 0
+        @origin = zone_origin.clone
+        @origin << '.' unless @origin[-1] == '.'
+      else
+        @origin = zone_origin 
+      end
+      @origin
+    end
+
     def name
       @origin.sub(/\.$/, '')
     end

data/spec/zone_spec.rb

@@ -56,4 +56,25 @@ alias1  	IN	CNAME	ns
                                })
   end
 
+  it "should add dot to zone name on creation unless there is no one" do
+    zone = Bind9mgr::Zone.new( 'example.com', 'example.com.db',
+                               { :main_ns => '192.168.1.1',
+                                 :secondary_ns => '192.168.1.2',
+                                 :main_server_ip => '192.168.1.3',
+                                 :support_email => 'qwe@qwe.ru'
+                               })
+    zone.origin.should eql('example.com.')
+    zone.name.should eql('example.com')
+  end
+
+  it "should raise error when undefined rr target added" do
+    # examples
+    # 1:
+    # @ NS ns.example.com # here is no dot at the end of line -> error!
+    #
+    # 2:
+    # ns.example.com CNAME @
+    # @ NS ns.example.com # here is no dot at the end of line but this is not error: subdomain really defined
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bind9mgr
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000 +04:00
+date: 2011-09-21 00:00:00.000000000 +04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &14745460 !ruby/object:Gem::Requirement
+  requirement: &24156520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *14745460
+  version_requirements: *24156520
 description: This gem contains some classes to manage bind9 zone files
 email:
 - mikhail@mad-box.ru