expressir 0.2.5-x64-mingw32 → 0.2.7-x64-mingw32

data/exe/expressir

@@ -1,20 +1,20 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-# resolve bin path, ignoring symlinks
-require "pathname"
-bin_file = Pathname.new(__FILE__).realpath
-
-# add self to libpath
-$:.unshift File.expand_path("../../lib", bin_file)
-
-# Fixes https://github.com/rubygems/rubygems/issues/1420
-require "rubygems/specification"
-
-class Gem::Specification
-  def this; self; end
-end
-
-# start up the CLI
-require "expressir"
-Expressir::Cli.start(ARGV)
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# resolve bin path, ignoring symlinks
+require "pathname"
+bin_file = Pathname.new(__FILE__).realpath
+
+# add self to libpath
+$:.unshift File.expand_path("../../lib", bin_file)
+
+# Fixes https://github.com/rubygems/rubygems/issues/1420
+require "rubygems/specification"
+
+class Gem::Specification
+  def this; self; end
+end
+
+# start up the CLI
+require "expressir"
+Expressir::Cli.start(ARGV)

data/exe/generate-parser

@@ -1,48 +1,48 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-require 'antlr4-native'
-
-grammar_file = ARGV.shift
-
-# ANTLR does weird things if the grammar file isn't in the current working directory
-temp_grammar_file = File.join(FileUtils.pwd(), File.basename(grammar_file))
-FileUtils.cp(grammar_file, temp_grammar_file)
-
-# generate parser
-generator = Antlr4Native::Generator.new(
-  grammar_files: [File.basename(temp_grammar_file)],
-  output_dir: 'ext',
-  parser_root_method: 'syntax'
-)
-generator.generate
-
-# fix issues with generated parser
-parser_source_file = File.join(*%w(ext express-parser express_parser.cpp))
-parser_source_lines = File.read(parser_source_file).split(/\n/)
-
-# - add ParserProxy tokens method, simple compensation for missing exposed BufferedTokenStream
-i = parser_source_lines.index{|x| x == '  Object syntax() {'}
-parser_source_lines[i + 6] += "\n" + <<~CPP.split(/\n/).map{|x| x != "" ? "  " + x : x}.join("\n") + "\n"
-  Array getTokens() {
-    Array a;
-
-    std::vector<Token*> tokens = this -> tokens -> getTokens();
-
-    for (auto &token : tokens) {
-      a.push(token);
-    }
-
-    return a;
-  }
-CPP
-i = parser_source_lines.index{|x| x == '    .define_method("syntax", &ParserProxy::syntax)'}
-parser_source_lines[i] += "\n" + <<~CPP.split(/\n/).map{|x| x != "" ? "    " + x : x}.join("\n")
-  .define_method("tokens", &ParserProxy::getTokens)
-CPP
-
-# write fixed parser file
-File.write(parser_source_file, parser_source_lines.join("\n") + "\n")
-
-# cleanup
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'antlr4-native'
+
+grammar_file = ARGV.shift
+
+# ANTLR does weird things if the grammar file isn't in the current working directory
+temp_grammar_file = File.join(FileUtils.pwd(), File.basename(grammar_file))
+FileUtils.cp(grammar_file, temp_grammar_file)
+
+# generate parser
+generator = Antlr4Native::Generator.new(
+  grammar_files: [File.basename(temp_grammar_file)],
+  output_dir: 'ext',
+  parser_root_method: 'syntax'
+)
+generator.generate
+
+# fix issues with generated parser
+parser_source_file = File.join(*%w(ext express-parser express_parser.cpp))
+parser_source_lines = File.read(parser_source_file).split(/\n/)
+
+# - add ParserProxy tokens method, simple compensation for missing exposed BufferedTokenStream
+i = parser_source_lines.index{|x| x == '  Object syntax() {'}
+parser_source_lines[i + 6] += "\n" + <<~CPP.split(/\n/).map{|x| x != "" ? "  " + x : x}.join("\n") + "\n"
+  Array getTokens() {
+    Array a;
+
+    std::vector<Token*> tokens = this -> tokens -> getTokens();
+
+    for (auto &token : tokens) {
+      a.push(token);
+    }
+
+    return a;
+  }
+CPP
+i = parser_source_lines.index{|x| x == '    .define_method("syntax", &ParserProxy::syntax)'}
+parser_source_lines[i] += "\n" + <<~CPP.split(/\n/).map{|x| x != "" ? "    " + x : x}.join("\n")
+  .define_method("tokens", &ParserProxy::getTokens)
+CPP
+
+# write fixed parser file
+File.write(parser_source_file, parser_source_lines.join("\n") + "\n")
+
+# cleanup
 FileUtils.rm(temp_grammar_file)

data/expressir.gemspec

