nom-xml 0.5.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb52919534624c32a6a015dec49c1b7070d0c933
-  data.tar.gz: b64cc4bba00bee3b5afef3f67ca877fab87a9b44
+SHA256:
+  metadata.gz: 2b2ab72999bcce7d9fc1173c01393e03d8e2388428d90943e2fe1831f8b52563
+  data.tar.gz: 6c1c4a29b276fc07afe6bfd241f4a2a29105e49a9e20c39801f15577dc512889
 SHA512:
-  metadata.gz: 76735f5e2789f473ad4354778775a2cf3292b83c4f25caf1d5fab17e984cb7ab478acd78c775b32dcb9106dc9a8a708640de9cf6f909cd6f70bf61035a89934b
-  data.tar.gz: c5fe6162f42f5e05ee41d8069ce1bcf9ba42912dc4467b55a7820604244b4bfdb5d0ef2e8a495e4e7ac0db4f16fe724d30c0a4365a04cf789f63a5c6b3498013
+  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/Gemfile

@@ -2,8 +2,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'simplecov', :platform => :ruby_19
-gem 'rcov', :platform => :ruby_18
-gem 'debugger', :platform => :mri_19
-gem "redcarpet", :platform => :ruby_19
-gem 'byebug'
+gem 'simplecov'
+gem 'byebug', platform: :mri

data/Rakefile

@@ -10,25 +10,8 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-task :default => :ci
+task default: :spec
 
 require 'rspec/core/rake_task'
 desc "Run specs"
-RSpec::Core::RakeTask.new do |t|
-
-  if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.8/
-    t.rcov = true
-    t.rcov_opts = %w{--exclude spec\/*,gems\/*,ruby\/* --aggregate coverage.data}
-  end
-end
-
-require 'yard'
-YARD::Rake::YardocTask.new do |t|
-  t.options = ["--readme", "README.md"]
-end
-
-desc "Continuous Integration build"
-task :ci do
-  Rake::Task['spec'].invoke
- # Rake::Task['yard'].invoke
-end
+RSpec::Core::RakeTask.new(:spec)

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

@@ -31,7 +31,11 @@ module Nom::XML::Decorators::NodeSet
   def method_missing sym, *args, &block
     if self.all? { |node| node.respond_to? sym }
       result = self.collect { |node| node.send(sym, *args, &block) }.flatten
-      self.class.new(self.document, result) rescue result
+      if result.empty? || result.any? { |x| x.is_a? Nokogiri::XML::Node }
+        self.class.new(self.document, result) rescue result
+      else
+        result
+      end
     else
       begin
         self.document.template_registry.send(sym, self, *args, &block)

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

@@ -1,19 +1,4 @@
 module Nom::XML::Decorators::Terminology
-
-  def self.extended node
-    node.add_terminology_method_overrides!
-  end
-
-  def add_terminology_method_overrides!
-    self.term_accessors.each do |k, term|
-      if self.respond_to_without_terms? k and not term.options[:override]
-        raise "Trying to redefine method #{k} on #{self.to_s}"
-      end
-    end.select { |k, term| term.options[:override] }.each do |method, term|
-       define_term_method(method, self.term_accessors[method.to_sym])
-    end
-  end
-
   def method_missing method, *args, &block
     if self.term_accessors[method.to_sym]
       define_term_method(method, self.term_accessors[method.to_sym])
@@ -97,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
 
@@ -114,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

@@ -16,6 +16,10 @@ module Nom::XML
     # @attr [Hash] options
     # @yield 
     def initialize parent, name, options = {}, *args, &block
+      if Nokogiri::XML::Node.instance_methods.include?(name.to_sym)
+        raise "Unable to redefine method #{name} on Nokogiri::XML::Node"
+      end
+
       @name = name
       @terms = {}
       @parent = parent
@@ -48,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 = '0.5.4'
+    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'
 

data/spec/examples/mods_example_spec.rb

@@ -13,7 +13,7 @@ describe "Namespaces example" do
 
       t.author :path => '//mods:name' do |n|
         n.authorityURI :path => '@authorityURI', :accessor => lambda { |e| e.text }
-        n.description :path => 'mods:description', :override => true
+        n.mods_description :path => 'mods:description'
         n.valueURI :path => '@valueURI'
         n.namePart :path => 'mods:namePart', :single => true, :index_as => [:type_1]
       end
@@ -39,10 +39,6 @@ describe "Namespaces example" do
      xml
   }
 
-  it "should work with existing reserved method names when override is present" do
-    expect(subject.author.first.description.text).to include('asdf')
-  end
-
   it "should return nodesets by default" do
     expect(subject.personal_authors).to be_a_kind_of(Nokogiri::XML::NodeSet)
   end

data/spec/lib/terminology_decorator_spec.rb

@@ -32,23 +32,6 @@ describe "Nutrition" do
      xml
   }
 
-  describe "#add_terminology_method_overrides!" do
-
-    it "should warn you if you try to override already existing methods" do
-      pending if defined? JRUBY_VERSION
-      mock_term = {:text => double(:options => {})}
-      allow(document.a.first).to receive(:term_accessors).and_return mock_term
-      expect { document.a.first.add_terminology_method_overrides! }.to raise_error /Trying to redefine/
-    end
-  
-    it "should let you override the warning" do
-      pending if defined? JRUBY_VERSION
-      mock_term = {:text => double(:options => { :override => true } )}
-      allow(document.a.first).to receive(:term_accessors).and_return mock_term
-      expect { document.a.first.add_terminology_method_overrides! }.to_not raise_error
-    end
-  end
-
   describe "#terms" do
 
     context "root element" do

data/spec/spec_helper.rb

@@ -1,13 +1,9 @@
-if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
-  require 'simplecov'
-  SimpleCov.start
-end
+require 'simplecov'
+SimpleCov.start
 
 require 'rspec'
 require 'nom'
 require 'equivalent-xml/rspec_matchers'
-
 RSpec.configure do |config|
 
 end
-

metadata

@@ -1,30 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: nom-xml
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Beer
 - Michael B. Klein
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-09 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,15 +104,13 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails3.gemfile
-- gemfiles/rails4.gemfile
 - lib/nom.rb
 - lib/nom/xml.rb
 - lib/nom/xml/decorators.rb
@@ -156,7 +140,7 @@ files:
 homepage: http://github.com/cbeer/nom-xml
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,9 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: A library to help you tame sprawling XML schemas.
 test_files:
@@ -191,4 +174,3 @@ test_files:
 - spec/lib/terminology_spec.rb
 - spec/spec_helper.rb
 - spec/test_spec.rb
-has_rdoc: 

data/.travis.yml

@@ -1,13 +0,0 @@
-notifications:
-  email: false
-
-gemfile:
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails4.gemfile
-
-rvm:
-  - 1.9.3
-  - jruby-19mode
-  - rbx-19mode
-  - 2.0.0
-  - 2.1.2

data/gemfiles/rails3.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../"
-
-gem 'activesupport', '~> 3.2', '>= 3.2.18'
-

data/gemfiles/rails4.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../"
-
-gem 'activesupport', '~> 4.1'
-