oga 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c12b25a1de8aefc56af27b416df64100198d776
-  data.tar.gz: f2b5d83c0ab750a1005ef99997e3d38b2c938c26
+  metadata.gz: 0c097f57414df0ae5dafab755c0792c9c57c9fc8
+  data.tar.gz: e36bb88a9f92ccf32959f8ab31158877612af4d8
 SHA512:
-  metadata.gz: d457b69ca2daa6d529c83f02c8681b7dff2b16e5a31cfca58932c7b778075f2698e24ec15e288739a7485c197396848f1e1894e4e7ecc15f4db0b5a772afe7de
-  data.tar.gz: 4c8c0af22947d873c19ffb5594d986f0c3080c0eb0bc6533628c5274da62b379f884a6c6e1c84e1b3e6886234cb7457988a8b6b26125e44527ebb720fb6b7f50
+  metadata.gz: c3db35d326713f49c4db2142ee7c9e92ffff0c50c1053b6cca2f419261a8b4ac1342be0d0ffead460665a83260f967eba874b03dd000d88985d6e52cb7aced06
+  data.tar.gz: c057a3939683645551c6a51282a25345438809cf45da4c2ae5df3a936f17c538cba9d86f5588960aa63544233b414fdb355da5eb593658c0daff8e23cb282f8c

data/lib/oga/version.rb

@@ -1,3 +1,3 @@
 module Oga
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end # Oga

data/lib/oga/xml/lexer.rb

@@ -162,6 +162,20 @@ module Oga
         return !!html
       end
 
+      ##
+      # @return [TrueClass|FalseClass]
+      #
+      def html_script?
+        return html? && current_element == HTML_SCRIPT
+      end
+
+      ##
+      # @return [TrueClass|FalseClass]
+      #
+      def html_style?
+        return html? && current_element == HTML_STYLE
+      end
+
       private
 
       ##
@@ -194,20 +208,6 @@ module Oga
         return @elements.last
       end
 
-      ##
-      # @return [TrueClass|FalseClass]
-      #
-      def html_script?
-        return html? && current_element == HTML_SCRIPT
-      end
-
-      ##
-      # @return [TrueClass|FalseClass]
-      #
-      def html_style?
-        return html? && current_element == HTML_STYLE
-      end
-
       ##
       # Called when processing a single quote.
       #

data/lib/oga/xml/sax_parser.rb

@@ -128,6 +128,10 @@ module Oga
 
         key = ns ? "#{ns}:#{name}" : name
 
+        if value
+          value = EntityDecoder.try_decode(value, @lexer.html?)
+        end
+
         return {key => value}
       end
 
@@ -152,8 +156,30 @@ module Oga
         return merged
       end
 
+      ##
+      # @param [String] text
+      #
+      def on_text(text)
+        if @handler.respond_to?(:on_text)
+          unless inside_literal_html?
+            text = EntityDecoder.try_decode(text, @lexer.html?)
+          end
+
+          run_callback(:on_text, text)
+        end
+
+        return
+      end
+
       private
 
+      ##
+      # @return [TrueClass|FalseClass]
+      #
+      def inside_literal_html?
+        return @lexer.html_script? || @lexer.html_style?
+      end
+
       ##
       # @param [Symbol] method
       # @param [Array] args

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oga
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Yorick Peterse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast