oga 0.3.0-java → 0.3.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89ef02859eae3c3117773035f01723b32a7031a7
-  data.tar.gz: db6f29804d9ff062b5614996414461fd70dca00b
+  metadata.gz: ac227c01680fb6b04932a7715c113e2fc09b1c62
+  data.tar.gz: 412ab533e651333c671442239e7165ba3bbec2e7
 SHA512:
-  metadata.gz: 0faba8accbbb9709bb68ed1b688a9728ad4e34125a9eb28f8a6eb50db3c19c320f1bbf89f9ce84ea66fadc5fbc4b7a8bc836b32904a5ad50e8ff49678f21a120
-  data.tar.gz: 720d2c649056d5ffaf460725aaffd456081999a0311801cc11332795f81382836e88f77ef2d5d3ae30ca9a0e64801851cdf7af6e52858307e67beacf817def57
+  metadata.gz: 7daa67d63f5148e7894bd03df2f6a85562a5f9a08eee09388ce41f5a510896e65f7fe5c6a582d46b6efac8399050ed752bd5a33b6494a4fd11ffa1a4b598b523
+  data.tar.gz: 12a94c68692f33941c0d040ea576537e0eb3e6dcc3326c7f7f4ad6664282688fc2b454e2b3b3bc27864a8f60d36d9424032c25f6ee24e95ab6d988426aaf91d3

data/lib/oga.rb

@@ -6,6 +6,7 @@ require 'thread'
 require_relative 'oga/version'
 require_relative 'oga/oga'
 require_relative 'oga/lru'
+require_relative 'oga/entity_decoder'
 
 # Load these first so that the native extensions don't have to define the
 # Oga::XML namespace.

data/lib/oga/entity_decoder.rb

@@ -0,0 +1,21 @@
+module Oga
+  module EntityDecoder
+    ##
+    # @see [decode]
+    #
+    def self.try_decode(input, html = false)
+      return input ? decode(input, html) : nil
+    end
+
+    ##
+    # @param [String] input
+    # @param [TrueClass|FalseClass] html
+    # @return [String]
+    #
+    def self.decode(input, html = false)
+      decoder = html ? HTML::Entities : XML::Entities
+
+      return decoder.decode(input)
+    end
+  end # EntityDecoder
+end # Oga

data/lib/oga/version.rb

@@ -1,3 +1,3 @@
 module Oga
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end # Oga

data/lib/oga/xml/attribute.rb

@@ -10,16 +10,12 @@ module Oga
     # @!attribute [rw] namespace_name
     #  @return [String]
     #
-    # @!attribute [rw] value
-    #  The value of the attribute.
-    #  @return [String]
-    #
     # @!attribute [r] element
     #  The element this attribute belongs to.
     #  @return [Oga::XML::Element]
     #
     class Attribute
-      attr_accessor :name, :namespace_name, :element, :value
+      attr_accessor :name, :namespace_name, :element
 
       ##
       # The default namespace available to all attributes. This namespace can
@@ -67,8 +63,28 @@ module Oga
       end
 
       ##
-      # Returns the value of the attribute.
+      # @param [String] value
       #
+      def value=(value)
+        @value   = value
+        @decoded = false
+      end
+
+      ##
+      # Returns the value of the attribute or nil if no explicit value was set.
+      #
+      # @return [String|NilClass]
+      #
+      def value
+        if !@decoded and @value
+          @value   = EntityDecoder.try_decode(@value, html?)
+          @decoded = true
+        end
+
+        return @value
+      end
+
+      ##
       # @return [String]
       #
       def text
@@ -108,6 +124,15 @@ module Oga
 
         return "Attribute(#{segments.join(' ')})"
       end
+
+      private
+
+      ##
+      # @return [TrueClass|FalseClass]
+      #
+      def html?
+        return !!@element && @element.html?
+      end
     end # Attribute
   end # XML
 end # Oga

data/lib/oga/xml/text.rb

@@ -26,9 +26,8 @@ module Oga
       # @return [String]
       #
       def text
-        unless @decoded
-          decoder  = html? ? HTML::Entities : Entities
-          @text    = decoder.decode(@text)
+        if decode_entities?
+          @text    = EntityDecoder.try_decode(@text, html?)
           @decoded = true
         end
 
@@ -39,15 +38,29 @@ module Oga
       # @see [Oga::XML::CharacterNode#to_xml]
       #
       def to_xml
