nom-xml 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 958e8e47f3ad37b2a192354cf1d7d04b31d45ab8
-  data.tar.gz: 24307ffb65569e749fdc820fe62fa9f611418d3f
+SHA256:
+  metadata.gz: 2b2ab72999bcce7d9fc1173c01393e03d8e2388428d90943e2fe1831f8b52563
+  data.tar.gz: 6c1c4a29b276fc07afe6bfd241f4a2a29105e49a9e20c39801f15577dc512889
 SHA512:
-  metadata.gz: 5637795c9e229b0d24107dc5301919c01e59ef6950e59b3006c836db4a04fe63698edebc6053d5d870a4c8f534f23f3ceb7b5a31ee24d8068f65fb7c936f6b74
-  data.tar.gz: ee6630352a0fb50069b43a77213658d8dc4a35344667af50817e9886caa7f5be0823bff6c9304947e8d74fa9cb27eae2489bef0a0044dc4585ef4d9781537b7b
+  metadata.gz: 91ac790f990da5482c3489d3e57d0c014e01f9684ad408e5202e792d8f581d0412df55b427435aa320250ef9398a2f774c81c1abfda151f0ba7a55c94d20e8a9
+  data.tar.gz: 0ecd92b30918cde11a15197ea58edc6ccbc2d479a7a2f7d010789eee303f55edfac4cff0525dfbe972349f72cc49e4d4d43fc82ccb16422b343ae2a3593cbcea

data/.github/workflows/ruby.yml

@@ -0,0 +1,24 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [jruby-9.2.12.0, 2.4, 2.5, 2.6, 2.7, 3.0]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/lib/nom/xml/decorators/terminology.rb

@@ -82,9 +82,7 @@ module Nom::XML::Decorators::Terminology
   end
 
   def lookup_term term, *args
-    options = args.extract_options!
-
-    args += options.map { |key, value| %{#{key}="#{value.gsub(/"/, '\\\"') }"} }
+    args = extract_term_options(*args)
 
     xpath = term.local_xpath
 
@@ -99,4 +97,14 @@ module Nom::XML::Decorators::Terminology
 
     result.values_for_term(term)
   end
+
+  def extract_term_options(*args)
+    if args.last.is_a? Hash
+      h = args.pop
+
+      args + h.map { |key, value| %(#{key}="#{value.gsub(/"/, '\\\"')}") }
+    else
+      args
+    end
+  end
 end

data/lib/nom/xml/nokogiri_extension.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/array'
-
 module Nom::XML
   module NokogiriExtension
 
@@ -24,7 +22,7 @@ module Nom::XML
     # Set the terminology accessors for this document
     def set_terminology options = {}, &block
       @terminology = Nom::XML::Terminology.new(self, options, &block)
-      
+
       self
     end
 

data/lib/nom/xml/term.rb

@@ -52,7 +52,7 @@ module Nom::XML
     # Get the relative xpath to this node from its immediate parent's term
     # @return [String]
     def local_xpath
-      xpath = if xmlns.blank?
+      xpath = if xmlns.nil? || xmlns.empty?
         ""
       else
         xmlns + ":"

data/lib/nom/xml/version.rb

@@ -1,5 +1,5 @@
 module Nom
   module XML
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/nom-xml.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
   s.summary = %q{ A library to help you tame sprawling XML schemas. }
   s.description = %q{ NOM allows you to define a “terminology” to ease translation between XML and ruby objects }
 
-  s.add_dependency 'activesupport', '>= 3.2.18'  # could be rails/AS 3 or 4+, but we don't support old insecure versions
   s.add_dependency 'i18n'
   s.add_dependency 'nokogiri'
 

metadata

@@ -1,30 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: nom-xml
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Beer
 - Michael B. Klein
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.18
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.18
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -118,9 +104,9 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -154,7 +140,7 @@ files:
 homepage: http://github.com/cbeer/nom-xml
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,9 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: A library to help you tame sprawling XML schemas.
 test_files:

data/.travis.yml

@@ -1,7 +0,0 @@
-notifications:
-  email: false
-
-rvm:
-  - 2.4.4
-  - 2.5.1
-  - jruby-9.2.0.0