mixml 0.0.3 → 0.9

data/lib/mixml.rb

@@ -1,2 +1,6 @@
 require 'mixml/version'
 require 'mixml/tool'
+require 'mixml/selection'
+require 'mixml/template/text'
+require 'mixml/template/expression'
+require 'mixml/template/xml'

data/lib/mixml/selection.rb

@@ -5,26 +5,28 @@ module Mixml
     # Selection of XML nodes
     class Selection
         # @return [Nokogiri::XML::NodeSet] Selected nodes
-        attr_reader :nodes
+        attr_reader :nodesets
 
-        # @param nodes [Nokogiri::XML::NodeSet] Selected nodes
-        def initialize(nodes)
-            @nodes = nodes
+        # @param nodesets [Array<Nokogiri::XML::NodeSet>] Selected nodes
+        def initialize(nodesets)
+            @nodesets = nodesets
         end
 
         # Remove selected nodes from the document
         def remove
-            @nodes.remove
+            each_node do |nodeset|
+                nodeset.remove
+            end
         end
 
         # Replace selected nodes with a template
         #
         # @param template [Template::Base] Template to replace nodes with
-        def replace(template = nil, &block)
+        def replace(template)
             template = template.to_mixml_template
 
-            @nodes.each do |node|
-                value = template.evaluate(node, &block)
+            each_node do |node|
+                value = template.evaluate(node)
                 node.replace(value)
             end
         end
@@ -32,11 +34,11 @@ module Mixml
         # Append children to node
         #
         # @param template [Template::Base] Template to replace nodes with
-        def append(template = nil, &block)
+        def append(template)
             template = template.to_mixml_template
 
-            @nodes.each do |node|
-                value = template.evaluate(node, &block)
+            each_node do |node|
+                value = template.evaluate(node)
                 node << value
             end
         end
@@ -47,7 +49,7 @@ module Mixml
         def value(template)
             template = template.to_mixml_template
 
-            @nodes.each do |node|
+            each_node do |node|
                 value = template.evaluate(node)
                 node.value = value
             end
@@ -59,10 +61,24 @@ module Mixml
         def rename(template)
             template = template.to_mixml_template
 
-            @nodes.each do |node|
+            each_node do |node|
                 value = template.evaluate(node)
                 node.name = value
             end
         end
+
+        protected
+
+        # Execute a block for each node
+        #
+        # @yield Block to execute for each node
+        # @yieldparam node [Nokogiri::XML::Node] Current node
+        def each_node
+            @nodesets.each do |nodeset|
+                nodeset.each do |node|
+                    yield node
+                end
+            end
+        end
     end
 end

data/lib/mixml/template/xml.rb

@@ -6,13 +6,20 @@ module Mixml
     module Template
         # XML builder based template
         class Xml < Base
+            # Initialize new XML template
+            #
+            # @param proc [lambda] Proc to create xml
+            def initialize(proc)
+                @proc = proc
+            end
+
             # Evaluate the template
             #
             # @param [Nokogiri::XML::Node] node Current node
             # @return [String] Template result
             def evaluate(node)
                 builder = Nokogiri::XML::Builder.new do |xml|
-                    yield(node, xml)
+                    @proc.call(node, xml)
                 end
                 builder.to_xml
             end

data/lib/mixml/tool.rb

@@ -162,36 +162,40 @@ module Mixml
 
         # Select nodes using an XPath expression and execute DSL commands for these nodes
         #
-        # @param query [String] XPath expression
+        # @param paths [Array<String>] XPath expression
         # @yield Block to execute for each nodeset
-        # @yieldparam nodes {Nokogiri::XML::NodeSet} XML nodes to process
         # @return [void]
-        def xpath(query, &block)
+        def xpath(*paths, &block)
+            nodesets = []
             process do |xml|
-                nodes = xml.xpath(query)
-                selection = Selection.new(nodes)
+                nodesets << xml.xpath(*paths)
+            end
+            selection = Selection.new(nodesets)
 
-                if block_given? then
-                    Docile.dsl_eval(selection, &block)
-                end
+            if block_given? then
+                Docile.dsl_eval(selection, &block)
             end
+
+            selection
         end
 
         # Select nodes using CSS selectors and execute DSL commands for these nodes
         #
-        # @param selectors [String] CSS selectors
+        # @param selectors [Array<String>] CSS selectors
         # @yield Block to execute for each nodeset
-        # @yieldparam nodes {Nokogiri::XML::NodeSet} XML nodes to process
         # @return [void]
         def css(*selectors, &block)
+            nodesets = []
             process do |xml|
-                nodes = xml.css(*selectors)
-                selection = Selection.new(nodes)
+                nodesets << xml.css(*selectors)
+            end
+            selection = Selection.new(nodesets)
 
-                if block_given? then
-                    Docile.dsl_eval(selection, &block)
-                end
+            if block_given? then
+                Docile.dsl_eval(selection, &block)
             end
+
+            selection
         end
 
         # Create a DSL replacement template
@@ -205,8 +209,9 @@ module Mixml
         # Create a XML replacement template
         #
         # @return [Template] Replacement template
-        def xml
-            Template::Xml.new
+        # @param proc [Proc] Lambda to create XML
+        def xml(proc)
+            Template::Xml.new(proc)
         end
 
         # Execute a script or a block
@@ -223,5 +228,30 @@ module Mixml
                 Docile.dsl_eval(self, &block)
             end
         end
+
+        # Execute block for each node
+        #
+        # @param selection [Selection] Selected nodes
+        # @yield Block to execute for each node
+        # @yieldparam node [Nokogiri::XML::Node] Current node
+        def node(selection)
+            selection.nodesets.each do |nodeset|
+                nodeset.each do |node|
+                    yield node
+                end
+            end
+        end
+
+        # Execute block for each node set
+        #
+        # @param selection [Selection] Selected nodes
+        # @yield Block to execute for each node set
+        # @yieldparam node [Nokogiri::XML::NodeSet] Current node set
+        def nodes(selection, &block)
+            selection.nodesets.each do |nodeset|
+                yield nodeset
+            end
+        end
+
     end
 end

data/lib/mixml/version.rb

@@ -1,4 +1,4 @@
 module Mixml
     # Current version
-    VERSION = '0.0.3'
+    VERSION = '0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixml
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: '0.9'
 platform: ruby
 authors:
 - Jochen Seeber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -84,16 +84,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: qed
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -151,20 +165,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: yard-qed
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
-description: Easily manipulate multiple XML files at once
+        version: '0.7'
+description: Never use XSLT again...
 email:
 - jochen@seeber.me
 executables:
@@ -172,7 +186,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .yardopts
+- LICENSE.txt
+- README.md
 - bin/mixml
+- demo/applique/test.rb
+- demo/tool.md
 - lib/mixml.rb
 - lib/mixml/document.rb
 - lib/mixml/selection.rb