nokogiri_schematron_builder 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24f02a10a7493555198daad2202e63376d1e7bbc9af7b91c79318d4c36239c41
-  data.tar.gz: 9bf5e2b1ac5e0e6a7949bcef45331e8277a823a13cecb5b8c387ccdadee41c34
+  metadata.gz: 35ab25309264d992dcaeb53e7ba9e5d464a38c48cea1c34f1516ea21e97529e9
+  data.tar.gz: b2a4b40c93cda3d52c9e7e740ad2b13489f89efbc14077322881fe13fa2f3556
 SHA512:
-  metadata.gz: babe38706760546dfbb24513d9a9453c4156769837279c75967a253e8fd5bea48fb101c014c25299973e960d59d280dc5de5413a2ce63aac80de9a64320a4928
-  data.tar.gz: 175f4df54fa99d350c8823519c3d22c68be65c5912f98bf4605b949580bbd803590ffe703a6aa662d4a47509aff00a0439b65ca5b455e9f8c05e94b908b0bce7
+  metadata.gz: fce61ec49eb9e2e95725a04a366c4a2cd3dbb5123f02ee289f1253f7dc0c58170e03aeeb91f5ce16ff918c049b969c6dbfaa3d05053375d5595f6d1d5c52a695
+  data.tar.gz: 308ec3df6cc0cf780209b7b4a9509a141cc53b585b125d642519978a715395b01479e377a1135c4561399b06503f6924fa114c816e1570eb7ea956255eea0823

data/CHANGELOG.md

@@ -0,0 +1,28 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [0.1.3] - 2024-11-07
+
+### Changed
+- Separate positional and keyword arguments (support Ruby 3.0 and higher).
+
+## [0.1.2] - 2021-08-30
+
+### Changed
+- Upgrade `bundler` and `rake` dependencies.
+
+## [0.1.1] - 2019-11-07
+
+### Added
+- This `CHANGELOG.md` file.
+
+### Changed
+- Rename attribute from `Nokogiri::XML::Schematron::Pattern#name` to `Nokogiri::XML::Schematron::Pattern#title`.
+- Map `Nokogiri::XML::Schematron::Pattern#title` attribute to `<sch:title>` XML element (previously `@name` XML attribute).
+- Map `Nokogiri::XML::Schematron::Schema#title` attribute to `<sch:title>` XML element (previously, `@title` XML attribute).
+
+## [0.1.0] - 2019-10-20
+
+### Added
+- Initial commit.

data/LICENSE.txt

@@ -1,6 +1,6 @@
 nokogiri_schematron_builder
 
-Copyright (c) 2019, Battelle Memorial Institute
+Copyright (c) 2019-2024, Battelle Memorial Institute
 All rights reserved.
 
 1. Battelle Memorial Institute (hereinafter Battelle) hereby grants permission

data/README.md

@@ -31,7 +31,7 @@ Create the schema using the domain-specific language:
 ```ruby
 schema = Nokogiri::XML::Schematron::Schema.new(title: "Example schema") do
   ns(prefix: "ex", uri: "http://example.com/ns#")
-  pattern(name: "Example pattern") do
+  pattern(title: "Example pattern") do
     rule(context: "/") do
       assert(test: "count(ex:A) >= 1", message: "element \"ex:A\" is REQUIRED")
     end
@@ -50,7 +50,7 @@ Or, equivalently:
 ```ruby
 schema = Nokogiri::XML::Schematron::Schema.new(title: "Example schema") do
   ns(prefix: "ex", uri: "http://example.com/ns#")
-  pattern(name: "Example pattern") do
+  pattern(title: "Example pattern") do
     context("/") do
       require("ex:A") do
         permit("ex:B") do
@@ -78,9 +78,11 @@ The result is:
 
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" title="Example schema">
+<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron">
+  <sch:title>Example schema</sch:title>
   <sch:ns prefix="ex" uri="http://example.com/ns#"/>
-  <sch:pattern name="Example pattern">
+  <sch:pattern>
+    <sch:title>Example pattern</sch:title>
     <sch:rule context="/">
       <sch:assert test="count(ex:A) &gt;= 1">element "ex:A" is REQUIRED</sch:assert>
     </sch:rule>

