ox 2.10.0 → 2.10.1

data/ext/ox/sax_stack.h

@@ -3,22 +3,22 @@
  * All rights reserved.
  */
 
-#ifndef __OX_SAX_STACK_H__
-#define __OX_SAX_STACK_H__
+#ifndef OX_SAX_STACK_H
+#define OX_SAX_STACK_H
 
 #include "sax_hint.h"
 
 #define STACK_INC	32
 
-typedef struct _Nv {
+typedef struct _nv {
     const char	*name;
     VALUE	val;
     int		childCnt;
     Hint	hint;
 } *Nv;
 
-typedef struct _NStack {
-    struct _Nv	base[STACK_INC];
+typedef struct _nStack {
+    struct _nv	base[STACK_INC];
     Nv		head;	/* current stack */
     Nv		end;	/* stack end */
     Nv		tail;	/* pointer to one past last element name on stack */
@@ -27,7 +27,7 @@ typedef struct _NStack {
 inline static void
 stack_init(NStack stack) {
     stack->head = stack->base;
-    stack->end = stack->base + sizeof(stack->base) / sizeof(struct _Nv);
+    stack->end = stack->base + sizeof(stack->base) / sizeof(struct _nv);
     stack->tail = stack->head;
 }
 
@@ -50,10 +50,10 @@ stack_push(NStack stack, const char *name, VALUE val, Hint hint) {
 	size_t	toff = stack->tail - stack->head;
 
 	if (stack->base == stack->head) {
-	    stack->head = ALLOC_N(struct _Nv, len + STACK_INC);
-	    memcpy(stack->head, stack->base, sizeof(struct _Nv) * len);
+	    stack->head = ALLOC_N(struct _nv, len + STACK_INC);
+	    memcpy(stack->head, stack->base, sizeof(struct _nv) * len);
 	} else {
-	    REALLOC_N(stack->head, struct _Nv, len + STACK_INC);
+	    REALLOC_N(stack->head, struct _nv, len + STACK_INC);
 	}
 	stack->tail = stack->head + toff;
 	stack->end = stack->head + len + STACK_INC;
@@ -82,4 +82,4 @@ stack_pop(NStack stack) {
     return 0;
 }
 
-#endif /* __OX_SAX_STACK_H__ */
+#endif /* OX_SAX_STACK_H */

data/ext/ox/special.h

@@ -3,11 +3,11 @@
  * All rights reserved.
  */
 
-#ifndef __OX_SPECIAL_H__
-#define __OX_SPECIAL_H__
+#ifndef OX_SPECIAL_H
+#define OX_SPECIAL_H
 
 #include <stdint.h>
 
 extern char*	ox_ucs_to_utf8_chars(char *text, uint64_t u);
 
-#endif /* __OX_SPECIAL_H__ */
+#endif /* OX_SPECIAL_H */

data/ext/ox/type.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef __OX_TYPE_H__
-#define __OX_TYPE_H__
+#ifndef OX_TYPE_H
+#define OX_TYPE_H
 
 typedef enum {
     NoCode	   = 0,
@@ -36,4 +36,4 @@ typedef enum {
     NilClassCode   = 'z',
 } Type;
 
-#endif /* __OX_TYPE_H__ */
+#endif /* OX_TYPE_H */

data/lib/ox/element.rb

@@ -182,6 +182,30 @@ module Ox
       found
     end
 
+    # Remove all the children matching the path provided
+    #
+    # Examples are:
+    # * <code>element.remove_children(Ox:Element)</code> removes the element passed as argument if child of the element.
+    # * <code>element.remove_children(Ox:Element, Ox:Element)</code> removes the list of elements passed as argument if children of the element.
+    #
+    # - +children+ [Array] array of OX
+    def remove_children(*children)
+      return self if children.compact.empty?
+      recursive_children_removal(children.compact.map { |c| c.object_id })
+      self
+    end
+
+    # Remove all the children matching the path provided
+    #
+    # Examples are:
+    # * <code>element.remove_children_by_path("*")</code> removes all children attributes.
+    # * <code>element.remove_children_by_path("Family/Kid[@age=32]")</code> removes the Kid elements with an age attribute equal to 32 in the Family Element.
+    #
+    # - +path+ [String] path to the Nodes to locate
+    def remove_children_by_path(path)
+      del_locate(path.split('/')) unless path.nil?
+      self
+    end
     # Handles the 'easy' API that allows navigating a simple XML by
     # referencing elements and attributes by name.
     # - +id+ [Symbol] element or attribute name
@@ -307,13 +331,105 @@ module Ox
       end
     end
 
+    # - +path+ [Array] array of steps in a path
+    def del_locate(path)
+      step = path[0]
+      if step.start_with?('@') # attribute
+        raise InvalidPath.new(path) unless 1 == path.size
+        if instance_variable_defined?(:@attributes)
+          step = step[1..-1]
+          sym_step = step.to_sym
+          @attributes.delete_if { |k,v| '?' == step || k.to_sym == sym_step }
+        end
+      else # element name
+        if (i = step.index('[')).nil? # just name
+          name = step
+          qual = nil
+        else
+          name = step[0..i-1]
+          raise InvalidPath.new(path) unless step.end_with?(']')
+          i += 1
+          qual = step[i..i] # step[i] would be better but some rubies (jruby, ree, rbx) take that as a Fixnum.
+          if '0' <= qual and qual <= '9'
+            qual = '+'
+          else
+            i += 1
+          end
+          index = step[i..-2].to_i
+        end
+        if '?' == name or '*' == name
+          match = nodes
+        elsif '^' == name[0..0] # 1.8.7 thinks name[0] is a fixnum
+          case name[1..-1]
+           when 'Element'
+            match = nodes.select { |e| e.is_a?(Element) }
+           when 'String', 'Text'
+            match = nodes.select { |e| e.is_a?(String) }
+          when 'Comment'
+            match = nodes.select { |e| e.is_a?(Comment) }
+          when 'CData'
+            match = nodes.select { |e| e.is_a?(CData) }
+          when 'DocType'
+            match = nodes.select { |e| e.is_a?(DocType) }
+          else
+            #puts "*** no match on #{name}"
+            match = []
+          end
+        else
+          match = nodes.select { |e| e.is_a?(Element) and name == e.name }
+        end
+        unless qual.nil? or match.empty?
+          case qual
+          when '+'
+            match = index < match.size ? [match[index]] : []
+          when '-'
+            match = index <= match.size ? [match[-index]] : []
+          when '<'
+            match = 0 < index ? match[0..index - 1] : []
+          when '>'
+            match = index <= match.size ? match[index + 1..-1] : []
+          when '@'
+            k,v = step[i..-2].split('=')
+            if v
+              match = match.select { |n| n.is_a?(Element) && (v == n.attributes[k.to_sym] || v == n.attributes[k]) }
+            else
+              match = match.select { |n| n.is_a?(Element) && (n.attributes[k.to_sym] || n.attributes[k]) }
+            end
+          else
+            raise InvalidPath.new(path)
+          end
+        end
+        if (1 == path.size)
+          nodes.delete_if { |n| match.include?(n) }
+        elsif '*' == name
+          match.each { |n| n.del_locate(path) if n.is_a?(Element) }
+          match.each { |n| n.del_locate(path[1..-1]) if n.is_a?(Element) }
+        else
+          match.each { |n| n.del_locate(path[1..-1]) if n.is_a?(Element) }
+        end
+      end
+    end
+
     private
 
+    # Removes recursively children for nodes and sub_nodes
+    #
+    # - +found+ [Array] An array of Ox::Element
+    def recursive_children_removal(found)
+      return if found.empty?
+      nodes.tap do |ns|
+        # found.delete(n.object_id) stops looking for an already found object_id
+        ns.delete_if { |n| found.include?(n.object_id) ? found.delete(n.object_id) : false }
+        nodes.each do |n|
+          n.send(:recursive_children_removal, found) if n.is_a?(Ox::Element)
+        end
+      end
+    end
+
     def name_matchs?(pat, id)
       return false unless pat.length == id.length
       pat.length.times { |i| return false unless '_' == id[i] || pat[i] == id[i] }
       true
     end
-
   end # Element
 end # Ox

data/lib/ox/version.rb

@@ -1,5 +1,5 @@
 
 module Ox
   # Current version of the module.
-  VERSION = '2.10.0'
+  VERSION = '2.10.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies: []
 description: "A fast XML parser and object serializer that uses only standard C lib.\n
   \           \nOptimized XML (Ox), as the name implies was written to provide speed
@@ -35,6 +35,7 @@ files:
 - ext/ox/cache8.c
 - ext/ox/cache8.h
 - ext/ox/dump.c
+- ext/ox/encode.h
 - ext/ox/err.c
 - ext/ox/err.h
 - ext/ox/extconf.rb
@@ -98,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ox
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A fast XML parser and object serializer.