concrete 0.2.0

data/test/concrete_test.rb

@@ -0,0 +1,5 @@
+require 'file_cache_map_test'
+require 'index_builder_test'
+require 'metamodel_test'
+require 'working_set_test'
+

data/test/file_cache_map_test.rb

@@ -0,0 +1,90 @@
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+
+require 'test/unit'
+require 'fileutils'
+require 'concrete/file_cache_map'
+
+class FileCacheMapTest < Test::Unit::TestCase
+
+  TestDir = File.dirname(__FILE__)+"/file_cache_map_test/testdir"
+ 
+  def setup
+    FileUtils.rm_r(Dir[TestDir+"/*"])
+    # * doesn't include dot files
+    FileUtils.rm_r(Dir[TestDir+"/.cache"])
+    @cm = Concrete::FileCacheMap.new(".cache", ".test")
+  end
+   
+  def test_nocache
+    assert_equal(:invalid, @cm.loadData(TestDir+"/fileA"))
+  end
+
+  def test_storeload
+    keyFile = TestDir+"/fileA"  
+    File.open(keyFile, "w") {|f| f.write("somedata")}
+    @cm.storeData(keyFile, "valuedata")
+    assert(File.exist?(TestDir+"/.cache/fileA.test"))
+    assert_equal("valuedata", @cm.loadData(keyFile))
+  end
+
+  def test_storeload_subdir
+    keyFile = TestDir+"/subdir/fileA"
+    FileUtils.mkdir(TestDir+"/subdir")
+    File.open(keyFile, "w") {|f| f.write("somedata")}
+    @cm.storeData(keyFile, "valuedata")
+    assert(File.exist?(TestDir+"/subdir/.cache/fileA.test"))
+    assert_equal("valuedata", @cm.loadData(keyFile))
+  end
+
+  def test_storeload_postfix
+    keyFile = TestDir+"/fileB.txt"  
+    File.open(keyFile, "w") {|f| f.write("somedata")}
+    @cm.storeData(keyFile, "valuedata")
+    assert(File.exist?(TestDir+"/.cache/fileB.txt.test"))
+    assert_equal("valuedata", @cm.loadData(keyFile))
+  end
+
+  def test_storeload_empty
+    keyFile = TestDir+"/fileA"  
+    File.open(keyFile, "w") {|f| f.write("")}
+    @cm.storeData(keyFile, "valuedata")
+    assert(File.exist?(TestDir+"/.cache/fileA.test"))
+    assert_equal("valuedata", @cm.loadData(keyFile))
+  end
+
+  def test_corruptcache
+    keyFile = TestDir+"/fileA"
+    File.open(keyFile, "w") {|f| f.write("somedata")}
+    @cm.storeData(keyFile, "valuedata")
+    File.open(TestDir+"/.cache/fileA.test","a") {|f| f.write("more data")}
+    assert_equal(:invalid, @cm.loadData(keyFile))
+  end  
+
+  def test_changedcontent
+    keyFile = TestDir+"/fileA"
+    File.open(keyFile, "w") {|f| f.write("somedata")}
+    @cm.storeData(keyFile, "valuedata")
+    File.open(keyFile, "a") {|f| f.write("more data")}
+    assert_equal(:invalid, @cm.loadData(keyFile))
+  end 
+
+  def test_versioninfo
+    keyFile = TestDir+"/fileA"  
+    File.open(keyFile, "w") {|f| f.write("somedata")}
+    @cm.versionInfo = "123"
+    @cm.storeData(keyFile, "valuedata")
+    assert(File.exist?(TestDir+"/.cache/fileA.test"))
+    assert_equal("valuedata", @cm.loadData(keyFile))
+  end
+
+  def test_changed_version
+    keyFile = TestDir+"/fileA"  
+    File.open(keyFile, "w") {|f| f.write("somedata")}
+    @cm.versionInfo = "123"
+    @cm.storeData(keyFile, "valuedata")
+    @cm.versionInfo = "456"
+    assert_equal(:invalid, @cm.loadData(keyFile))
+  end
+
+end
+