data/lib/nokogiri/xml/schematron/base.rb

@@ -56,8 +56,8 @@ module Nokogiri
           #
           # is a descendent of this class, defines methods that are equivalent to:
           #
-          #   def name(*args, &block)
-          #     base = DescendentOfBase.new(self, *args, &block)
+          #   def name(*args, **options, &block)
+          #     base = DescendentOfBase.new(self, *args, **options, &block)
           #     @children << base
           #     base
           #   end
@@ -66,8 +66,8 @@ module Nokogiri
           # @param klass [Class] the class.
           # @return [void]
           def element(name, klass)
-            define_method(name.to_sym) do |*args, &block|
-              base = klass.send(:new, self, *args, &block)
+            define_method(name.to_sym) do |*args, **options, &block|
+              base = klass.send(:new, self, *args, **options, &block)
               instance_variable_get(:@children) << base
               base
             end
@@ -107,8 +107,8 @@ module Nokogiri
         #
         # @return [Nokogiri::XML::Builder]
         # @see https://www.rubydoc.info/github/sparklemotion/nokogiri/Nokogiri/XML/Builder#initialize-instance_method
-        def to_builder(*args)
-          ::Nokogiri::XML::Builder.new(*args) do |xml|
+        def to_builder(*args, **options)
+          ::Nokogiri::XML::Builder.new(*args, **options) do |xml|
             build!(xml)
           end
         end

data/lib/nokogiri/xml/schematron/internal/core_ext/array.rb

@@ -13,7 +13,7 @@ module Nokogiri
             # @option options [String] :two_words_connector the sign or word used to join the elements in arrays with two elements.
             # @option options [String] :last_word_connector the sign or word used to join the last element in arrays with three or more elements.
             # @return [String] the comma-separated sentence.
-            def self.to_sentence(array, options = {})
+            def self.to_sentence(array, **options)
               case array.length
               when 0
                 ''

data/lib/nokogiri/xml/schematron/pattern.rb

@@ -10,19 +10,19 @@ module Nokogiri
       #
       # For example:
       #
-      #   pattern = Nokogiri::XML::Schematron::Pattern.new(nil, id: "pattern1", name: "Example pattern")
-      #   # => #<Nokogiri::XML::Schematron::Pattern:0x00007f8486a71f18 @parent=nil, @children=[], @options={:id=>"pattern1", :name=>"Example pattern"}>
+      #   pattern = Nokogiri::XML::Schematron::Pattern.new(nil, id: "pattern1", title: "Example pattern")
+      #   # => #<Nokogiri::XML::Schematron::Pattern:0x00007f8486a71f18 @parent=nil, @children=[], @options={:id=>"pattern1", :title=>"Example pattern"}>
       #   pattern.to_builder.to_xml
-      #   # => "<?xml version=\"1.0\"?>\n<sch:pattern xmlns:sch=\"http://purl.oclc.org/dsdl/schematron\" id=\"pattern1\" name=\"Example pattern\"/>\n"
+      #   # => "<?xml version=\"1.0\"?>\n<sch:pattern xmlns:sch=\"http://purl.oclc.org/dsdl/schematron\" id=\"pattern1\">\n  <sch:title>Example pattern</sch:title>\n</sch:pattern>\n"
       #
       class Pattern < Nokogiri::XML::Schematron::Base
         # @!attribute [rw] id
         #   @return [String] the value of the +@id+ XML attribute.
         attribute :id
 
-        # @!attribute [rw] name
-        #   @return [String] the value of the +@name+ XML attribute.
-        attribute :name
+        # @!attribute [rw] title
+        #   @return [String] the value of the +@title+ XML element.
+        attribute :title
 
         # @!method context(context, **options, &block)
         #   Create a new +Node::Context+ object.
@@ -132,13 +132,21 @@ module Nokogiri
         protected
 
         def build!(xml)
