expressir 0.2.27-arm64-darwin → 1.0.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d8f3802280511fdf1ccf27f8fcba3831f715a5c9b36ccb17970032effc61d23
-  data.tar.gz: 62fa1fd2523e69be7b7a0b1e46f183dd1e49cd237fe3a3023deeae433a3a09d7
+  metadata.gz: 203c617ef03b1499b79c52488a5d0cbd7b96ba0f0125002ac60abde5f5df6109
+  data.tar.gz: fd306202ef29053bbaf052acb2e2b97ccc8bb00d45c57886279d251f2e927900
 SHA512:
-  metadata.gz: 927db026109a9481f61ac086e6b40983aaa5f66d5cb399b297dcf9bec0c31edd6c552b28db82f9e53e6f9f0017f1300e568d87b3b324db863d9a11116c03105c
-  data.tar.gz: 32b737367314f50e39d90a8726a0f8ee66091b9b923f7fc4b842831992fef6f3b9bc158565dca4030bdb9f71514e88e85aaad294047da81cb214e91948317dbb
+  metadata.gz: ea5b1fb36a8f26c2962c67be45b97c1fd1e421404c03d6a08dbb9c34a917b08d3f546e5865eade601088137d73f03ab0750941dd80464d96e27d5fa0bc49f677
+  data.tar.gz: 28df92411daf364ee0c2d3c1103043604628174bcc2e4ad7fe215d18b3cc88e2fb8d172654a162fc1c6101e68a46a2353bb8c80207a669e731e0d47a82647633

data/.github/workflows/rake.yml

@@ -42,10 +42,10 @@ jobs:
 
       - uses: actions/cache@v2
         with:
-          path: lib/expressir/express_exp/express_parser.*
-          key: v3-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }}
+          path: lib/expressir/express/express_parser.*
+          key: v4-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }}
 
-      - if: hashFiles('lib/expressir/express_exp/express_parser.*') == ''
+      - if: hashFiles('lib/expressir/express/express_parser.*') == ''
         run: bundle exec rake compile
 
       - run: bundle exec rake

data/.gitignore

@@ -8,8 +8,8 @@
 /tmp/
 /Gemfile.lock
 /.idea