data/test/file_cache_map_test/testdir/fileA

@@ -0,0 +1 @@
+somedata

data/test/index_builder_test.rb

@@ -0,0 +1,68 @@
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+
+require 'test/unit'
+require 'fileutils'
+require 'rgen/array_extensions'
+require 'rgen/serializer/json_serializer'
+require 'concrete/index_builder'
+
+class IndexBuilderTest < Test::Unit::TestCase
+
+  TestDir = File.dirname(__FILE__)+"/index_builder_test"
+
+  def test_index_metamodel
+    builder = Concrete::IndexBuilder.new(RGen::ECore)
+    mm = builder.indexMetamodel
+    assert_equal [
+      "EAttribute", "EClass", "EClassifier", "EDataType",
+      "EEnum", "EEnumLiteral", "ENamedElement", "EOperation",
+      "EPackage", "EParameter", "EReference", "EStructuralFeature",
+      "ETypedElement", "IndexElement", "Module"
+    ], mm.ecore.eAllClasses.name.sort
+  end
+
+  def test_index_metamodel_reference_only
+    builder = Concrete::IndexBuilder.new(RGen::ECore, :ignoreReferences => proc{|r| r.eType.name != "EReference"})
+    mm = builder.indexMetamodel
+    # metamodel should only contain the EReference class and its container classes and base elements
+    assert_equal [
+      "EClass",
+      "EPackage", "EReference",
+      "IndexElement", "Module"
+    ], mm.ecore.eAllClasses.name.sort
+  end
+
+  def test_index_metamodel_different_ident_name
+    builder = Concrete::IndexBuilder.new(RGen::ECore, :identifierName => "theName")
+    mm = builder.indexMetamodel
+    # metamodel should only contain the base elements 
+    assert_equal [
+      "IndexElement", "Module"
+    ], mm.ecore.eAllClasses.name.sort
+  end
+
+  def test_index_metamodel_module_class_name
+    builder = Concrete::IndexBuilder.new(RGen::ECore, :moduleClassName => "File")
+    mm = builder.indexMetamodel
+    assert mm.ecore.eAllClasses.all?{|c| c.name != "Module"}
+    assert mm.ecore.eAllClasses.any?{|c| c.name == "File"}
+  end
+
+  def test_metamodel_loaded
+    builder = Concrete::IndexBuilder.new(RGen::ECore)
+    mm = builder.indexMetamodel
+    assert mm.is_a?(Module)
+    assert mm::IndexElement.is_a?(Class)
+  end
+
+  def test_build_index
+    builder = Concrete::IndexBuilder.new(RGen::ECore)
+    index = builder.buildIndex(RGen::ECore.ecore)
+    File.open(TestDir+"/ecore_index.js", "w") do |f|
+      ser = RGen::Serializer::JsonSerializer.new(f)
+      ser.serialize(index)        
+    end
+    assert_equal File.read(TestDir+"/ecore_index_expected.js").strip, File.read(TestDir+"/ecore_index.js").strip
+  end
+
+end

data/test/index_builder_test/ecore_index.js

@@ -0,0 +1,85 @@
+{ "_class": "EPackage", "name": "ECore", "elements": [ 
+  { "_class": "EClass", "name": "EModelElement", "elements": [ 
+    { "_class": "EReference", "name": "eAnnotations" }] },
+  { "_class": "EClass", "name": "EReference", "elements": [ 
+    { "_class": "EAttribute", "name": "container" },
+    { "_class": "EAttribute", "name": "containment" },
+    { "_class": "EAttribute", "name": "resolveProxies" },
+    { "_class": "EReference", "name": "eOpposite" },
+    { "_class": "EReference", "name": "eReferenceType" }] },
+  { "_class": "EClass", "name": "ETypedElement", "elements": [ 
+    { "_class": "EAttribute", "name": "lowerBound" },
+    { "_class": "EAttribute", "name": "ordered" },
+    { "_class": "EAttribute", "name": "unique" },
+    { "_class": "EAttribute", "name": "upperBound" },
+    { "_class": "EAttribute", "name": "many" },
+    { "_class": "EAttribute", "name": "required" },
+    { "_class": "EReference", "name": "eType" }] },
+  { "_class": "EClass", "name": "EAttribute", "elements": [ 
+    { "_class": "EAttribute", "name": "iD" },
+    { "_class": "EReference", "name": "eAttributeType" }] },
+  { "_class": "EClass", "name": "EFactory", "elements": [ 
+    { "_class": "EReference", "name": "ePackage" }] },
+  { "_class": "EClass", "name": "EObject" },
+  { "_class": "EClass", "name": "EStructuralFeature", "elements": [ 
+    { "_class": "EAttribute", "name": "changeable" },
+    { "_class": "EAttribute", "name": "defaultValue" },
+    { "_class": "EAttribute", "name": "defaultValueLiteral" },
+    { "_class": "EAttribute", "name": "derived" },
+    { "_class": "EAttribute", "name": "transient" },
+    { "_class": "EAttribute", "name": "unsettable" },
+    { "_class": "EAttribute", "name": "volatile" },
+    { "_class": "EReference", "name": "eContainingClass" }] },
+  { "_class": "EClass", "name": "EStringToStringMapEntry", "elements": [ 
+    { "_class": "EAttribute", "name": "key" },
+    { "_class": "EAttribute", "name": "value" }] },
+  { "_class": "EClass", "name": "ENamedElement", "elements": [ 
+    { "_class": "EAttribute", "name": "name" }] },
+  { "_class": "EClass", "name": "EEnumLiteral", "elements": [ 
+    { "_class": "EAttribute", "name": "literal" },
+    { "_class": "EAttribute", "name": "value" },
+    { "_class": "EReference", "name": "eEnum" }] },
+  { "_class": "EClass", "name": "EPackage", "elements": [ 
+    { "_class": "EAttribute", "name": "nsPrefix" },
+    { "_class": "EAttribute", "name": "nsURI" },
+    { "_class": "EReference", "name": "eClassifiers" },
+    { "_class": "EReference", "name": "eSubpackages" },
+    { "_class": "EReference", "name": "eSuperPackage" },
+    { "_class": "EReference", "name": "eFactoryInstance" }] },
+  { "_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" }] }] }

data/test/index_builder_test/ecore_index_expected.js

@@ -0,0 +1,85 @@
+{ "_class": "EPackage", "name": "ECore", "elements": [ 
+  { "_class": "EClass", "name": "EModelElement", "elements": [ 
+    { "_class": "EReference", "name": "eAnnotations" }] },
+  { "_class": "EClass", "name": "EReference", "elements": [ 
+    { "_class": "EAttribute", "name": "container" },
+    { "_class": "EAttribute", "name": "containment" },
+    { "_class": "EAttribute", "name": "resolveProxies" },
+    { "_class": "EReference", "name": "eOpposite" },
+    { "_class": "EReference", "name": "eReferenceType" }] },
+  { "_class": "EClass", "name": "ETypedElement", "elements": [ 
+    { "_class": "EAttribute", "name": "lowerBound" },
+    { "_class": "EAttribute", "name": "ordered" },
+    { "_class": "EAttribute", "name": "unique" },
+    { "_class": "EAttribute", "name": "upperBound" },
+    { "_class": "EAttribute", "name": "many" },
+    { "_class": "EAttribute", "name": "required" },
+    { "_class": "EReference", "name": "eType" }] },
+  { "_class": "EClass", "name": "EAttribute", "elements": [ 
+    { "_class": "EAttribute", "name": "iD" },
+    { "_class": "EReference", "name": "eAttributeType" }] },
+  { "_class": "EClass", "name": "EFactory", "elements": [ 
+    { "_class": "EReference", "name": "ePackage" }] },
+  { "_class": "EClass", "name": "EObject" },
+  { "_class": "EClass", "name": "EStructuralFeature", "elements": [ 
+    { "_class": "EAttribute", "name": "changeable" },
+    { "_class": "EAttribute", "name": "defaultValue" },
+    { "_class": "EAttribute", "name": "defaultValueLiteral" },
+    { "_class": "EAttribute", "name": "derived" },
+    { "_class": "EAttribute", "name": "transient" },
+    { "_class": "EAttribute", "name": "unsettable" },
+    { "_class": "EAttribute", "name": "volatile" },
+    { "_class": "EReference", "name": "eContainingClass" }] },
+  { "_class": "EClass", "name": "EStringToStringMapEntry", "elements": [ 
+    { "_class": "EAttribute", "name": "key" },
+    { "_class": "EAttribute", "name": "value" }] },
+  { "_class": "EClass", "name": "ENamedElement", "elements": [ 
+    { "_class": "EAttribute", "name": "name" }] },
+  { "_class": "EClass", "name": "EEnumLiteral", "elements": [ 
+    { "_class": "EAttribute", "name": "literal" },
+    { "_class": "EAttribute", "name": "value" },
+    { "_class": "EReference", "name": "eEnum" }] },
+  { "_class": "EClass", "name": "EPackage", "elements": [ 
+    { "_class": "EAttribute", "name": "nsPrefix" },
+    { "_class": "EAttribute", "name": "nsURI" },
+    { "_class": "EReference", "name": "eClassifiers" },
+    { "_class": "EReference", "name": "eSubpackages" },
+    { "_class": "EReference", "name": "eSuperPackage" },
+    { "_class": "EReference", "name": "eFactoryInstance" }] },
+  { "_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" }] }] }

data/test/integration/external_elements_test.html

