agreement-design-prototype 0.0.3 → 0.0.4

data/test/data_model_test.rb

@@ -1,85 +1,61 @@
 require 'test/unit'
 require_relative '../src/data_model'
 include DataModel
-
-DataModel::domain :TestMetamodel do
-
-  datatype :BasicType do
-    attribute :id, String
-  end
-
-  datatype :Table, description: "Test type" do
-    MULT = [0..10]
-    DESC = "table of values"
-    attribute :vals, Integer,
-              multiplicity: MULT,
-              :description => DESC
-    attribute :morevals, String, 2..5, "array of strings"
-  end
-
-  datatype :ReferencingType do
-    attribute :id, String
-    attribute :mate, TestMetamodel::BasicType
-  end
-
-  datatype :DerivedType, extends: TestMetamodel::ReferencingType do
-    attribute :more, String
-  end
-
-  datatype :DerivedTypeNamingClass, extends: TestMetamodel::ReferencingType do
-    attribute :othermore, String
-  end
-
-  datatype :Empty do
-
-  end
-
-end
+require 'test_model'
 
 class DataModelTest < Test::Unit::TestCase
-
-
+  
   def test_metamodel
-    assert(contains(TestMetamodel::BasicType, :id), 'has id attribute')
-    id_t = TestMetamodel::BasicType.attributes[:id]
-    assert_equal(1..1, TestMetamodel::BasicType.attributes[:id][:multiplicity], "has default multiplicity")
+    assert(contains(TestModel::BasicType, :id), 'has id attribute')
+    id_t = TestModel::BasicType.attributes[:id]
+    assert_equal(1..1, TestModel::BasicType.attributes[:id][:multiplicity], "has default multiplicity")
     assert(id_t[:type] == String)
 
-    assert_equal(MULT, TestMetamodel::Table.attributes[:vals][:multiplicity]);
-    assert_equal(2..5, TestMetamodel::Table.attributes[:morevals][:multiplicity]);
-    assert_equal("Test type", TestMetamodel::Table.description);
+    assert_equal(MULT, TestModel::Table.attributes[:vals][:multiplicity]);
+    assert_equal(2..5, TestModel::Table.attributes[:morevals][:multiplicity]);
+    assert_equal("Test type", TestModel::Table.description);
 
-    assert_equal(MULT, TestMetamodel::Table.attributes[:vals][:multiplicity], "has multiplicity")
-    assert_equal(DESC, TestMetamodel::Table.attributes[:vals][:description], "has description")
+    assert_equal(MULT, TestModel::Table.attributes[:vals][:multiplicity], "has multiplicity")
+    assert_equal(DESC, TestModel::Table.attributes[:vals][:description], "has description")
 
-    mate_t = TestMetamodel::ReferencingType.attributes[:mate]
-    assert(mate_t[:type] == TestMetamodel::BasicType)
+    mate_t = TestModel::ReferencingType.attributes[:mate]
+    assert(mate_t[:type] == TestModel::BasicType)
 
-    assert(contains(TestMetamodel::DerivedType, :more), "has derived attribute")
-    assert(contains(TestMetamodel::DerivedType, :mate), "has derived attribute")
-    assert(contains(TestMetamodel::DerivedType, :id), "has derived attribute")
-    assert(contains(TestMetamodel::DerivedTypeNamingClass, :othermore), "has derived attribute")
-    assert(contains(TestMetamodel::DerivedTypeNamingClass, :id), "has derived attribute")
+    assert(contains(TestModel::DerivedType, :more), "has derived attribute")
+    assert(contains(TestModel::DerivedType, :mate), "has derived attribute")
+    assert(contains(TestModel::DerivedType, :id), "has derived attribute")
   end
 
