xembly 0.3 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aefd3284a7d99ffa9bc9b2d477263a1b47a220a3
-  data.tar.gz: 1d795786c9081702f40b6aa43668af5d07964795
+SHA256:
+  metadata.gz: 50574558c2dfaf0e8f4f38ba6934363b95a63775f8f5a9971b4691914c65d360
+  data.tar.gz: a80c257490c72f5d3eb47d104eb10f51b9a8698b05d8779d49fa5a4abf0de762
 SHA512:
-  metadata.gz: f56633f3ed7ebe4f8feea6fe724d7f1a22a14e721a8f12e4665aadfcaf567fd43443f202c0eb91b8ac29dfdb22c7fad44a858d609c0a399b90976b28941aed52
-  data.tar.gz: 033130d913d80d85d0f205ec519dfcd474d7626b1f3577f4dede4a54a283a11591cb830669deef211b2f3ea45f9088509be7f67d7d2348bd39f0f681702082e5
+  metadata.gz: 420cf03c5e9a327723fba2830c48902141c483fa5cee8b05b30872d20594399cb09a13291cfb5a01c61be566ae515f4d07812066cabe7de2513f4ad08dee1104
+  data.tar.gz: 4fd96da7e88af05d4b7e2ed9da0c959510105bd3c6af481d7d7f6ed18b11dcf123cbcb821b946750607dde6ae5ee4576807dcdef7a03ee361d4e8eec68890db7

data/.0pdd.yml

@@ -0,0 +1,9 @@
+errors:
+  - yegor256@gmail.com
+# alerts:
+#   github:
+#     - yegor256
+
+tags:
+  - pdd
+  - bug

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,12 @@
+Make sure the title of the issue explains the problem you are having. Also, the description of the issue must clearly explain what is broken, not what you want us to implement. Go through this checklist and make sure you answer "YES" to all points:
+
+  - You have all pre-requisites listed in README.md installed
+  - You are sure that you are not reporting a duplicate (search all issues)
+  - You say "is broken" or "doesn't work" in the title
+  - You tell us what you are trying to do
+  - You explain the results you are getting
+  - You suggest an alternative result you would like to see
+
+This article will help you understand what we are looking for: http://www.yegor256.com/2014/11/24/principles-of-bug-tracking.html
+
+Thank you for your contribution!

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+Many thanks for your contribution, we truly appreciate it. We will appreciate it even more, if you make sure that you can say "YES" to each point in this short checklist:
+
+  - You made a small amount of changes (less than 100 lines, less than 10 files)
+  - You made changes related to only one bug (create separate PRs for separate problems)
+  - You are ready to defend your changes (there will be a code review)
+  - You don't touch what you don't understand
+  - You ran the build locally and it passed
+
+This article will help you understand what we are looking for: http://www.yegor256.com/2015/02/09/serious-code-reviewer.html
+
+Thank you for your contribution!

data/.pdd

@@ -0,0 +1,7 @@
+--source=.
+--verbose
+--exclude target/**/*
+--exclude src/main/resources/images/**/*
+--rule min-words:20
+--rule min-estimate:15
+--rule max-estimate:90

data/.rubocop.yml

@@ -1,6 +1,17 @@
+AllCops:
+  NewCops: enable
+  Exclude:
+    - 'assets/**/*'
+  DisplayCopNames: true
+  TargetRubyVersion: '2.5'
+
 MethodLength:
-  Max: 30
+  Max: 50
 Style/ClassLength:
   Max: 150
 Style/CyclomaticComplexity:
   Max: 20
+Metrics/BlockLength:
+  Max: 30
+Metrics/AbcSize:
+  Max: 30

data/.rultor.yml

@@ -1,28 +1,21 @@
 assets:
   rubygems.yml: yegor256/home#assets/rubygems.yml
-  s3cfg: yegor256/home#assets/s3cfg
 install: |
-  sudo apt-get update
-  sudo gem install pdd
+  pdd -f /dev/null
+  sudo bundle install --no-color "--gemfile=$(pwd)/Gemfile"
 release:
   script: |-