-          xml["sch"].send(:pattern, %w(id name).inject(xmlns) { |acc, method_name|
+          xml["sch"].send(:pattern, %w(id).inject(xmlns) { |acc, method_name|
             unless (s = send(method_name.to_sym)).nil?
               acc[method_name.to_s] = s
             end
 
             acc
           }) do
+            %w(title).each do |method_name|
+              unless (s = send(method_name.to_sym)).nil?
+                xml["sch"].send(method_name.to_sym, xmlns) do
+                  xml.text(s)
+                end
+              end
+            end
+
             super(xml)
           end
 

data/lib/nokogiri/xml/schematron/schema.rb

@@ -13,7 +13,7 @@ module Nokogiri
       #   schema = Nokogiri::XML::Schematron::Schema.new(id: "schema1", title: "Example schema")
       #   # => #<Nokogiri::XML::Schematron::Schema:0x00007fa1fb9e3b68 @parent=nil, @children=[], @options={:id=>"schema1", :title=>"Example schema"}>
       #   schema.to_builder.to_xml
-      #   # => "<?xml version=\"1.0\"?>\n<sch:schema xmlns:sch=\"http://purl.oclc.org/dsdl/schematron\" id=\"schema1\" title=\"Example schema\"/>\n"
+      #   # => "<?xml version=\"1.0\"?>\n<sch:schema xmlns:sch=\"http://purl.oclc.org/dsdl/schematron\" id=\"schema1\">\n  <sch:title>Example schema</sch:title>\n</sch:schema>\n"
       #
       class Schema < Nokogiri::XML::Schematron::Base
         # @!attribute [rw] id
@@ -21,7 +21,7 @@ module Nokogiri
         attribute :id
 
         # @!attribute [rw] title
-        #   @return [String] the value of the +@title+ XML attribute.
+        #   @return [String] the value of the +@title+ XML element.
         attribute :title
 
         # @!method ns(**options, &block)
@@ -47,7 +47,7 @@ module Nokogiri
         #   Create a new +Pattern+ object.
         #   @param options [Hash<Symbol, Object>] the options.
         #   @option options [String] :id the value of the +@id+ XML attribute.
-        #   @option options [String] :name the value of the +@name+ XML attribute.
+        #   @option options [String] :title the value of the +@title+ XML element.
         #   @yieldparam pattern [Nokogiri::XML::Schematron::Pattern] the internal representation of the +<sch:pattern>+ XML element.
         #   @yieldreturn [void]
         #   @return [Nokogiri::XML::Schematron::Pattern] the +Pattern+ object.
@@ -57,7 +57,7 @@ module Nokogiri
         #
         # @param options [Hash<Symbol, Object>] the options.
         # @option options [#to_s] :id the value of the +@id+ XML attribute.
-        # @option options [#to_s] :title the value of the +@title+ XML attribute.
+        # @option options [#to_s] :title the value of the +@title+ XML element.
         # @yieldparam schema [Nokogiri::XML::Schematron::Schema] the internal representation of the +<sch:schema>+ XML element.
         # @yieldreturn [void]
         def initialize(**options, &block)
@@ -67,13 +67,21 @@ module Nokogiri
         protected
 
         def build!(xml)
-          xml["sch"].send(:schema, %w(id title).inject(xmlns) { |acc, method_name|
+          xml["sch"].send(:schema, %w(id).inject(xmlns) { |acc, method_name|
             unless (s = send(method_name.to_sym)).nil?
               acc[method_name.to_s] = s
             end
 
             acc
           }) do
+            %w(title).each do |method_name|
+              unless (s = send(method_name.to_sym)).nil?
+                xml["sch"].send(method_name.to_sym, xmlns) do
+                  xml.text(s)
+                end
+              end
+            end
+
             super(xml)
           end
 

data/lib/nokogiri/xml/schematron/version.rb

@@ -1,7 +1,7 @@
 module Nokogiri
   module XML
     module Schematron
-      VERSION = "0.1.0"
+      VERSION = "0.1.3"
     end
   end
 end

data/nokogiri_schematron_builder.gemspec

@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "nokogiri"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", ">= 12.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri_schematron_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Mark Borkum
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2024-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -28,30 +28,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 description: NokogiriSchematronBuilder is a Ruby library for building Schematron XML
   documents using Nokogiri.
 email:
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -91,7 +92,7 @@ homepage: https://github.com/pnnl/nokogiri_schematron_builder
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,9 +107,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Build Schematron XML documents using Nokogiri.
 test_files: []