weskit 0.2.0 → 0.2.1

data/README.md

@@ -111,7 +111,7 @@ To get Weskit::WML::Elements container with references to all b elements you can
 ```
 
 This code takes advantage of method_missing as well and if you can't use
-it that (because of method name conflicts) its equivalent can be used:
+it (because of method name conflicts) its equivalent can be used:
 
 ```ruby
   root.find(:a).find(:b)
@@ -126,7 +126,7 @@ Weskit::WML objects dosn't have any representation code coupled. Special class o
 used to handle their display. Most commonly you will use plain text representation (default formatter)
 or terminal friendly colorful version of it (color formatter). Most of WML objects provide formatter
 seter to replace formatter associated with them but you can as well change default formatter globally
-by calling Formatter.default= method.
+by calling Formatter.default= setter method.
 
 Whatever representation you need (JSON, XML, YAML) creating new formaters shouldn't
 be hard. Take look at Weskit::WML::Formatters module for further reference on that matter.

data/Rakefile

@@ -4,7 +4,7 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new 'spec'
 task :default => :spec
 
-namespace :kpeg do
+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)

data/lib/weskit/version.rb

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

data/lib/weskit/wml/formatters/attribute.rb

@@ -44,7 +44,9 @@ module Weskit::WML::Formatters
     def text_value attribute
       string = escape text attribute
       string = "#@quote#{string}#@quote"
-      string = "#@underscore#{string}" if attribute.translatable?
+
+      return "#@underscore#{string}" if attribute.translatable?
+      string
     end
 
     def value attribute

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

@@ -22,7 +22,7 @@
 
 # Rules ========================================================================
 
-id  = < /[a-z][a-z_]*/i > { text }
+id  = < /[a-z][0-9a-z_]*/i > { text }
 ids = ids:i1 - ',' - ids:i2 { i1 + i2 }
     | id:i { [i] }
 
@@ -31,7 +31,7 @@ items = items:i1 items:i2 { i1 + i2 }
       | item:i { (i.is_a? Array) ? i : [i] }
 
 contents = items?:i { i.to_a }
-      
+
 # Attributes -------------------------------------------------------------------
 
 single_attr    = - id:n - '=' - val:v  - eol
@@ -88,4 +88,4 @@ blk_lines = (- eol)*
 
 # Root -------------------------------------------------------------------------
 
-root = contents:c { Root.new.push *c }
+root = contents:c { c.empty? ? nil : Root.new.push(*c) }

data/lib/weskit/wml/kpeg_parser.rb

@@ -366,13 +366,13 @@ class KPEGParser
   # :stopdoc:
   def setup_foreign_grammar; end
 
-  # id = < /[a-z][a-z_]*/i > { text }
+  # id = < /[a-z][0-9a-z_]*/i > { text }
   def _id
 
     _save = self.pos
     while true # sequence
       _text_start = self.pos
-      _tmp = scan(/\A(?i-mx:[a-z][a-z_]*)/)
+      _tmp = scan(/\A(?i-mx:[a-z][0-9a-z_]*)/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -569,8 +569,8 @@ class KPEGParser
     return _tmp
   end
 
-  # attr = - id:n - "=" - val:v - eol { Attribute.new n, *v }
-  def _attr
+  # single_attr = - id:n - "=" - val:v - eol { Attribute.new n, *v }
+  def _single_attr
 
     _save = self.pos
     while true # sequence
@@ -624,11 +624,11 @@ class KPEGParser
       break
     end # end sequence
 
-    set_failed_rule :_attr unless _tmp
+    set_failed_rule :_single_attr unless _tmp
     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 << Attribute.new(name, *value)                  end }
   def _multiple_attrs
 
     _save = self.pos
@@ -676,7 +676,7 @@ class KPEGParser
         break
       end
       @result = begin;  n.reduce(Array.new) do |attrs, name|
-                   value =  v.shift or [nil]
+                   value =v.shift or [nil]
                    attrs << Attribute.new(name, *value)
                  end ; end
       _tmp = true
@@ -690,7 +690,7 @@ class KPEGParser
     return _tmp
   end
 
-  # attribute = blk_lines attr:a blk_lines { a }
+  # attribute = blk_lines single_attr:a blk_lines { a }
   def _attribute
 
     _save = self.pos
@@ -700,7 +700,7 @@ class KPEGParser
         self.pos = _save
         break
       end
-      _tmp = apply(:_attr)
+      _tmp = apply(:_single_attr)
       a = @result
       unless _tmp
         self.pos = _save
@@ -1461,7 +1461,7 @@ class KPEGParser
     return _tmp
   end
 
-  # root = contents:c { Root.new.push *c }
+  # root = contents:c { c.empty? ? nil : Root.new.push(*c) }
   def _root
 
     _save = self.pos
@@ -1472,7 +1472,7 @@ class KPEGParser
         self.pos = _save
         break
       end
-      @result = begin;  Root.new.push *c ; end
+      @result = begin;  c.empty? ? nil : Root.new.push(*c) ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1485,14 +1485,14 @@ class KPEGParser
   end
 
   Rules = {}
-  Rules[:_id] = rule_info("id", "< /[a-z][a-z_]*/i > { text }")
+  Rules[:_id] = rule_info("id", "< /[a-z][0-9a-z_]*/i > { text }")
   Rules[:_ids] = rule_info("ids", "(ids:i1 - \",\" - ids:i2 { i1 + i2 } | id:i { [i] })")
   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[:_attr] = rule_info("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[:_attribute] = rule_info("attribute", "blk_lines attr:a blk_lines { 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[:_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}] }")
   Rules[:_in_brackets] = rule_info("in_brackets", "< /\\(.*?\\)/m > { [strip_chars(text, 1)] }")
@@ -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 { Root.new.push *c }")
+  Rules[:_root] = rule_info("root", "contents:c { c.empty? ? nil : Root.new.push(*c) }")
   # :startdoc:
 end
 

data/lib/weskit/wml/parser.rb

@@ -15,7 +15,7 @@ module Weskit::WML
         begin
           str = open(uri).read
         rescue
-          raise Errrors::ReadError, "Couldn't open URI"
+          raise Errors::ReadError, "Couldn't open URI"
         ensure
           str = Zlib::GzipReader.new(StringIO.new str).read rescue str
         end
@@ -26,6 +26,7 @@ module Weskit::WML
       private
 
       def parse data
+        data   = remove_directives data
         parser = KPEGParser.new "#{data}\n"
 
         unless parser.parse
@@ -35,6 +36,17 @@ module Weskit::WML
 
         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/spec/wml/parser_spec.rb

@@ -4,8 +4,19 @@ describe Weskit::WML::Parser do
   include WMLHelpers
 
   describe 'parse' do
+    specify 'ignore preprocessor' do
+      data = <<-DOC
+        {~/path/to.cfg}
+        #undef SOME_STUFF
+      DOC
+
+      parsed = Weskit::WML::Parser.string data
+      parsed.should be_nil
+    end
+
     specify 'empty lines' do
-      Weskit::WML::Parser.string document_with_empty_lines
+      parsed = Weskit::WML::Parser.string document_with_empty_lines
+      parsed.should_not be_nil
     end
 
     context 'attribute' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: weskit
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - f6p
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-05 00:00:00 Z
+date: 2012-10-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: kpeg