xembly 0.4.2 → 0.5.0

data/lib/xembly/directives.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -20,14 +21,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'xembly/add'
-require 'xembly/addif'
-require 'xembly/attr'
-require 'xembly/remove'
-require 'xembly/set'
-require 'xembly/strict'
-require 'xembly/up'
-require 'xembly/xpath'
+require_relative 'add'
+require_relative 'addif'
+require_relative 'attr'
+require_relative 'remove'
+require_relative 'set'
+require_relative 'strict'
+require_relative 'up'
+require_relative 'xpath'
 
 module Xembly
   # Directives
@@ -36,10 +37,10 @@ module Xembly
     # +text+:: Directives in text
     def initialize(text)
       @array = text
-        .strip
-        .scan(/([A-Za-z]+)(?:\s+"([^"]+)")?(?:\s*,\s*"([^"]+)")*\s*;/)
-        .map { |t| t.reject(&:nil?) }
-        .map { |t| Directives.map(t) }
+               .strip
+               .scan(/([A-Za-z]+)(?:\s+"([^"]+)")?(?:\s*,\s*"([^"]+)")*\s*;/)
+               .map(&:compact)
+               .map { |t| Directives.map(t) }
     end
 
     def each(&block)
@@ -60,15 +61,15 @@ module Xembly
       when 'ATTR'
         Attr.new(args[0], args[1])
       when 'CDATA'
-        fail 'CDATA command is not supported yet, please contribute'
+        raise 'CDATA command is not supported yet, please contribute'
       when 'NS'
-        fail 'NS command is not supported yet, please contribute'
+        raise 'NS command is not supported yet, please contribute'
       when 'PI'
-        fail 'PI command is not supported yet, please contribute'
+        raise 'PI command is not supported yet, please contribute'
       when 'POP'
-        fail 'POP command is not supported yet, please contribute'
+        raise 'POP command is not supported yet, please contribute'
       when 'PUSH'
-        fail 'PUSH command is not supported yet, please contribute'
+        raise 'PUSH command is not supported yet, please contribute'
       when 'REMOVE'
         Remove.new
       when 'SET'
@@ -80,9 +81,9 @@ module Xembly
       when 'XPATH'
         Xpath.new(args[0])
       when 'XSET'
-        fail 'XSET command is not supported yet, please contribute'
+        raise 'XSET command is not supported yet, please contribute'
       else
-        fail "Unknown command \"#{cmd}\""
+        raise "Unknown command \"#{cmd}\""
       end
     end
   end

data/lib/xembly/remove.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -20,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'xembly'
+require_relative '../xembly/base'
 
 module Xembly
   # REMOVE directive

data/lib/xembly/set.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -21,7 +22,7 @@
 # SOFTWARE.
 
 require 'nokogiri'
-require 'xembly'
+require_relative '../xembly/base'
 
 module Xembly
   # SET directive

data/lib/xembly/strict.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -21,6 +22,7 @@
 # SOFTWARE.
 
 require 'nokogiri'
+require_relative '../xembly/base'
 
 module Xembly
   # STRICT directive
@@ -32,8 +34,9 @@ module Xembly
     end
 
     def exec(_, cursor)
-      fail "there are #{cursor.length} nodes, while #{@count} expected" unless \
+      raise "there are #{cursor.length} nodes, while #{@count} expected" unless \
         cursor.length == @count
+
       cursor
     end
   end

data/lib/xembly/up.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -21,6 +22,7 @@
 # SOFTWARE.
 
 require 'nokogiri'
+require_relative '../xembly/base'
 
 module Xembly
   # UP directive

data/lib/xembly/version.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -21,9 +22,9 @@
 # SOFTWARE.
 
 # Xembly main module.
-# Author:: Yegor Bugayenko (yegor@teamed.io)
-# Copyright:: Copyright (c) 2016 Yegor Bugayenko
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2016-2024 Yegor Bugayenko
 # License:: MIT
 module Xembly
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/lib/xembly/xembler.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -20,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'xembly'
+require_relative '../xembly/base'
 
 module Xembly
   # Xembler
@@ -37,6 +38,7 @@ module Xembly
       cursor = [dom]
       @dirs.each do |dir|
         cursor = dir.exec(dom, cursor)
+        Xembly.log.info "Applied: #{dir}"
       end
       Xembly.log.info "#{@dirs.length} directive(s) applied"
       dom

