concrete 0.2.0 → 0.2.1

data/CHANGELOG

@@ -30,3 +30,10 @@
 * Fixed marker (cursor) positioning for editor nodes with offset
 * Fixed exception in case fold control nodes are not present
 
+=0.2.1 (September 21st, 2010)
+
+* Added support for HAML style HTML templates and stylesheets based on SASS
+* Fixed layout/positioning problems when a doctype is provided (added missing 'px' unit)
+* Fixed bug not allowing to finish editing of a text attribute if an integer attribute has been edited before
+* Fixed bug not allowing to position the cursor with the mouse in a text field in edit mode
+

data/concrete/editor.js

@@ -134,12 +134,14 @@ Concrete.Editor = Class.create({
         this._handleInfoPopups(event);
       }
 			this._handleRefHighlight(event);
-      this.popup.setStyle({left: event.clientX+20, top: event.clientY+20});
+      this.popup.setStyle({left: event.clientX+20+'px', top: event.clientY+20+'px'});
 		}
 		if (this.inlineEditor.isActive) {
 			if (event.type == "click" && event.isLeftClick()) {
-				this.inlineEditor.cancel()
-				this.selector.selectDirect(Event.element(event));	
+        if (!Event.element(event).up().hasClassName("ct_inline_editor")) {
+          this.inlineEditor.cancel();
+          this.selector.selectDirect(Event.element(event));	
+        }
 			}
 			else if (event.keyCode == 9) { 	// tab
 				this.inlineEditor.finish();
@@ -512,7 +514,7 @@ Concrete.Editor = Class.create({
 	adjustMarker: function() {
 		var cur = this.selector.getCursorPosition();
     var poff = this.marker.getOffsetParent().cumulativeOffset();
-		this.marker.setStyle({left: cur.x-poff.left, top: cur.y-poff.top});
+		this.marker.setStyle({left: cur.x-poff.left+'px', top: cur.y-poff.top+'px'});
 	},
 	
 	getModel: function() {

data/concrete/inline_editor.js

@@ -11,43 +11,44 @@ Concrete.InlineEditor = Class.create(Concrete.BasicInlineEditor, {
 	},
 	
 	edit: function(element, opt) {
-		var init = opt.init || ""
-		var partial = opt.partial || false
+		var init = opt.init || "";
+		var partial = opt.partial || false;
 		if (opt.options instanceof Array) {
-			this._options = opt.options
-			this._regexp = undefined		
+			this._options = opt.options;
+			this._regexp = undefined;
 		}
 		else if (opt.options instanceof RegExp) {
-			this._options = []
-			this._regexp = opt.options
+			this._options = [];
+			this._regexp = opt.options;
 		}
 		else {
-			this._options = []
+			this._options = [];
+			this._regexp = undefined;
 		}
-		this._successHandler = opt.onSuccess
-		this._failureHandler = opt.onFailure
-		this.isActive = true
+		this._successHandler = opt.onSuccess;
+		this._failureHandler = opt.onFailure;
+		this.isActive = true;
 		this.stateChangeFunc(this.isActive);
-		this.show(element, init, partial, this._options)	
+		this.show(element, init, partial, this._options);
 	},
 	
 	finish: function() {
 		if ((this._options.size() == 0 || this._options.include(this.getText())) && (this._regexp == undefined || this._regexp.test(this.getText()))) {
-			this.isActive = false
+			this.isActive = false;
 			this.stateChangeFunc(this.isActive);
-			this.hide()
-			if (this._successHandler) this._successHandler(this.getText())
+			this.hide();
+			if (this._successHandler) this._successHandler(this.getText());
 		}
 		else {
-			this.setError()
+			this.setError();
 		}
 	},
 	
 	cancel: function() {
-		this.isActive = false
+		this.isActive = false;
 		this.stateChangeFunc(this.isActive);
-		this.hide()
-		if (this._failureHandler) this._failureHandler()
+		this.hide();
+		if (this._failureHandler) this._failureHandler();
 	}
 		
 })

data/concrete/ui/abstract_dialog.js

@@ -20,7 +20,7 @@ Concrete.UI.AbstractDialog = Class.create({
     }.bind(this));
     Event.observe(window, 'mousemove', function(event) {
       if (this.moving) {
-        this.dialogElement.setStyle({left: event.clientX-this.moveOffset.left, top: event.clientY-this.moveOffset.top});
+        this.dialogElement.setStyle({left: event.clientX-this.moveOffset.left+'px', top: event.clientY-this.moveOffset.top+'px'});
       }
     }.bind(this));
     Event.observe(window, 'click', function(event) {
@@ -62,8 +62,8 @@ Concrete.UI.AbstractDialog = Class.create({
   },
 
   open: function() {
-    this.dialogElement.setStyle({left: (window.innerWidth-this.dialogElement.getWidth())/2, top: (window.innerHeight-this.dialogElement.getHeight())/2});
-    this.dialogElement.down(".shadow").setStyle({width: this.dialogElement.getWidth()+10, height: this.dialogElement.getHeight()+10});
+    this.dialogElement.setStyle({left: (window.innerWidth-this.dialogElement.getWidth())/2+'px', top: (window.innerHeight-this.dialogElement.getHeight())/2+'px'});
+    this.dialogElement.down(".shadow").setStyle({width: this.dialogElement.getWidth()+10+'px', height: this.dialogElement.getHeight()+10+'px'});
     this.dialogElement.show();
     this.dialogElement.down("input").select();
     this.active = true;

data/concrete/ui/layout_manager.js

@@ -45,10 +45,10 @@ Concrete.UI.LayoutManager = Class.create({
     var sb = this.sidebar;
     var sbd = this._sidebarDrag; 
     var main = this.main; 
-    tb.setStyle({left: 0, top: 0, width: window.innerWidth});
-    sb.setStyle({left: 0, top: tb.getHeight(), width: this._sidebarWidth, height: window.innerHeight-tb.getHeight()});
-    sbd.setStyle({left: sb.getWidth(), top: tb.getHeight(), height: window.innerHeight-tb.getHeight()});
-    main.setStyle({left: sb.getWidth()+sbd.getWidth(), top: tb.getHeight(), width: window.innerWidth-sb.getWidth()-sbd.getWidth(), height: window.innerHeight-tb.getHeight()});
+    tb.setStyle({left: 0, top: 0, width: window.innerWidth+'px'});
+    sb.setStyle({left: 0, top: tb.getHeight()+'px', width: this._sidebarWidth+'px', height: window.innerHeight-tb.getHeight()+'px'});
+    sbd.setStyle({left: sb.getWidth()+'px', top: tb.getHeight()+'px', height: window.innerHeight-tb.getHeight()+'px'});
+    main.setStyle({left: sb.getWidth()+sbd.getWidth()+'px', top: tb.getHeight()+'px', width: window.innerWidth-sb.getWidth()-sbd.getWidth()+'px', height: window.innerHeight-tb.getHeight()+'px'});
   }
 
 });

data/concrete/ui/toolbar.js

@@ -39,7 +39,7 @@ Concrete.UI.Toolbar = Class.create({
           if (left > document.viewport.getDimensions().width - this.popup.getWidth()) {
             left = document.viewport.getDimensions().width - this.popup.getWidth();
           }
-          this.popup.setStyle({left: left, top: event.clientY+20});
+          this.popup.setStyle({left: left+'px', top: event.clientY+20+'px'});
           this.popup.show();
         }
       }

data/doc/concrete_developers_guide.html

@@ -753,12 +753,15 @@ cellspacing="0" cellpadding="4">
     templates.html
   <syntax 2>
     style.css
-    templates.html</tt></pre>
+    templates.html
+...
+&lt;syntax root dir n&gt;</tt></pre>
 </div></div>
-<div class="paragraph"><p>There can be several syntax root directories (e.g. one which is deployed with your editor and one in the user&#8217;s home directory). The display name of a specific syntax is derived from the syntax directory within a root directory. The syntax directory should contain a file "templates.html" in case the syntax contains a HTML part. It should also contain a CSS file "style.css" and it may contain more resources (e.g. images) referenced from that stylesheet.</p></div>
+<div class="paragraph"><p>There can be several syntax root directories (e.g. one which is deployed with your editor and one in the user&#8217;s home directory). The display name of a specific syntax is derived from the syntax directory within a root directory. The syntax directory should contain a file "templates.html" or "templates.haml" in case the syntax contains a HTML part. It should also contain a CSS, SASS or SCSS file and it may contain more resources (e.g. images) referenced from that stylesheet.</p></div>
+<div class="paragraph"><p>HTML templates and stylesheets may be specified in HAML and SASS or SCSS format to make them more concise and readable. For this to work, <em>haml</em> needs to be installed as a gem (use "gem install haml"), the HTML templates file must be named "templates.haml" and the SASS and SCSS filenames must end with .sass and .scss. If the server is given a <em>haml eval contect</em> object (see below) the HAML templates will evaluate in this context.</p></div>
 <div class="paragraph"><p>The server will make the files in the directory of the selected syntax available via the path prefix "/syntax". It will also insert the contents of the file "template.html" in the main HTML file by replacing the placeholder comment "html templates". See below for an example.</p></div>
 <h3 id="_setting_up_the_server">Setting up the Server</h3><div style="clear:left"></div>
-<div class="paragraph"><p>With a working set, data provider and syntax provider in place the server can be instantiated. As an additional argument, it needs the location of its HTML root directory. The root directory should contain a file named "editor.html" which is the main HTML file as described in the next section.</p></div>
+<div class="paragraph"><p>With a working set, data provider and syntax provider in place the server can be instantiated. As an additional argument, it needs the location of its HTML root directory. The root directory should contain a file named "editor.html" which is the main HTML file as described in the next section. A further option to the server is the HAML eval context which can be provided using the named argument <em>:hamlEvalContext</em>.</p></div>
 <div class="paragraph"><p>The following example code sets up an instance of <em>Concrete::Server</em>. It reads the module names as file names from the command line and uses the RGen builtin ECore meta-metamodel as metamodel (in fact this is taken form the "mmedit" metamodel editor project). It uses the <em>Concrete::IndexBuilder</em> to derive the index metamodel and the index model and it uses a <em>Concrete::Config</em> to store the preferences in the user&#8217;s home directory.</p></div>
 <div class="listingblock">
 <div class="content">
@@ -1047,7 +1050,7 @@ cellspacing="0" cellpadding="4">
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2010-06-14 14:05:31 WEDT
+Last updated 2010-06-30 08:10:12 WEDT
 </div>
 </div>
 </body>

data/doc/concrete_developers_guide.txt

@@ -353,16 +353,20 @@ The workbench server supports selecting a concrete syntax from a set of availabl
   <syntax 2>
     style.css
     templates.html
+...
+<syntax root dir n>
 ----
 
-There can be several syntax root directories (e.g. one which is deployed with your editor and one in the user's home directory). The display name of a specific syntax is derived from the syntax directory within a root directory. The syntax directory should contain a file "templates.html" in case the syntax contains a HTML part. It should also contain a CSS file "style.css" and it may contain more resources (e.g. images) referenced from that stylesheet.
+There can be several syntax root directories (e.g. one which is deployed with your editor and one in the user's home directory). The display name of a specific syntax is derived from the syntax directory within a root directory. The syntax directory should contain a file "templates.html" or "templates.haml" in case the syntax contains a HTML part. It should also contain a CSS, SASS or SCSS file and it may contain more resources (e.g. images) referenced from that stylesheet.
+
+HTML templates and stylesheets may be specified in HAML and SASS or SCSS format to make them more concise and readable. For this to work, _haml_ needs to be installed as a gem (use "gem install haml"), the HTML templates file must be named "templates.haml" and the SASS and SCSS filenames must end with .sass and .scss. If the server is given a _haml eval contect_ object (see below) the HAML templates will evaluate in this context.
 
 The server will make the files in the directory of the selected syntax available via the path prefix "/syntax". It will also insert the contents of the file "template.html" in the main HTML file by replacing the placeholder comment "html templates". See below for an example.
 
 
 === Setting up the Server ===
 
-With a working set, data provider and syntax provider in place the server can be instantiated. As an additional argument, it needs the location of its HTML root directory. The root directory should contain a file named "editor.html" which is the main HTML file as described in the next section.
+With a working set, data provider and syntax provider in place the server can be instantiated. As an additional argument, it needs the location of its HTML root directory. The root directory should contain a file named "editor.html" which is the main HTML file as described in the next section. A further option to the server is the HAML eval context which can be provided using the named argument _:hamlEvalContext_.
 
 The following example code sets up an instance of _Concrete::Server_. It reads the module names as file names from the command line and uses the RGen builtin ECore meta-metamodel as metamodel (in fact this is taken form the "mmedit" metamodel editor project). It uses the _Concrete::IndexBuilder_ to derive the index metamodel and the index model and it uses a _Concrete::Config_ to store the preferences in the user's home directory.
 

data/doc/concrete_users_guide.html

@@ -498,7 +498,8 @@ If a constraint is violated for an element or feature, the element/feature will
 Move the mouse over such an element in order to show the error message in a popup window.</p></div>
 <h3 id="_model_information">Model Information</h3><div style="clear:left"></div>
 <div class="paragraph"><p>Depending on the concrete syntax, the feature names might be hidden. When moving the mouse over a model value, the name of the
-feature that value belongs to will be shown. Also for references, the full identifier will be shown.</p></div>
+feature that value belongs to will be shown. Also for references, the full identifier, and in case of external references to other models,
+the module identifier will be shown.</p></div>
 </div>
 <h2 id="_workbench">Workbench</h2>
 <div class="sectionbody">
@@ -687,7 +688,7 @@ cellspacing="0" cellpadding="4">
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2010-06-13 23:51:34 WEDT
+Last updated 2010-06-25 07:58:46 WEDT
 </div>
 </div>
 </body>

data/doc/concrete_users_guide.txt

@@ -159,7 +159,8 @@ Move the mouse over such an element in order to show the error message in a popu
 === Model Information ===
 
 Depending on the concrete syntax, the feature names might be hidden. When moving the mouse over a model value, the name of the
-feature that value belongs to will be shown. Also for references, the full identifier will be shown.
+feature that value belongs to will be shown. Also for references, the full identifier, and in case of external references to other models, 
+the module identifier will be shown.
 
 
 == Workbench ==

data/lib/concrete/concrete_syntax_provider.rb

@@ -1,9 +1,11 @@
+require 'andand'
+
 module Concrete
 
 class ConcreteSyntaxProvider
 
   class ConcreteSyntax
-    attr_accessor :ident, :dir, :name, :desc, :htmlTemplates, :cssStyleFile
+    attr_accessor :ident, :dir, :name, :desc
   end
 
   def initialize(configDirs, logger, config=nil)
@@ -22,7 +24,7 @@ class ConcreteSyntaxProvider
 
   def selectSyntax(ident)
     @selectedSyntax = syntaxes.find{|s| s.ident == ident}
-    @config.andand.storeValue("concrete_syntax", ident.to_s)
+    @config.andand.storeValue("concrete_syntax", ident.to_s) if @selectedSyntax
   end
 
   def syntaxesAsJson
@@ -38,25 +40,17 @@ class ConcreteSyntaxProvider
       Dir.entries(cd).sort.each do |sd|
         next if sd == "." || sd == ".."
         syntaxDir = cd+"/"+sd
-        templatesFile = syntaxDir + "/templates.html"
-        styleFile = syntaxDir + "/style.css"
-        unless File.exist?(templatesFile) || File.exist?(styleFile)
-          @logger.warn("Concrete syntax dir without a templates.html or a style.css: #{syntaxDir}")
-          next
-        end
         s = ConcreteSyntax.new
         s.ident = syntaxDir.gsub("\\","/")
         s.dir = syntaxDir
         s.name = sd.split(/[_\W]/).collect{|w| w.capitalize}.join(" ")
         s.desc = ""
-        s.cssStyleFile = styleFile if File.exist?(styleFile)
-        s.htmlTemplates = File.read(templatesFile) if File.exist?(templatesFile)
         result << s 
       end
     end
     result
   end
-   
+
 end
 
 end

data/lib/concrete/haml_eval_context.rb

@@ -0,0 +1,57 @@
+require 'rgen/ecore/ecore'
+
+module Concrete
+
+# Objects of this class are meant to be used as HAML eval context
+# Context methods provide convenient access to the metamodel
+# The metamodel is expected to be a RGen ECore metamodel
+class HamlEvalContext
+  def initialize(mm)
+    @mm = mm
+    @metaclassesByName = nil 
+  end
+
+  def metaclasses
+    loadMetaclasses unless @metaclassesByName 
+    @metaclassesByName.values
+  end
+
+  def metaclass(name)
+    loadMetaclasses unless @metaclassesByName 
+    @metaclassesByName[name]
+  end
+
+  def metaclassFeatures(name, options={})
+    exclusions = options[:except] || []
+    if exclusions.is_a?(Array)
+      metaclass(name).eAllStructuralFeatures.reject{|f| exclusions.include?(f.name)}
+    else
+      metaclass(name).eAllStructuralFeatures.reject{|f| exclusions == f.name}
+    end
+  end
+
+  def metaclassContainments(name, options={})
+    metaclassFeatures(name, options).select{|f| f.is_a?(RGen::ECore::EReference) && f.containment}
+  end
+
+  def metaclassReferences(name, options={})
+    metaclassFeatures(name, options).select{|f| f.is_a?(RGen::ECore::EReference) && !f.containment}
+  end
+  
+  def metaclassAttributes(name, options={})
+    metaclassFeatures(name, options).select{|f| f.is_a?(RGen::ECore::EAttribute)}
+  end
+
+  private
+
+  def loadMetaclasses
+    @metaclassesByName = {}
+    @mm.eAllClasses.each do |c|
+      @metaclassesByName[c.name] = c
+    end
+  end
+
+end
+
+end
+

data/lib/concrete/server.rb

@@ -1,4 +1,9 @@
 require 'webrick'
+begin
+  require 'haml'
+  require 'sass'
+rescue LoadError
+end
 
 module Concrete
 
@@ -9,6 +14,8 @@ class Server
     @dataProvider = dataProvider
     @syntaxProvider = syntaxProvider 
     @htmlRoot = htmlRoot
+    @logger = options[:logger]
+    @hamlEvalContext = options[:hamlEvalContext]
     @mutex = Mutex.new
 		@server = WEBrick::HTTPServer.new(:Port => (options[:port] || 1234))
 		@server.mount_proc("/") do |req, res|
@@ -27,16 +34,15 @@ class Server
 	def handleRequest(req, res)
 		if req.path == "/"
       editorHtml = File.read(@htmlRoot+"/editor.html")
-      editorHtml.sub!(/<!--\s+html templates\s+-->/, @syntaxProvider.selectedSyntax.htmlTemplates) if @syntaxProvider.andand.selectedSyntax.andand.htmlTemplates
+      templatesData = htmlTemplatesData(@syntaxProvider.selectedSyntax.dir) if @syntaxProvider.selectedSyntax
+      editorHtml.sub!(/<!--\s+html templates\s+-->/, templatesData) if templatesData 
 			res.body = editorHtml 
 		elsif req.path =~ /^\/html\/(.*)/
       File.open(@htmlRoot+"/"+$1, "rb") do |f|
         res.body = f.read
       end
     elsif req.path =~ /^\/syntax\/(.*)/ && @syntaxProvider.selectedSyntax
-      File.open(@syntaxProvider.selectedSyntax.dir+"/"+$1, "rb") do |f|
-        res.body = f.read
-      end
+      res.body = syntaxFileData(@syntaxProvider.selectedSyntax.dir+"/"+$1)
 		elsif req.path =~ /^\/concrete\/(.*)/
       File.open(File.dirname(__FILE__)+"/../../"+$1, "rb") do |f|
         res.body = f.read
@@ -85,7 +91,36 @@ class Server
       # error
 		end
 	end	
-		
+	
+  def syntaxFileData(fileName)
+    if haveHaml? && fileName =~ /(\.sass|\.scss)$/
+      Sass::Engine.new(File.read(fileName)).render
+    else
+      File.open(fileName, "rb") do |f|
+        f.read
+      end
+    end
+  end
+  	
+  def htmlTemplatesData(syntaxDir)
+    if haveHaml? && File.exist?(syntaxDir + "/templates.haml")
+      templatesFile = syntaxDir + "/templates.haml"
+      @logger.info("Using HAML templates file #{templatesFile}") if @logger
+      engine = Haml::Engine.new(File.read(templatesFile))
+      engine.render(@hamlEvalContext || Object.new)
+    elsif File.exist?(syntaxDir + "/templates.html")
+      templatesFile = syntaxDir + "/templates.html"
+      @logger.info("Using HTML templates file #{templatesFile}") if @logger
+      File.read(templatesFile)
+    end
+  end
+
+  def haveHaml?
+    begin
+      Haml
+    rescue NameError
+    end
+  end
 end
 
 end

data/rakefile

@@ -2,7 +2,7 @@ require 'rake/gempackagetask'
 
 GemSpec = Gem::Specification.new do |s|
   s.name = "concrete"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
   s.date = Time.now.strftime("%Y-%m-%d")
   s.summary = %q{Concrete is a lightweight, web-based model editor which can be configured for different DSLs}
   s.authors = ["Martin Thiede"]

data/test/concrete_syntax_provider_test.rb

@@ -0,0 +1,127 @@
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+
+require 'test/unit'
+require 'fileutils'
+require 'concrete/concrete_syntax_provider'
+begin 
+  require 'haml'
+rescue LoadError
+end
+
+class ConcreteSyntaxProviderTest < Test::Unit::TestCase
+
+  TestDir = File.dirname(__FILE__)+"/concrete_syntax_provider_test"
+
+  class LoggerMock
+    attr_reader :messages
+    def initialize; @messages = []; end
+    def info(msg)
+      @messages << "INFO: #{msg}"
+    end
+    def warn(msg)
+      @messages << "WARN: #{msg}"
+    end
+    def error(msg)
+      @messages << "ERROR: #{msg}"
+    end
+  end
+
+  class ConfigMock
+    attr_reader :values
+    def initialize; @values = {}; end
+    def loadValue(ident)
+      @values[ident] 
+    end
+    def storeValue(ident, value)
+      @values[ident] = value
+    end
+  end
+
+  def test_syntaxes_no_dirs
+    logger = LoggerMock.new
+    sp = Concrete::ConcreteSyntaxProvider.new([], logger)
+    assert_equal [], sp.syntaxes
+    assert_equal '{ "syntaxes": [], "selected": "" }', sp.syntaxesAsJson
+    assert_equal [], logger.messages
+  end
+
+  def test_syntaxes_non_existing_dir
+    logger = LoggerMock.new
+    sp = Concrete::ConcreteSyntaxProvider.new([TestDir+"/doesNotExist"], logger)
+    assert_equal [], sp.syntaxes
+    assert_equal '{ "syntaxes": [], "selected": "" }', sp.syntaxesAsJson
+    assert_equal [], logger.messages
+  end
+
+  def test_syntaxes_no_syntaxes
+    logger = LoggerMock.new
+    raise "bad preconditions" unless File.exist?(TestDir+"/syntaxDir0")
+    sp = Concrete::ConcreteSyntaxProvider.new([TestDir+"/syntaxDir0"], logger)
+    assert_equal [], sp.syntaxes
+    assert_equal '{ "syntaxes": [], "selected": "" }', sp.syntaxesAsJson
+    assert_equal [], logger.messages
+  end
+
+  def test_syntaxes_empty_syntax
+    logger = LoggerMock.new
+    sp = Concrete::ConcreteSyntaxProvider.new([TestDir+"/syntaxDir1"], logger)
+    assert_equal 1, sp.syntaxes.size
+    assert_equal "Empty Syntax", sp.syntaxes.first.name
+    assert_equal [], logger.messages
+    assert_equal '{ "syntaxes": [' + 
+      '{ "ident": "'+TestDir+'/syntaxDir1/empty_syntax", "name": "Empty Syntax" }' + 
+      '], "selected": "" }', sp.syntaxesAsJson
+  end
+
+  def test_syntaxes_common
+    logger = LoggerMock.new
+    sp = Concrete::ConcreteSyntaxProvider.new([TestDir+"/syntaxDir2"], logger)
+    syntaxes = sp.syntaxes
+    assert_equal 1, syntaxes.size
+    assert_equal "First Syntax", syntaxes.first.name
+    assert_equal TestDir+"/syntaxDir2/first_syntax", syntaxes.first.ident
+    assert_equal '{ "syntaxes": [' + 
+      '{ "ident": "'+TestDir+'/syntaxDir2/first_syntax", "name": "First Syntax" }' + 
+      '], "selected": "" }', sp.syntaxesAsJson
+    assert_equal [], logger.messages
+  end
+
+  def test_selectSyntax_no_syntax
+    logger = LoggerMock.new
+    sp = Concrete::ConcreteSyntaxProvider.new([], logger)
+    assert_nothing_raised do
+      sp.selectSyntax("dummy")
+    end
+    assert_nil sp.selectedSyntax
+  end
+
+  def test_selectSyntax_no_config
+    logger = LoggerMock.new
+    sp = Concrete::ConcreteSyntaxProvider.new([TestDir+"/syntaxDir2", TestDir+"/syntaxDir3"], logger)
+    assert_nothing_raised do
+      sp.selectSyntax("dummy")
+    end
+    assert_equal "First Syntax", sp.selectedSyntax.name
+    sp.selectSyntax(TestDir+"/syntaxDir3/haml_syntax")
+    assert_equal "Haml Syntax", sp.selectedSyntax.name
+  end
+
+  def test_selectSyntax_load_config
+    logger = LoggerMock.new
+    config = ConfigMock.new
+    config.values["concrete_syntax"] = TestDir+"/syntaxDir3/haml_syntax" 
+    sp = Concrete::ConcreteSyntaxProvider.new([TestDir+"/syntaxDir2", TestDir+"/syntaxDir3"], logger, config)
+    assert_equal "Haml Syntax", sp.selectedSyntax.name
+  end
+
+  def test_selectSyntax_store_config
+    logger = LoggerMock.new
+    config = ConfigMock.new
+    sp = Concrete::ConcreteSyntaxProvider.new([TestDir+"/syntaxDir2", TestDir+"/syntaxDir3"], logger, config)
+    sp.selectSyntax("dummy")
+    assert_equal({}, config.values)
+    sp.selectSyntax(TestDir+"/syntaxDir3/haml_syntax" )
+    assert_equal({"concrete_syntax" => TestDir+"/syntaxDir3/haml_syntax" }, config.values)
+  end
+
+end

data/test/concrete_syntax_provider_test/syntaxDir3/haml_syntax/templates.haml

@@ -0,0 +1 @@
+%p Haml code!

data/test/concrete_syntax_provider_test/syntaxDir3/html_syntax/templates.html

@@ -0,0 +1,2 @@
+<div>Template Content</div>
+

data/test/concrete_test.rb

@@ -2,4 +2,6 @@ require 'file_cache_map_test'
 require 'index_builder_test'
 require 'metamodel_test'
 require 'working_set_test'
+require 'concrete_syntax_provider_test'
+require 'haml_eval_context_test'
 

data/test/haml_eval_context_test.rb

@@ -0,0 +1,46 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+
+require 'test/unit'
+require 'rgen/environment'
+require 'rgen/array_extensions'
+require 'rgen/ecore/ecore'
+require 'concrete/haml_eval_context'
+begin
+  require 'haml'
+rescue LoadError
+end
+
+class HamlEvalContextTest < Test::Unit::TestCase
+
+  def test_simple
+    return unless haveHaml?
+    context = Concrete::HamlEvalContext.new(RGen::ECore.ecore)
+    engine = Haml::Engine.new("= metaclass('EClass').name")  
+    assert_equal "EClass\n", engine.render(context)
+    engine = Haml::Engine.new("= metaclasses.size")  
+    assert_equal "18\n", engine.render(context)
+    engine = Haml::Engine.new("= metaclassFeatures('EEnum').size")  
+    assert_equal "8\n", engine.render(context)
+    engine = Haml::Engine.new("= metaclassContainments('EEnum').size")  
+    assert_equal "2\n", engine.render(context)
+    engine = Haml::Engine.new("= metaclassReferences('EEnum').size")  
+    assert_equal "1\n", engine.render(context)
+    engine = Haml::Engine.new("= metaclassAttributes('EEnum').size")  
+    assert_equal "5\n", engine.render(context)
+    engine = Haml::Engine.new("= metaclassAttributes('EEnum', :except => ['name']).size")  
+    assert_equal "4\n", engine.render(context)
+    engine = Haml::Engine.new("= metaclassAttributes('EEnum', :except => 'name').size")  
+    assert_equal "4\n", engine.render(context)
+    engine = Haml::Engine.new("= metaclassAttributes('EEnum', :except => 'namex').size")  
+    assert_equal "5\n", engine.render(context)
+  end
+
+  def haveHaml?
+    begin
+      Haml
+    rescue NameError
+    end
+  end
+
+end
+

data/test/index_builder_test/ecore_index.js

@@ -1,4 +1,37 @@
 { "_class": "EPackage", "name": "ECore", "elements": [ 
+  { "_class": "EClass", "name": "EAnnotation", "elements": [ 
+    { "_class": "EAttribute", "name": "source" },
+    { "_class": "EReference", "name": "eModelElement" },
+    { "_class": "EReference", "name": "details" },
+    { "_class": "EReference", "name": "contents" },
+    { "_class": "EReference", "name": "references" }] },
+  { "_class": "EClass", "name": "EDataType", "elements": [ 
+    { "_class": "EAttribute", "name": "serializable" }] },
+  { "_class": "EClass", "name": "EClassifier", "elements": [ 
+    { "_class": "EAttribute", "name": "defaultValue" },
+    { "_class": "EAttribute", "name": "instanceClass" },
+    { "_class": "EAttribute", "name": "instanceClassName" },
+    { "_class": "EReference", "name": "ePackage" }] },
+  { "_class": "EClass", "name": "EOperation", "elements": [ 
+    { "_class": "EReference", "name": "eContainingClass" },
+    { "_class": "EReference", "name": "eParameters" },
+    { "_class": "EReference", "name": "eExceptions" }] },
+  { "_class": "EClass", "name": "EClass", "elements": [ 
+    { "_class": "EAttribute", "name": "abstract" },
+    { "_class": "EAttribute", "name": "interface" },
+    { "_class": "EReference", "name": "eIDAttribute" },
+    { "_class": "EReference", "name": "eAllAttributes" },
+    { "_class": "EReference", "name": "eAllContainments" },
+    { "_class": "EReference", "name": "eAllOperations" },
+    { "_class": "EReference", "name": "eAllReferences" },
+    { "_class": "EReference", "name": "eAllStructuralFeatures" },
+    { "_class": "EReference", "name": "eAllSuperTypes" },
+    { "_class": "EReference", "name": "eAttributes" },
+    { "_class": "EReference", "name": "eReferences" },
+    { "_class": "EReference", "name": "eOperations" },
+    { "_class": "EReference", "name": "eStructuralFeatures" },
+    { "_class": "EReference", "name": "eSuperTypes" },
+    { "_class": "EReference", "name": "eSubTypes" }] },
   { "_class": "EClass", "name": "EModelElement", "elements": [ 
     { "_class": "EReference", "name": "eAnnotations" }] },
   { "_class": "EClass", "name": "EReference", "elements": [ 
@@ -49,37 +82,4 @@
   { "_class": "EClass", "name": "EEnum", "elements": [ 
     { "_class": "EReference", "name": "eLiterals" }] },
   { "_class": "EClass", "name": "EParameter", "elements": [ 
-    { "_class": "EReference", "name": "eOperation" }] },
-  { "_class": "EClass", "name": "EAnnotation", "elements": [ 
-    { "_class": "EAttribute", "name": "source" },
-    { "_class": "EReference", "name": "eModelElement" },
-    { "_class": "EReference", "name": "details" },
-    { "_class": "EReference", "name": "contents" },
-    { "_class": "EReference", "name": "references" }] },
-  { "_class": "EClass", "name": "EDataType", "elements": [ 
-    { "_class": "EAttribute", "name": "serializable" }] },
-  { "_class": "EClass", "name": "EClassifier", "elements": [ 
-    { "_class": "EAttribute", "name": "defaultValue" },
-    { "_class": "EAttribute", "name": "instanceClass" },
-    { "_class": "EAttribute", "name": "instanceClassName" },
-    { "_class": "EReference", "name": "ePackage" }] },
-  { "_class": "EClass", "name": "EOperation", "elements": [ 
-    { "_class": "EReference", "name": "eContainingClass" },
-    { "_class": "EReference", "name": "eParameters" },
-    { "_class": "EReference", "name": "eExceptions" }] },
-  { "_class": "EClass", "name": "EClass", "elements": [ 
-    { "_class": "EAttribute", "name": "abstract" },
-    { "_class": "EAttribute", "name": "interface" },
-    { "_class": "EReference", "name": "eIDAttribute" },
-    { "_class": "EReference", "name": "eAllAttributes" },
-    { "_class": "EReference", "name": "eAllContainments" },
-    { "_class": "EReference", "name": "eAllOperations" },
-    { "_class": "EReference", "name": "eAllReferences" },
-    { "_class": "EReference", "name": "eAllStructuralFeatures" },
-    { "_class": "EReference", "name": "eAllSuperTypes" },
-    { "_class": "EReference", "name": "eAttributes" },
-    { "_class": "EReference", "name": "eReferences" },
-    { "_class": "EReference", "name": "eOperations" },
-    { "_class": "EReference", "name": "eStructuralFeatures" },
-    { "_class": "EReference", "name": "eSuperTypes" },
-    { "_class": "EReference", "name": "eSubTypes" }] }] }
+    { "_class": "EReference", "name": "eOperation" }] }] }

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: concrete
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Martin Thiede
@@ -9,29 +14,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 +02:00
+date: 2010-09-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rgen
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 2
         version: 0.5.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: andand
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: 
 executables: []
@@ -127,6 +142,7 @@ files:
 - lib/concrete/concrete_syntax_provider.rb
 - lib/concrete/config.rb
 - lib/concrete/file_cache_map.rb
+- lib/concrete/haml_eval_context.rb
 - lib/concrete/index_builder.rb
 - lib/concrete/metamodel/concrete_mmm.rb
 - lib/concrete/metamodel/ecore_to_concrete.rb
@@ -143,9 +159,14 @@ files:
 - redist/scriptaculous/slider.js
 - redist/scriptaculous/sound.js
 - redist/scriptaculous/unittest.js
+- test/concrete_syntax_provider_test/syntaxDir2/first_syntax/style.css
+- test/concrete_syntax_provider_test/syntaxDir3/haml_syntax/templates.haml
+- test/concrete_syntax_provider_test/syntaxDir3/html_syntax/templates.html
+- test/concrete_syntax_provider_test.rb
 - test/concrete_test.rb
 - test/file_cache_map_test/testdir/fileA
 - test/file_cache_map_test.rb
+- test/haml_eval_context_test.rb
 - test/index_builder_test/ecore_index.js
 - test/index_builder_test/ecore_index_expected.js
 - test/index_builder_test.rb
@@ -179,21 +200,27 @@ require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Concrete is a lightweight, web-based model editor which can be configured for different DSLs