rtext 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 51b8fbadb70e46e456b58b2910f56862f5021d5fc1e0d22671aafb31236bfb85
-  data.tar.gz: f6df8e5a17c1dbc839f0ca751b4ae99671e4f9b21242389ba7c3e8190ae391ee
+SHA1:
+  metadata.gz: 747355cc5b17bf91ec5a902b0be20b9b13639baf
+  data.tar.gz: 808497bcef84bfcb8e5a5f5d50b4b6cda109337a
 SHA512:
-  metadata.gz: 93e358c961fedc1b3497229699f14cb5ecca26c9b4f6eb4c73609321dc2383fc6089b2b4db1f4781889a3be6701d439e9a37ca0f4d887ff75eb9eb37cd4ccd31
-  data.tar.gz: 36e6b72e7d2b7d78051a872cfcd173180b2831e570b3f7dc42a25b4966589edbf859f00809b9470518d5f3d85fadb0c48af5193238dbcba57f8b999afd370922
+  metadata.gz: 987cf234234bb2284fe9d7c030be5c7837667cf051701985c2634f0cbee14d77c0abe4cad9eb962dd66312c9d35b1020f0578931cccc8c9f0de4a2fa3ea08295
+  data.tar.gz: 5425d8b7189dd74db31d97df3123cee9d27fb59716d73913b2f3d993f79f354f561d26d1f1a6a175f8ab7cc4a813977428a602898ba5748a71d71d58700da630

data/CHANGELOG

@@ -99,4 +99,10 @@
 
 =0.9.1
 
-* Fixed backward compatibility issues
+* Fixed backward compatibility issues
+
+=0.9.2
+
+* Fixed frontend connector
+* Fixed frontend tests
+* Automatic conversion of integer and float values to string

data/RText_Protocol

@@ -501,7 +501,7 @@ the parent commands wrapped around it. Any sibling commands can be omitted as we
 any lines containing closing braces and brackets. The order of lines is the same as in the 
 RText file.
 