data/lib/xembly/xpath.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -21,6 +22,7 @@
 # SOFTWARE.
 
 require 'nokogiri'
+require_relative '../xembly/base'
 
 module Xembly
   # XPATH directive

data/lib/xembly.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -20,62 +21,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'xembly/version'
-require 'xembly/xembler'
-require 'xembly/directives'
 require 'nokogiri'
 require 'logger'
 require 'time'
-
-# Xembly main module.
-# Author:: Yegor Bugayenko (yegor@teamed.io)
-# Copyright:: Copyright (c) 2016 Yegor Bugayenko
-# License:: MIT
-module Xembly
-  # Get logger.
-  def self.log
-    unless @logger
-      @logger = Logger.new(STDOUT)
-      @logger.formatter = proc { |severity, _, _, msg|
-        "#{severity}: #{msg.dump}\n"
-      }
-      @logger.level = Logger::ERROR
-    end
-    @logger
-  end
-
-  class << self
-    attr_writer :logger
-  end
-
-  # Code base abstraction
-  class Base
-    # Ctor.
-    # +opts+:: Options
-    def initialize(opts)
-      @opts = opts
-      Xembly.log.level = Logger::INFO if @opts.verbose?
-      Xembly.log.info "my version is #{Xembly::VERSION}"
-      Xembly.log.info "Ruby version is #{RUBY_VERSION} at #{RUBY_PLATFORM}"
-    end
-
-    # Generate XML.
-    def xml
-      if @opts.xml?
-        xml = File.read(@opts[:xml])
-        Xembly.log.info "reading #{@opts[:xml]}"
-      else
-        xml = STDIN.read
-        Xembly.log.info 'reading STDIN'
-      end
-      if @opts.dirs?
-        Xembly.log.info "reading directives from #{@opts[:dirs]}"
-        dirs = File.read(@opts[:dirs])
-      else
-        Xembly.log.info "#{@opts.arguments.length} directives in command line"
-        dirs = @opts.arguments.join('')
-      end
-      Xembler.new(Directives.new(dirs)).apply(xml).to_xml
-    end
-  end
-end
+require_relative 'xembly/version'
+require_relative 'xembly/xembler'
+require_relative 'xembly/directives'
+require_relative 'xembly/base'

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}

data/test/test__helper.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -22,17 +23,17 @@
 
 require 'simplecov'
 require 'nokogiri'
-require 'xembly'
 require 'minitest/autorun'
+require_relative '../lib/xembly'
 
 # Xembly test, parent class.
-# Author:: Yegor Bugayenko (yegor@teamed.io)
-# Copyright:: Copyright (c) 2016 Yegor Bugayenko
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2016-2024 Yegor Bugayenko
 # License:: MIT
 class XeTest < Minitest::Test
   def matches(xml, xpaths)
     xpaths.each do |xpath|
-      fail "doesn't match '#{xpath}': #{xml}" \
+      raise "doesn't match '#{xpath}': #{xml}" \
         unless Nokogiri::XML(xml).xpath(xpath).size == 1
     end
   end

data/test/test_add.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -24,8 +25,8 @@ require 'xembly/add'
 require 'test__helper'
 
 # Xembly::Add tests.
-# Author:: Yegor Bugayenko (yegor@teamed.io)
-# Copyright:: Copyright (c) 2016 Yegor Bugayenko
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2016-2024 Yegor Bugayenko
 # License:: MIT
 class TestAdd < XeTest
   def test_adds_nodes

data/test/test_addif.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -24,8 +25,8 @@ require 'xembly/addif'
 require 'test__helper'
 
 # Xembly::AddIf tests.
-# Author:: Yegor Bugayenko (yegor@teamed.io)
-# Copyright:: Copyright (c) 2016 Yegor Bugayenko
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2016-2024 Yegor Bugayenko
 # License:: MIT
 class TestAddIf < XeTest
   def test_skips_nodes

data/test/test_attr.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -24,8 +25,8 @@ require 'xembly/attr'
 require 'test__helper'
 
 # Xembly::Attr tests.
-# Author:: Yegor Bugayenko (yegor@teamed.io)
-# Copyright:: Copyright (c) 2016 Yegor Bugayenko
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2016-2024 Yegor Bugayenko
 # License:: MIT
 class TestAttr < XeTest
   def test_sets_attributes

data/test/test_directives.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,8 +26,8 @@ require 'nokogiri'
 require 'xembly/directives'
 
 # Xembly::Directives module tests.
