expressir 0.2.9-x64-mingw32 → 0.2.10-x64-mingw32

data/spec/expressir/express_exp/source_spec.rb

@@ -1,15 +1,12 @@
 require "spec_helper"
 require "expressir/express_exp/parser"
 
-RSpec.describe Expressir::Model::Scope do
+RSpec.describe Expressir::ExpressExp::Parser do
   describe ".source" do
     it "contains original source" do
       input = File.read(sample_file)
       repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
 
-      expected_result = input
-      expect(repo.source).to eq(expected_result)
-
       schema = repo.schemas.first
       start_index = input.index("SCHEMA")
       stop_index = input.index("END_SCHEMA;") + "END_SCHEMA;".length - 1

data/spec/expressir/model/model_element_spec.rb

@@ -0,0 +1,59 @@
+require "spec_helper"
+require "expressir/express_exp/parser"
+
+RSpec.describe Expressir::Model::ModelElement do
+  describe ".from_hash" do
+    it "parses an object from hash" do
+      input = {
+        "_class" => "Expressir::Model::Repository",
+        "schemas" => [{
+          "_class" => "Expressir::Model::Schema",
+          "id" => "simple_schema",
+          "entities" => [{
+            "_class" => "Expressir::Model::Entity",
+            "id" => "empty_entity"
+          }]
+        }]
+      }
+
+      repo = Expressir::Model::ModelElement.from_hash(input)
+
+      expect(repo).to be_instance_of(Expressir::Model::Repository)
+      expect(repo.schemas).to be_instance_of(Array)
+      expect(repo.schemas.count).to eq(1)
+      expect(repo.schemas[0]).to be_instance_of(Expressir::Model::Schema)
+      expect(repo.schemas[0].id).to eq("simple_schema")
+      expect(repo.schemas[0].entities).to be_instance_of(Array)
+      expect(repo.schemas[0].entities.count).to eq(1)
+      expect(repo.schemas[0].entities[0]).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.schemas[0].entities[0].id).to eq("empty_entity")
+    end
+  end
+
+  describe ".to_hash" do
+    it "exports an object to hash" do
+      repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
+
+      result = repo.to_hash
+      
+      expect(result).to be_instance_of(Hash)
+      expect(result["_class"]).to eq("Expressir::Model::Repository")
+      expect(result["schemas"]).to be_instance_of(Array)
+      expect(result["schemas"].count).to eq(1)
+      expect(result["schemas"][0]).to be_instance_of(Hash)
+      expect(result["schemas"][0]["_class"]).to eq("Expressir::Model::Schema")
+      expect(result["schemas"][0]["id"]).to eq("simple_schema")
+      expect(result["schemas"][0]["entities"]).to be_instance_of(Array)
+      expect(result["schemas"][0]["entities"].count).to eq(1)
+      expect(result["schemas"][0]["entities"][0]).to be_instance_of(Hash)
+      expect(result["schemas"][0]["entities"][0]["_class"]).to eq("Expressir::Model::Entity")
+      expect(result["schemas"][0]["entities"][0]["id"]).to eq("empty_entity")
+    end
+  end
+
+  def sample_file
+    @sample_file ||= Expressir.root_path.join(
+      "original", "examples", "syntax", "simple.exp"
+    )
+  end
+end

data/spec/expressir/model/{find_spec.rb → scope_spec.rb}

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "expressir/express_exp/parser"
 
-RSpec.describe Expressir::Model do
+RSpec.describe Expressir::Model::Scope do
   describe ".find" do
     it "finds an object" do
       repo = Expressir::ExpressExp::Parser.from_exp(sample_file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: x64-mingw32
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -230,6 +230,7 @@ files:
 - lib/expressir/model/literals/logical.rb
 - lib/expressir/model/literals/real.rb
 - lib/expressir/model/literals/string.rb
+- lib/expressir/model/model_element.rb
 - lib/expressir/model/parameter.rb
 - lib/expressir/model/procedure.rb
 - lib/expressir/model/renamed_ref.rb
@@ -304,6 +305,7 @@ files:
 - original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.xml
 - original/examples/syntax/remark.exp
 - original/examples/syntax/remark_formatted.exp
+- original/examples/syntax/simple.exp
 - original/examples/syntax/source.exp
 - original/examples/syntax/syntax.exp
 - original/examples/syntax/syntax_formatted.exp
@@ -326,7 +328,8 @@ files:
 - spec/expressir/express_exp/parse_remark_spec.rb
 - spec/expressir/express_exp/parse_syntax_spec.rb
 - spec/expressir/express_exp/source_spec.rb
-- spec/expressir/model/find_spec.rb
+- spec/expressir/model/model_element_spec.rb
+- spec/expressir/model/scope_spec.rb
 - spec/expressr_spec.rb
 - spec/spec_helper.rb
 - spec/support/console_helper.rb