-Here is an example. Consider the following RText file with the cursor in the line of "Command3" 
+Here is an example. Consider the following RText file with the cursor in the line of "Command5"
 at the time when the auto completion command is issued.
 
   Command1 {

data/Rakefile

@@ -1,36 +1,22 @@
 require 'rubygems/package_task'
+
+require 'rake'
 require 'rdoc/task'
 
-DocFiles = [
-  "README.rdoc", "CHANGELOG", "MIT-LICENSE", 
-  "RText_Users_Guide", 
-  "RText_Protocol"]
-
-RTextGemSpec = Gem::Specification.new do |s|
-  s.name = %q{rtext}
-  s.version = "0.9.1"
-  s.date = Time.now.strftime("%Y-%m-%d")
-  s.summary = %q{Ruby Textual Modelling}
-  s.email = %q{martin dot thiede at gmx de}
-  s.homepage = %q{http://ruby-gen.org}
-  s.description = %q{RText can be used to derive textual languages from an RGen metamodel with very little effort.}
-  s.authors = ["Martin Thiede"]
-  s.add_dependency('rgen', '>= 0.8.2')
-  gemfiles = Rake::FileList.new
-  gemfiles.include("{lib,test}/**/*")
-  gemfiles.include(DocFiles)
-  gemfiles.include("Rakefile") 
-  gemfiles.exclude(/\b\.bak\b/)
-  s.files = gemfiles
-  s.rdoc_options = ["--main", "README.rdoc", "-x", "test"]
-  s.extra_rdoc_files = DocFiles
-end
+RTextGemSpec = eval(File.read('rtext.gemspec'))
+
+gemfiles = Rake::FileList.new
+gemfiles.include('{lib,test}/**/*')
+gemfiles.include(DocFiles)
+gemfiles.include('Rakefile')
+gemfiles.exclude(/\b\.bak\b/)
+RTextGemSpec.files = gemfiles
 
 RDoc::Task.new do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_files.include(DocFiles)
-  rd.rdoc_files.include("lib/**/*.rb")
-  rd.rdoc_dir = "doc"
+  rd.main = 'README.rdoc'
+  rd.rdoc_files.include(RTextGemSpec.extra_rdoc_files)
+  rd.rdoc_files.include('lib/**/*.rb')
+  rd.rdoc_dir = 'doc'
 end
 
 RTextPackageTask = Gem::PackageTask.new(RTextGemSpec) do |p|
@@ -38,9 +24,16 @@ RTextPackageTask = Gem::PackageTask.new(RTextGemSpec) do |p|
 end	
 
 task :prepare_package_rdoc => :rdoc do
-  RTextPackageTask.package_files.include("doc/**/*")
+  RTextPackageTask.package_files.include('doc/**/*')
 end
 
 task :release => [:prepare_package_rdoc, :package]
 
 task :clobber => [:clobber_rdoc, :clobber_package]
+
+require 'rake/testtask'
+
+::Rake::TestTask.new(:test) do |t|
+  t.test_files = ['test/rtext_test.rb']
+  t.warning = false
+end

data/lib/rtext/frontend/connector.rb

@@ -21,15 +21,21 @@ def initialize(config, options={})
   @outfile_provider = options[:outfile_provider]
   @keep_outfile = options[:keep_outfile]
   @connection_timeout = options[:connection_timeout] || 10
+  @process_id = nil
 end
 
 def execute_command(obj, options={})
-  timeout = options[:timeout] || 5
+  timeout = options[:timeout] || 10
   @busy = false if @busy_start_time && (Time.now > @busy_start_time + timeout)
   if @busy
     do_work
-    :backend_busy 
-  elsif connected?
+    return :backend_busy 
+  end
+  unless connected?
+    connect unless connecting?
+    do_work
+  end
+  if connected?
     obj["invocation_id"] = @invocation_id
     obj["type"] = "request"
     @socket.send(serialize_message(obj), 0)
@@ -66,9 +72,7 @@ def execute_command(obj, options={})
       result
     end
   else
-    connect unless connecting?
-    do_work
-    :connecting 
+    :connecting
   end
 end
 
@@ -87,23 +91,68 @@ def stop
       sleep(0.1)
     end
   end
+  ensure_process_cleanup(@process_id, @keep_outfile ? nil : @out_file, 10)
+  @process_id = nil
 end
 
 private
 
+def wait_for_process_to_exit(process_id, timeout)
+  with_timeout timeout do
+    begin
+      waitpid(process_id, Process::WNOHANG)
+      process_id = nil
+      true
+    rescue Errno::ECHILD => _
+      false
+    end
+  end
+end
+
+def ensure_process_cleanup(process_id, out_file, timeout)
+  Thread.new do
+    begin
+      unless process_id.nil?
+        process_id = nil if wait_for_process_to_exit(process_id, timeout)
+      end
+    ensure
+      unless process_id.nil?
+        begin
+          Process.kill('QUIT', process_id)
+        rescue Errno::ESRCH => _
+        end
+      end
+      File.unlink(out_file) if !out_file.nil? && File.exist?(out_file)
+    end
+  end
+end
+
+def with_timeout(timeout, sleep_time = 0.1, &block)
+  started = Time.now
+  while true do
+    return true if block.call
+    if Time.now > started + timeout
+      return false
+    end
+    sleep(sleep_time)
+  end
+end
+
+
 def connected?
-  @state == :connected && backend_running?
+  !@process_id.nil? && @state == :read_from_socket && backend_running?
 end
 
 def connecting?
-  @state == :connecting
+  !@process_id.nil? && (@state == :wait_for_file || @state == :wait_for_port)
 end
 
 def backend_running?
   if @process_id
     begin
-      return true unless waitpid(@process_id, Process::WNOHANG)
-    rescue Errno::ECHILD
+      waitpid(@process_id, Process::WNOHANG)
+      return true
+    rescue Errno::ECHILD => _
     end
   end
   false
@@ -121,7 +170,7 @@ def tempfile_name
 end
 
 def connect
-  @state = :connecting
+  return if connected?
   @connect_start_time = Time.now
 
   @logger.info @config.command if @logger
@@ -131,56 +180,75 @@ def connect
   else
     @out_file = tempfile_name 
   end
-  File.unlink(@out_file) if File.exist?(@out_file)
 
-  Dir.chdir(File.dirname(@config.file)) do
-    @process_id = spawn(@config.command.strip + " > #{@out_file} 2>&1")
+  if @process_id.nil?
+    File.unlink(@out_file) if File.exist?(@out_file)
+    Dir.chdir(File.dirname(@config.file)) do
+      @process_id = spawn(@config.command.strip + " > #{@out_file} 2>&1")
+      @state = :wait_for_file
+    end
   end
-  @work_state = :wait_for_file
 end
 
 def do_work
-  case @work_state
-  when :wait_for_file
-    if File.exist?(@out_file)
-      @work_state = :wait_for_port
-    end
-    if Time.now > @connect_start_time + @connection_timeout
-      cleanup
-      @connection_listener.call(:timeout) if @connection_listener
-      @work_state = :done
-      @state = :off
-      @logger.warn "process didn't startup (connection timeout)" if @logger
+  if @process_id.nil?
+    @state = :off
+    return false
+  end
+  if @state == :wait_for_port && !File.exist?(@out_file)
+    @state = :wait_for_file
+  end
+  if @state == :wait_for_file && File.exist?(@out_file)
+    @state = :wait_for_port
+  end
+  if @state == :wait_for_file
+    while true
+      if Time.now > @connect_start_time + @connection_timeout
+        cleanup
+        @connection_listener.call(:timeout) if @connection_listener
+        @state = :off
+        @logger.warn "process didn't startup (connection timeout)" if @logger
+        return false
+      end
+      sleep(0.1)
+      if File.exist?(@out_file)
+        @state = :wait_for_port
+        break
+      end
     end
-    true
-  when :wait_for_port
-    output = File.read(@out_file)
-    if output =~ /^RText service, listening on port (\d+)/
-      port = $1.to_i
-      @logger.info "connecting to #{port}" if @logger
-      begin
-        @socket = TCPSocket.new("127.0.0.1", port)
-        @socket.setsockopt(:SOCKET, :RCVBUF, 1000000)
-      rescue Errno::ECONNREFUSED
+  end
+  if @state == :wait_for_port
+    while true
+      break unless File.exist?(@out_file)
+      output = File.read(@out_file)
+      if output =~ /^RText service, listening on port (\d+)/
+        port = $1.to_i
+        @logger.info "connecting to #{port}" if @logger
+        begin
+          @socket = TCPSocket.new("127.0.0.1", port)
+          @socket.setsockopt(:SOCKET, :RCVBUF, 1000000)
+        rescue Errno::ECONNREFUSED
+          cleanup
+          @connection_listener.call(:timeout) if @connection_listener
+          @state = :off
+          @logger.warn "could not connect socket (connection timeout)" if @logger
+          return false
+        end
+        @state = :read_from_socket
+        @connection_listener.call(:connected) if @connection_listener
+        break
+      end
+      if Time.now > @connect_start_time + @connection_timeout
         cleanup
         @connection_listener.call(:timeout) if @connection_listener
-        @work_state = :done
         @state = :off
         @logger.warn "could not connect socket (connection timeout)" if @logger
+        return false
       end
-      @state = :connected
-      @work_state = :read_from_socket
-      @connection_listener.call(:connected) if @connection_listener
-    end
-    if Time.now > @connect_start_time + @connection_timeout
-      cleanup
-      @connection_listener.call(:timeout) if @connection_listener
-      @work_state = :done
-      @state = :off
-      @logger.warn "could not connect socket (connection timeout)" if @logger
+      sleep(0.1)
     end
-    true
-  when :read_from_socket
+  end
+  if @state == :read_from_socket
     repeat = true
     socket_closed = false
     response_data = ""
@@ -208,13 +276,12 @@ def do_work
         end
       elsif !backend_running? || socket_closed
         cleanup
-        @work_state = :done
+        @state = :off
         return false
       end
     end
-    true
   end
-
+  true
 end
 
 def cleanup
@@ -224,7 +291,7 @@ def cleanup
     break unless backend_running?
     sleep(0.1)
   end
-  File.unlink(@out_file) unless @keep_outfile
+  ensure_process_cleanup(@process_id, @keep_outfile ? @out_file : nil, 10)
 end
 
 end

data/lib/rtext/instantiator.rb

@@ -247,7 +247,15 @@ class Instantiator
         element.setOrAddGeneric(feature.name, proxy)
       else
         begin
-          element.setOrAddGeneric(feature.name, v.value)
+          v_value = v.value
+          feature_instance_class = feature.eType.instanceClass
+          if feature_instance_class == String && (v_value.is_a?(Float) || v_value.is_a?(Fixnum))
+            element.setOrAddGeneric(feature.name, v_value.to_s)
+          elsif feature_instance_class == Float && v_value.is_a?(Fixnum)
+            element.setOrAddGeneric(feature.name, v_value.to_f)
+          else
+            element.setOrAddGeneric(feature.name, v_value)
+          end
         rescue StandardError
           # backward compatibility for RGen versions not supporting BigDecimal
           if v.value.is_a?(BigDecimal)
@@ -302,9 +310,9 @@ class Instantiator
     elsif feature.eType.is_a?(RGen::ECore::EEnum)
       [:identifier, :string]
     else
-      expected = { String => [:string, :identifier],
+      expected = { String => [:string, :identifier, :integer, :float],
         Integer => [:integer],
-        Float => [:float],
+        Float => [:float, :integer],
         RGen::MetamodelBuilder::DataTypes::Boolean => [:boolean],
         Object => [:string, :identifier, :integer, :float, :boolean]
       }[feature.eType.instanceClass] 

data/test/context_builder_test.rb

@@ -914,7 +914,11 @@ def assert_context(c, options)
   assert_equal(options[:in_array], c.position.in_array)
   assert_equal(options[:in_block], c.position.in_block)
   assert_equal((options[:after_label] || false), c.position.after_label)
-  assert_equal(options[:problem], c.problem)
+  if options[:problem]
+    assert_equal(options[:problem], c.problem)
+  else
+    assert_nil(c.problem)
+  end
   if options[:feature]
     assert_equal(options[:feature], c.feature.name)
   else

data/test/instantiator_test.rb

@@ -106,6 +106,50 @@ class InstantiatorTest < MiniTest::Test
     end
   end
 
+  def test_int_float_string
+    root_elements = []
+    _, problems = instantiate(%Q(
+      TestNode text: 10
+      TestNode text: -14.55
+      ), TestMM, :root_elements => root_elements)
+    assert_no_problems(problems)
+    assert(root_elements.first.text.is_a?(String))
+    assert_equal('10', root_elements.first.text)
+    assert(root_elements[1].text.is_a?(String))
+    assert_equal('-14.55', root_elements[1].text)
+  end
+
+  def test_int_float
+    env, problems = instantiate(%Q(
+      TestNode float: "abc"
+      ), TestMM)
+    assert_equal(1, problems.length)
+
+    root_elements = []
+    env, problems = instantiate(%Q(
+      TestNode text: "some text", float: -25 {
+        TestNode text: "child"
+        TestNode text: "child2"
+      }
+      ), TestMM, :root_elements => root_elements)
+    assert_no_problems(problems)
+    assert_model_simple(env)
+    assert(root_elements.first.float.is_a?(Float))
+    assert_equal(-25.0, root_elements.first.float)
+
+    root_elements = []
+    env, problems = instantiate(%Q(
+      TestNode text: "some text", float: -72.001 {
+        TestNode text: "child"
+        TestNode text: "child2"
+      }
+      ), TestMM, :root_elements => root_elements)
+    assert_no_problems(problems)
+    assert_model_simple(env)
+    assert(root_elements.first.float.is_a?(Float))
+    assert_equal(-72.001, root_elements.first.float)
+  end
+  
   def test_simple
     env, problems = instantiate(%Q(
       TestNode text: "some text", nums: [1,2] {
@@ -729,7 +773,6 @@ class InstantiatorTest < MiniTest::Test
       TestNode related: 1
     ), TestMM)
     assert_problems([
-      [/argument 'text' can not take a integer, expected string/i, 2],
       [/argument 'integer' can not take a string, expected integer/i, 3],
       [/argument 'integer' can not take a boolean, expected integer/i, 4],
       [/argument 'integer' can not take a float, expected integer/i, 5],
@@ -1728,5 +1771,3 @@ class InstantiatorTest < MiniTest::Test
   end
 
 end
-	
-

data/test/integration/test.rb

@@ -21,7 +21,7 @@ CrashOnRequestFile = File.dirname(__FILE__)+"/model/test.crash_on_request"
 
 def setup_connector(file)
   @infile = file
-  outfile = File.dirname(__FILE__)+"/backend.out"
+  outfile = File.dirname(__FILE__)+"/backend.out" + Random.new.rand(100000000).to_s
   logfile = File.dirname(__FILE__)+"/frontend.log"
   logger = Logger.new(logfile)
     File.unlink(outfile) if File.exist?(outfile)
@@ -29,7 +29,7 @@ def setup_connector(file)
   man = RText::Frontend::ConnectorManager.new(
     :logger => logger,
     :keep_outfile => true,
-    :connection_timeout => 2,
+    :connection_timeout => 10,
     :outfile_provider => lambda { File.expand_path(outfile) },
     :connect_callback => lambda do |connector, state|
       @connection_timeout = true if state == :timeout
@@ -936,8 +936,16 @@ def assert_link_targets(context, options)
     {"command" => "link_targets", "context" => lines, "column" => col})
   assert_equal "response", response["type"]
   assert_equal options[:targets], response["targets"]
-  assert_equal options[:begin], response["begin_column"]
-  assert_equal options[:end], response["end_column"]
+  if options[:begin]
+    assert_equal options[:begin], response["begin_column"]
+  else
+    assert_nil response["begin_column"]
+  end
+  if options[:end]
+    assert_equal options[:end], response["end_column"]
+  else
+    assert_nil response["end_column"]
+  end
 end
 
 def assert_completions(context, expected)
@@ -952,11 +960,10 @@ end
 def load_model
   done = false
   response = nil
-  while !done 
+  while !done
     response = @con.execute_command({"command" => "load_model"})
     if response == :connecting && !@connection_timeout
       sleep(0.1)
-      @con.resume
     else
       done = true
     end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rtext
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Martin Thiede
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-11 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
@@ -67,7 +67,6 @@ files:
 - test/instantiator_test.rb
 - 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
@@ -108,7 +107,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubyforge_project: 
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby Textual Modelling