bind9mgr 0.3.14 → 0.3.15

data/History.txt

@@ -93,3 +93,7 @@
 * Parser fix: TXT, SRV, MX parse algorithm rewrited
 * Parser rules definition optimized
 * test zone contents updated
+
+=== 0.3.15 / 2013-03-06
+
+* Parser fix: \n causes parsing error

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.14'
+  VERSION = '0.3.15'
 
   ZONES_BIND_SUBDIR = 'primary'
 

data/lib/parser.rb

@@ -18,7 +18,9 @@ module Bind9mgr
 
       @STATE_RULES = 
         # [current_state, target_state, proc to perform(token will be passe in)
-        [ [:origin, :last_token_in_a_row, Proc.new{ |t| set_origin t }],
+        [ [:start, :origin, Proc.new{ |t| t == '$ORIGIN' }],
+          [:start, :ttl,    Proc.new{ |t| t == '$TTL' }],
+          [:origin, :last_token_in_a_row, Proc.new{ |t| set_origin t }],
           [:ttl, :last_token_in_a_row,    Proc.new{ |t| set_ttl t }],
           [:last_token_in_a_row, :start, Proc.new{ |t| t == "\n" ? true : false }],
           [:owner, :rttl,   Proc.new{ |t| t.match(/^\d+$/) ? update_last_rr(nil, t, nil, nil, nil) : false }],
@@ -39,14 +41,13 @@ module Bind9mgr
           [:start, :type,   Proc.new{ |t| TYPES.include?(t) ? add_rr(nil, nil, nil, t, nil) : false }],
           [:start, :klass,  Proc.new{ |t| KLASSES.include?(t) ? add_rr(nil, nil, t, nil, nil) : false }],
           [:start, :rttl,   Proc.new{ |t| t.match(/^\d+$/) ? add_rr(nil, t, nil, nil, nil) : false }],
-          [:start, :origin, Proc.new{ |t| t == '$ORIGIN' }],
-          [:start, :ttl,    Proc.new{ |t| t == '$TTL' }],
           [:start,  :srv,    @SHARED_RULES[:srv]],
           [:start,  :txt,    @SHARED_RULES[:txt]],
           [:start, :owner,  Proc.new{ |t| add_rr(t, nil, nil, nil, nil) }],
-          [:soa, :last_token_in_a_row,    Proc.new{ |t| rdata = [t] + @tokens.shift(@tokens.index(')'))
+          [:soa, :last_token_in_a_row,    Proc.new{ |t|
+             rdata = [t] + @tokens.shift(@tokens.index(')'))
              rdata.select!{|tt| tt != "\n" }
-             raise ParserError, "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]
@@ -98,9 +99,14 @@ module Bind9mgr
     private
 
     def tokenize str
+      str.gsub!(/;.*$/, '')
       str.squeeze!("\n\t\r")
-      dirty_tokens = str.gsub(/;.*$/, '').split(/[ \t\r]/)
+      dirty_tokens = str.split(/[ \t\r]/)
+      
+#      puts "-----------------------------------"
+#      puts dirty_tokens[0].inspect
 
+      
       puts dirty_tokens.inspect
 
       tokens = []
@@ -125,7 +131,17 @@ module Bind9mgr
 
       end
 
-      tokens.select{|s|s.length > 0}
+      tokens.select!{|s|s.length > 0}
+
+      if tokens[0] == "\n"
+        tokens.shift
+      end
+
+#      puts "--------------------2222222222222---------------"
+#      puts tokens[0].inspect
+
+
+      tokens
     end
 
     def get_options

data/spec/parser_spec.rb

@@ -4,7 +4,10 @@ describe Bind9mgr::Parser do
 
   # first rrs are used by index at some tests so dont change their sequence
   let(:test_zone) do
-    %Q{$ORIGIN cloud.ru.
+    %Q{; File is under automatic control. Edit with caution.
+;;; Zone qwertyy.ru. ;;;
+
+$ORIGIN cloud.ru.
 $TTL 86400 ; 1 day
 @	IN	SOA	cloud.ru. root.cloud.ru. (
 	2011083002	; serial

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bind9mgr
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
   prerelease: 
 platform: ruby
 authors: