I can also get concept by name

tests/core/test_SheerkaCreateNewConcept.py

@@ -1,5 +1,5 @@
 from core.builtin_concepts import BuiltinConcepts
-from core.concept import PROPERTIES_TO_SERIALIZE, Concept
+from core.concept import PROPERTIES_TO_SERIALIZE, Concept, DEFINITION_TYPE_DEF
 from core.sheerka.Sheerka import Sheerka
 from sdp.sheerkaDataProvider import SheerkaDataProvider
 
@@ -25,10 +25,38 @@ class TestSheerkaCreateNewConcept(TestUsingMemoryBasedSheerka):
 
         assert concept.key in sheerka.cache_by_key
         assert concept.id in sheerka.cache_by_id
+        assert concept.name in sheerka.cache_by_name
         assert sheerka.sdp.io.exists(
             sheerka.sdp.io.get_obj_path(SheerkaDataProvider.ObjectsFolder, concept_found.get_origin()))
         assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_HASH_ENTRY, concept.get_definition_hash())
         assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_ID_ENTRY, concept.id)
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_NAME_ENTRY, concept.name)
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_ENTRY, concept.key)
+
+    def test_i_can_add_a_concept_when_name_differs_from_the_key(self):
+        sheerka = self.get_sheerka()
+        concept = Concept("greetings", definition="hello a", definition_type=DEFINITION_TYPE_DEF).def_prop("a")
+
+        res = sheerka.create_new_concept(self.get_context(sheerka), concept)
+
+        assert res.status
+        assert sheerka.isinstance(res.value, BuiltinConcepts.NEW_CONCEPT)
+
+        concept_found = res.value.body
+        for prop in PROPERTIES_TO_SERIALIZE:
+            assert getattr(concept_found.metadata, prop) == getattr(concept.metadata, prop)
+
+        assert concept_found.key == "hello __var__0"
+        assert concept_found.id == "1001"
+
+        assert concept.key in sheerka.cache_by_key
+        assert concept.id in sheerka.cache_by_id
+        assert concept.name in sheerka.cache_by_name
+        assert sheerka.sdp.io.exists(
+            sheerka.sdp.io.get_obj_path(SheerkaDataProvider.ObjectsFolder, concept_found.get_origin()))
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_HASH_ENTRY, concept.get_definition_hash())
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_ID_ENTRY, concept.id)
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_NAME_ENTRY, concept.name)
         assert sheerka.sdp.exists(Sheerka.CONCEPTS_ENTRY, concept.key)
 
     def test_i_cannot_add_the_same_concept_twice(self):
@@ -200,3 +228,4 @@ class TestSheerkaCreateNewConcept(TestUsingMemoryBasedSheerka):
 
         assert res.status
 
+

tests/core/test_SheerkaModifyConcept.py

@@ -11,9 +11,9 @@ class TestSheerkaModifyConcept(TestUsingMemoryBasedSheerka):
         sheerka, context, foo, bar = self.init_concepts("foo", "bar", create_new=True)
 
         foo_instance = sheerka.new("foo")
-        foo_instance.metadata.body = "value"
-        foo_instance.set_prop(BuiltinConcepts.ISA, bar)
-        foo_instance.set_metadata_value(ConceptParts.BODY, "body value")
+        foo_instance.metadata.body = "value"  # modify metadata
+        foo_instance.set_prop(BuiltinConcepts.ISA, bar)  # modify property
+        foo_instance.set_metadata_value(ConceptParts.BODY, "body value")  # modify value
         res = sheerka.modify_concept(context, foo_instance)
 
         assert res.status
@@ -36,6 +36,13 @@ class TestSheerkaModifyConcept(TestUsingMemoryBasedSheerka):
         assert foo_from_sheerka.get_prop(BuiltinConcepts.ISA) == bar
         assert foo_from_sheerka.body == "body value"
 
+        # test that ref by name is updated
+        sheerka.reset_cache()
+        foo_from_sheerka = sheerka.get_by_name(foo.name)
+        assert foo_from_sheerka.metadata.body == "value"
+        assert foo_from_sheerka.get_prop(BuiltinConcepts.ISA) == bar
+        assert foo_from_sheerka.body == "body value"
+
         # test that ref by hash is updated
         foo_from_sdp = sheerka.sdp.get(Sheerka.CONCEPTS_BY_HASH_ENTRY, foo_instance.get_definition_hash())
         assert foo_from_sdp.metadata.body == "value"

tests/core/test_concept.py

@@ -1,6 +1,6 @@
 import pytest
 
-from core.concept import Concept, ConceptParts
+from core.concept import Concept, ConceptParts, DEFINITION_TYPE_DEF
 
 
 @pytest.mark.parametrize("name, properties, expected", [
@@ -29,6 +29,25 @@ def test_i_can_compute_the_key(name, properties, expected):
     assert concept.key == expected
 
 
+def test_i_can_compute_the_key_when_from_definition():
+
+    # if definition is not defined, use the name
+    concept = Concept()
+    concept.metadata.name = "hello a"
+    concept.metadata.props = [("a", None)]
+    concept.init_key()
+    assert concept.key == "hello __var__0"
+
+    # if definition is defined, use it
+    concept = Concept()
+    concept.metadata.name = "greetings"
+    concept.metadata.definition = "hello a"
+    concept.metadata.definition_type = DEFINITION_TYPE_DEF
+    concept.metadata.props = [("a", None)]
+    concept.init_key()
+    assert concept.key == "hello __var__0"
+
+
 def test_key_does_not_use_variable_when_definition_is_set():
     concept = Concept("plus").def_prop('plus')