bind9mgr 0.3.3 → 0.3.4

data/History.txt

@@ -36,3 +36,12 @@
 * light bugfixes
 * adds dot to origin if there is no one
 * new specs
+
+=== 0.3.3 / 2011-10-05
+
+* some resource record validations added
+
+=== 0.3.4 / 2011-10-14
+
+* A record validations
+* SOA record validations

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.3'
+  VERSION = '0.3.4'
 
   ZONES_BIND_SUBDIR = 'primary'
 

data/lib/resource_record.rb

@@ -17,27 +17,34 @@ module Bind9mgr
     def valid?
       @errors = []
       (@errors << "Base type_and_rdata_shouldnt_be_blank"; return false)   unless @type && @rdata
-      (@errors << "Owner invalid")                                         if     @owner && ( !@owner.kind_of?(String) || (@owner.length < 1) || (@owner.match(/^\d+$/)) || (@owner == 'localhost') )
+      (@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 )
 
       validate_method_name = "validate_#{@type.downcase}"
-      
-      self.class.send validate_method_name if self.class.respond_to?(validate_method_name)
+
+      (self.send validate_method_name) if self.respond_to?(validate_method_name)
 
       return @errors.size == 0
     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 << "Base a record validation is under construction") unless @rdata[0].match(/\.$/)
+    end
+
     def validate_a
-      @errors << "Base a record validation is under construction"
+      (@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
     end
 
     def validate_cname 
-      @errors << "Base cname record validation is under construction"
+#      @errors << "Base cname record validation is under construction"
     end
 
     def validate_mx
-      @errors << "Base mx record validation is under construction"
+#      @errors << "Base mx record validation is under construction"
     end
 
     ##

data/lib/zone.rb

@@ -72,11 +72,18 @@ module Bind9mgr
       raise ArgumentError, "default_ttl not secified" unless @default_ttl
       
       add_default_rrs
-      
+
+      rrhash = @records.inject({}){|s, v| s[v.type] ||= []; s[v.type] << v; s}
+
       cont = "; File is under automatic control. Edit with caution.\n"
       cont << ";;; Zone #{@origin} ;;;" << "\n"
       cont << "$ORIGIN #{@origin}" << "\n" if @origin
       cont << "$TTL #{@default_ttl}" << "\n" if @default_ttl
+
+      rrhash.keys.each do |rr_type|
+        cont << ";;; #{rr_type} ;;;\n"
+        cont << rrhash[rr_type].map{ |r| r.gen_rr_string }.join
+      end
       cont << @records.map{ |r| r.gen_rr_string }.join
 
       cont

data/spec/resource_record_spec.rb

@@ -47,6 +47,35 @@ describe Bind9mgr::ResourceRecord do
     expect { @rr.gen_rr_string }.not_to raise_error
   end
 
+  describe "A records validation" do
+    subject { Bind9mgr::ResourceRecord }
+    
+    it( "with normal data" ) { subject.new( 'sub', nil, 'IN', 'A', '192.168.1.1' ).should be_valid }
+    it( "without class"    ) { subject.new( 'sub', nil, nil, 'A', '192.168.1.1' ).should be_valid }
+    it( "with blank owner" ) { subject.new( '', nil, 'IN', 'A', '192.168.1.1' ).should be_valid }
+    it( "with nil owner"   ) { subject.new( nil, nil, 'IN', 'A', '192.168.1.1' ).should be_valid }
+    
+    it( "with '1' in all fields"     ) { subject.new( '1', '1', '1', 'A', '1' ).should_not be_valid }
+    it( "with digit in owner"        ) { subject.new( '1', nil, 'IN', 'A', '192.168.1.1' ).should_not be_valid }
+    it( "with double digit in owner" ) { subject.new( '11', nil, 'IN', 'A', '192.168.1.1' ).should_not be_valid }
+    it( "with blank rdata"           ) { subject.new( 'sub', nil, 'IN', 'A', '' ).should_not be_valid }
+    it( "with nil rdata"             ) { subject.new( 'sub', nil, 'IN', 'A', nil ).should_not be_valid }
+    it( "with digit in rdata"        ) { subject.new( '1', nil, 'IN', 'A', '1' ).should_not be_valid }
+    it( "with char in rdata"         ) { subject.new( '1', nil, 'IN', 'A', 's' ).should_not be_valid }
+    it( "with punctuation in rdata"  ) { subject.new( '1', nil, 'IN', 'A', ',;;;' ).should_not be_valid }
+    it( "with wrong class"           ) { subject.new( 'sub', nil, 'IN222', 'A', '192.168.1.1' ).should_not be_valid }
+  end
+
+  describe "SOA records validation" do
+    subject { Bind9mgr::ResourceRecord }
+
+    it( "with normal data" ) { subject.new( '@', nil, 'IN', 'SOA', ['qwe.com.', 'support@qwe.com', '123', '123', '123', '123', '123'] ).should be_valid }
+    it( "with wrong origin in rdata" ) { subject.new( '@', nil, 'IN', 'SOA', ['qwe', 'qwe', '123', '123', '123', '123', '123'] ).should_not be_valid }
+    it( "with wrong rdata size" ) { subject.new( '@', nil, 'IN', 'SOA', ['123', '123', '123'] ).should_not be_valid }
+    it( "with wrong rdata kind" ) { subject.new( '@', nil, 'IN', 'SOA', 'qwe' ).should_not be_valid }
+
+  end
+
   it "shoult have a list of allowed rr types" do
     Bind9mgr::ALLOWED_TYPES.should be_kind_of(Array)
     Bind9mgr::ALLOWED_TYPES.count.should > 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bind9mgr
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000Z
+date: 2011-10-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &24264520 !ruby/object:Gem::Requirement
+  requirement: &17322180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *24264520
+  version_requirements: *17322180
 description: This gem contains some classes to manage bind9 zone files
 email:
 - mikhail@mad-box.ru