oga 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f8a4c2a027e02e07a94874d17bb49492bd09460
-  data.tar.gz: 2798515da813f4ef194075131846affbb95e25ac
+  metadata.gz: 4445e4b345d7892e11706b1901c3a19b3ad8e4b1
+  data.tar.gz: 886eb1880fecd4e068498ff5328d2cf0bc24f50c
 SHA512:
-  metadata.gz: 8b567514db0296d5c16a815d769d0a38c1f70949d198f971338d25fe00c95b0ff513c698c65b63a5e965097502d51945a81a695f6ae208c1dfb6a7c41b43f602
-  data.tar.gz: b69129e2b101db42009f8b9f1cac4cc18e3f54f83a78eb6b990689e520e4d027e3c1e47865d76968e3c59f0311bf30fa0362472a151dca2be9b473fa03189509
+  metadata.gz: 0ae267cf2e6572b51691bca870f7b825f6cdde8cee6804cb056dff81a0cfc01618d274aff0d402b7e9e59c61ec1211d0df1e6cceaea8f077bdeb86d8b4b46c54
+  data.tar.gz: d99c0848e4906c3059c314da523c963aca4b77a257380da98e86dc87c11485fa3620247e2d1df005c92077503dc36acd0097e855bff0ec08cf65b885447a3bf4

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: ruby
 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
@@ -165,6 +165,7 @@ files:
 - lib/oga.rb
 - lib/oga/css/lexer.rb
 - lib/oga/css/parser.rb
+- lib/oga/entity_decoder.rb
 - lib/oga/html/entities.rb
 - lib/oga/html/parser.rb
 - lib/oga/html/sax_parser.rb