@@ -0,0 +1,114 @@
+<html>
+	<head>
+		<link rel="stylesheet" href="../../example/themes/cobalt.css" type="text/css" />		
+		<link rel="stylesheet" href="../../example/metamodel_editor/style.css" type="text/css" />
+		<script src="../../redist/prototype.js" type="text/javascript"></script>
+		<script src="../../redist/scriptaculous/scriptaculous.js" type="text/javascript"></script>
+		<script src="../../concrete/concrete.js" type="text/javascript"></script>
+	</head>
+	<body>
+
+    <div id="templates1" style="display: none">	
+    </div>
+
+    <div id="templates2" style="display: none">	
+    </div>
+
+		<div id="metamodel" style="display: none">
+[{"_class": "Datatype", "name": "String"}, 
+{"_class": "Class", "name": "PackageableElement", "abstract": true, "features": 
+  {"_class": "Feature", "name": "name", "kind": "attribute", "type": "String"}}, 
+{"_class": "Class", "name": "Package", "superTypes": "PackageableElement", "features": 
+  {"_class": "Feature", "name": "elements", "kind": "containment", "type": "PackageableElement"}}, 
+{"_class": "Class", "name": "Class", "superTypes": "PackageableElement", "features": 
+  {"_class": "Feature", "name": "references", "kind": "containment", "type": "Reference"}}, 
+{"_class": "Class", "name": "Reference", "features": [
+  {"_class": "Feature", "name": "role", "kind": "attribute", "lowerLimit": 1, "upperLimit": 1, "type": "String"}, 
+  {"_class": "Feature", "name": "target", "kind": "reference", "lowerLimit": 1, "upperLimit": 1, "type": "Class"}]}]
+   </div>
+
+		<div id="index_metamodel" style="display: none">
+[{"_class": "Datatype", "name": "String"}, 
+{"_class": "Class", "name": "IndexElement", "abstract": true, "features": [
+  {"_class": "Feature", "name": "name", "kind": "attribute", "type": "String"}, 
+  {"_class": "Feature", "name": "elements", "kind": "containment", "type": "IndexElement"}]}, 
+{"_class": "Class", "name": "Module", "superTypes": "IndexElement"}, 
+{"_class": "Class", "name": "Package", "superTypes": "IndexElement"}, 
+{"_class": "Class", "name": "Class", "superTypes": "IndexElement"}]
+    </div>
+
+    <div id="example_index_model" style="display: none">
+[{"_class": "Module", "name": "Module1", "elements": [
+  {"_class": "Package", "name": "ExtP1", "elements": [
+    {"_class": "Class", "name": "A"}, 
+    {"_class": "Class", "name": "B", "elements": [
+      {"_class": "Class", "name": "B1"}, 
+      {"_class": "Class", "name": "B2"}]}]}, 
+  {"_class": "Package", "name": "ExtP2", "elements": 
+    {"_class": "Package", "name": "ExtP21", "elements": [
+      {"_class": "Class", "name": "C", "elements": [
+        {"_class": "Class", "name": "C1"}, 
+        {"_class": "Class", "name": "C2"}]}, 
+      {"_class": "Class", "name": "D"}]}}]}, 
+{"_class": "Module", "name": "Module2", "elements": 
+  {"_class": "Package", "name": "ExtP3", "elements": 
+    {"_class": "Class", "name": "E"}}}]
+    </div>
+
+    <div class="ct_editor" id="index_view" style="position: absolute; width: 200px">
+    </div>
+
+    <div id="main" style="margin-left: 250px"> 
+      <div class="ct_editor" id="editor"> 
+      </div>
+      <br/>
+      <textarea id="clipboard1" style="background-color: white; color: black; border: 1px solid grey" cols="80" rows="10" wrap="off"></textarea>
+    </div>
+
+		<script type="text/javascript" language="javascript" charset="utf-8">
+			// <![CDATA[
+        function createEditor(cb, eip, mp) {
+          var tp = new Concrete.TemplateProvider($("templates1"), {identifierAttribute: "name"});
+          var ip = new Concrete.QualifiedNameBasedIdentifierProvider({nameAttribute: "name"});
+          var ed = new Concrete.Editor($("editor"), tp, mp, ip, 
+            {clipboard: cb, 
+             externalIdentifierProvider: eip, 
+             onFollowExternalReference: function(module, ident) { alert("Would open "+ident+" in "+module); },
+             rootClasses: mp.metaclasses.select(function(c) {return c.name == "Package"})});
+          return ed;
+        }
+        
+        function createIndexView(cb) {
+          var tp = new Concrete.TemplateProvider($("templates2"), {identifierAttribute: "name"});
+          var mp = new Concrete.MetamodelProvider($("index_metamodel").textContent.evalJSON());
+          var ip = new Concrete.QualifiedNameBasedIdentifierProvider({nameAttribute: "name"});
+          var ed = new Concrete.Editor($("index_view"), tp, mp, ip, 
+            {clipboard: cb, readOnlyMode: true});
+          return ed;
+        }
+
+        var mp = new Concrete.MetamodelProvider($("metamodel").textContent.evalJSON());
+        var cb = new Concrete.Clipboard($("clipboard1"));
+        var index = $("example_index_model").textContent.evalJSON();
+        var eip = new Concrete.IndexBasedExternalIdentifierProvider(index, mp);
+        var editor = createEditor(cb, eip, mp);
+        var indexView = createIndexView(cb);
+        indexView.setModel($("example_index_model").textContent);
+					
+				Event.observe(window, 'click', function(event) {
+					editor.handleEvent(event);
+					indexView.handleEvent(event);
+				});
+				Event.observe(window, 'keydown', function(event) {
+					editor.handleEvent(event);
+					indexView.handleEvent(event);
+				});
+				Event.observe(window, 'mousemove', function(event) {
+					editor.handleEvent(event);
+					indexView.handleEvent(event);
+				});
+			// ]]>
+		</script>
+	</body>
+</html>
+