weskit 0.3.2 → 0.3.3

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
   - 1.8.7

data/README.markdown

@@ -1,9 +1,14 @@
-Weskit [![Build Status](https://secure.travis-ci.org/f6p/weskit.png?branch=master)](http://travis-ci.org/f6p/weskit)
-====================================================================================================================
+Weskit
+======
 
-Weskit gem consists of tools for interaction with Wesnoth Markup Langage and Wesnoth infrastructure.
-For more documentation check out ri pages and examples directory. Production code that 
-utilizes weskit capabilites can be found inside Ladder8 sources.
+[![Build Status](https://secure.travis-ci.org/f6p/weskit.png?branch=master)](http://travis-ci.org/f6p/weskit)
+[![Gem Version](https://badge.fury.io/rb/weskit.png)](http://badge.fury.io/rb/weskit)
+[![Code Climate](https://codeclimate.com/github/f6p/weskit.png)](https://codeclimate.com/github/f6p/weskit.png)
+
+Weskit gem consists of tools for interaction with Wesnoth Markup Langage and
+Wesnoth infrastructure. For more documentation check out ri pages and examples
+directory. Production code that utilizes weskit capabilites can be found
+inside Ladder8 sources.
 
 #### Modules
 

data/lib/weskit/mp/adapter.rb

@@ -2,11 +2,12 @@ require 'term/ansicolor'
 
 module Weskit::MP
   class Adapter
-    attr_accessor :buffer, :socket
+    attr_accessor :buffer, :parser, :socket
 
     def initialize connection, debug = false
       @connection = connection
       @debug      = debug
+      @parser     = :simple
     end
 
     def message container, hash
@@ -56,7 +57,7 @@ module Weskit::MP
       @buffer = nil
 
       puts debug_header(:read) if @debug
-      @buffer = ::Weskit::WML::Parser.string Zlib::GzipReader.new(data).read
+      @buffer = ::Weskit::WML::Parser.string Zlib::GzipReader.new(data).read, @parser
       puts debug(@buffer) if @debug
 
       @buffer
@@ -78,4 +79,4 @@ module Weskit::MP
       puts debug(node) if @debug
     end
   end
-end
+end

data/lib/weskit/version.rb

@@ -1,3 +1,3 @@
 module Weskit
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/lib/weskit/wml/extensions/object.rb

@@ -3,7 +3,7 @@ class Object
 
   attr_reader :attribute
 
-  alias_method :attr,  :attribute
+  alias_method :attr, :attribute
 
   def attribute= item
     @attribute = item ? (raise_unless ::Weskit::WML::Attribute, item ; item) : nil
@@ -16,4 +16,4 @@ class Object
   end
 
   alias_method :attr?, :attribute?
-end
+end

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

@@ -2,7 +2,7 @@ module Weskit::WML::Mixins
   module Grammar
     module_function
 
-    def raise_on_mismatching opening, closing
+    def raise_on_mismatch opening, closing
       unless opening.name == closing.name
         raise ::Weskit::WML::Errors::ParseError, 'Invalid element'
       end
@@ -14,4 +14,4 @@ module Weskit::WML::Mixins
       end
     end
   end
-end
+end

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

@@ -83,13 +83,22 @@ module Weskit::WML::Parsers
     def current_attribute
       tmp = @current_match[1..2].collect &:strip
 
-      tmp[0] = tmp.first.to_sym
+      name  = attribute_name tmp.first
+      value = attribute_value tmp.last
 
-      tmp.last.gsub! /^"|"$/,  ''
-      tmp.last.gsub! '""', '"'
-      tmp.last.strip!
+      [name, value]
+    end
+
+    def attribute_name string
+      string.to_sym
+    end
 
-      tmp
+    def attribute_value string
+      case string
+        when /^"(.*)"$/ then $1.strip
+        when /^"(.*)$/  then $1.strip + '...'
+        else string
+      end.gsub '""', '"'
     end
 
     def current_tag

data/spec/wml/parser_spec.rb

@@ -60,8 +60,17 @@ describe Weskit::WML::Parser do
   end
 
   context 'with Simple backend' do
+    let(:backend) { :simple }
+
     it_should_behave_like 'basic parser' do
-      let(:parser) { :simple }
+      let(:parser) { backend }
+    end
+
+    context 'attribute' do
+      specify 'multiline' do
+        parsed = Weskit::WML::Parser.string %Q{a = "a \n b"}, backend
+        parsed[:a].should match_value_of('a...')
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weskit
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kpeg
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby utilies for BfW