-# Author:: Yegor Bugayenko (yegor@teamed.io)
-# Copyright:: Copyright (c) 2016 Yegor Bugayenko
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2016-2024 Yegor Bugayenko
 # License:: MIT
 class TestDirectives < Minitest::Test
   def test_parses_directives

data/test/test_remove.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -24,8 +25,8 @@ require 'xembly/remove'
 require 'test__helper'
 
 # Xembly::Remove tests.
-# Author:: Yegor Bugayenko (yegor@teamed.io)
-# Copyright:: Copyright (c) 2016 Yegor Bugayenko
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2016-2024 Yegor Bugayenko
 # License:: MIT
 class TestRemove < XeTest
   def test_adds_nodes

data/test/test_set.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -24,8 +25,8 @@ require 'xembly/set'
 require 'test__helper'
 
 # Xembly::Set tests.
-# Author:: Yegor Bugayenko (yegor@teamed.io)
-# Copyright:: Copyright (c) 2016 Yegor Bugayenko
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2016-2024 Yegor Bugayenko
 # License:: MIT
 class TestSet < XeTest
   def test_sets_values

data/test/test_xembler.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -24,11 +25,11 @@ require 'minitest/autorun'
 require 'nokogiri'
 require 'xembly/xembler'
 require 'xembly/directives'
-require 'test__helper'
+require_relative 'test__helper'
 
 # Xembly::Xembler module tests.
-# Author:: Yegor Bugayenko (yegor@teamed.io)
-# Copyright:: Copyright (c) 2016 Yegor Bugayenko
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2016-2024 Yegor Bugayenko
 # License:: MIT
 class TestXembler < XeTest
   def test_modifies_xml

data/test/test_xembly.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -22,14 +23,14 @@
 
 require 'minitest/autorun'
 require 'nokogiri'
-require 'xembly'
 require 'tmpdir'
 require 'slop'
-require 'test__helper'
+require_relative '../lib/xembly'
+require_relative 'test__helper'
 
 # Xembly main module test.
-# Author:: Yegor Bugayenko (yegor@teamed.io)
-# Copyright:: Copyright (c) 2016 Yegor Bugayenko
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2016-2024 Yegor Bugayenko
 # License:: MIT
 class TestXembly < XeTest
   def test_basic
@@ -68,7 +69,7 @@ class TestXembly < XeTest
   private
 
   def opts(args)
-    Slop.parse args do |o|
+    Slop.parse(args, help: true) do |o|
       o.on '-v', '--verbose'
       o.string '-x', '--xml', argument: :required
       o.string '-d', '--dirs', argument: :required

data/xembly.gemspec

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -20,38 +21,27 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'xembly/version'
 
 Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  if s.respond_to? :required_rubygems_version=
-    s.required_rubygems_version = Gem::Requirement.new('>= 0')
-  end
-  s.rubygems_version = '2.2.2'
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  s.required_ruby_version = '>= 2.5'
   s.name = 'xembly'
   s.version = Xembly::VERSION
   s.license = 'MIT'
   s.summary = 'Xembly Gem'
   s.description = 'Command Line XML Manipulator'
   s.authors = ['Yegor Bugayenko']
-  s.email = 'yegor@teamed.io'
+  s.email = 'yegor256@gmail.com'
   s.homepage = 'http://github.com/yegor256/xembly-gem'
   s.files = `git ls-files`.split($RS)
-  s.executables = s.files.grep(/^bin\//) { |f| File.basename(f) }
-  s.test_files = s.files.grep(/^(test|spec|features)\//)
+  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_runtime_dependency 'nokogiri', '1.6.7.2'
-  s.add_runtime_dependency 'slop', '4.3.0'
-  s.add_runtime_dependency 'rake', '11.1.1'
-  s.add_development_dependency 'coveralls', '0.7.2'
-  s.add_development_dependency 'rdoc', '4.2.0'
-  s.add_development_dependency 'cucumber', '1.3.17'
-  s.add_development_dependency 'minitest', '5.5.0'
-  s.add_development_dependency 'rubocop', '0.24.1'
-  s.add_development_dependency 'rubocop-rspec', '1.2.1'
-  s.add_development_dependency 'rspec-rails', '3.1.0'
+  s.add_runtime_dependency 'nokogiri', '1.16.2'
+  s.add_runtime_dependency 'rake', '13.1.0'
+  s.add_runtime_dependency 'slop', '4.10.1'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end