-        node = parent
-
-        if node.is_a?(Element) and html? \
-        and Lexer::LITERAL_HTML_ELEMENTS.include?(node.name)
-          return super
-        end
+        return super if inside_literal_html?
 
         return Entities.encode(super)
       end
+
+      private
+
+      ##
+      # @return [TrueClass|FalseClass]
+      #
+      def decode_entities?
+        return !@decoded && !inside_literal_html?
+      end
+
+      ##
+      # @return [TrueClass|FalseClass]
+      #
+      def inside_literal_html?
+        node = parent
+
+        return node.is_a?(Element) && html? &&
+          Lexer::LITERAL_HTML_ELEMENTS.include?(node.name)
+      end
     end # Text
   end # XML
 end # Oga

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oga
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: java
 authors:
 - Yorick Peterse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -142,56 +142,57 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- doc/xml_namespaces.md
 - doc/manually_creating_documents.md
+- doc/DCO.md
+- doc/xml_namespaces.md
 - doc/css_selectors.md
 - doc/migrating_from_nokogiri.md
-- doc/DCO.md
 - doc/css/common.css
 - lib/oga.rb
+- lib/oga/oga.rb
 - lib/oga/version.rb
 - lib/oga/lru.rb
-- lib/oga/oga.rb
+- lib/oga/entity_decoder.rb
 - lib/oga/css/lexer.rb
 - lib/oga/css/parser.rb
-- lib/oga/xml/namespace.rb
+- lib/oga/html/sax_parser.rb
+- lib/oga/html/parser.rb
+- lib/oga/html/entities.rb
 - lib/oga/xml/lexer.rb
+- lib/oga/xml/namespace.rb
+- lib/oga/xml/processing_instruction.rb
+- lib/oga/xml/character_node.rb
+- lib/oga/xml/sax_parser.rb
+- lib/oga/xml/doctype.rb
+- lib/oga/xml/document.rb
+- lib/oga/xml/comment.rb
+- lib/oga/xml/default_namespace.rb
+- lib/oga/xml/text.rb
 - lib/oga/xml/querying.rb
+- lib/oga/xml/attribute.rb
+- lib/oga/xml/pull_parser.rb
 - lib/oga/xml/parser.rb
-- lib/oga/xml/traversal.rb
-- lib/oga/xml/text.rb
+- lib/oga/xml/entities.rb
+- lib/oga/xml/html_void_elements.rb
 - lib/oga/xml/node.rb
-- lib/oga/xml/document.rb
-- lib/oga/xml/pull_parser.rb
 - lib/oga/xml/node_set.rb
-- lib/oga/xml/sax_parser.rb
-- lib/oga/xml/cdata.rb
 - lib/oga/xml/element.rb
-- lib/oga/xml/character_node.rb
-- lib/oga/xml/doctype.rb
-- lib/oga/xml/html_void_elements.rb
-- lib/oga/xml/entities.rb
-- lib/oga/xml/default_namespace.rb
-- lib/oga/xml/attribute.rb
 - lib/oga/xml/xml_declaration.rb
-- lib/oga/xml/processing_instruction.rb
-- lib/oga/xml/comment.rb
-- lib/oga/html/parser.rb
-- lib/oga/html/sax_parser.rb
-- lib/oga/html/entities.rb
+- lib/oga/xml/cdata.rb
+- lib/oga/xml/traversal.rb
 - lib/oga/xpath/lexer.rb
-- lib/oga/xpath/parser.rb
 - lib/oga/xpath/evaluator.rb
-- ext/ragel/base_lexer.rl
-- ext/java/Liboga.java
-- ext/java/org/liboga/xml/Lexer.java
-- ext/java/org/liboga/xml/Lexer.rl
-- ext/c/extconf.rb
+- lib/oga/xpath/parser.rb
+- ext/c/lexer.c
 - ext/c/lexer.rl
 - ext/c/lexer.h
 - ext/c/liboga.c
-- ext/c/lexer.c
+- ext/c/extconf.rb
 - ext/c/liboga.h
+- ext/ragel/base_lexer.rl
+- ext/java/Liboga.java
+- ext/java/org/liboga/xml/Lexer.java
+- ext/java/org/liboga/xml/Lexer.rl
 - README.md
 - LICENSE
 - oga.gemspec