rtext 0.2.0 → 0.2.1

data/CHANGELOG

@@ -2,3 +2,7 @@
 
 * First public release
 
+=0.2.1
+
+* Fixed serialization of enum literals starting with a digit
+

data/Rakefile

@@ -8,7 +8,7 @@ DocFiles = [
 
 RTextGemSpec = Gem::Specification.new do |s|
   s.name = %q{rtext}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
   s.date = Time.now.strftime("%Y-%m-%d")
   s.summary = %q{Ruby Textual Modelling}
   s.email = %q{martin dot thiede at gmx de}

data/lib/rtext/serializer.rb

@@ -132,7 +132,7 @@ class Serializer
           result << v.to_s
         end
       elsif feature.eType.is_a?(RGen::ECore::EEnum)
-        if v.to_s =~ /\W/
+        if v.to_s =~ /^\d|\W/
           result << "\"#{v.to_s.gsub("\\","\\\\\\\\").gsub("\"","\\\"").gsub("\n","\\n").
             gsub("\r","\\r").gsub("\t","\\t").gsub("\f","\\f").gsub("\b","\\b")}\""
         else

data/test/instantiator_test.rb

@@ -12,7 +12,7 @@ class RTextInstantiatorTest < Test::Unit::TestCase
   module TestMM
     extend RGen::MetamodelBuilder::ModuleExtension
     class TestNode < RGen::MetamodelBuilder::MMBase
-      SomeEnum = RGen::MetamodelBuilder::DataTypes::Enum.new([:A, :B, :'non-word*chars'])
+      SomeEnum = RGen::MetamodelBuilder::DataTypes::Enum.new([:A, :B, :'non-word*chars', :'2you'])
       has_attr 'text', String
       has_attr 'integer', Integer
       has_attr 'boolean', Boolean
@@ -859,10 +859,11 @@ class RTextInstantiatorTest < Test::Unit::TestCase
         TestNode enum: A 
         TestNode enum: B 
         TestNode enum: "non-word*chars"
+        TestNode enum: "2you"
       }
     ), TestMM)
     assert_no_problems(problems)
-    assert_equal [:A, :B, :'non-word*chars'], env.find(:text => "root").first.childs.collect{|c| c.enum}
+    assert_equal [:A, :B, :'non-word*chars', :'2you'], env.find(:text => "root").first.childs.collect{|c| c.enum}
   end
 
   #

data/test/serializer_test.rb

@@ -15,7 +15,7 @@ class RTextSerializerTest < Test::Unit::TestCase
   module TestMM
     extend RGen::MetamodelBuilder::ModuleExtension
     SomeEnum = RGen::MetamodelBuilder::DataTypes::Enum.new(
-      :name => "SomeEnum", :literals => [:A, :B, :'non-word*chars'])
+      :name => "SomeEnum", :literals => [:A, :B, :'non-word*chars', :'2you'])
     class TestNode < RGen::MetamodelBuilder::MMBase
       has_attr 'text', String
       has_attr 'integer', Integer
@@ -352,7 +352,8 @@ TestNode {
     testModel = [
       TestMM::TestNode.new(:enum => :A),
       TestMM::TestNode.new(:enum => :B),
-      TestMM::TestNode.new(:enum => :'non-word*chars')
+      TestMM::TestNode.new(:enum => :'non-word*chars'),
+      TestMM::TestNode.new(:enum => :'2you')
     ]
     output = StringWriter.new
     serialize(testModel, TestMM, output) 
@@ -360,6 +361,7 @@ TestNode {
 TestNode enum: A
 TestNode enum: B
 TestNode enum: "non-word*chars"
+TestNode enum: "2you"
 ), output
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtext
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgen
-  requirement: &24349776 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *24349776
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: RText can be used to derive textual languages from an RGen metamodel
   with very little effort.
 email: martin dot thiede at gmx de
@@ -77,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby Textual Modelling