xembly 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aefd3284a7d99ffa9bc9b2d477263a1b47a220a3
-  data.tar.gz: 1d795786c9081702f40b6aa43668af5d07964795
+  metadata.gz: 7d13f44b89daed33ea1f5225bb756ee791e25776
+  data.tar.gz: fa87b4c56484867037eb1d5fdf47f60cf2af938b
 SHA512:
-  metadata.gz: f56633f3ed7ebe4f8feea6fe724d7f1a22a14e721a8f12e4665aadfcaf567fd43443f202c0eb91b8ac29dfdb22c7fad44a858d609c0a399b90976b28941aed52
-  data.tar.gz: 033130d913d80d85d0f205ec519dfcd474d7626b1f3577f4dede4a54a283a11591cb830669deef211b2f3ea45f9088509be7f67d7d2348bd39f0f681702082e5
+  metadata.gz: 6ff45d3322febcd673bb205f8689ad8136a04676e64734ff9736ff848f50f0b89980495d57241c0e224f721918b948bd57de1b87a48f5a534eea34c2735c0829
+  data.tar.gz: b0c88f349598911c36247d229363c1adba7095417988b38e81d9f46bbf60e91823bd5188b4c926eb28b76e51171a7d4f252abf77434452975f04fd6d9855e1b6

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

@@ -66,11 +66,11 @@ Then(/^Stdout is empty$/) do
   fail "STDOUT is not empty:\n#{@stdout}" unless @stdout == ''
 end
 
-Then(/^XML file "([^"]+)" matches "([^"]+)"$/) do |file, xpath|
+Then(/^XML file "([^"]+)" matches "((?:[^"]|\\")+)"$/) do |file, xpath|
   fail "File #{file} doesn't exit" unless File.exist?(file)
   xml = Nokogiri::XML.parse(File.read(file))
   xml.remove_namespaces!
-  if xml.xpath(xpath).empty?
+  if xml.xpath(xpath.gsub(/\\"/, '"')).empty?
     fail "XML file #{file} doesn't match \"#{xpath}\":\n#{xml}"
   end
 end

data/lib/xembly/directives.rb

@@ -37,8 +37,8 @@ module Xembly
     def initialize(text)
       @array = text
         .strip
-        .split(/\s*;\s*/)
-        .reject(&:empty?)
+        .scan(/([A-Za-z]+)(?:\s+"([^"]+)")?(?:\s*,\s*"([^"]+)")*\s*;/)
+        .map { |t| t.reject(&:nil?) }
         .map { |t| Directives.map(t) }
     end
 
@@ -50,13 +50,9 @@ 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'

data/lib/xembly/set.rb

@@ -20,6 +20,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 +34,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/version.rb

@@ -25,5 +25,5 @@
 # Copyright:: Copyright (c) 2016 Yegor Bugayenko
 # License:: MIT
 module Xembly
-  VERSION = '0.3'
+  VERSION = '0.4'
 end

data/lib/xembly.rb

@@ -73,7 +73,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_directives.rb

@@ -31,8 +31,8 @@ require 'xembly/directives'
 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_xembler.rb

@@ -34,7 +34,7 @@ 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";'
       )
     )
     matches(
@@ -42,7 +42,8 @@ class TestXembler < XeTest
       [
         '/*',
         '/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

@@ -33,7 +33,7 @@ require 'test__helper'
 # 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,
       [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xembly
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri