cw 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb7266c839627f6135e9adf8e83b3e59f5112177
-  data.tar.gz: b0da0ee8068f18450a1fedfee2e0b0df2d3b4053
+  metadata.gz: f32cecabf34fb0f987f2c33b7678f5d1de000655
+  data.tar.gz: 38ea73121579a8b0e194021e8997b191939e3bc8
 SHA512:
-  metadata.gz: edadbf29105e8f07f58d899b9446bcd7e23dd0d70e9c9f455b4b93182ed21418a0dda8a813651f2461e493a2e9b4ac55240e20710de157de1582778761de16a3
-  data.tar.gz: f1ec5443a2fd3a574460318171438d77511a4450f273f44d03b8f9674c26b38b01b30dfed56dff53c84dc7a06d4cb3dc7cdfebeccfc089885727e17f6901309c
+  metadata.gz: 3a9c6b660fba1f14a7429d73879cef6cc28790ecb8136576d580e3ad388a35cfdd12d4f8fdcee7d67b0b5427bc0a290db942359d73fa73faec06f2cc119cc2d3
+  data.tar.gz: a0bd05411135bfdbb77dd51091445bf5d3e556c1f05a7afbe5bc60787ec8c2c276e487ec3bd60807a8f4b89b3853f25ae631de76648498f45d05e3aa8c1c3478

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/cw.gemspec

@@ -19,16 +19,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib", "audio", "data/text", "test"]
 
   spec.required_ruby_version = '>= 2.0.0'
-  spec.add_runtime_dependency 'oga', '~>2.7'
+  spec.add_runtime_dependency 'oga', '~> 2.8'
   spec.add_runtime_dependency 'httpclient'
   spec.add_runtime_dependency 'htmlentities', '>= 4.3.4'
   spec.add_runtime_dependency 'paint', '>= 1.0.1'
   spec.add_runtime_dependency 'rake', '>= 11.2.2'
   spec.add_runtime_dependency 'ruby-progressbar', '>= 1.8.1'
-  spec.add_runtime_dependency 'sanitize', '~> 4.4.0'
   spec.add_runtime_dependency 'wavefile', '>= 0.7.0'
   spec.add_runtime_dependency 'parseconfig', '~> 1.0.8'
   spec.add_runtime_dependency 'rubyserial', '~> 0.4.0'
+
   spec.add_dependency         'os', '~> 0.9.6'
 
   spec.add_development_dependency 'version', '>= 1.0.0'

data/lib/cw.rb

@@ -16,6 +16,7 @@ require_relative 'cw/alphabet'
 require_relative 'cw/numbers'
 require_relative 'cw/str'
 require_relative 'cw/rss'
+require_relative 'cw/rss_clean'
 require_relative 'cw/words'
 require_relative 'cw/cl'
 require_relative 'cw/key_input'

data/lib/cw/rss.rb

@@ -3,7 +3,6 @@
 require 'oga'
 require 'httpclient'
 require "htmlentities"
-require 'sanitize'
 
 module CWG
 
@@ -41,8 +40,11 @@ module CWG
         unless(title.include?('VIDEO:') ||
                title.include?('In pictures:') ||
                title.include?('Morning business round-up'))
-          @rss_articles << Sanitize.clean(coder.decode(title)) + '. ' +
-                           Sanitize.clean(coder.decode(description))
+          clean_title = CWG::RSSClean.new(title).scrub
+          clean_desc = CWG::RSSClean.new(description).scrub
+#          @rss_articles << Sanitize.clean(coder.decode(title)) + '. ' +
+          #                           Sanitize.clean(coder.decode(description))
+          @rss_articles << clean_title + '. ' + clean_desc
           count += 1
           break if count >= article_count
         end

data/lib/cw/rss_clean.rb

@@ -0,0 +1,41 @@
+require 'oga'
+
+module CWG
+  class RSSClean
+    def initialize(html_fragment)
+      @html_fragment = html_fragment
+    end
+
+    def scrub(options = {})
+      blacklisted_tags = NON_CONTENT_TAGS + options.fetch(:blacklist, [])
+
+      sanitize(Oga.parse_html(html_fragment).children, blacklisted_tags)
+    end
+
+    private
+
+    attr_reader :html_fragment
+
+    NON_CONTENT_TAGS = %w(script style)
+    WHITESPACE_CONTENT_TAGS = %w(address article aside blockquote br dd div dl dt footer h1 h2 h3 h4 h5 h6 header hgroup hr li nav ol p pre section ul)
+
+    def sanitize(node_set, blacklisted_tags)
+      node_set.reject { |node| !text?(node) && blacklisted_tags.include?(node.name) }
+        .flat_map { |node| [whitespace(node, :prefix), text(node, blacklisted_tags), whitespace(node, :suffix)] }.join
+    end
+
+    def text?(node)
+      node.is_a?(Oga::XML::Text)
+    end
+
+    def whitespace(node, _position)
+      return ' ' if !text?(node) && WHITESPACE_CONTENT_TAGS.include?(node.name)
+      ''
+    end
+
+    def text(node, blacklisted_tags)
+      return node.text if text?(node)
+      sanitize(node.children, blacklisted_tags)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cw
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Martyn Jago
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
-- !ruby/object:Gem::Dependency
-  name: sanitize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: wavefile
   requirement: !ruby/object:Gem::Requirement
@@ -310,6 +296,7 @@ files:
 - lib/cw/repeat_word.rb
 - lib/cw/reveal.rb
 - lib/cw/rss.rb
+- lib/cw/rss_clean.rb
 - lib/cw/sentence.rb
 - lib/cw/speak.rb
 - lib/cw/spoken.rb