-  TestMetamodel.new :Test_Model do
-    table do
-      vals 1
-      vals 2
-    end
-    referencingtype do
-      id :owner
-      mate do
-        id :content
+
+  def test_model
+    assert_equal(1, TestModel::TESTMODEL.contents[:table][0].attributes[:vals][0], "has vals")
+    assert_equal(2, TestModel::TESTMODEL.contents[:table][0].attributes[:vals][1], "has vals")
+    assert_equal(:content, TestModel::TESTMODEL.contents[:referencingtype][0].attributes[:mate].attributes[:id], "has vals")
+    assert_equal(:content, TestModel::TESTMODEL.contents[:referencingtype][0].mate.id, "has vals")
+
+    TestModel.new :T2 do
+      table do
+        for i in 7..9
+          vals i
+        end
       end
     end
+
+    assert_equal(7, TestModel::T2.table[0].vals[0], "block iterate")
+    assert_equal(8, TestModel::T2.table[0].vals[1], "block iterate")
+
   end
 
-  def test_model
-    assert_equal(1, TestMetamodel::Test_Model.contents[:table][0].attributes[:vals][0], "has vals")
-    assert_equal(2, TestMetamodel::Test_Model.contents[:table][0].attributes[:vals][1], "has vals")
-    assert_equal(:content, TestMetamodel::Test_Model.contents[:referencingtype][0].attributes[:mate].attributes[:id], "has vals")
-    assert_equal(:content, TestMetamodel::Test_Model.contents[:referencingtype][0].mate.id, "has vals")
+
+  def test_kinds
+    assert_equal(:Framework, TestModel::TESTMODEL.kindly[0].kind, "kinds")
+
+    # TODO: assertion on strings that aren't in the selection list
+    # assert_raise() do
+    #   TestModel.new :T3 do
+    #     kindly {kind :KindNotValid}
+    #   end
+    # end
   end
 
   private
@@ -88,4 +64,6 @@ class DataModelTest < Test::Unit::TestCase
     type.attributes.keys.one? {|k| k == attr}
   end
 
+
+
 end

data/test/data_test.rb

@@ -0,0 +1,26 @@
+require 'test/unit'
+require_relative '../src/data'
+require_relative 'test_model'
+include DataModel
+
+class DataTest < Test::Unit::TestCase
+
+  # Called before every test method runs. Can be used
+  # to set up fixture information.
+  PATH = "out/test/"
+  NAME = "datatest"
+
+  def setup
+    @d = DataFile.new(PATH, NAME)
+    if File.file?(@d.filepath)
+      File.delete(@d.filepath)
+    end
+  end
+
+  def test_dot
+    assert_equal("#{PATH}data/#{NAME}.json", @d.filepath, "file name")
+    assert(!File.file?(@d.filepath), "no dotfile")
+    @d.output( TestModel::TESTMODEL)
+    assert(File.file?(@d.filepath), "file created")
+  end
+end

data/test/diagram_test.rb

@@ -1,9 +1,8 @@
 require 'test/unit'
 require_relative '../src/diagram'
-require_relative '../model/agreement'
+require_relative 'test_model'
 include DataModel
 
-
 class DiagramTest < Test::Unit::TestCase
 
   # Called before every test method runs. Can be used
@@ -25,10 +24,8 @@ class DiagramTest < Test::Unit::TestCase
     assert_equal("out/test/diagrams/d.dot", @d.dotfile, "file format")
     assert_equal("out/test/images/d.jpg", @d.jpgfile, "file format")
     assert(!File.file?(@d.dotfile), "no dotfile")
-    @d.describe( Category)
+    @d.describe( TestModel)
     assert(File.file?(@d.dotfile), "file created")
     assert(File.file?(@d.jpgfile), "file created")
-    # TODO test the features in the diagram
-    @d.describe( Category, Parties)
   end
 end

data/test/doc_test.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require_relative '../src/doc'
-require_relative '../model/fm'
+require_relative 'test_model'
 include DataModel
 
 class DocTest < Test::Unit::TestCase
@@ -9,19 +9,25 @@ class DocTest < Test::Unit::TestCase
   # to set up fixture information.
   PATH = "out/test/"
   NAME = "doctest"