@@ -1,40 +1,43 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "expressir/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "expressir"
-  spec.version       = Expressir::VERSION
-  spec.authors       = ["Ribose Inc."]
-  spec.email         = ["open.source@ribose.com'"]
-
-  spec.summary       = "ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models."
-  spec.description   = "ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models."
-  spec.homepage      = "https://github.com/lutaml/expressir"
-  spec.license       = "MIT"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "https://github.com/lutaml/expressir/releases"
-
-  spec.files         = `git ls-files`.split("\n")\
-    + Dir.glob('ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/**/*')
-
-  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-
-  spec.bindir        = "exe"
-  spec.require_paths = ["lib"]
-  spec.executables   = %w[expressir]
-
-  spec.extensions = File.join(*%w(ext express-parser extconf.rb))
-
-  spec.add_runtime_dependency "thor", "~> 1.0"
-  spec.add_runtime_dependency "rice", "~> 2.2.0"
-  spec.add_development_dependency "antlr4-native", "~> 1.1.0"
-  spec.add_development_dependency "nokogiri", "~> 1.10"
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "pry", "~> 0.12.2"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rake-compiler", "~> 1.1.1"
-  spec.add_development_dependency "rspec", "~> 3.0"
-end
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "expressir/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "expressir"
+  spec.version       = Expressir::VERSION
+  spec.authors       = ["Ribose Inc."]
+  spec.email         = ["open.source@ribose.com'"]
+
+  spec.summary       = "ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models."
+  spec.description   = "ISO EXPRESS parser in Ruby, tools for accessing EXPRESS data models."
+  spec.homepage      = "https://github.com/lutaml/expressir"
+  spec.license       = "MIT"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["changelog_uri"] = "https://github.com/lutaml/expressir/releases"
+
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+
+  spec.files         = `git ls-files`.split("\n")\
+    + Dir.glob('ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/**/*')
+
+  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
+
+  spec.bindir        = "exe"
+  spec.require_paths = ["lib"]
+  spec.executables   = %w[expressir]
+
+  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", "~> 2.2.0"
+  spec.add_development_dependency "antlr4-native", "~> 1.1.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "pry", "~> 0.12.2"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake-compiler", "~> 1.1"
+  spec.add_development_dependency "rake-compiler-dock", "~> 1.1"
+  spec.add_development_dependency "rspec", "~> 3.0"
+end

data/lib/expressir/cli/ui.rb

@@ -1,36 +1,36 @@
-require "thor"
-
-module Expressir
-  module Cli
-    class UI < Thor
-      def self.ask(message)
-        new.ask(message)
-      end
-
-      def self.say(message)
-        new.say(message)
-      end
-
-      def self.error(message)
-        if log_types.include?("error")
-          new.error(message)
-        end
-      end
-
-      def self.info(message)
-        if log_types.include?("info")
-          new.say(message)
-        end
-      end
-
-      def self.run(command)
-        require "open3"
-        Open3.capture3(command)
-      end
-
-      def self.log_types
-        Expressir.configuration.logs.map(&:to_s) || []
-      end
-    end
-  end
-end
+require "thor"
+
+module Expressir
+  module Cli
+    class UI < Thor
+      def self.ask(message)
+        new.ask(message)
+      end
+
+      def self.say(message)
+        new.say(message)
+      end
+
+      def self.error(message)
+        if log_types.include?("error")
+          new.error(message)
+        end
+      end
+
+      def self.info(message)
+        if log_types.include?("info")
+          new.say(message)
+        end
+      end
+
+      def self.run(command)
+        require "open3"
+        Open3.capture3(command)
+      end
+
+      def self.log_types
+        Expressir.configuration.logs.map(&:to_s) || []
+      end
+    end
+  end
+end

data/lib/expressir/cli.rb

@@ -1,27 +1,27 @@
-require "thor"
-require "expressir/cli/ui"
-require "expressir/express_parser"
-
-module Expressir
-  module Cli
-    def self.ui
-      Expressir::Cli::UI
-    end
-
-    def self.start(args)
-      Base.start(args)
-    end
-
-    class Base < Thor
-      desc "version", "The Expressir Version"
-      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
+require "thor"
+require "expressir/cli/ui"
+require "expressir/express_parser"
+
+module Expressir
+  module Cli
+    def self.ui
+      Expressir::Cli::UI
+    end
+
+    def self.start(args)
+      Base.start(args)
+    end
+
+    class Base < Thor
+      desc "version", "The Expressir Version"
+      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/config.rb

@@ -1,23 +1,23 @@
-module Expressir
-  module Config
-    def configure
-      if block_given?
-        yield configuration
-      end
-    end
-
-    def configuration
-      @configuration ||= Configuration.new
-    end
-  end
-
-  class Configuration
-    attr_accessor :logs
-
-    def initialize
-      @logs ||= %i(error)
-    end
-  end
-
-  extend Config
-end
+module Expressir
+  module Config
+    def configure
+      if block_given?
+        yield configuration
+      end
+    end
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+  end
+
+  class Configuration
+    attr_accessor :logs
+
+    def initialize
+      @logs ||= %i(error)
+    end
+  end
+
+  extend Config
+end

