oga 0.3.3-java → 0.3.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e5eae7184738ed26011bc86192ce7468a56d8d0
-  data.tar.gz: fa9d98441fa84f22ef644e665ec5c41182f2951e
+  metadata.gz: d6dab71dd0f5c74363b5f4a86873a9cd8e254650
+  data.tar.gz: 0c8c46ad063f3788e226023c00327736c9868552
 SHA512:
-  metadata.gz: aa892fc40ac36551956ef575d9ab5e2dab140189bda839a69967e674623a7f31c8aaca66d60be5220e27aa22bf6cc8902474e0b0d6ff0287b30db28c52a1460f
-  data.tar.gz: d0a80c1f2fbb161d8eef7eebeea2f77de994fc26be170a7d5b6d378a50220e17a724a2236f025ba44991b96d2c7272a84eb69ab005ab4e87c3478083cdb4f218
+  metadata.gz: 40f2855864d4b404c51570a752a5d89b374fb60f810ea73cda54978da00ec351aa8f76eedf6e88ea612b617c8a3a34e76f8eeff33ca5bd75657b77773a528450
+  data.tar.gz: 193cf32aca15cd292ad00ed3d189a9d5653039faa039606588dae99406fb97e855c4ac2d9f4df3c3e51958f442086f3eb5808533510101cf17287f023a7e79a3

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: java
 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