+  META = "modeldoctest"
 
   def setup
-    @d = Doc.new(PATH, NAME)
-    if File.file?(@d.docfile)
-      File.delete(@d.docfile)
+    @d = Document.new(PATH, NAME)
+    if File.file?(@d.filepath)
+      File.delete(@d.filepath)
+    end
+    @m = Document.new(PATH, META)
+    if File.file?(@d.filepath)
+      File.delete(@d.filepath)
     end
   end
 
-
   def test_dot
-    assert_equal("#{PATH}doc/#{NAME}.md", @d.docfile, "file name")
-    assert(!File.file?(@d.docfile), "no dotfile")
-    @d.document( Category::FM)
-    assert(File.file?(@d.docfile), "file created")
+    assert_equal("#{PATH}doc/#{NAME}.md", @d.filepath, "file name")
+    assert(!File.file?(@d.filepath), "no dotfile")
+    @d.document( TestModel::TESTMODEL)
+    assert(File.file?(@d.filepath), "file created")
+    @m.document_metamodel( TestModel)
+    assert(File.file?(@m.filepath), "file created")
   end
 end

data/test/test_model.rb

@@ -0,0 +1,88 @@
+require_relative '../src/data_model'
+include DataModel
+
+domain :TestModel do
+
+  datatype(:ArrayParam,
+           description: "Thing") {
+    attribute :thingname, String
+  }
+
+  datatype :Table, description: "Test type" do
+    MULT = 0..10
+    DESC = "table of values"
+    attribute :vals, Integer,
+              multiplicity: MULT,
+              :description => DESC
+    attribute :morevals, String, 2..5, "array of strings"
+  end
+
+  datatype :BasicType do
+    attribute :id, String
+  end
+
+  datatype :Kindly do
+    attribute :kind, Selection( :Framework, :Lot, :Contract), "semantic version id of the form X.Y.Z"
+  end
+
+  datatype :ReferencingType do
+    attribute :id, String
+    attribute :mate, TestModel::BasicType
+  end
+
+  datatype(:ComplexType,
+           description: "Thing with things") {
+    attribute :string, String
+    attribute :things, TestModel::ArrayParam, ZERO_TO_MANY
+    attribute :thing_id, String, ZERO_TO_MANY, links: TestModel::ArrayParam
+    attribute :strings, String, ZERO_TO_MANY
+    attribute :mustbeafter, Date
+  }
+
+  datatype(:AnotherType,
+           description: "Thing with things") {
+    attribute :string, String
+  }
+
+  datatype :DerivedType, extends: TestModel::ReferencingType do
+    attribute :more, String
+  end
+
+  datatype :Empty do
+  end
+
+end
+
+TestModel.new :TESTMODEL do
+
+  complextype do
+    string "ID1"
+    things do
+      thingname "thing1"
+    end
+    things do
+      thingname "thing2"
+    end
+  end
+
+  anothertype do
+    string "Anotherthing"
+  end
+
+  table do
+    vals 1
+    vals 2
+  end
+
+  referencingtype do
+    id :owner
+    mate do
+      id :content
+    end
+  end
+
+  kindly do
+    kind :Framework
+  end
+
+end

data/test/transform_test.rb

