bind9mgr 0.3.8 → 0.3.9

data/History.txt

@@ -61,3 +61,10 @@
 === 0.3.8 / 2011-10-15
 
 * NamedConf#add_zone returns Zone instance
+
+=== 0.3.9 / 2011-10-16
+
+* CNAME validations
+* MX validations
+* A validations
+* spec update

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.8'
+  VERSION = '0.3.9'
 
   ZONES_BIND_SUBDIR = 'primary'
 

data/lib/resource_record.rb

@@ -17,6 +17,7 @@ module Bind9mgr
     def valid?
       @errors = []
       (@errors << "Base type_and_rdata_shouldnt_be_blank"; return false)   unless @type && @rdata
+      (@errors << "Rdata rdata_shouldnt_be_blank_string"; return false)    if @rdata.kind_of?(String) && @rdata.length < 1
       (@errors << "Owner invalid")                                         if     @owner && ( !@owner.kind_of?(String) || (@owner.match(/^\d+$/)) || (@owner == 'localhost') )
       (@errors << "Class invalid")                                         if     !klass.nil? && !KLASSES.include?( klass ) 
       (@errors << "Type not_supported")                                    unless ALLOWED_TYPES.include?( type )
@@ -29,22 +30,28 @@ module Bind9mgr
     end
 
     def validate_soa
-      (@errors << "Rdata should_be_an_array"; return false) unless @rdata.kind_of? Array
-      (@errors << "Rdata should_have_7_elements"; return false) unless @rdata.size == 7
+      (@errors << "Rdata should_be_an_array"; return false)         unless @rdata.kind_of? Array
+      (@errors << "Rdata should_have_7_elements"; return false)     unless @rdata.size == 7
       (@errors << "Base a record validation is under construction") unless @rdata[0].match(/\.$/)
     end
 
     def validate_a
-      (@errors << "Rdata should_be_a_string"; return false) unless @rdata.kind_of? String
-      (@errors << "Rdata should_not_be_blank"; return false) if @rdata.length < 1
+      (@errors << "Rdata should_be_a_string"; return false)  unless @rdata.kind_of? String
+      (@errors << "Rdata should_not_be_blank"; return false) if @rdata.length < 1 # TODO DRY it
     end
 
     def validate_cname 
-#      @errors << "Base cname record validation is under construction"
+      (@errors << "owner should_be_a_string"; return false)             unless @owner.kind_of? String
+      (@errors << "owner should_not_contain_only_digits"; return false) if @owner.match(/^\d+$/)
     end
 
     def validate_mx
-#      @errors << "Base mx record validation is under construction"
+      (@errors << "Rdata should_be_an_array"; return false)                    unless @rdata.kind_of? Array
+      (@errors << "Rdata should_contain_priority"; return false)               unless @rdata[0].to_s.match(/^\d+$/) # TODO how about integer value
+      (@errors << "Rdata target_should_not_contain_only_digits"; return false) if @rdata[1].match(/^\d+$/)
+    end
+
+    def validate_txt
     end
 
     ##

data/lib/zone.rb

@@ -158,6 +158,11 @@ zone "#{name}" {
       true
     end
 
+    def valid?
+      return false if @records.size < 1
+      @records.select{ |z| !z.valid? }.size == 0
+    end
+
     private
 
     def default_soa

data/spec/zone_spec.rb

@@ -47,27 +47,44 @@ alias1  	IN	CNAME	ns
   end
   pending "should generate zone entry content"
 
-  it "should add default rrs before generate db content" 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'
-                               })
-  end
+  describe "records creation & validation" do
+    subject do
+      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'
+                          })
+    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')
+    it "should add default rrs before generate db content" do
+      subject.gen_db_content
+      subject.records.size.should > 0
+    end
+    
+    it "should add dot to zone name on creation unless there is no one" do
+      subject.origin.should eql('example.com.')
+      subject.name.should eql('example.com')
+    end
+    
+    it "should not be valid without records" do
+      subject.should_not be_valid
+    end
+    
+    it "should pass when there are default records and some valid ones" do
+      subject.add_default_rrs
+      subject.add_rr( 'qwe', nil, nil, 'CNAME', '@' )
+      subject.should be_valid
+    end
+    
+    it "should not be valid with wrong records" do
+      subject.add_default_rrs
+      subject.add_rr( 'qwe', nil, nil, 'CNAME', '' )
+      subject.should_not be_valid
+    end
   end
 
-  it "should raise error when undefined rr target added" do
+  pending "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!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bind9mgr
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &17488080 !ruby/object:Gem::Requirement
+  requirement: &24673600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *17488080
+  version_requirements: *24673600
 description: This gem contains some classes to manage bind9 zone files
 email:
 - mikhail@mad-box.ru