-/lib/expressir/express_exp/express_parser.bundle
-/original/examples/syntax/*-pretty.exp
+/lib/expressir/express/express_parser.bundle
+/spec/syntax/*-pretty.exp
 
 # rspec failure tracking
 .rspec_status

data/demo.rb

@@ -1,18 +1,18 @@
 #!/usr/bin/env ruby
 
 require 'expressir'
-require 'expressir/express_exp/parser'
+require 'expressir/express/parser'
 
 # This file is from:
 # https://github.com/metanorma/annotated-express/blob/master/data/resources/action_schema/action_schema.exp
 file = 'action_schema.exp'
 
-# repo = Expressir::ExpressExp::Parser.from_exp(file)
+# repo = Expressir::Express::Parser.from_exp(file)
 # schema = repo.schemas.find{|schema| schema.id == "support_resource_schema"}
 
-repo = Expressir::ExpressExp::Parser.from_exp(file)
+repo = Expressir::Express::Parser.from_exp(file)
 schema = repo.schemas.find{|schema| schema.id == "action_schema"}
 entity = schema.entities.find{|entity| entity.id == "action_directive_relationship"}
-where = entity.where.find{|where| where.id == "WR1"}
+where_rule = entity.where_rules.find{|where_rule| where_rule.id == "WR1"}
 
-puts where.inspect
+puts where_rule.inspect

data/exe/format

@@ -1,17 +1,17 @@
 #!/usr/bin/env ruby
 
 require "yaml"
-require "expressir/express_exp/parser"
-require "expressir/express_exp/formatter"
-require "expressir/express_exp/schema_head_formatter"
-require "expressir/express_exp/hyperlink_formatter"
+require "expressir/express/parser"
+require "expressir/express/formatter"
+require "expressir/express/schema_head_formatter"
+require "expressir/express/hyperlink_formatter"
 
 exp_files = ARGV
 
-repository = Expressir::ExpressExp::Parser.from_files(exp_files)
-formatter = Class.new(Expressir::ExpressExp::Formatter) do
-  include Expressir::ExpressExp::SchemaHeadFormatter
-  include Expressir::ExpressExp::HyperlinkFormatter
+repository = Expressir::Express::Parser.from_files(exp_files)
+formatter = Class.new(Expressir::Express::Formatter) do
+  include Expressir::Express::SchemaHeadFormatter
+  include Expressir::Express::HyperlinkFormatter
 end
 result = repository.to_hash(formatter: formatter, skip_empty: true)
 

data/exe/format-test

@@ -2,11 +2,11 @@
 
 require "yaml"
 require "tempfile"
-require "expressir/express_exp/parser"
-require "expressir/express_exp/formatter"
-require "expressir/express_exp/schema_head_formatter"
-require "expressir/express_exp/hyperlink_formatter"
-require "expressir/express_exp/cache"
+require "expressir/express/parser"
+require "expressir/express/formatter"
+require "expressir/express/schema_head_formatter"
+require "expressir/express/hyperlink_formatter"
+require "expressir/express/cache"
 
 exp_files = [
   # basic test
@@ -53,17 +53,17 @@ exp_files = [
 ]
 
 start = Time.now
-repository = Expressir::ExpressExp::Parser.from_files(exp_files)
+repository = Expressir::Express::Parser.from_files(exp_files)
 puts "Parser.from_files time:  #{(Time.now - start).round(2)}s"
 
 temp_file = Tempfile.new
 begin
   start = Time.now
-  Expressir::ExpressExp::Cache.to_file(temp_file, repository)
+  Expressir::Express::Cache.to_file(temp_file, repository)
   puts "Cache.to_file time:      #{(Time.now - start).round(2)}s"
 
   start = Time.now
-  repository = Expressir::ExpressExp::Cache.from_file(temp_file)
+  repository = Expressir::Express::Cache.from_file(temp_file)
   puts "Cache.from_file time:    #{(Time.now - start).round(2)}s"
 ensure
   temp_file.close
@@ -71,9 +71,9 @@ ensure
 end
 
 start = Time.now
-formatter = Class.new(Expressir::ExpressExp::Formatter) do
-  include Expressir::ExpressExp::SchemaHeadFormatter
-  include Expressir::ExpressExp::HyperlinkFormatter
+formatter = Class.new(Expressir::Express::Formatter) do
+  include Expressir::Express::SchemaHeadFormatter
+  include Expressir::Express::HyperlinkFormatter
 end
 result = repository.to_hash(formatter: formatter, skip_empty: true)
 puts "Repository.to_hash time: #{(Time.now - start).round(2)}s"

data/expressir.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
 
   spec.extensions = File.join(*%w(ext express-parser extconf.rb))
 
-  spec.add_runtime_dependency "nokogiri", "~> 1.10"
   spec.add_runtime_dependency "thor", "~> 1.0"
   spec.add_runtime_dependency "rice", "~> 3"
   spec.add_development_dependency "antlr4-native", "~> 1.1.0"

data/lib/expressir.rb

@@ -2,7 +2,6 @@ require "expressir/version"
 
 require "expressir/cli"
 require "expressir/config"
-require "expressir/express"
 
 module Expressir
   class Error < StandardError; end

data/lib/expressir/cli.rb

@@ -1,6 +1,5 @@
 require "thor"
 require "expressir/cli/ui"
-require "expressir/express_parser"
 
 module Expressir
   module Cli
@@ -17,11 +16,6 @@ module Expressir
       def version
         Cli.ui.say("Version #{Expressir::VERSION}")
       end
-
-      desc "express-to-owl FILE", "Express to OWL conversion"
-      def express_to_owl(file)
-        Cli.ui.say(ExpressParser.to_owl(file))
-      end
     end
   end
 end

data/lib/expressir/{express_exp → express}/cache.rb

@@ -3,7 +3,7 @@ require 'zlib'
 require 'expressir/model'
 
 module Expressir
-  module ExpressExp
+  module Express
     class Cache
       def self.to_file(file, content, options = {})
         root_path = options[:root_path]
@@ -16,7 +16,7 @@ module Expressir
           content: content
         })
 
-        hash = cache.to_hash(root_path: root_path, skip_empty: true)
+        hash = cache.to_hash(root_path: root_path)
         yaml = YAML.dump(hash)
         yaml_compressed = Zlib::Deflate.deflate(yaml)
 
@@ -35,14 +35,11 @@ module Expressir
         cache = Model::ModelElement.from_hash(hash, root_path: root_path)
 
         if cache.version != version
-          raise CacheLoadError.new("Cache version mismatch, cache version is #{cache.version}, Expressir version is #{version}")
+          raise Error.new("Cache version mismatch, cache version is #{cache.version}, Expressir version is #{version}")
         end
 
         cache.content
       end
     end
-
-    class CacheLoadError < StandardError
-    end
   end
 end

data/lib/expressir/{express_exp → express}/formatter.rb

@@ -1,7 +1,7 @@
 require 'expressir/model'
 
 module Expressir
-  module ExpressExp
+  module Express
     class Formatter
       INDENT_CHAR = ' '
       INDENT_WIDTH = 2
@@ -68,12 +68,12 @@ module Expressir
           format_subtype_constraint(node)
         elsif node.is_a? Model::Type
           format_type(node)
-        elsif node.is_a? Model::Unique
-          format_unique(node)
+        elsif node.is_a? Model::UniqueRule
+          format_unique_rule(node)
         elsif node.is_a? Model::Variable
           format_variable(node)
-        elsif node.is_a? Model::Where
-          format_where(node)
+        elsif node.is_a? Model::WhereRule
+          format_where_rule(node)
         elsif node.is_a? Model::Expressions::AggregateInitializer
           format_expressions_aggregate_initializer(node)
         elsif node.is_a? Model::Expressions::AggregateItem
@@ -316,16 +316,16 @@ module Expressir
               indent(inverse_attributes.map{|x| format(x)}.join("\n")),
             ]
           end,
-          *if node.unique.length > 0
+          *if node.unique_rules.length > 0
             [
               'UNIQUE',
-              indent(node.unique.map{|x| format(x)}.join("\n"))
+              indent(node.unique_rules.map{|x| format(x)}.join("\n"))
             ]
           end,
-          *if node.where.length > 0
+          *if node.where_rules.length > 0
             [
               'WHERE',
-              indent(node.where.map{|x| format(x)}.join("\n")),
+              indent(node.where_rules.map{|x| format(x)}.join("\n")),
             ]
           end,
           [
@@ -576,10 +576,10 @@ module Expressir
           *if node.statements.length > 0
             indent(node.statements.map{|x| format(x)}.join("\n"))
           end,
-          *if node.where.length > 0
+          *if node.where_rules.length > 0
             [
               'WHERE',
-              indent(node.where.map{|x| format(x)}.join("\n"))
+              indent(node.where_rules.map{|x| format(x)}.join("\n"))
             ]
           end,
           [
@@ -720,13 +720,13 @@ module Expressir
             ' ',
             '=',
             ' ',
-            format(node.type),
+            format(node.underlying_type),
             ';',
           ].join(''),
-          *if node.where.length > 0
+          *if node.where_rules.length > 0
             [
               'WHERE',
-              indent(node.where.map{|x| format(x)}.join("\n"))
+              indent(node.where_rules.map{|x| format(x)}.join("\n"))
             ]
           end,
           [
@@ -736,7 +736,7 @@ module Expressir
         ].join("\n")
       end
 
-      def format_unique(node)
+      def format_unique_rule(node)
         [
           *if node.id
             [
@@ -769,7 +769,7 @@ module Expressir
         ].join('')
       end
 
-      def format_where(node)
+      def format_where_rule(node)
         [
           *if node.id
             [
@@ -1299,38 +1299,41 @@ module Expressir
             ].join('')
           end,
           'ENUMERATION',
-          *if node.items.length > 0
-            item_indent = INDENT_CHAR * '('.length
-            [
-              ' ',
-              'OF',
-              "\n",
-              indent([
-                '(',
-                node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
-                ')'
-              ].join(''))
-            ].join('')
-          end,
-          *if node.extension_type
+          *if node.based_on
             [
               ' ',
               'BASED_ON',
               ' ',
-              format(node.extension_type)
+              format(node.based_on),
+              *if node.items.length > 0
+                item_indent = INDENT_CHAR * '('.length
+                [
+                  ' ',
+                  'WITH',
+                  "\n",
+                  indent([
+                    '(',
+                    node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                    ')'
+                  ].join(''))
+                ].join('')
+              end
             ].join('')
-          end,
-          *if node.extension_items.length > 0
-            item_indent = INDENT_CHAR * '('.length
+          else
             [
-              ' ',
-              'WITH',
-              "\n",
-              indent([
-                '(',
-                node.extension_items.map{|x| format(x)}.join(",\n#{item_indent}"),
-                ')'
-              ].join(''))
+              *if node.items.length > 0
+                item_indent = INDENT_CHAR * '('.length
+                [
+                  ' ',
+                  'OF',
+                  "\n",
+                  indent([
+                    '(',
+                    node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                    ')'
+                  ].join(''))
+                ].join('')
+              end
             ].join('')
           end
         ].join('')
@@ -1427,36 +1430,39 @@ module Expressir
             ].join('')
           end,
           'SELECT',
-          *if node.items.length > 0
-            item_indent = INDENT_CHAR * '('.length
-            [
-              "\n",
-              indent([
-                '(',
-                node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
-                ')'
-              ].join(''))
-            ].join('')
-          end,
-          *if node.extension_type
+          *if node.based_on
             [
               ' ',
               'BASED_ON',
               ' ',
-              format(node.extension_type)
+              format(node.based_on),
+              *if node.items.length > 0
+                item_indent = INDENT_CHAR * '('.length
+                [
+                  ' ',
+                  'WITH',
+                  "\n",
+                  indent([
+                    '(',
+                    node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                    ')'
+                  ].join(''))
+                ].join('')
+              end
             ].join('')
-          end,
-          *if node.extension_items.length > 0
-            item_indent = INDENT_CHAR * '('.length
+          else
             [
-              ' ',
-              'WITH',
-              "\n",
-              indent([
-                '(',
-                node.extension_items.map{|x| format(x)}.join(",\n#{item_indent}"),
-                ')'
-              ].join(''))
+              *if node.items.length > 0
+                item_indent = INDENT_CHAR * '('.length
+                [
+                  "\n",
+                  indent([
+                    '(',
+                    node.items.map{|x| format(x)}.join(",\n#{item_indent}"),
+                    ')'
+                  ].join(''))
+                ].join('')
+              end
             ].join('')
           end
         ].join('')