-    sudo bundle install
-    rake
-    rm -rf *.gem
+    bundle exec rake clean test rubocop copyright
     sed -i "s/1\.0\.snapshot/${tag}/g" lib/xembly/version.rb
     git add lib/xembly/version.rb
     git commit -m "version set to ${tag}"
     gem build xembly.gemspec
     chmod 0600 ../rubygems.yml
     gem push *.gem --config-file ../rubygems.yml
-    sudo gem install xembly
-    pdd --source=$(pwd) --verbose --file=xembly-gem.xml -e=test/** -e=features/** -e=README.md
-    s3cmd --no-progress put xembly-gem.xml --config=../s3cfg s3://pdd.teamed.io/xembly-gem.xml
-  commanders:
-  - yegor256
-architect:
-- yegor256
-- davvd
 merge:
-  commanders: []
-deploy: {}
+  script: |-
+    bundle exec rake clean test rubocop copyright
+deploy:
+  script: |-
+    echo "There is nothing to deploy"
+    exit -1

data/.simplecov

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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,13 +23,13 @@
 
 require 'coveralls'
 
-if Gem.win_platform? then
+if Gem.win_platform?
   SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
     SimpleCov::Formatter::HTMLFormatter
   ]
   SimpleCov.start do
-    add_filter "/test/"
-    add_filter "/features/"
+    add_filter '/test/'
+    add_filter '/features/'
   end
 else
   SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new [
@@ -36,8 +37,8 @@ else
     Coveralls::SimpleCov::Formatter
   ]
   SimpleCov.start do
-    add_filter "/test/"
-    add_filter "/features/"
+    add_filter '/test/'
+    add_filter '/features/'
     minimum_coverage 90
   end
 end

data/.travis.yml

@@ -1,12 +1,15 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.6.0
 cache: bundler
 branches:
   only:
     - master
 install:
+  - gem install pdd -v 0.20.5
   - travis_retry bundle update
 script:
-  - rake
-
+  - pdd -f /dev/null
+  - bundle exec rake
+after_success:
+  - "bash <(curl -s https://codecov.io/bash)"

data/Gemfile

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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

data/LICENSE.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2016 Yegor Bugayenko
+Copyright (c) 2016-2021 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

data/README.md

@@ -1,37 +1,33 @@
-[![Made By Teamed.io](http://img.teamed.io/btn.svg)](http://www.teamed.io)
+<img src="http://www.xembly.org/logo.png" width="64px" height="64px" />
+
+[![Managed by Zerocracy](http://www.zerocracy.com/badge.svg)](http://www.zerocracy.com)
 [![DevOps By Rultor.com](http://www.rultor.com/b/yegor256/xembly-gem)](http://www.rultor.com/p/yegor256/xembly-gem)
-[![We recommend RubyMine](http://img.teamed.io/rubymine-recommend.svg)](https://www.jetbrains.com/ruby/)
+[![We recommend RubyMine](https://www.elegantobjects.org/rubymine.svg)](https://www.jetbrains.com/ruby/)
 
 [![Build Status](https://travis-ci.org/yegor256/xembly-gem.svg)](https://travis-ci.org/yegor256/xembly-gem)
 [![Build status](https://ci.appveyor.com/api/projects/status/8e5dsjjemymfg510?svg=true)](https://ci.appveyor.com/project/yegor256/xembly-gem)
 [![Gem Version](https://badge.fury.io/rb/xembly.svg)](http://badge.fury.io/rb/xembly)
-[![Dependency Status](https://gemnasium.com/yegor256/xembly-gem.svg)](https://gemnasium.com/yegor256/xembly-gem)
-[![Code Climate](http://img.shields.io/codeclimate/github/yegor256/xembly-gem.svg)](https://codeclimate.com/github/yegor256/xembly-gem)
+[![Maintainability](https://api.codeclimate.com/v1/badges/f26349e81b04628d8bf7/maintainability)](https://codeclimate.com/github/yegor256/xembly-gem/maintainability)
 [![Coverage Status](https://img.shields.io/coveralls/yegor256/xembly-gem.svg)](https://coveralls.io/r/yegor256/xembly-gem)
 
-## Assembly for XML
+Xembly is assembly for XML.
 
 Read this [blog post](http://www.yegor256.com/2014/04/09/xembly-intro.html)
 and check this project: [yegor256/xembly](https://github.com/yegor256/xembly)
 
-## How to Install?
-
-You will need Ruby 2.0+:
+To install, you will need Ruby 2.0+:
 
 ```bash
 $ gem install xembly
 ```
 
-## How to Run?
-
-Run it locally and read its output:
+Then, run it and read its output:
 
 ```bash
 $ xembly --help
 ```
 
-Say, you want to modify an existing XML document, which is
-in file `doc.xml`:
+Say, you want to modify an existing XML document, which is in the file `doc.xml`:
 
 ```xml
 <books>
@@ -53,5 +49,5 @@ $ xembly --xml doc.xml 'XPATH "/books"; ADD "book"; ATTR "isbn", "0201379430"; S
 
 Simple as that!
 
-Full specification of Xembly language is
+The full specification of Xembly language is 
 [here](https://github.com/yegor256/xembly).

data/Rakefile

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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
@@ -33,7 +34,7 @@ def version
   Gem::Specification.load(Dir['*.gemspec'].first).version
 end
 
-task default: [:clean, :test, :features, :rubocop, :copyright]
+task default: %i[clean test features rubocop copyright]
 
 require 'rake/testtask'
 desc 'Run all unit tests'
@@ -65,12 +66,12 @@ Cucumber::Rake::Task.new(:features) do |t|
   Rake::Cleaner.cleanup_files(['coverage'])
   t.profile = 'travis'
 end
-Cucumber::Rake::Task.new(:"features:html") do |t|
+Cucumber::Rake::Task.new(:'features:html') do |t|
   t.profile = 'html_report'
 end
 
 task :copyright do
-  sh "grep -q -r '#{Date.today.strftime('%Y')}' \
+  sh "grep -q -r '2016-#{Date.today.strftime('%Y')}' \
     --include '*.rb' \
     --include '*.txt' \
     --include 'Rakefile' \

data/bin/xembly

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-STDOUT.sync = true
+$stdout.sync = true
 
 require 'xembly'
 require 'xembly/version'
@@ -58,10 +59,10 @@ opts = Slop.parse(ARGV, strict: true, help: true) do |o|
   )
 end
 
-fail '-f is mandatory when using -v' if opts.verbose? && !opts.file?
+raise '-f is mandatory when using -v' if opts.verbose? && !opts.file?
 
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 output = Xembly::Base.new(opts).xml
-file = opts.file? ? File.new(opts[:file], 'w') : STDOUT
+file = opts.file? ? File.new(opts[:file], 'w') : $stdout
 file << output

data/features/cli.feature

@@ -25,7 +25,7 @@ Feature: Command Line Processing
     XPATH "/books";
     ADD "book";
     ATTR "isbn", "1519166915";
-    SET "Elegant Objects";
+    SET ""Elegant Objects; The Book"";
     UP;
     ADD "author";
     ADDIF "name";
@@ -39,7 +39,8 @@ Feature: Command Line Processing
     Then Exit code is zero
     And Stdout contains "reading text.xml"
     And XML file "out.xml" matches "/books[count(book) = 3]"
-    And XML file "out.xml" matches "/books/book[@isbn='1519166915' and .='Elegant Objects']"
+    And XML file "out.xml" matches "/books/book[@isbn='1519166915']"
+    And XML file "out.xml" matches "/books/book[.='\"Elegant Objects; The Book\"']"
     And XML file "out.xml" matches "/books[author='yegor']"
     And XML file "out.xml" matches "/books[not(garbage)]"
 

data/features/step_definitions/steps.rb

@@ -1,7 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 TechnoPark Corp.
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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
@@ -42,45 +42,42 @@ end
 Given(/^I have a "([^"]*)" file with content:$/) do |file, text|
   FileUtils.mkdir_p(File.dirname(file)) unless File.exist?(file)
   File.open(file, 'w') do |f|
-    f.write(text.gsub(/\\xFF/, "\xFF"))
+    f.write(text.gsub(/\\xFF/, 0xff.chr))
   end
 end
 
 Then(/^XML matches "([^"]+)"$/) do |xpath|
-  fail "XML doesn't match \"#{xpath}\":\n#{@xml}" if @xml.xpath(xpath).empty?
+  raise "XML doesn't match \"#{xpath}\":\n#{@xml}" if @xml.xpath(xpath).empty?
 end
 
-When(/^I run bin\/xembly with "([^"]*)"$/) do |arg|
+When(%r{^I run bin/xembly with "([^"]*)"$}) do |arg|
   home = File.join(File.dirname(__FILE__), '../..')
   @stdout = `ruby -I#{home}/lib #{home}/bin/xembly #{arg}`
   @exitstatus = $CHILD_STATUS.exitstatus
 end
 
 Then(/^Stdout contains "([^"]*)"$/) do |txt|
-  unless @stdout.include?(txt)
-    fail "STDOUT doesn't contain '#{txt}':\n#{@stdout}"
-  end
+  raise "STDOUT doesn't contain '#{txt}':\n#{@stdout}" unless @stdout.include?(txt)
 end
 
 Then(/^Stdout is empty$/) do
-  fail "STDOUT is not empty:\n#{@stdout}" unless @stdout == ''
+  raise "STDOUT is not empty:\n#{@stdout}" unless @stdout == ''
 end
 
-Then(/^XML file "([^"]+)" matches "([^"]+)"$/) do |file, xpath|
-  fail "File #{file} doesn't exit" unless File.exist?(file)
+Then(/^XML file "([^"]+)" matches "((?:[^"]|\\")+)"$/) do |file, xpath|
+  raise "File #{file} doesn't exit" unless File.exist?(file)
+
   xml = Nokogiri::XML.parse(File.read(file))
   xml.remove_namespaces!
-  if xml.xpath(xpath).empty?
-    fail "XML file #{file} doesn't match \"#{xpath}\":\n#{xml}"
-  end
+  raise "XML file #{file} doesn't match \"#{xpath}\":\n#{xml}" if xml.xpath(xpath.gsub(/\\"/, '"')).empty?
 end
 
 Then(/^Exit code is zero$/) do
-  fail "Non-zero exit code #{@exitstatus}" unless @exitstatus == 0
+  raise "Non-zero exit code #{@exitstatus}" unless @exitstatus.zero?
 end
 
 Then(/^Exit code is not zero$/) do
-  fail 'Zero exit code' if @exitstatus == 0
+  raise 'Zero exit code' if @exitstatus.zero?
 end
 
 When(/^I run bash with$/) do |text|

data/features/support/env.rb

@@ -1,7 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 TechnoPark Corp.
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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

data/lib/xembly/add.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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

data/lib/xembly/addif.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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
@@ -35,7 +36,7 @@ module Xembly
     def exec(dom, cursor)
       after = []
       cursor.each do |node|
-        if !node.element_children.any? { |e| e.name == @name }
+        if node.element_children.none? { |e| e.name == @name }
           child = Nokogiri::XML::Node.new(@name, dom)
           node.add_child(child)
           after.push(child)

data/lib/xembly/attr.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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

data/lib/xembly/directives.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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
@@ -36,10 +37,10 @@ module Xembly
     # +text+:: Directives in text
     def initialize(text)
       @array = text
-        .strip
-        .split(/\s*;\s*/)
-        .reject(&:empty?)
-        .map { |t| Directives.map(t) }
+               .strip
+               .scan(/([A-Za-z]+)(?:\s+"([^"]+)")?(?:\s*,\s*"([^"]+)")*\s*;/)
+               .map { |t| t.reject(&:nil?) }
+               .map { |t| Directives.map(t) }
     end
 
     def each(&block)