data/lib/expressir/express/aggregate_dimension.rb

@@ -1,38 +1,38 @@
-module Expressir
-  module Express
-    class AggregateDimension
-      attr_accessor :aggrtype, :lower, :upper, :isUnique, :isOptionalArray
-
-      def initialize(options = {})
-        @aggrtype = "SET"
-        @lower = "0"
-        @upper = "?"
-        @isUnique = false
-        @isOptionalArray = false
-
-        @options = options
-      end
-
-      def parse
-        document = @options.fetch(:document, nil)
-        extract_attributes(document) if document
-
-        self
-      end
-
-      def self.parse(document)
-        new(document: document).parse
-      end
-
-      private
-
-      def extract_attributes(document)
-        @aggrtype = document.attributes["type"]
-        @lower = document.attributes["lower"]
-        @upper = document.attributes["upper"]
-        @isUnique = document.attributes["unique"] == "YES"
-        @isOptionalArray = document.attributes["optional"] == "YES"
-      end
-    end
-  end
-end
+module Expressir
+  module Express
+    class AggregateDimension
+      attr_accessor :aggrtype, :lower, :upper, :isUnique, :isOptionalArray
+
+      def initialize(options = {})
+        @aggrtype = "SET"
+        @lower = "0"
+        @upper = "?"
+        @isUnique = false
+        @isOptionalArray = false
+
+        @options = options
+      end
+
+      def parse
+        document = @options.fetch(:document, nil)
+        extract_attributes(document) if document
+
+        self
+      end
+
+      def self.parse(document)
+        new(document: document).parse
+      end
+
+      private
+
+      def extract_attributes(document)
+        @aggrtype = document.attributes["type"]
+        @lower = document.attributes["lower"]
+        @upper = document.attributes["upper"]
+        @isUnique = document.attributes["unique"] == "YES"
+        @isOptionalArray = document.attributes["optional"] == "YES"
+      end
+    end
+  end
+end

data/lib/expressir/express/attribute.rb

@@ -1,15 +1,15 @@
-require "expressir/express/model_element"
-
-module Expressir
-  module Express
-    class Attribute < ModelElement
-      attr_accessor :name, :entity, :domain, :redeclare_entity,
-        :redeclare_oldname
-
-      def initialize
-        @redeclare_entity = nil
-        @redeclare_oldname = nil
-      end
-    end
-  end
-end
+require "expressir/express/model_element"
+
+module Expressir
+  module Express
+    class Attribute < ModelElement
+      attr_accessor :name, :entity, :domain, :redeclare_entity,
+        :redeclare_oldname
+
+      def initialize
+        @redeclare_entity = nil
+        @redeclare_oldname = nil
+      end
+    end
+  end
+end

data/lib/expressir/express/comment.rb

@@ -1,7 +1,7 @@
-module Expressir
-  module Express
-    class Comment
-      attr_accessor :comment, :ModelElement
-    end
-  end
-end
+module Expressir
+  module Express
+    class Comment
+      attr_accessor :comment, :ModelElement
+    end
+  end
+end

data/lib/expressir/express/defined_type.rb

@@ -1,36 +1,36 @@
-require "expressir/express/named_type"
-
-module Expressir
-  module Express
-    class DefinedType < NamedType
-      def initialize(options = {})
-        @options = options
-        @schema = options.fetch(:schema)
-      end
-
-      def parse
-        document = @options.fetch(:document)
-        extract_type_attributes(document)
-
-        self
-      end
-
-      def self.parse(document, schema)
-        new(document: document, schema: schema).parse
-      end
-
-      private
-
-      def extract_type_attributes(document)
-        @name = document.attributes["name"].to_s
-        @wheres = extract_where_rules(document)
-      end
-
-      def extract_where_rules(document)
-        document.xpath("where").map do |where|
-          Express::WhereRule.parse(where)
-        end
-      end
-    end
-  end
-end
+require "expressir/express/named_type"
+
+module Expressir
+  module Express
+    class DefinedType < NamedType
+      def initialize(options = {})
+        @options = options
+        @schema = options.fetch(:schema)
+      end
+
+      def parse
+        document = @options.fetch(:document)
+        extract_type_attributes(document)
+
+        self
+      end
+
+      def self.parse(document, schema)
+        new(document: document, schema: schema).parse
+      end
+
+      private
+
+      def extract_type_attributes(document)
+        @name = document.attributes["name"].to_s
+        @wheres = extract_where_rules(document)
+      end
+
+      def extract_where_rules(document)
+        document.xpath("where").map do |where|
+          Express::WhereRule.parse(where)
+        end
+      end
+    end
+  end
+end