bind9mgr 0.3.12 → 0.3.13

data/History.txt

@@ -82,3 +82,8 @@
 === 0.3.11 / 2011-12-26
 
 * Missing newLine after rr in generated zone db files bug fix
+
+=== 0.3.13 / 2013-02-13
+
+* Parser fix: TXT records with spaces are parsed without failure
+* test added

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.12'
+  VERSION = '0.3.13'
 
   ZONES_BIND_SUBDIR = 'primary'
 

data/lib/parser.rb

@@ -1,5 +1,6 @@
 module Bind9mgr
-  TYPES = %w{A CNAME TXT PTR NS SRV} # SOA, MX - are different
+  # this TYPES will be parsed with simplified state_rules chain
+  TYPES = %w{A CNAME PTR NS SRV} # SOA, MX, TXT - are different
   class Parser
 
     attr_reader :state
@@ -12,9 +13,10 @@ module Bind9mgr
       @STATE_RULES = 
         # [current_state, target_state, proc to perform(token will be passe in)
         [ [:start, :origin, Proc.new{ |t| t == '$ORIGIN' }],
-          [:origin, :start, Proc.new{ |t| set_origin t }],
+          [:origin, :last_token_in_a_row, Proc.new{ |t| set_origin t }],
           [:start, :ttl,    Proc.new{ |t| t == '$TTL' }],
-          [:ttl, :start,    Proc.new{ |t| set_ttl 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 }],
           [: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 }],
@@ -23,11 +25,13 @@ module Bind9mgr
           [:owner, :klass,  Proc.new{ |t| KLASSES.include?(t) ? update_last_rr(nil, nil, t, nil, nil) : false }],
           [:owner, :type,   Proc.new{ |t| TYPES.include?(t) ? update_last_rr(nil, nil, nil, t, nil) : false }],
           [:owner, :mx,     Proc.new{ |t| t == 'MX' ? update_last_rr(nil, nil, nil, t, nil) : false }],
+          [:owner, :txt,    Proc.new{ |t| t == 'TXT' ? update_last_rr(nil, nil, nil, t, nil) : false }],
           [:rttl,  :klass,  Proc.new{ |t| KLASSES.include?(t) ? update_last_rr(nil, nil, t, nil, nil) : false }],
           [:klass, :type,   Proc.new{ |t| TYPES.include?(t) ? update_last_rr(nil, nil, nil, t, nil) : false }],
-          [:type, :start,   Proc.new{ |t| update_last_rr(nil, nil, nil, nil, t)  }],
+          [:type, :last_token_in_a_row,   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)
+          [: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 != ')')
              rdata.delete_at(2)
              @result.options[:support_email] = rdata[1]
@@ -40,7 +44,8 @@ module Bind9mgr
              @tokens.shift
            }],
           [:klass, :mx,     Proc.new{ |t| t == 'MX' ? update_last_rr(nil, nil, nil, t, nil) : false }],
-          [:mx, :start,     Proc.new{ |t| update_last_rr(nil, nil, nil, nil, [t] + [@tokens.shift]) }]
+          [:mx, :last_token_in_a_row,     Proc.new{ |t| update_last_rr(nil, nil, nil, nil, [t] + [@tokens.shift]) }], 
+          [:txt, :last_token_in_a_row,     Proc.new{ |t| update_last_rr(nil, nil, nil, nil, ([t] + [@tokens.shift(@tokens.index("\n"))]).join(" ")) }] # '\t' symbol is lost here! may be a BUG
         ]
     end
 
@@ -48,6 +53,8 @@ module Bind9mgr
       @content = str # for debugging
       @tokens = tokenize( str )
       
+      puts @tokens.inspect
+
       cntr = 0
       while @tokens.size > 0
         token = @tokens.shift
@@ -65,7 +72,7 @@ module Bind9mgr
           @state = current_edge[1] if flag
         end
 
-        raise( ParserError, "no successful rules found. cur_state: #{@state}, token: #{token}" ) unless flag
+        raise( ParserError, "no successful rules found. cur_state: #{@state}, token: #{token}, next tokens: #{@tokens.inspect}" ) unless flag
         cntr += 1
       end
 
@@ -77,7 +84,35 @@ module Bind9mgr
     private
 
     def tokenize str
-      str.gsub(/;.*$/, '').split(/\s/).select{|s|s.length > 0}
+      dirty_tokens = str.gsub(/;.*$/, '').split(/[ \t\r]/)
+
+      puts dirty_tokens.inspect
+
+      tokens = []
+      dirty_tokens.each do |t|
+
+        
+
+        if t.index("\n")
+          puts "n found: #{t.inspect}"
+          while t.index("\n") do
+            i = t.index("\n")-1
+            puts "slice: #{i}, #{t.slice(0..(i >= 0 ? i : 0))}"
+            tokens << t.slice!(0..i) if i >= 0
+            puts "after slice: #{t.inspect}"
+            tokens << "\n"
+            puts "cut:" + t.slice!(0..0).inspect
+          end
+          puts "add after cut:#{t.inspect}"
+          tokens << t
+        else
+          puts "just add:#{t}"
+          tokens << t
+        end
+
+      end
+
+      tokens.select{|s|s.length > 0}
     end
 
     def get_options

data/spec/parser_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 
 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{$ORIGIN cloud.ru.
 $TTL 86400 ; 1 day
 @	IN	SOA	cloud.ru. root.cloud.ru. (
 	2011083002	; serial
@@ -17,6 +19,8 @@ nfsstorage	IN	CNAME	ns
 mail            IN MX 40 192.168.1.33
 www CNAME @
 cloud.ru.	IN	A	192.168.1.1
+human-txt     TXT 'this is text with spases'
+
 NS ns2.cloud.ru
 manager		IN	A	192.168.1.20
 director	IN	A	192.168.1.23
@@ -97,6 +101,14 @@ esx1		IN	A	192.168.1.2
     rr.rdata.should eql('192.168.1.200')
   end
 
+  it "should parse TXT records" do
+    rr = @result.records[7]
+    rr.type.should == 'TXT'
+    rr.owner.should eql('human-txt')
+    rr.klass.should eql(nil)
+    rr.rdata.should eql("'this is text with spases'")
+  end
+
   it "should parse MX records(and mx priority!)" do
     rr = @result.records[4]
     rr.type.should == 'MX'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bind9mgr
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-27 00:00:00.000000000Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &24340360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.5'
   type: :development
   prerelease: false
-  version_requirements: *24340360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.5'
 description: This gem contains some classes to manage bind9 zone files
 email:
 - mikhail@mad-box.ru
@@ -72,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bind9mgr
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This gem contains some classes to manage bind9 zone files