@@ -50,19 +51,25 @@ module Xembly
       @array.length
     end
 
-    def self.map(text)
-      cmd, tail = text.strip.split(/\s+/, 2)
-      args = (tail.nil? ? '' : tail).strip
-        .scan(/"([^"]+)"/)
-        .flatten
-        .map { |a| a.tr('"', '') }
-      case cmd.upcase
+    def self.map(cmd)
+      args = cmd.drop(1)
+      case cmd[0].upcase
       when 'ADD'
         Add.new(args[0])
       when 'ADDIF'
         AddIf.new(args[0])
       when 'ATTR'
         Attr.new(args[0], args[1])
+      when 'CDATA'
+        raise 'CDATA command is not supported yet, please contribute'
+      when 'NS'
+        raise 'NS command is not supported yet, please contribute'
+      when 'PI'
+        raise 'PI command is not supported yet, please contribute'
+      when 'POP'
+        raise 'POP command is not supported yet, please contribute'
+      when 'PUSH'
+        raise 'PUSH command is not supported yet, please contribute'
       when 'REMOVE'
         Remove.new
       when 'SET'
@@ -73,8 +80,10 @@ module Xembly
         Up.new
       when 'XPATH'
         Xpath.new(args[0])
+      when 'XSET'
+        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-2021 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
@@ -29,8 +30,9 @@ module Xembly
       after = []
       cursor.each do |node|
         Xembly.log.info "node \"#{node.name}\" removed"
