bind9mgr 0.3.2 → 0.3.3

data/lib/bind9mgr.rb

@@ -6,10 +6,13 @@ require File.join( File.dirname(__FILE__), 'resource_record' )
 require File.join( File.dirname(__FILE__), 'parser' )
 
 module Bind9mgr
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 
   ZONES_BIND_SUBDIR = 'primary'
 
   KLASSES = %w{IN CH}
   ALLOWED_TYPES = %w{A CNAME MX TXT PTR NS SRV SOA}
+
+  class ParserError             < RuntimeError; end
+  class MalformedResourceRecord < RuntimeError; end
 end

data/lib/parser.rb

@@ -28,7 +28,7 @@ module Bind9mgr
           [:type, :start,   Proc.new{ |t| update_last_rr(nil, nil, nil, nil, t)  }],
           [:klass, :soa,    Proc.new{ |t| t == 'SOA' ? update_last_rr(nil, nil, nil, t, nil) : false }],
           [:soa, :start,    Proc.new{ |t| rdata = [t] + @tokens.shift(7)
-             raise RuntimeError, "Zone parsing error: parentices expected in SOA record.\n#{@content}" if (rdata[2] != '(') && (@tokens.first != ')')
+             raise ParserError, "Zone parsing error: parentices expected in SOA record.\n#{@content}" if (rdata[2] != '(') && (@tokens.first != ')')
              rdata.delete_at(2)
              @result.options[:support_email] = rdata[1]
              @result.options[:serial] = rdata[2]
@@ -53,7 +53,7 @@ module Bind9mgr
         token = @tokens.shift
         # puts "state: #{@state}, token: #{token}"
         possible_edges = @STATE_RULES.select{|arr|arr[0] == @state }
-        raise "no possible_edges. cur_state: #{@state}" if possible_edges.count < 1
+        raise( ParserError, "no possible_edges. cur_state: #{@state}" ) if possible_edges.count < 1
 
         flag = false
         while ( possible_edges.count > 0 ) && flag == false
@@ -65,7 +65,7 @@ module Bind9mgr
           @state = current_edge[1] if flag
         end
 
-        raise "no successful rules found. cur_state: #{@state}, token: #{token}" unless flag
+        raise( ParserError, "no successful rules found. cur_state: #{@state}, token: #{token}" ) unless flag
         cntr += 1
       end
 

data/lib/resource_record.rb

@@ -1,6 +1,7 @@
 module Bind9mgr
   class ResourceRecord
     attr_accessor :owner, :ttl, :klass, :type, :rdata
+    attr_reader :errors
 
     def initialize owner = nil, ttl = nil, klass = nil, type = nil, rdata = nil
       @owner = owner
@@ -10,13 +11,40 @@ module Bind9mgr
       @rdata = rdata
     end
 
-    def gen_rr_string
-      raise ArgumentError, "RR Type not specified" unless @type
-      raise ArgumentError, "RR Rdata not specified" unless @rdata
+    # Validations
+    ##
+
+    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 << "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)
+
+      return @errors.size == 0
+    end
+
+    def validate_a
+      @errors << "Base a record validation is under construction"
+    end
 
-      raise( ArgumentError, "wrong owner: #{owner.inspect}" ) if owner == 'localhost'
-      raise( ArgumentError, "wrong class: #{klass.inspect}" ) if !klass.nil? && !KLASSES.include?( klass ) 
-      raise( ArgumentError, "wrong type: #{type.inspect}" )  unless ALLOWED_TYPES.include?( type )
+    def validate_cname 
+      @errors << "Base cname record validation is under construction"
+    end
+
+    def validate_mx
+      @errors << "Base mx record validation is under construction"
+    end
+
+    ##
+    # Validations
+
+    def gen_rr_string
+      raise MalformedResourceRecord, "Owner:'#{@owner}', ttl:'#{@ttl}', class:'#{klass}', type:'#{type}', rdata:'#{rdata}'" unless self.valid?
 
       if @type == 'SOA'
         cont = ''

data/lib/zone.rb

@@ -1,16 +1,5 @@
 module Bind9mgr
   class Zone
-    RRClasses = ['IN', 'CH']
-    RRTypes = [ 'A',
-                'MX',
-                'SRV',
-                'CNAME',
-                'SOA',
-                'NS',
-                'TXT',
-                'PTR'
-              ]
-
     attr_accessor :default_ttl
     attr_accessor :file, :options
     attr_reader :records
@@ -74,7 +63,7 @@ module Bind9mgr
       begin
         p.parse File.read( @file )
       rescue 
-        raise RuntimeError, "Parser error. File: #{@file.inspect}.\nError: #{$!.to_s}\n#{$!.backtrace.join("\n")}"
+        raise ParserError, "Parser error. File: #{@file.inspect}.\nError: #{$!.to_s}\n#{$!.backtrace.join("\n")}"
       end
     end
 

data/spec/resource_record_spec.rb

@@ -29,6 +29,24 @@ describe Bind9mgr::ResourceRecord do
     @rr.should respond_to( :gen_rr_string )
   end
 
+  it "should raise error when wrong record exists on gen_rr_string" do
+    expect { @rr.gen_rr_string }.to raise_error
+  end
+
+  it "should fill errors array with something on validation" do
+    @rr.should_not be_valid
+    @rr.errors.size.should > 0
+    puts @rr.errors
+  end
+
+  it "should not raise error when valid record exists on gen_rr_string" do
+    @rr.owner = '@'
+    @rr.type = 'A'
+    @rr.rdata = '123.123.123.123'
+    
+    expect { @rr.gen_rr_string }.not_to raise_error
+  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.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-21 00:00:00.000000000 +04:00
-default_executable: 
+date: 2011-10-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &24156520 !ruby/object:Gem::Requirement
+  requirement: &24264520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +21,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *24156520
+  version_requirements: *24264520
 description: This gem contains some classes to manage bind9 zone files
 email:
 - mikhail@mad-box.ru
@@ -51,7 +50,6 @@ files:
 - spec/parser_spec.rb
 - spec/resource_record_spec.rb
 - .gemtest
-has_rdoc: true
 homepage: https://github.com/madbox/bind9mgr
 licenses: []
 post_install_message: 
@@ -74,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bind9mgr
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: This gem contains some classes to manage bind9 zone files