@@ -0,0 +1,83 @@
+require 'test/unit'
+require_relative '../src/doc'
+require_relative 'test_model'
+include DataModel
+
+class TransformTest < Test::Unit::TestCase
+
+  def test_model
+    the_model = TestModel::TESTMODEL
+    transform_datamodel(
+        {
+            before_model: lambda do |model:|
+              assert_equal(model, the_model)
+            end,
+            before_group: lambda do |name:, depth: 0|
+              puts "before group #{name}, #{depth}"
+              assert(name = "framework" || name = "lot")
+              return :group_context
+            end,
+            after_group: lambda do |name:, depth:, before:|
+              puts "after group #{name}, #{depth}"
+              assert(before == :group_context)
+            end,
+            before_type: lambda do |type:, depth:, index:, total:|
+              puts "before type  #{type}, #{depth}"
+              assert(type.class < DataType)
+              return :type_context
+            end,
+            after_type: lambda do |type:, depth:, before:|
+              puts "after type  #{type}, #{depth}"
+              assert(before == :type_context)
+            end,
+            before_array: lambda do |name:, decl:, depth:, total:|
+              puts "before array #{name}, #{decl}, #{depth}"
+              assert(decl.class <= Array)
+              return :array_context
+            end,
+            after_array: lambda do |index:, decl:, depth:, before:|
+              puts "after array #{index}, #{decl}, #{depth}, #{before}"
+              assert(before == :array_context)
+            end,
+            attribute: lambda do |id:, val:, depth: 0, type: 0, index:, total:|
+              puts "attribute #{id}, #{val}, #{depth}, #{type}"
+            end,
+        },
+        the_model)
+  end
+
+  def test_metamodel
+    the_model = TestModel
+    transform_metamodel(
+        {
+            before_model: lambda do |model:|
+              assert_equal(model, the_model)
+            end,
+            before_group: lambda do |name:, depth:|
+              assert(false, "shouldn't be called")
+            end,
+            after_group: lambda do |name:, depth:, before:|
+              assert(false, "shouldn't be called")
+            end,
+            before_type: lambda do |type:, depth:, index:, total:|
+              puts "before type #{type}, #{depth}"
+              assert(type <= DataType)
+              return :type_context
+            end,
+            after_type: lambda do |type:, depth:, before: nil|
+              puts "after type #{type}, #{depth}"
+              assert(before == :type_context)
+            end,
+            before_array: lambda do |index:, decl:, depth:|
+              assert(false, "shouldn't be called")
+            end,
+            after_array: lambda do |index:, decl:, depth:, before:|
+              assert(false, "shouldn't be called")
+            end,
+            attribute: lambda do |id:, val:, depth:, type:, index:, total:|
+              puts "attribute #{id}, #{val}, #{depth}, #{type}"
+            end,
+        },
+        the_model)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agreement-design-prototype
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - CCS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -35,22 +35,35 @@ files:
 - "./Rakefile"
 - "./agreement-design.gemspec"
 - "./build/build_models.rb"
-- "./gen/diagrams/data_model.dot"
-- "./gen/doc/frameworks.md"
+- "./gen/data/data.json"
+- "./gen/data/data.yaml"
+- "./gen/data/fm_agreements.jsonlines"
+- "./gen/data/fm_catalogue.jsonlines"
+- "./gen/diagrams/metamodel.dot"
+- "./gen/doc/data.md"
 - "./gen/doc/metamodel.md"
-- "./gen/images/data_model.jpg"
+- "./gen/images/metamodel.jpg"
 - "./model/agreement.rb"
 - "./model/fm.rb"
+- "./model/geographic.rb"
 - "./model/party.rb"
+- "./out/test/data/datatest.json"
 - "./out/test/diagrams/d.dot"
 - "./out/test/doc/doctest.md"
+- "./out/test/doc/modeldoctest.md"
 - "./out/test/images/d.jpg"
+- "./src/api.rb"
+- "./src/data.rb"
 - "./src/data_model.rb"
 - "./src/diagram.rb"
 - "./src/doc.rb"
+- "./src/transform.rb"
 - "./test/data_model_test.rb"
+- "./test/data_test.rb"
 - "./test/diagram_test.rb"
 - "./test/doc_test.rb"
+- "./test/test_model.rb"
+- "./test/transform_test.rb"
 homepage: https://github.com/Crown-Commercial-Service/cmp-design-prototype/agreement-design
 licenses:
 - MIT
@@ -79,4 +92,7 @@ summary: Agreement prototype .
 test_files:
 - "./test/diagram_test.rb"
 - "./test/data_model_test.rb"
+- "./test/data_test.rb"
 - "./test/doc_test.rb"
+- "./test/transform_test.rb"
+- "./test/test_model.rb"