+        parent = node.parent
         node.remove
-        after.push(node.parent)
+        after.push(parent)
       end
       after
     end

data/lib/xembly/set.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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,6 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'nokogiri'
 require 'xembly'
 
 module Xembly
@@ -33,7 +35,7 @@ module Xembly
 
     def exec(_, cursor)
       cursor.each do |node|
-        node.content = @value
+        node.content = Nokogiri::HTML.parse(@value).text
         Xembly.log.info "node \"#{node.name}\" text content set"
       end
       cursor

data/lib/xembly/strict.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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
@@ -32,8 +33,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-2021 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

data/lib/xembly/version.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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-2021 Yegor Bugayenko
 # License:: MIT
 module Xembly
-  VERSION = '0.3'
+  VERSION = '0.4.3'
 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-2021 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
@@ -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-2021 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
@@ -31,10 +32,14 @@ module Xembly
       @path = path
     end
 
-    def exec(_, cursor)
-      after = []
-      cursor.each do |node|
-        node.xpath(@path).each { |n| after.push(n) }
+    def exec(dom, cursor)
+      if @path.start_with?('/')
+        after = dom.xpath(@path)
+      else
+        after = []
+        cursor.each do |node|
+          node.xpath(@path).each { |n| after.push(n) }
+        end
       end
       after
     end

data/lib/xembly.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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
@@ -28,14 +29,14 @@ require 'logger'
 require 'time'
 
 # 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-2021 Yegor Bugayenko
 # License:: MIT
 module Xembly
   # Get logger.
   def self.log
     unless @logger
-      @logger = Logger.new(STDOUT)
+      @logger = Logger.new($stdout)
       @logger.formatter = proc { |severity, _, _, msg|
         "#{severity}: #{msg.dump}\n"
       }
@@ -65,7 +66,7 @@ module Xembly
         xml = File.read(@opts[:xml])
         Xembly.log.info "reading #{@opts[:xml]}"
       else
-        xml = STDIN.read
+        xml = $stdin.read
         Xembly.log.info 'reading STDIN'
       end
       if @opts.dirs?
@@ -73,7 +74,7 @@ module Xembly
         dirs = File.read(@opts[:dirs])
       else
         Xembly.log.info "#{@opts.arguments.length} directives in command line"
-        dirs = @opts.arguments.join(';')
+        dirs = @opts.arguments.join
       end
       Xembler.new(Directives.new(dirs)).apply(xml).to_xml
     end

data/test/test__helper.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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
@@ -26,13 +27,13 @@ require 'xembly'
 require 'minitest/autorun'
 
 # 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-2021 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-2021 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-2021 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-2021 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-2021 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-2021 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-2021 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-2021 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,14 +26,14 @@ 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-2021 Yegor Bugayenko
 # License:: MIT
 class TestDirectives < Minitest::Test
   def test_parses_directives
     dirs = Xembly::Directives.new(
-      "  ADD \"book\" ; ATTR 'a1', 'works, for\nme!';  "
+      "  ADD \"book;&quot;me\";UP;ATTR \"a1\", \"works, for\nme!\";  "
     )
-    assert dirs.length == 2, 'two directives must be there'
+    assert dirs.length == 3, 'three directives must be there'
   end
 end

data/test/test_remove.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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-2021 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-2021 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-2021 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-2021 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
@@ -27,22 +28,28 @@ require 'xembly/directives'
 require '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-2021 Yegor Bugayenko
 # License:: MIT
 class TestXembler < XeTest
   def test_modifies_xml
     xembler = Xembly::Xembler.new(
       Xembly::Directives.new(
-        'XPATH "/books"; ADD "book"; ADD "test"; UP; ADD "title"; SET "hi";'
+        'XPATH "/books"; ADD "book"; ADD "test"; UP;' \
+        'ADD "title"; SET "hi;you";' \
+        'XPATH "none"; XPATH "/none-again";' \
+        'XPATH "/books"; ATTR "amp", "test";' \
+        'ADD "temp"; ADD "t1"; UP; XPATH "t1"; REMOVE; ADD "t2";'
       )
     )
     matches(
       xembler.apply('<books/>').to_xml,
       [
         '/*',
+        '/books[@amp]',
         '/books[count(book)=1]',
-        '/books/book[test and title]'
+        '/books/book[test and title]',
+        '/books/book/title[.="hi;you"]'
       ]
     )
   end

data/test/test_xembly.rb

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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
@@ -28,12 +29,12 @@ require 'slop'
 require '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-2021 Yegor Bugayenko
 # License:: MIT
 class TestXembly < XeTest
   def test_basic
-    opts = opts(['-x', '/dev/null', 'ADD "books"', 'ADD "book"'])
+    opts = opts(['-x', '/dev/null', 'ADD "books";', 'ADD "book";'])
     matches(
       Xembly::Base.new(opts).xml,
       [

data/xembly.gemspec

@@ -1,6 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 #
-# Copyright (c) 2016 Yegor Bugayenko
+# Copyright (c) 2016-2021 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,36 @@
 # 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.rubygems_version = '2.2'
+  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.test_files = s.files.grep(%r{^(test|spec|features)/})
   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.12.3'
+  s.add_runtime_dependency 'rake', '13.0.6'
+  s.add_runtime_dependency 'slop', '4.4.1'
+  s.add_development_dependency 'coveralls', '0.8.23'
+  s.add_development_dependency 'cucumber', '7.0.0'
+  s.add_development_dependency 'minitest', '5.14.4'
+  s.add_development_dependency 'rdoc', '6.3.2'
+  s.add_development_dependency 'rspec-rails', '5.0.2'
+  s.add_development_dependency 'rubocop', '1.19.1'
+  s.add_development_dependency 'rubocop-rspec', '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xembly
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.4.3
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,142 +16,142 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.7.2
+        version: 1.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.7.2
+        version: 1.12.3
 - !ruby/object:Gem::Dependency
-  name: slop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 13.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 11.1.1
+        version: 4.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 11.1.1
+        version: 4.4.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.23
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 7.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.17
+        version: 5.14.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.17
+        version: 5.14.4
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: 6.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: 6.3.2
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 5.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.19.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.19.1
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 2.4.0
 description: Command Line XML Manipulator
-email: yegor@teamed.io
+email: yegor256@gmail.com
 executables:
 - xembly
 extensions: []
@@ -159,9 +159,13 @@ extra_rdoc_files:
 - README.md
 - LICENSE.txt
 files:
+- ".0pdd.yml"
 - ".coveralls.yml"
 - ".gitattributes"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
+- ".pdd"
 - ".rubocop.yml"
 - ".rultor.yml"
 - ".simplecov"
@@ -212,15 +216,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 2
 summary: Xembly Gem