rtext 0.2.1 → 0.3.0

data/test/rtext_test.rb

@@ -2,4 +2,6 @@ $:.unshift File.dirname(__FILE__)
 
 require 'serializer_test'
 require 'instantiator_test'
+require 'context_builder_test'
+require 'completer_test'
 

data/test/serializer_test.rb

@@ -6,7 +6,7 @@ require 'rgen/metamodel_builder'
 require 'rtext/serializer'
 require 'rtext/language'
 
-class RTextSerializerTest < Test::Unit::TestCase
+class SerializerTest < Test::Unit::TestCase
 
   class StringWriter < String
     alias write concat
@@ -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', :'2you'])
+      :name => "SomeEnum", :literals => [:A, :B, :'non-word*chars'])
     class TestNode < RGen::MetamodelBuilder::MMBase
       has_attr 'text', String
       has_attr 'integer', Integer
@@ -243,7 +243,7 @@ TestNode name: "Target" {
       has_attr 'text', String
     end
     class TestNodeD < RGen::MetamodelBuilder::MMBase
-      has_attr 'text', String
+      has_attr 'text3', String
     end
     class TestNodeE < RGen::MetamodelBuilder::MMMultiple(TestNodeC, TestNodeD)
       has_attr 'text2', String
@@ -270,7 +270,7 @@ TestNode name: "Target" {
       :child3 => TestMMChildRole::TestNodeA.new(:text => "child3"),
       :childs4 => [TestMMChildRole::TestNodeB.new(:text => "child4")],
       :child5 => TestMMChildRole::TestNodeC.new(:text => "child5"),
-      :childs6 => [TestMMChildRole::TestNodeD.new(:text => "child6")],
+      :childs6 => [TestMMChildRole::TestNodeD.new(:text3 => "child6"), TestMMChildRole::TestNodeE.new(:text => "child6.1")],
       :child7 => TestMMChildRole::TestNodeE.new(:text2 => "child7")
       )
 
@@ -288,7 +288,10 @@ TestNode {
   TestNodeA text: "child3"
   TestNodeB text: "child4"
   TestNodeC text: "child5"
-  TestNodeD text: "child6"
+  childs6: [
+    TestNodeD text3: "child6"
+    TestNodeE text: "child6.1"
+  ]
   child7:
     TestNodeE text2: "child7"
 }
@@ -352,8 +355,7 @@ TestNode {
     testModel = [
       TestMM::TestNode.new(:enum => :A),
       TestMM::TestNode.new(:enum => :B),
-      TestMM::TestNode.new(:enum => :'non-word*chars'),
-      TestMM::TestNode.new(:enum => :'2you')
+      TestMM::TestNode.new(:enum => :'non-word*chars')
     ]
     output = StringWriter.new
     serialize(testModel, TestMM, output) 
@@ -361,7 +363,6 @@ 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.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgen
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &22687308 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,12 +21,7 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+  version_requirements: *22687308
 description: RText can be used to derive textual languages from an RGen metamodel
   with very little effort.
 email: martin dot thiede at gmx de
@@ -40,7 +35,7 @@ extra_rdoc_files:
 - RText_Plugin_Implementation_Guide
 files:
 - lib/rtext/completer.rb
-- lib/rtext/context_element_builder.rb
+- lib/rtext/context_builder.rb
 - lib/rtext/default_loader.rb
 - lib/rtext/default_service_provider.rb
 - lib/rtext/instantiator.rb
@@ -49,6 +44,8 @@ files:
 - lib/rtext/serializer.rb
 - lib/rtext/service.rb
 - lib/rtext_plugin/connection_manager.rb
+- test/completer_test.rb
+- test/context_builder_test.rb
 - test/instantiator_test.rb
 - test/rtext_test.rb
 - test/serializer_test.rb
@@ -82,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Ruby Textual Modelling

data/lib/rtext/context_element_builder.rb

@@ -1,112 +0,0 @@
-module RText
-
-# ContextElementBuilder build a partial model from a set of context lines.
-#
-# Context lines are lines from an RText file which contain a (context) command and all 
-# the parent commands wrapped around it. Any sibling commands can be omitted as well as
-# any lines containing closing braces and brackets.
-#
-# The resulting partial model contains a (context) model element and all its parent
-# elements. Further references are not resolved.
-#
-module ContextElementBuilder
-
-  class << self
-
-  # Instantiates the context element based on a set of +content_lines+. Content lines
-  # are the RText lines containing the nested command headers in the original order.
-  # The last line of +context_lines+ is the one which will create the context element.
-  # +position_in_line+ is the cursor column position within the last line
-  def build_context_element(language, context_lines, position_in_line)
-    context_info = fix_context(context_lines)
-    return nil unless context_info
-    element = instantiate_context_element(language, context_info)
-    unless element
-      fix_current_line(context_info, position_in_line)
-      element = instantiate_context_element(language, context_info)
-    end
-    element
-  end
-
-  private
-
-  def instantiate_context_element(language, context_info)
-    root_elements = []
-    problems = []
-    Instantiator.new(language).instantiate(context_info.lines.join("\n"),
-      :root_elements => root_elements, :problems => problems)
-    if root_elements.size > 0
-      find_leaf_child(root_elements.first, context_info.num_elements-1)
-    else
-      nil
-    end
-  end
-
-  def find_leaf_child(element, num_required_children)
-    childs = element.class.ecore.eAllReferences.select{|r| r.containment}.collect{|r|
-      element.getGenericAsArray(r.name)}.flatten
-    if childs.size > 0
-      find_leaf_child(childs.first, num_required_children-1)
-    elsif num_required_children == 0
-      element
-    else
-      nil
-    end
-  end
-
-  ContextInfo = Struct.new(:lines, :num_elements, :pos_leaf_element)
-
-  # extend +context_lines+ into a set of lines which can be processed by the RText
-  # instantiator: cut of curly brace from current line if present and add missing
-  # closing curly braces and square brackets
-  # returns a ContextInfo containing the new set of lines, the number of model elements
-  # contained in this model snipped and the number of the line containing the leaf element
-  def fix_context(context_lines)
-    context_lines = context_lines.dup
-    line = context_lines.last
-    return nil if line.nil? || is_non_element_line(line)
-    context_lines << strip_curly_brace(context_lines.pop)
-    pos_leaf_element = context_lines.size-1
-    num_elements = 1
-    context_lines.reverse.each do |l|
-      if l =~ /\{\s*$/
-        context_lines << "}"
-        num_elements += 1
-      elsif l =~ /\[\s*$/
-        context_lines << "]"
-      end
-    end
-    ContextInfo.new(context_lines, num_elements, pos_leaf_element)
-  end
-
-  def is_non_element_line(line)
-    line = line.strip
-    line == "" || line == "}" || line == "]" || line =~ /^#/ || line =~ /^\w+:$/
-  end
-
-  def strip_curly_brace(line)
-    line.sub(/\{\s*$/,'') 
-  end
-
-  def fix_current_line(context_info, pos_in_line)
-    context_info.lines[context_info.pos_leaf_element] = 
-      cut_current_argument(context_info.lines[context_info.pos_leaf_element], pos_in_line)
-  end
-
-  def cut_current_argument(line, pos_in_line)
-    left_comma_pos = line.rindex(",", pos_in_line-1)
-    if left_comma_pos
-      line[0..left_comma_pos-1]
-    elsif line =~ /^\s*\w+/
-      $&
-    else
-      ""
-    end
-  end
-
-  end
-
-end
-
-end
-