weskit 0.2.1 → 0.3.0

data/README.markdown

@@ -0,0 +1,10 @@
+Weskit [![Build Status](https://secure.travis-ci.org/f6p/weskit.png?branch=master)](http://travis-ci.org/f6p/weskit)
+====================================================================================================================
+
+Weskit gem consists of tools for interaction with Wesnoth Markup Langage and Wesnoth infrastructure.
+For more details please check out generated documentation and source code.
+
+#### Modules
+
+* MP - basic interaction with multiplayer server
+* WML - parsing and manipulation of WML documents

data/Rakefile

@@ -7,6 +7,6 @@ task :default => :spec
 namespace :parser do
   desc 'Re-build KPEGParser'
   task :rebuild do
-    puts %x(kpeg -fsvo lib/weskit/wml/kpeg_parser.rb lib/weskit/wml/grammars/wml.kpeg)
+    puts %x(kpeg -fsvo lib/weskit/wml/parsers/kpeg.rb lib/weskit/wml/grammars/wml.kpeg)
   end
 end

data/lib/weskit/version.rb

@@ -1,3 +1,3 @@
 module Weskit
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/weskit/wml.rb

@@ -13,5 +13,6 @@ w = Weskit::WML
 w.require_all %w{validator grammar searchable container}, :mixins
 w.require_all %w{object}, :extensions
 w.require_all %w{error invalid_identifier invalid_item invalid_option invalid_parameters parse_error read_error}, :errors
+w.require_all %w(kpeg simple), :parsers
 w.require_all %w{item_formatter attribute element ansi_color ansi_color_attribute ansi_color_element}, :formatters
-w.require_all %w{item items attribute attributes builder element elements formatter kpeg_parser parser root}
+w.require_all %w{item items attribute attributes builder element elements formatter preprocessor parser root}

data/lib/weskit/wml/grammars/wml.kpeg

@@ -1,10 +1,10 @@
 # Parser =======================================================================
 
 %% header {
-  module Weskit::WML
+  module Weskit::WML::Parsers
 }
 
-%% name = KPEGParser
+%% name = KPEG
 
 %% {
   attr_accessor :result
@@ -35,11 +35,11 @@ contents = items?:i { i.to_a }
 # Attributes -------------------------------------------------------------------
 
 single_attr    = - id:n - '=' - val:v  - eol
-                 { Attribute.new n, *v }
+                 { Weskit::WML::Attribute.new n, *v }
 multiple_attrs = - ids:n - '=' - vals:v - eol
                  { n.reduce(Array.new) do |attrs, name|
                    value =v.shift or [nil]
-                   attrs << Attribute.new(name, *value)
+                   attrs << Weskit::WML::Attribute.new(name, *value)
                  end }
 
 attribute  = blk_lines single_attr:a blk_lines { a }
@@ -64,9 +64,9 @@ vals = vals:v1 - ',' - vals:v2 { v1 + v2 }
 # Elements ---------------------------------------------------------------------
 
 amendment = - amending_tag:n - eol contents:c - closing_tag(n) - eol
-            { Element.new(n, :amendment => true).push *c }
+            { Weskit::WML::Element.new(n, :amendment => true).push *c }
 regular   = - opening_tag:n  - eol contents:c - closing_tag(n) - eol
-            { Element.new(n).push *c }
+            { Weskit::WML::Element.new(n).push *c }
 
 element = blk_lines (amendment | regular):e blk_lines { e }
 
@@ -88,4 +88,4 @@ blk_lines = (- eol)*
 
 # Root -------------------------------------------------------------------------
 
-root = contents:c { c.empty? ? nil : Root.new.push(*c) }
+root = contents:c { c.empty? ? nil : Weskit::WML::Root.new.push(*c) }

data/lib/weskit/wml/mixins/container.rb

@@ -5,7 +5,7 @@ module Weskit::WML::Mixins
     extend Forwardable
     include ::Weskit::WML::Mixins::Validator
 
-    def_delegators :contents, :each, :empty?, :first, :last, :size, :to_a
+    def_delegators :contents, :each, :empty?, :first, :last, :size, :to_a, :to_ary
 
     def [] key
       case key
@@ -93,4 +93,4 @@ module Weskit::WML::Mixins
       contents.select {|i| i.is_a? constant}
     end
   end
-end
+end

data/lib/weskit/wml/mixins/validator.rb

@@ -10,20 +10,20 @@ module Weskit::WML::Mixins
 
     def raise_if_invalid identifier
       unless "#{identifier}".match identifier_pattern
-        raise ::Weskit::WML::Errors::InvalidIdentifier, "Invalid identifier"
+        raise ::Weskit::WML::Errors::InvalidIdentifier, "Invalid identifier: #{identifier}"
       end
     end
 
     def raise_if_missing object, method
       unless object.respond_to? "#{method}="
-        raise ::Weskit::WML::Errors::InvalidOption, "Object doesn't have #{method}"
+        raise ::Weskit::WML::Errors::InvalidOption, "Object doesn't have: #{method}"
       end
     end
 
     private
 
     def identifier_pattern
-      %r{^[a-z][a-z_0-9]*$}
+      /^[a-z][a-z_0-9]*$/i
     end
   end
-end
+end

data/lib/weskit/wml/parser.rb

@@ -7,11 +7,11 @@ module Weskit::WML
     private_class_method :new
 
     class << self
-      def string str
-        parse str
+      def string str, bck = :kpeg
+        parse str, bck
       end
 
-      def uri uri
+      def uri uri, bck = :kpeg
         begin
           str = open(uri).read
         rescue
@@ -20,33 +20,25 @@ module Weskit::WML
           str = Zlib::GzipReader.new(StringIO.new str).read rescue str
         end
 
-        parse str
+        parse str, bck
       end
 
       private
 
-      def parse data
-        data   = remove_directives data
-        parser = KPEGParser.new "#{data}\n"
+      def backends
+        {
+          :kpeg   => Parsers::KPEG,
+          :simple => Parsers::Simple
+        }
+      end
 
-        unless parser.parse
-          msg = "#{parser.failure_character} #{parser.failure_info}"
-          raise Errors::ParseError, msg
-        end
+      def parse data, backend
+        data   = Preprocessor.new(data).remove_directives
+        parser = backends[backend].new "#{data}\n"
 
+        parser.parse
         parser.result
       end
-
-      # It removes directives because:
-      # - prepreocessor isn't supported anyway
-      # - adding rules for directives hinders performance
-      # - it will remove lines nested inside multiline strings
-      #   if they match preprocessor directive pattern
-      def remove_directives data
-        ary = data.split "\n"
-        ary.reject! {|i| i.match /\A\s*(\#|\{)/}
-        ary.join "\n"
-      end
     end
   end
 end

data/lib/weskit/wml/{kpeg_parser.rb → parsers/kpeg.rb}

@@ -1,5 +1,5 @@
-module Weskit::WML
-class KPEGParser
+module Weskit::WML::Parsers
+class KPEG
   # :stopdoc:
 
     # This is distinct from setup_parser so that a standalone parser
@@ -569,7 +569,7 @@ class KPEGParser
     return _tmp
   end
 
-  # single_attr = - id:n - "=" - val:v - eol { Attribute.new n, *v }
+  # single_attr = - id:n - "=" - val:v - eol { Weskit::WML::Attribute.new n, *v }
   def _single_attr
 
     _save = self.pos
@@ -616,7 +616,7 @@ class KPEGParser
         self.pos = _save
         break
       end
-      @result = begin;  Attribute.new n, *v ; end
+      @result = begin;  Weskit::WML::Attribute.new n, *v ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -628,7 +628,7 @@ class KPEGParser
     return _tmp
   end
 
-  # multiple_attrs = - ids:n - "=" - vals:v - eol { n.reduce(Array.new) do |attrs, name|                    value =v.shift or [nil]                    attrs << Attribute.new(name, *value)                  end }
+  # multiple_attrs = - ids:n - "=" - vals:v - eol { n.reduce(Array.new) do |attrs, name|                    value =v.shift or [nil]                    attrs << Weskit::WML::Attribute.new(name, *value)                  end }
   def _multiple_attrs
 
     _save = self.pos
@@ -677,7 +677,7 @@ class KPEGParser
       end
       @result = begin;  n.reduce(Array.new) do |attrs, name|
                    value =v.shift or [nil]
-                   attrs << Attribute.new(name, *value)
+                   attrs << Weskit::WML::Attribute.new(name, *value)
                  end ; end
       _tmp = true
       unless _tmp
@@ -1085,7 +1085,7 @@ class KPEGParser
     return _tmp
   end
 
-  # amendment = - amending_tag:n - eol contents:c - closing_tag(n) - eol { Element.new(n, :amendment => true).push *c }
+  # amendment = - amending_tag:n - eol contents:c - closing_tag(n) - eol { Weskit::WML::Element.new(n, :amendment => true).push *c }
   def _amendment
 
     _save = self.pos
@@ -1137,7 +1137,7 @@ class KPEGParser
         self.pos = _save
         break
       end
-      @result = begin;  Element.new(n, :amendment => true).push *c ; end
+      @result = begin;  Weskit::WML::Element.new(n, :amendment => true).push *c ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1149,7 +1149,7 @@ class KPEGParser
     return _tmp
   end
 
-  # regular = - opening_tag:n - eol contents:c - closing_tag(n) - eol { Element.new(n).push *c }
+  # regular = - opening_tag:n - eol contents:c - closing_tag(n) - eol { Weskit::WML::Element.new(n).push *c }
   def _regular
 
     _save = self.pos
@@ -1201,7 +1201,7 @@ class KPEGParser
         self.pos = _save
         break
       end
-      @result = begin;  Element.new(n).push *c ; end
+      @result = begin;  Weskit::WML::Element.new(n).push *c ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1461,7 +1461,7 @@ class KPEGParser
     return _tmp
   end
 
-  # root = contents:c { c.empty? ? nil : Root.new.push(*c) }
+  # root = contents:c { c.empty? ? nil : Weskit::WML::Root.new.push(*c) }
   def _root
 
     _save = self.pos
@@ -1472,7 +1472,7 @@ class KPEGParser
         self.pos = _save
         break
       end
-      @result = begin;  c.empty? ? nil : Root.new.push(*c) ; end
+      @result = begin;  c.empty? ? nil : Weskit::WML::Root.new.push(*c) ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1490,8 +1490,8 @@ class KPEGParser
   Rules[:_item] = rule_info("item", "(attribute | attributes | element)")
   Rules[:_items] = rule_info("items", "(items:i1 items:i2 { i1 + i2 } | item:i { (i.is_a? Array) ? i : [i] })")
   Rules[:_contents] = rule_info("contents", "items?:i { i.to_a }")
-  Rules[:_single_attr] = rule_info("single_attr", "- id:n - \"=\" - val:v - eol { Attribute.new n, *v }")
-  Rules[:_multiple_attrs] = rule_info("multiple_attrs", "- ids:n - \"=\" - vals:v - eol { n.reduce(Array.new) do |attrs, name|                    value =v.shift or [nil]                    attrs << Attribute.new(name, *value)                  end }")
+  Rules[:_single_attr] = rule_info("single_attr", "- id:n - \"=\" - val:v - eol { Weskit::WML::Attribute.new n, *v }")
+  Rules[:_multiple_attrs] = rule_info("multiple_attrs", "- ids:n - \"=\" - vals:v - eol { n.reduce(Array.new) do |attrs, name|                    value =v.shift or [nil]                    attrs << Weskit::WML::Attribute.new(name, *value)                  end }")
   Rules[:_attribute] = rule_info("attribute", "blk_lines single_attr:a blk_lines { a }")
   Rules[:_attributes] = rule_info("attributes", "blk_lines multiple_attrs:a blk_lines { a }")
   Rules[:_code] = rule_info("code", "< /<<.*?>>/m > { [strip_chars(text, 2), {:code => true}] }")
@@ -1502,8 +1502,8 @@ class KPEGParser
   Rules[:_i18n] = rule_info("i18n", "\"_\" - (in_brackets | in_quotes):s { [s[0], {:translatable => true}] }")
   Rules[:_val] = rule_info("val", "(val:v1 - \"+\" sp_lf val:v2 { v1[0] += v2[0] ; v1 } | escaped | i18n | code | in_brackets | in_quotes | raw)")
   Rules[:_vals] = rule_info("vals", "(vals:v1 - \",\" - vals:v2 { v1 + v2 } | val:v { [v] })")
-  Rules[:_amendment] = rule_info("amendment", "- amending_tag:n - eol contents:c - closing_tag(n) - eol { Element.new(n, :amendment => true).push *c }")
-  Rules[:_regular] = rule_info("regular", "- opening_tag:n - eol contents:c - closing_tag(n) - eol { Element.new(n).push *c }")
+  Rules[:_amendment] = rule_info("amendment", "- amending_tag:n - eol contents:c - closing_tag(n) - eol { Weskit::WML::Element.new(n, :amendment => true).push *c }")
+  Rules[:_regular] = rule_info("regular", "- opening_tag:n - eol contents:c - closing_tag(n) - eol { Weskit::WML::Element.new(n).push *c }")
   Rules[:_element] = rule_info("element", "blk_lines (amendment | regular):e blk_lines { e }")
   Rules[:_amending_tag] = rule_info("amending_tag", "\"[+\" id:n \"]\" { n }")
   Rules[:_closing_tag] = rule_info("closing_tag", "\"[/\" id:n \"]\" &{ n == m }")
@@ -1514,7 +1514,7 @@ class KPEGParser
   Rules[:__hyphen_] = rule_info("-", "sp*")
   Rules[:_sp_lf] = rule_info("sp_lf", "(sp | eol)*")
   Rules[:_blk_lines] = rule_info("blk_lines", "(- eol)*")
-  Rules[:_root] = rule_info("root", "contents:c { c.empty? ? nil : Root.new.push(*c) }")
+  Rules[:_root] = rule_info("root", "contents:c { c.empty? ? nil : Weskit::WML::Root.new.push(*c) }")
   # :startdoc:
 end
 

data/lib/weskit/wml/parsers/simple.rb

@@ -0,0 +1,99 @@
+module Weskit::WML::Parsers
+  class Simple
+    attr_accessor :result
+
+    def initialize data
+      @data = data.to_s
+    end
+
+    def parse
+      root    = Weskit::WML::Root.new
+      stack   = []
+      current = root
+
+      lines.each do |line|
+        line.strip!
+
+        if attribute? line
+          current << Weskit::WML::Attribute.new(*current_attribute)
+
+        elsif amending_tag? line
+          stack.push current
+          current = Weskit::WML::Element.new(current_tag, :amendment => true)
+
+        elsif closing_tag? line
+          if current.name != current_tag
+            raise Weskit::WML::Errors::ParseError
+          end
+          stack.last << current
+          current = stack.pop
+
+        elsif opening_tag? line
+          stack.push current
+          current = Weskit::WML::Element.new(current_tag)
+
+        end
+      end
+
+      @result = root.empty? ? nil : root
+    end
+
+    private
+
+    def lines
+      @data.lines.collect &:strip
+    end
+
+    def attribute? line
+      !!(@current_match = line.match attribute)
+    end
+
+    def tag? line, prefix
+      !!(@current_match = line.match tag(prefix))
+    end
+
+    def amending_tag? line
+      tag? line, '\+'
+    end
+
+    def closing_tag? line
+      tag? line, '\/'
+    end
+
+    def opening_tag? line
+      tag? line, ''
+    end
+
+    def data_rule
+      '(.+)'
+    end
+
+    def id_rule
+      '([a-z][0-9a-z_]*)'
+    end
+
+    def attribute
+      /#{id_rule}\s*=\s*_?\s*#{data_rule}/i
+    end
+
+    def tag prefix
+      /\[#{prefix}#{id_rule}\]/i
+    end
+
+    def current_attribute
+      tmp = @current_match[1..2].collect &:strip
+
+      tmp[0] = tmp.first.to_sym
+
+      tmp.last.gsub! /^"|"$/,  ''
+      tmp.last.gsub! '""', '"'
+      tmp.last.strip!
+
+      tmp
+    end
+
+    def current_tag
+      @current_match[1].to_sym
+    end
+  end
+end

data/lib/weskit/wml/preprocessor.rb

@@ -0,0 +1,27 @@
+module Weskit::WML
+  class Preprocessor
+    attr_reader :data
+
+    def initialize data
+      @data = data.to_s
+    end
+
+    def remove_directives
+      directives.reduce(@data) {|r, d| r.gsub d, ''}
+    end
+
+    def directives
+      [
+        /#define.+?#enddef/m,
+        /#undef.+/,
+
+        /#ifn?def.+?#endif/m,
+        /#ifn?have.+?#endif/m,
+        /#ifn?ver.+?#endif/m,
+        /#endif/,
+
+        /\{.*?\}/
+      ]
+    end
+  end
+end

data/spec/wml/parser_spec.rb

@@ -3,48 +3,34 @@ require 'wml_spec_helper'
 describe Weskit::WML::Parser do
   include WMLHelpers
 
-  describe 'parse' do
-    specify 'ignore preprocessor' do
-      data = <<-DOC
-        {~/path/to.cfg}
-        #undef SOME_STUFF
-      DOC
+  context 'with KPEG backend' do
+    let(:backend) { :kpeg }
 
-      parsed = Weskit::WML::Parser.string data
-      parsed.should be_nil
-    end
-
-    specify 'empty lines' do
-      parsed = Weskit::WML::Parser.string document_with_empty_lines
-      parsed.should_not be_nil
+    it_should_behave_like 'basic parser' do
+      let(:parser) { backend }
     end
 
     context 'attribute' do
-      specify 'raw' do
-        parsed = Weskit::WML::Parser.string 'a=b'
-        parsed[:a].should match_value_of(:b)
-      end
-
       specify 'code' do
-        parsed = Weskit::WML::Parser.string ' a= <<b>> '
+        parsed = Weskit::WML::Parser.string ' a= <<b>> ', backend
         parsed[:a].attribute.should be_code
         parsed[:a].should match_value_of(:b)
       end
 
       specify 'concated' do
-        parsed = Weskit::WML::Parser.string ' a= _ "a" + 1 '
+        parsed = Weskit::WML::Parser.string ' a= _ "a" + 1 ', backend
         parsed[:a].attribute.should be_translatable
         parsed[:a].should match_value_of(:a1)
       end
 
       specify 'multiline' do
-        parsed = Weskit::WML::Parser.string %Q{a= "b \n c"}
+        parsed = Weskit::WML::Parser.string %Q{a= "b \n c"}, backend
         parsed[:a].attribute.should be_multiline
         parsed[:a].should match_value_of("b \n c")
       end
 
       specify 'multiple' do
-        parsed = Weskit::WML::Parser.string %Q{ a, b = _"a", <<b>> }
+        parsed = Weskit::WML::Parser.string %Q{ a, b = _"a", <<b>> }, backend
 
         parsed[:a].attribute.should be_translatable
         parsed[:a].should match_value_of(:a)
@@ -53,13 +39,8 @@ describe Weskit::WML::Parser do
         parsed[:b].should match_value_of(:b)
       end
 
-      specify 'escape sequence' do
-        parsed = Weskit::WML::Parser.string %Q{ a= "b "" c" }
-        parsed[:a].should match_value_of('b " c')
-      end
-
       specify 'translatable' do
-        parsed = Weskit::WML::Parser.string ' a= _ "b" '
+        parsed = Weskit::WML::Parser.string ' a= _ "b" ', backend
         parsed[:a].attribute.should be_translatable
         parsed[:a].should match_value_of(:b)
       end
@@ -67,14 +48,20 @@ describe Weskit::WML::Parser do
 
     context 'element' do
       specify 'default' do
-        parsed = Weskit::WML::Parser.string "[foo]\n[/foo]"
+        parsed = Weskit::WML::Parser.string "[foo]\n[/foo]", backend
         parsed[0].should have_identifier_of(:foo)
       end
 
       specify 'amending' do
-        parsed = Weskit::WML::Parser.string document_with_amendment
+        parsed = Weskit::WML::Parser.string document_with_amendment, backend
         parsed[0][:bat].should match_value_of(:baz)
       end
     end
   end
-end
+
+  context 'with Simple backend' do
+    it_should_behave_like 'basic parser' do
+      let(:parser) { :simple }
+    end
+  end
+end

data/spec/wml/preprocessor_spec.rb

@@ -0,0 +1,25 @@
+require 'wml_spec_helper'
+
+describe Weskit::WML::Preprocessor do
+  specify 'removes directives' do
+    document = <<-DOC
+      #define TEST
+        a=b
+      #enddef
+
+      #undef TEST
+      {TEST}
+
+      #ifdef TEST
+        {TEST}
+      #else
+        #ifdef BAR
+          {BAR}
+        #endif
+      #endif
+    DOC
+
+    preprocessed = Weskit::WML::Preprocessor.new(document).remove_directives
+    preprocessed.strip.should be_empty
+  end
+end

data/spec/wml_shared_examples.rb

@@ -43,6 +43,49 @@ shared_examples_for 'a container' do
   end
 end
 
+shared_examples_for 'basic  parser' do
+  context 'ignores' do
+    specify 'directives' do
+      data = <<-DOC
+        {~/path/to.cfg}
+        #undef SOME_STUFF
+      DOC
+
+      parsed = Weskit::WML::Parser.string data, parser
+      parsed.should be_nil
+    end
+
+    specify 'blank lines' do
+      parsed = Weskit::WML::Parser.string document_with_empty_lines, parser
+      parsed.should_not be_nil
+    end
+  end
+
+  context 'attribute' do
+    specify 'raw' do
+      parsed = Weskit::WML::Parser.string 'a=b', parser
+      parsed[:a].should match_value_of(:b)
+    end
+
+    specify 'escape sequence' do
+      parsed = Weskit::WML::Parser.string %Q{ a= "b "" c" }, parser
+      parsed[:a].should match_value_of('b " c')
+    end
+  end
+
+  context 'element' do
+    specify 'default' do
+      parsed = Weskit::WML::Parser.string "[foo]\n[/foo]", parser
+      parsed[0].should have_identifier_of(:foo)
+    end
+
+    specify 'amending' do
+      parsed = Weskit::WML::Parser.string document_with_amendment, parser
+      parsed[0][:bat].should match_value_of(:baz)
+    end
+  end
+end
+
 shared_examples_for 'a searchable' do
   specify 'append amending elements' do
     searchable << Weskit::WML::Element.new(:bar)
@@ -65,4 +108,47 @@ shared_examples_for 'a searchable' do
       item.name == :b
     end.size.should eq(2)
   end
-end
+end
+
+shared_examples_for 'basic parser' do
+  context 'ignores' do
+    specify 'directives' do
+      data = <<-DOC
+        {~/path/to.cfg}
+        #undef SOME_STUFF
+      DOC
+
+      parsed = Weskit::WML::Parser.string data, parser
+      parsed.should be_nil
+    end
+
+    specify 'blank lines' do
+      parsed = Weskit::WML::Parser.string document_with_empty_lines, parser
+      parsed.should_not be_nil
+    end
+  end
+
+  context 'attribute' do
+    specify 'raw' do
+      parsed = Weskit::WML::Parser.string 'a=b', parser
+      parsed[:a].should match_value_of(:b)
+    end
+
+    specify 'escape sequence' do
+      parsed = Weskit::WML::Parser.string %Q{ a= "b "" c" }, parser
+      parsed[:a].should match_value_of('b " c')
+    end
+  end
+
+  context 'element' do
+    specify 'default' do
+      parsed = Weskit::WML::Parser.string "[foo]\n[/foo]", parser
+      parsed[0].should have_identifier_of(:foo)
+    end
+
+    specify 'amending' do
+      parsed = Weskit::WML::Parser.string document_with_amendment, parser
+      parsed[0][:bat].should match_value_of(:baz)
+    end
+  end
+end

metadata

@@ -1,102 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: weskit
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - f6p
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: kpeg
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 11
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: term-ansicolor
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 0
-        - 7
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.7
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.7
 description: Tools for interacting with Wesnoth Markup Language, MP Server and such.
-email: 
+email:
 - filip.pyda@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
 - Gemfile
 - LICENSE
+- README.markdown
 - README.md
 - Rakefile
 - lib/weskit.rb
@@ -131,12 +122,14 @@ files:
 - lib/weskit/wml/grammars/wml.kpeg
 - lib/weskit/wml/item.rb
 - lib/weskit/wml/items.rb
-- lib/weskit/wml/kpeg_parser.rb
 - lib/weskit/wml/mixins/container.rb
 - lib/weskit/wml/mixins/grammar.rb
 - lib/weskit/wml/mixins/searchable.rb
 - lib/weskit/wml/mixins/validator.rb
 - lib/weskit/wml/parser.rb
+- lib/weskit/wml/parsers/kpeg.rb
+- lib/weskit/wml/parsers/simple.rb
+- lib/weskit/wml/preprocessor.rb
 - lib/weskit/wml/root.rb
 - spec/spec_helper.rb
 - spec/wml/attribute_spec.rb
@@ -148,6 +141,7 @@ files:
 - spec/wml/item_spec.rb
 - spec/wml/items_spec.rb
 - spec/wml/parser_spec.rb
+- spec/wml/preprocessor_spec.rb
 - spec/wml/root_spec.rb
 - spec/wml_helpers.rb
 - spec/wml_matchers.rb
@@ -156,38 +150,29 @@ files:
 - weskit.gemspec
 homepage: https://github.com/f6p/weskit
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby utilies for BfW
-test_files: 
+test_files:
 - spec/spec_helper.rb
 - spec/wml/attribute_spec.rb
 - spec/wml/attributes_spec.rb
@@ -198,9 +183,9 @@ test_files:
 - spec/wml/item_spec.rb
 - spec/wml/items_spec.rb
 - spec/wml/parser_spec.rb
+- spec/wml/preprocessor_spec.rb
 - spec/wml/root_spec.rb
 - spec/wml_helpers.rb
 - spec/wml_matchers.rb
 - spec/wml_shared_examples.rb
 - spec/wml_spec_helper.rb
-has_rdoc: