rtext 0.9.0 → 0.9.2

data/test/tokenizer_test.rb

@@ -1,174 +1,173 @@
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
-
-gem 'minitest'
-require 'minitest/autorun'
-require 'rtext/tokenizer'
-require 'rtext/generic'
-
-class TokenizerTest < MiniTest::Test
-include RText::Tokenizer
-
-def test_simple
-  assert_tokens [
-    Token.new(:identifier, "TestNode", 1, 1, 8),
-    Token.new(:integer, 1, 1, 10, 10),
-    Token.new(",", nil, 1, 11, 11),
-    Token.new(:identifier, "bla", 1, 13, 15),
-    Token.new(",", nil, 1, 16, 16),
-    Token.new(:float, 0.4, 1, 18, 20),
-    Token.new(",", nil, 1, 21, 21),
-    Token.new(:label, "label", 1, 23, 28),
-    Token.new(:integer, 4, 1, 30, 30),
-    Token.new(",", nil, 1, 31, 31),
-    Token.new(:string, "string", 1, 33, 40),
-    Token.new(:newline, nil, 1, nil, nil) 
-  ], "TestNode 1, bla, 0.4, label: 4, \"string\""
-end
-
-def test_more
-  assert_tokens [
-    Token.new(:identifier, "TestNode", 1, 1, 8),
-    Token.new(:boolean, true, 1, 10, 13),
-    Token.new(",", nil, 1, 14, 14),
-    Token.new(:integer, 0xfaa, 1, 16, 20),
-    Token.new(:integer, -3, 1, 22, 23),
-    Token.new(:reference, "/a/b", 1, 25, 28),
-    Token.new(:newline, nil, 1, nil, nil) 
-  ], <<-END
-TestNode true, 0xfaa -3 /a/b
-  END
-end
-
-def test_comments_and_annotation
-  assert_tokens [
-    Token.new(:comment, " comment", 1, 1, 9),
-    Token.new(:newline, nil, 1, nil, nil),
-    Token.new(:annotation, " annotation", 2, 1, 12),
-    Token.new(:newline, nil, 2, nil, nil),
-    Token.new(:identifier, "TestNode", 3, 1, 8),
-    Token.new(:comment, "comment2", 3, 10, 18),
-    Token.new(:newline, nil, 3, nil, nil)
-  ], <<-END
-# comment
-@ annotation
-TestNode #comment2
-  END
-end
-
-def test_generic
-  tokens = do_tokenize("<name>")
-  assert_equal :generic, tokens.first.kind
-  assert_equal "name", tokens.first.value.string
-  assert_equal 1, tokens.first.line
-  assert_equal 1, tokens.first.scol
-  assert_equal 6, tokens.first.ecol
-end
-
-def test_generic_bad
-  tokens = do_tokenize("<a>b>")
-  assert_equal :generic, tokens.first.kind
-  assert_equal "a", tokens.first.value.string
-  assert_equal 1, tokens.first.line
-  assert_equal 1, tokens.first.scol
-  assert_equal 3, tokens.first.ecol
-  assert_equal :identifier, tokens[1].kind
-  assert_equal :error, tokens[2].kind
-end
-
-def test_generic_percent
-  tokens = do_tokenize("<%name%>")
-  assert_equal :generic, tokens.first.kind
-  assert_equal "name", tokens.first.value.string
-  assert_equal 1, tokens.first.line
-  assert_equal 1, tokens.first.scol
-  assert_equal 8, tokens.first.ecol
-end
-
-def test_generic_percent_angle_close
-  tokens = do_tokenize("<% a > b < c %>")
-  assert_equal :generic, tokens.first.kind
-  assert_equal " a > b < c ", tokens.first.value.string
-  assert_equal 1, tokens.first.line
-  assert_equal 1, tokens.first.scol
-  assert_equal 15, tokens.first.ecol
-end
-
-def test_generic_percent_bad
-  tokens = do_tokenize("<%= a %> b %>")
-  assert_equal :generic, tokens.first.kind
-  assert_equal "= a ", tokens.first.value.string
-  assert_equal 1, tokens.first.line
-  assert_equal 1, tokens.first.scol
-  assert_equal 8, tokens.first.ecol
-  assert_equal :identifier, tokens[1].kind
-  assert_equal :error, tokens[2].kind
-end
-
-def test_error
-  assert_tokens [
-    Token.new(:error, "\"", 1, 1, 1),
-    Token.new(:identifier, "open", 1, 2, 5),
-    Token.new(:newline, nil, 1, nil, nil)
-  ], <<-END
-"open
-  END
-end
-
-def test_with_bom
-  assert_tokens [
-    Token.new(:identifier, "TestNode", 1, 1, 8),
-    Token.new(:integer, 1, 1, 10, 10),
-    Token.new(:newline, nil, 1, nil, nil) 
-  ], "\xEF\xBB\xBFTestNode 1"
-end
-
-def test_excessive_newline
-  assert_tokens [
-    Token.new(:identifier, "TestNode", 3, 1, 8),
-    Token.new(:newline, nil, 3, nil, nil),
-    Token.new(:identifier, "TestNode", 5, 1, 8),
-    Token.new(:newline, nil, 5, nil, nil) 
-  ], %Q(
-
-TestNode
-
-TestNode
-
-)
-end
-
-def test_only_newline
-  assert_tokens [
-  ], %Q(
-
-
-)
-end
-
-def test_linebreak
-  assert_tokens [
-    Token.new(:identifier, "TestNode", 2, 1, 8),
-    Token.new(:identifier, "someNode", 2, 10, 17),
-    Token.new(",", nil, 2, 18, 18),
-    Token.new(:newline, nil, 2, nil, nil),
-    Token.new(:label, "label", 3, 3, 8),
-    Token.new(:identifier, "x", 3, 10, 10),
-    Token.new(:newline, nil, 3, nil, nil),
-  ], %Q(
-TestNode someNode,
-  label: x
-)
-
-end
-
-def do_tokenize(str)
-  tokenize(str, /\A\/[\/\w]+/)
-end
-
-def assert_tokens(expected, str)
-  tokens = tokenize(str, /\A\/[\/\w]+/)
-  assert_equal(expected, tokens)
-end
-
-end
-
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+
+require 'minitest/autorun'
+require 'rtext/tokenizer'
+require 'rtext/generic'
+
+class TokenizerTest < MiniTest::Test
+include RText::Tokenizer
+
+def test_simple
+  assert_tokens [
+    Token.new(:identifier, "TestNode", 1, 1, 8),
+    Token.new(:integer, 1, 1, 10, 10),
+    Token.new(",", nil, 1, 11, 11),
+    Token.new(:identifier, "bla", 1, 13, 15),
+    Token.new(",", nil, 1, 16, 16),
+    Token.new(:float, 0.4, 1, 18, 20),
+    Token.new(",", nil, 1, 21, 21),
+    Token.new(:label, "label", 1, 23, 28),
+    Token.new(:integer, 4, 1, 30, 30),
+    Token.new(",", nil, 1, 31, 31),
+    Token.new(:string, "string", 1, 33, 40),
+    Token.new(:newline, nil, 1, nil, nil) 
+  ], "TestNode 1, bla, 0.4, label: 4, \"string\""
+end
+
+def test_more
+  assert_tokens [
+    Token.new(:identifier, "TestNode", 1, 1, 8),
+    Token.new(:boolean, true, 1, 10, 13),
+    Token.new(",", nil, 1, 14, 14),
+    Token.new(:integer, 0xfaa, 1, 16, 20),
+    Token.new(:integer, -3, 1, 22, 23),
+    Token.new(:reference, "/a/b", 1, 25, 28),
+    Token.new(:newline, nil, 1, nil, nil) 
+  ], <<-END
+TestNode true, 0xfaa -3 /a/b
+  END
+end
+
+def test_comments_and_annotation
+  assert_tokens [
+    Token.new(:comment, " comment", 1, 1, 9),
+    Token.new(:newline, nil, 1, nil, nil),
+    Token.new(:annotation, " annotation", 2, 1, 12),
+    Token.new(:newline, nil, 2, nil, nil),
+    Token.new(:identifier, "TestNode", 3, 1, 8),
+    Token.new(:comment, "comment2", 3, 10, 18),
+    Token.new(:newline, nil, 3, nil, nil)
+  ], <<-END
+# comment
+@ annotation
+TestNode #comment2
+  END
+end
+
+def test_generic
+  tokens = do_tokenize("<name>")
+  assert_equal :generic, tokens.first.kind
+  assert_equal "name", tokens.first.value.string
+  assert_equal 1, tokens.first.line
+  assert_equal 1, tokens.first.scol
+  assert_equal 6, tokens.first.ecol
+end
+
+def test_generic_bad
+  tokens = do_tokenize("<a>b>")
+  assert_equal :generic, tokens.first.kind
+  assert_equal "a", tokens.first.value.string
+  assert_equal 1, tokens.first.line
+  assert_equal 1, tokens.first.scol
+  assert_equal 3, tokens.first.ecol
+  assert_equal :identifier, tokens[1].kind
+  assert_equal :error, tokens[2].kind
+end
+
+def test_generic_percent
+  tokens = do_tokenize("<%name%>")
+  assert_equal :generic, tokens.first.kind
+  assert_equal "name", tokens.first.value.string
+  assert_equal 1, tokens.first.line
+  assert_equal 1, tokens.first.scol
+  assert_equal 8, tokens.first.ecol
+end
+
+def test_generic_percent_angle_close
+  tokens = do_tokenize("<% a > b < c %>")
+  assert_equal :generic, tokens.first.kind
+  assert_equal " a > b < c ", tokens.first.value.string
+  assert_equal 1, tokens.first.line
+  assert_equal 1, tokens.first.scol
+  assert_equal 15, tokens.first.ecol
+end
+
+def test_generic_percent_bad
+  tokens = do_tokenize("<%= a %> b %>")
+  assert_equal :generic, tokens.first.kind
+  assert_equal "= a ", tokens.first.value.string
+  assert_equal 1, tokens.first.line
+  assert_equal 1, tokens.first.scol
+  assert_equal 8, tokens.first.ecol
+  assert_equal :identifier, tokens[1].kind
+  assert_equal :error, tokens[2].kind
+end
+
+def test_error
+  assert_tokens [
+    Token.new(:error, "\"", 1, 1, 1),
+    Token.new(:identifier, "open", 1, 2, 5),
+    Token.new(:newline, nil, 1, nil, nil)
+  ], <<-END
+"open
+  END
+end
+
+def test_with_bom
+  assert_tokens [
+    Token.new(:identifier, "TestNode", 1, 1, 8),
+    Token.new(:integer, 1, 1, 10, 10),
+    Token.new(:newline, nil, 1, nil, nil) 
+  ], "\xEF\xBB\xBFTestNode 1"
+end
+
+def test_excessive_newline
+  assert_tokens [
+    Token.new(:identifier, "TestNode", 3, 1, 8),
+    Token.new(:newline, nil, 3, nil, nil),
+    Token.new(:identifier, "TestNode", 5, 1, 8),
+    Token.new(:newline, nil, 5, nil, nil) 
+  ], %Q(
+
+TestNode
+
+TestNode
+
+)
+end
+
+def test_only_newline
+  assert_tokens [
+  ], %Q(
+
+
+)
+end
+
+def test_linebreak
+  assert_tokens [
+    Token.new(:identifier, "TestNode", 2, 1, 8),
+    Token.new(:identifier, "someNode", 2, 10, 17),
+    Token.new(",", nil, 2, 18, 18),
+    Token.new(:newline, nil, 2, nil, nil),
+    Token.new(:label, "label", 3, 3, 8),
+    Token.new(:identifier, "x", 3, 10, 10),
+    Token.new(:newline, nil, 3, nil, nil),
+  ], %Q(
+TestNode someNode,
+  label: x
+)
+
+end
+
+def do_tokenize(str)
+  tokenize(str, /\A\/[\/\w]+/)
+end
+
+def assert_tokens(expected, str)
+  tokens = tokenize(str, /\A\/[\/\w]+/)
+  assert_equal(expected, tokens)
+end
+
+end
+

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rtext
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Martin Thiede
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.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
@@ -36,6 +36,12 @@ extra_rdoc_files:
 - RText_Users_Guide
 - RText_Protocol
 files:
+- CHANGELOG
+- MIT-LICENSE
+- README.rdoc
+- RText_Protocol
+- RText_Users_Guide
+- Rakefile
 - lib/rtext/context_builder.rb
 - lib/rtext/default_completer.rb
 - lib/rtext/default_loader.rb
@@ -59,10 +65,8 @@ files:
 - test/context_builder_test.rb
 - test/frontend/context_test.rb
 - test/instantiator_test.rb
-- test/integration/backend.out
 - test/integration/crash_on_request_editor.rb
 - test/integration/ecore_editor.rb
-- test/integration/frontend.log
 - test/integration/model/invalid_encoding.invenc
 - test/integration/model/test.crash_on_request
 - test/integration/model/test.crashing_backend
@@ -81,36 +85,30 @@ files:
 - test/rtext_test.rb
 - test/serializer_test.rb
 - test/tokenizer_test.rb
-- README.rdoc
-- CHANGELOG
-- MIT-LICENSE
-- RText_Users_Guide
-- RText_Protocol
-- Rakefile
 homepage: http://ruby-gen.org
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
-- -x
+- "-x"
 - test
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby Textual Modelling

data/test/integration/backend.out

@@ -1,16 +0,0 @@
-RText service, listening on port 9001
-[15:34:36] INFO accepted connection
-[15:34:36] DEBUG request: {"command"=>"load_model", "invocation_id"=>1, "type"=>"request"}
-[15:34:36] DEBUG response: {"type"=>"response", "invocation_id"=>1, "problems"=>[], "total_problems"=>0}
-[15:34:36] INFO request complete (0.014002s)
-[15:34:36] DEBUG request: {"command"=>"link_targets", "context"=>[], "column"=>1, "invocation_id"=>2, "type"=>"request"}
-C:/Users/mthiede/gitrepos/rtext/lib/rtext/link_detector.rb:20:in `detect': undefined method `concat' for nil:NilClass (NoMethodError)
-	from C:/Users/mthiede/gitrepos/rtext/lib/rtext/service.rb:196:in `link_targets'
-	from C:/Users/mthiede/gitrepos/rtext/lib/rtext/service.rb:109:in `message_received'
-	from C:/Users/mthiede/gitrepos/rtext/lib/rtext/service.rb:80:in `block in run'
-	from C:/Users/mthiede/gitrepos/rtext/lib/rtext/service.rb:59:in `each'
-	from C:/Users/mthiede/gitrepos/rtext/lib/rtext/service.rb:59:in `run'
-	from C:/Users/mthiede/gitrepos/rtext/test/integration/ecore_editor.rb:50:in `<top (required)>'
-	from c:/tools/Ruby200/lib/ruby/2.0.0/rubygems/core_ext/kernel_require.rb:45:in `require'
-	from c:/tools/Ruby200/lib/ruby/2.0.0/rubygems/core_ext/kernel_require.rb:45:in `require'
-	from ../crash_on_request_editor.rb:12:in `<main>'