nokogiri 1.11.0.rc1-java → 1.11.2-java

data/ext/java/nokogiri/internals/NokogiriNamespaceCache.java

@@ -17,10 +17,10 @@
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -47,171 +47,214 @@ import org.w3c.dom.Node;
 
 /**
  * Cache of namespaces of each node. XmlDocument has one cache of this class.
- * 
+ *
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
-public class NokogiriNamespaceCache {
-
-    private final Map<CacheKey, CacheEntry> cache;  // pair of the index of a given key and entry
-    private XmlNamespace defaultNamespace = null;
-
-    public NokogiriNamespaceCache() {
-        this.cache = new LinkedHashMap<CacheKey, CacheEntry>(4);
+public class NokogiriNamespaceCache
+{
+
+  private final Map<CacheKey, CacheEntry> cache;  // pair of the index of a given key and entry
+  private XmlNamespace defaultNamespace = null;
+
+  public
+  NokogiriNamespaceCache()
+  {
+    this.cache = new LinkedHashMap<CacheKey, CacheEntry>(4);
+  }
+
+  public
+  NokogiriNamespaceCache(NokogiriNamespaceCache cache)
+  {
+    this.cache = new LinkedHashMap<CacheKey, CacheEntry>(cache.size() + 2);
+    this.cache.putAll(cache.cache);
+  }
+
+  public XmlNamespace
+  getDefault()
+  {
+    return defaultNamespace;
+  }
+
+  public XmlNamespace
+  get(String prefix, String href)
+  {
+    if (href == null) { return null; }
+
+    CacheEntry value = cache.get(new CacheKey(prefix, href));
+    return value == null ? null : value.namespace;
+  }
+
+  public XmlNamespace
+  get(Node node, String prefix)
+  {
+    if (prefix == null) { return defaultNamespace; }
+    for (Map.Entry<CacheKey, CacheEntry> entry : cache.entrySet()) {
+      if (entry.getKey().prefix.equals(prefix)) {
+        if (entry.getValue().isOwner(node)) {
+          return entry.getValue().namespace;
+        }
+      }
     }
-
-    public NokogiriNamespaceCache(NokogiriNamespaceCache cache) {
-        this.cache = new LinkedHashMap<CacheKey, CacheEntry>(cache.size() + 2);
-        this.cache.putAll(cache.cache);
+    return null;
+  }
+
+  public List<XmlNamespace>
+  get(String prefix)
+  {
+    List<XmlNamespace> namespaces = new ArrayList<XmlNamespace>();
+    if (prefix == null) {
+      namespaces.add(defaultNamespace);
+      return namespaces;
     }
-
-    public XmlNamespace getDefault() {
-        return defaultNamespace;
+    for (Map.Entry<CacheKey, CacheEntry> entry : cache.entrySet()) {
+      if (entry.getKey().prefix.equals(prefix)) {
+        namespaces.add(entry.getValue().namespace);
+      }
     }
-
-    public XmlNamespace get(String prefix, String href) {
-        if (href == null) return null;
-
-        CacheEntry value = cache.get(new CacheKey(prefix, href));
-        return value == null ? null : value.namespace;
+    return namespaces;
+  }
+
+  public List<XmlNamespace>
+  get(Node node)
+  {
+    List<XmlNamespace> namespaces = new ArrayList<XmlNamespace>();
+    for (Map.Entry<CacheKey, CacheEntry> entry : cache.entrySet()) {
+      if (entry.getValue().isOwner(node)) {
+        namespaces.add(entry.getValue().namespace);
+      }
     }
-
-    public XmlNamespace get(Node node, String prefix) {
-        if (prefix == null) return defaultNamespace;
-        for (Map.Entry<CacheKey, CacheEntry> entry : cache.entrySet()) {
-            if (entry.getKey().prefix.equals(prefix)) {
-                if (entry.getValue().isOwner(node)) {
-                    return entry.getValue().namespace;
-                }
-            }
+    return namespaces;
+  }
+
+  public void
+  put(XmlNamespace namespace, Node ownerNode)
+  {
+    String prefix = namespace.getPrefix();
+    String href = namespace.getHref();
+    if (href == null) { return; }
+
+    CacheKey key = new CacheKey(prefix, href);
+    if (cache.get(key) != null) { return; }
+    cache.put(key, new CacheEntry(namespace, ownerNode));
+    if ("".equals(prefix)) { defaultNamespace = namespace; }
+  }
+
+  public void
+  remove(Node ownerNode)
+  {
+    String prefix = ownerNode.getPrefix();
+    String href = ownerNode.getNamespaceURI();
+    if (href == null) { return; }
+
+    cache.remove(new CacheKey(prefix, href));
+  }
+
+  public int
+  size()
+  {
+    return cache.size();
+  }
+
+  public void
+  clear()
+  {
+    // removes namespace declarations from node
+    for (CacheEntry entry : cache.values()) {
+      NamedNodeMap attributes = entry.ownerNode.getAttributes();
+      for (int j = 0; j < attributes.getLength(); j++) {
+        String name = ((Attr) attributes.item(j)).getName();
+        if (isNamespace(name)) {
+          attributes.removeNamedItem(name);
         }
-        return null;
+      }
     }
-
-    public List<XmlNamespace> get(String prefix) {
-        List<XmlNamespace> namespaces = new ArrayList<XmlNamespace>();
-        if (prefix == null) {
-            namespaces.add(defaultNamespace);
-            return namespaces;
-        }
-        for (Map.Entry<CacheKey, CacheEntry> entry : cache.entrySet()) {
-            if (entry.getKey().prefix.equals(prefix)) {
-                namespaces.add(entry.getValue().namespace);
-            }
-        }
-        return namespaces;
+    cache.clear();
+    defaultNamespace = null;
+  }
+
+  public void
+  replaceNode(Node oldNode, Node newNode)
+  {
+    for (Map.Entry<CacheKey, CacheEntry> entry : cache.entrySet()) {
+      if (entry.getValue().isOwner(oldNode)) {
+        entry.getValue().replaceOwner(newNode);
+      }
     }
-
-    public List<XmlNamespace> get(Node node) {
-        List<XmlNamespace> namespaces = new ArrayList<XmlNamespace>();
-        for (Map.Entry<CacheKey, CacheEntry> entry : cache.entrySet()) {
-            if (entry.getValue().isOwner(node)) {
-                namespaces.add(entry.getValue().namespace);
-            }
-        }
-        return namespaces;
+  }
+
+  @Override
+  public String
+  toString()
+  {
+    return getClass().getName() + '@' + Integer.toHexString(hashCode()) + '(' + cache + "default=" + defaultNamespace + ')';
+  }
+
+  private static class CacheKey
+  {
+    final String prefix;
+    final String href;
+
+    CacheKey(String prefix, String href)
+    {
+      this.prefix = prefix;
+      this.href = href;
     }
 
-    public void put(XmlNamespace namespace, Node ownerNode) {
-        String prefix = namespace.getPrefix();
-        String href = namespace.getHref();
-        if (href == null) return;
-
-        CacheKey key = new CacheKey(prefix, href);
-        if (cache.get(key) != null) return;
-        cache.put(key, new CacheEntry(namespace, ownerNode));
-        if ("".equals(prefix)) defaultNamespace = namespace;
+    @Override
+    public boolean
+    equals(final Object obj)
+    {
+      if (obj instanceof CacheKey) {
+        CacheKey that = (CacheKey) obj;
+        return prefix == null ? that.prefix == null : prefix.equals(that.prefix) && href.equals(that.href);
+      }
+      return false;
     }
 
-    public void remove(Node ownerNode) {
-        String prefix = ownerNode.getPrefix();
-        String href = ownerNode.getNamespaceURI();
-        if (href == null) return;
-
-        cache.remove(new CacheKey(prefix, href));
+    @Override
+    public int
+    hashCode()
+    {
+      return (prefix == null ? 0 : prefix.hashCode()) + 37 * href.hashCode();
     }
 
-    public int size() {
-        return cache.size();
+    @Override
+    public String
+    toString()
+    {
+      return '[' + prefix + ']' + href;
     }
+  }
 
-    public void clear() {
-        // removes namespace declarations from node
-        for (CacheEntry entry : cache.values()) {
-            NamedNodeMap attributes = entry.ownerNode.getAttributes();
-            for (int j=0; j<attributes.getLength(); j++) {
-                String name = ((Attr) attributes.item(j)).getName();
-                if (isNamespace(name)) {
-                    attributes.removeNamedItem(name);
-                }
-            }
-        }
-        cache.clear();
-        defaultNamespace = null;
-    }
+  private static class CacheEntry
+  {
+    final XmlNamespace namespace;
+    private Node ownerNode;
 
-    public void replaceNode(Node oldNode, Node newNode) {
-        for (Map.Entry<CacheKey, CacheEntry> entry : cache.entrySet()) {
-            if (entry.getValue().isOwner(oldNode)) {
-                entry.getValue().replaceOwner(newNode);
-            }
-        }
+    CacheEntry(XmlNamespace namespace, Node ownerNode)
+    {
+      this.namespace = namespace;
+      this.ownerNode = ownerNode;
     }
 
-    @Override
-    public String toString() {
-        return getClass().getName() + '@' + Integer.toHexString(hashCode()) + '(' + cache + "default=" + defaultNamespace + ')';
+    boolean
+    isOwner(Node node)
+    {
+      return ownerNode.isSameNode(node);
     }
 
-    private static class CacheKey {
-        final String prefix;
-        final String href;
-
-        CacheKey(String prefix, String href) {
-            this.prefix = prefix;
-            this.href = href;
-        }
-
-        @Override
-        public boolean equals(final Object obj) {
-            if (obj instanceof CacheKey) {
-                CacheKey that = (CacheKey) obj;
-                return prefix == null ? that.prefix == null : prefix.equals(that.prefix) && href.equals(that.href);
-            }
-            return false;
-        }
-
-        @Override
-        public int hashCode() {
-            return (prefix == null ? 0 : prefix.hashCode()) + 37 * href.hashCode();
-        }
-
-        @Override
-        public String toString() {
-            return '[' + prefix + ']' + href;
-        }
+    void
+    replaceOwner(Node newNode)
+    {
+      this.ownerNode = newNode;
     }
 
-    private static class CacheEntry {
-        final XmlNamespace namespace;
-        private Node ownerNode;
-
-        CacheEntry(XmlNamespace namespace, Node ownerNode) {
-            this.namespace = namespace;
-            this.ownerNode = ownerNode;
-        }
-
-        boolean isOwner(Node node) {
-            return ownerNode.isSameNode(node);
-        }
-
-        void replaceOwner(Node newNode) {
-            this.ownerNode = newNode;
-        }
-
-        @Override
-        public String toString() {
-            return namespace.toString();
-        }
+    @Override
+    public String
+    toString()
+    {
+      return namespace.toString();
     }
+  }
 }

data/ext/java/nokogiri/internals/NokogiriNamespaceContext.java

@@ -17,10 +17,10 @@
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -44,77 +44,99 @@ import javax.xml.namespace.NamespaceContext;
 
 /**
  * Holder of each node's namespace.
- * 
+ *
  * @author Yoko Harada <yokolet@gmail.com>
  *
  */
-public final class NokogiriNamespaceContext implements NamespaceContext {
+public final class NokogiriNamespaceContext implements NamespaceContext
+{
+
+  /*
+   * these constants have matching declarations in
+   * ext/nokogiri/xml_xpath_context.c
+   */
+  public static final String NOKOGIRI_PREFIX = "nokogiri";
+  public static final String NOKOGIRI_URI = "http://www.nokogiri.org/default_ns/ruby/extensions_functions";
+
+  public static final String NOKOGIRI_BUILTIN_PREFIX = "nokogiri-builtin";
+  public static final String NOKOGIRI_BUILTIN_URI = "https://www.nokogiri.org/default_ns/ruby/builtins";
 
-	public static final String NOKOGIRI_PREFIX = "nokogiri";
-    public static final String NOKOGIRI_URI = "http://www.nokogiri.org/default_ns/ruby/extensions_functions";
-    public static final String NOKOGIRI_TEMPORARY_ROOT_TAG = "nokogiri-temporary-root-tag";
-    
-    private final Map<String,String> register;
+  private final Map<String, String> register;
 
-    public static NokogiriNamespaceContext create() {
-        return new NokogiriNamespaceContext();
+  public static NokogiriNamespaceContext
+  create()
+  {
+    return new NokogiriNamespaceContext();
+  }
+
+  private
+  NokogiriNamespaceContext()
+  {
+    register = new HashMap<String, String>(6, 1);
+    register.put(NOKOGIRI_PREFIX, NOKOGIRI_URI);
+    register.put(NOKOGIRI_BUILTIN_PREFIX, NOKOGIRI_BUILTIN_URI);
+    register.put("xml", "http://www.w3.org/XML/1998/namespace");
+    register.put("xhtml", "http://www.w3.org/1999/xhtml");
+  }
+
+  public String
+  getNamespaceURI(String prefix)
+  {
+    if (prefix == null) {
+      throw new IllegalArgumentException();
     }
-    
-    private NokogiriNamespaceContext() {
-        register = new HashMap<String, String>(6, 1);
-        register.put(NOKOGIRI_PREFIX, NOKOGIRI_URI);
-        register.put("xml", "http://www.w3.org/XML/1998/namespace");
-        register.put("xhtml", "http://www.w3.org/1999/xhtml");
+    String uri = this.register.get(prefix);
+    if (uri != null) {
+      return uri;
     }
 
-    public String getNamespaceURI(String prefix) {
-    	if (prefix == null) {
-            throw new IllegalArgumentException();
-        }
-        String uri = this.register.get(prefix);
-        if (uri != null) {
-            return uri;
-        }
-
-        if (prefix.equals(XMLConstants.XMLNS_ATTRIBUTE)) {
-            uri = this.register.get(XMLConstants.XMLNS_ATTRIBUTE);
-            return (uri == null) ? XMLConstants.XMLNS_ATTRIBUTE_NS_URI : uri;
-        }
-
-        return XMLConstants.NULL_NS_URI;
+    if (prefix.equals(XMLConstants.XMLNS_ATTRIBUTE)) {
+      uri = this.register.get(XMLConstants.XMLNS_ATTRIBUTE);
+      return (uri == null) ? XMLConstants.XMLNS_ATTRIBUTE_NS_URI : uri;
     }
 
-    public String getPrefix(String uri) {
-    	if (uri == null) {
-            throw new IllegalArgumentException("uri is null");
-        }
-        Set<Entry<String, String>> entries = register.entrySet();
-        for (Entry<String, String> entry : entries) {
-            if (uri.equals(entry.getValue())) {
-                return entry.getKey();
-            }
-        }
-        return null;
-    }
+    return XMLConstants.NULL_NS_URI;
+  }
 
-    public Iterator<String> getPrefixes(String uri) {
-        Set<Entry<String, String>> entries = register.entrySet();
-        ArrayList<String> list = new ArrayList<String>(entries.size());
-        for (Entry<String, String> entry : entries) {
-            if (uri.equals(entry.getValue())) {
-                list.add(entry.getKey());
-            }
-        }
-        return list.iterator();
+  public String
+  getPrefix(String uri)
+  {
+    if (uri == null) {
+      throw new IllegalArgumentException("uri is null");
     }
-    
-    public Set<String> getAllPrefixes() {
-        return register.keySet();
+    Set<Entry<String, String>> entries = register.entrySet();
+    for (Entry<String, String> entry : entries) {
+      if (uri.equals(entry.getValue())) {
+        return entry.getKey();
+      }
     }
+    return null;
+  }
 
-    public void registerNamespace(String prefix, String uri) {
-        if ("xmlns".equals(prefix)) prefix = "";
-        register.put(prefix, uri);
+  public Iterator<String>
+  getPrefixes(String uri)
+  {
+    Set<Entry<String, String>> entries = register.entrySet();
+    ArrayList<String> list = new ArrayList<String>(entries.size());
+    for (Entry<String, String> entry : entries) {
+      if (uri.equals(entry.getValue())) {
+        list.add(entry.getKey());
+      }
     }
+    return list.iterator();
+  }
+
+  public Set<String>
+  getAllPrefixes()
+  {
+    return register.keySet();
+  }
+
+  public void
+  registerNamespace(String prefix, String uri)
+  {
+    if ("xmlns".equals(prefix)) { prefix = ""; }
+    register.put(prefix, uri);
+  }
 
 }