onebox 1.8.76 → 1.8.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9394de674eacbe6d9888da14da4f40ddbe0dcfe2e5815ef03d12f4530a0c6c16
-  data.tar.gz: 3940a252b796ee2b75ed1226cceaf4e14cc722b3dd18e7e6eb5fc75f737325ba
+  metadata.gz: '08c3a640785331288e85c9998707a13f7cc2179cb2cc319535123595c5c52ef4'
+  data.tar.gz: b2e3f75c91844b7ee42cb41f874ed4d65387db2d33a74b9ff931aaf7dccfd608
 SHA512:
-  metadata.gz: '08a95ad2f83a68d969eaccad0192a2d91e28da4dab5e06fb6d22758daae29b84b872e415841ea3cbf7c55b20295d233478a822633c34cbb85380691c614ae839'
-  data.tar.gz: 1583dbd25f6ba7d2945d4cc8e76d017d1a055b31fc575ec3afa53067054d54741be03609df71b8bde8bb76c38c9fdbd619d48856e01a7f5cbfbe2559087c7bf7
+  metadata.gz: 47bf5de643663053b206d7309bfaa47c1e87e7970452a3afd9eccf83cdbe70a3078ffc72e2b8d248a1e145a7dd9a976bb105ffd84d31676f20b7870ad7b973ce
+  data.tar.gz: 2c6b8430d91bb83994c756f28ebf18ff31313e24f6bd5b64e6ec42f1d0b907438ec6112224cc2d8f7fd75f408eb370f6d617bc44fa10f5573e484df1369d1e2d

data/.gitignore

@@ -4,7 +4,6 @@
 /.idea
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile.lock

@@ -0,0 +1,152 @@
+PATH
+  remote: .
+  specs:
+    onebox (1.8.76)
+      htmlentities (~> 4.3)
+      moneta (~> 1.0)
+      multi_json (~> 1.11)
+      mustache
+      nokogiri (~> 1.7)
+      sanitize
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.0)
+    backports (3.11.4)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    coderay (1.1.2)
+    crass (1.0.4)
+    diff-lcs (1.3)
+    fakeweb (1.3.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.10.0)
+    formatador (0.2.5)
+    guard (2.15.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-rspec (4.2.10)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    haml (4.0.7)
+      tilt
+    hitimes (1.3.0)
+    htmlentities (4.3.4)
+    jaro_winkler (1.5.2)
+    listen (2.10.1)
+      celluloid (~> 0.16.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.13)
+    metaclass (0.0.4)
+    method_source (0.9.2)
+    mini_portile2 (2.4.0)
+    mocha (1.8.0)
+      metaclass (~> 0.0.1)
+    moneta (1.0.0)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
+    mustache (1.1.0)
+    nenv (0.3.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    nokogumbo (2.0.1)
+      nokogiri (~> 1.8, >= 1.8.4)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parallel (1.13.0)
+    parser (2.6.0.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rack (1.6.11)
+    rack-protection (1.5.5)
+      rack
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rainbow (3.0.0)
+    rake (10.5.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.63.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.0)
+    sanitize (5.0.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
+    shellany (0.0.1)
+    simple_oauth (0.3.1)
+    sinatra (1.4.8)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.7)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    thor (0.20.3)
+    tilt (2.0.9)
+    timers (4.0.4)
+      hitimes
+    twitter (4.8.1)
+      faraday (~> 0.8, < 0.10)
+      multi_json (~> 1.0)
+      simple_oauth (~> 0.2)
+    unicode-display_width (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  fakeweb (~> 1.3)
+  guard-rspec (~> 4.2.8)
+  haml (~> 4.0)
+  listen (~> 2.10.0)
+  mocha (~> 1.1)
+  onebox!
+  pry (~> 0.10)
+  rake (~> 10.4)
+  rspec (~> 3.2)
+  rubocop (~> 0.50)
+  sinatra (~> 1.4)
+  sinatra-contrib (~> 1.4)
+  twitter (~> 4.8)
+
+BUNDLED WITH
+   2.0.1

data/lib/onebox/engine/google_docs_onebox.rb

@@ -26,7 +26,7 @@ module Onebox
         og_data = get_og_data
         result = { link: link,
                    title: og_data[:title] || "Google #{shorttype.to_s.capitalize}",
-                   description: Sanitize.fragment(Onebox::Helpers.truncate(og_data[:description], 250)) || "This #{shorttype.to_s.chop.capitalize} is private",
+                   description: Onebox::Helpers.truncate(og_data[:description], 250) || "This #{shorttype.to_s.chop.capitalize} is private",
                    type: shorttype
                  }
         result

data/lib/onebox/engine/imgur_onebox.rb

@@ -31,7 +31,7 @@ module Onebox
       def album_html(og)
         escaped_url = ::Onebox::Helpers.normalize_url_for_output(url)
         escaped_src = ::Onebox::Helpers.normalize_url_for_output(get_secure_link(og[:image]))
-        album_title = "[Album] #{Onebox::Helpers.truncate(og[:title].strip, 80)}"
+        album_title = "[Album] #{Onebox::Helpers.truncate(og[:title], 80)}"
 
         <<-HTML
             <div class='onebox imgur-album'>

data/lib/onebox/engine/instagram_onebox.rb

@@ -20,7 +20,7 @@ module Onebox
 
         result = { link: og[:url],
                    title: html_entities.decode(Onebox::Helpers.truncate(title, 80)),
-                   description: html_entities.decode(Sanitize.fragment(Onebox::Helpers.truncate(og[:description].strip, 250)))
+                   description: html_entities.decode(Onebox::Helpers.truncate(og[:description], 250))
                   }
 
         if !Onebox::Helpers.blank?(og[:image])

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -202,16 +202,16 @@ module Onebox
           d = { link: link }.merge(raw)
 
           if !Onebox::Helpers.blank?(d[:title])
-            d[:title] = html_entities.decode(Onebox::Helpers.truncate(d[:title].strip, 80))
+            d[:title] = html_entities.decode(Onebox::Helpers.truncate(d[:title], 80))
           end
 
           d[:description] ||= d[:summary]
           if !Onebox::Helpers.blank?(d[:description])
-            d[:description] = html_entities.decode(Sanitize.fragment(Onebox::Helpers.truncate(d[:description].strip, 250)))
+            d[:description] = html_entities.decode(Onebox::Helpers.truncate(d[:description], 250))
           end
 
           if !Onebox::Helpers.blank?(d[:site_name])
-            d[:domain] = html_entities.decode(Onebox::Helpers.truncate(d[:site_name].strip, 80))
+            d[:domain] = html_entities.decode(Onebox::Helpers.truncate(d[:site_name], 80))
           elsif !Onebox::Helpers.blank?(d[:domain])
             d[:domain] = "http://#{d[:domain]}" unless d[:domain] =~ /^https?:\/\//
             d[:domain] = URI(d[:domain]).host.to_s.sub(/^www\./, '') rescue nil
@@ -231,22 +231,22 @@ module Onebox
 
           # Twitter labels
           if !Onebox::Helpers.blank?(d[:label1]) && !Onebox::Helpers.blank?(d[:data1]) && !!WhitelistedGenericOnebox.twitter_label_whitelist.find { |l| d[:label1] =~ /#{l}/i }
-            d[:label_1] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label1].strip))
-            d[:data_1]  = Sanitize.fragment(Onebox::Helpers.truncate(d[:data1].strip))
+            d[:label_1] = Onebox::Helpers.truncate(d[:label1])
+            d[:data_1]  = Onebox::Helpers.truncate(d[:data1])
           end
           if !Onebox::Helpers.blank?(d[:label2]) && !Onebox::Helpers.blank?(d[:data2]) && !!WhitelistedGenericOnebox.twitter_label_whitelist.find { |l| d[:label2] =~ /#{l}/i }
             unless Onebox::Helpers.blank?(d[:label_1])
-              d[:label_2] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label2].strip))
-              d[:data_2]  = Sanitize.fragment(Onebox::Helpers.truncate(d[:data2].strip))
+              d[:label_2] = Onebox::Helpers.truncate(d[:label2])
+              d[:data_2]  = Onebox::Helpers.truncate(d[:data2])
             else
-              d[:label_1] = Sanitize.fragment(Onebox::Helpers.truncate(d[:label2].strip))
-              d[:data_1]  = Sanitize.fragment(Onebox::Helpers.truncate(d[:data2].strip))
+              d[:label_1] = Onebox::Helpers.truncate(d[:label2])
+              d[:data_1]  = Onebox::Helpers.truncate(d[:data2])
             end
           end
 
           if Onebox::Helpers.blank?(d[:label_1]) && !Onebox::Helpers.blank?(d[:price_amount]) && !Onebox::Helpers.blank?(d[:price_currency])
             d[:label_1] = "Price"
-            d[:data_1] = Sanitize.fragment(Onebox::Helpers.truncate("#{d[:price_currency].strip} #{d[:price_amount].strip}"))
+            d[:data_1] = Onebox::Helpers.truncate("#{d[:price_currency].strip} #{d[:price_amount].strip}")
           end
 
           d

data/lib/onebox/engine/youtube_onebox.rb

@@ -50,7 +50,7 @@ module Onebox
 
       def video_title
         @video_title ||= begin
-          Sanitize.fragment(Onebox::Helpers.truncate(video_oembed_data[:title].strip, 80))
+          Onebox::Helpers.truncate(video_oembed_data[:title], 80)
         rescue
           nil
         end

data/lib/onebox/helpers.rb

@@ -169,12 +169,22 @@ module Onebox
     end
 
     def self.truncate(string, length = 50)
+      string = sanitize(string)
       string.size > length ? string[0...(string.rindex(" ", length) || length)] + "..." : string
     end
 
     def self.title_attr(meta)
-      title = meta[:title].gsub("'", "'").gsub('"', """)
-      (meta && !blank?(title)) ? "title='#{title}'" : ""
+      title = get(meta, :title)
+      !title.nil? ? "title='#{title}'" : ""
+    end
+
+    def self.get(meta, attr)
+      (meta && !blank?(meta[attr])) ? sanitize(meta[attr]) : nil
+    end
+
+    def self.sanitize(value, length = 50)
+      return nil if blank?(value)
+      Sanitize.fragment(value).strip
     end
 
     def self.normalize_url_for_output(url)

data/lib/onebox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onebox
-  VERSION = "1.8.76"
+  VERSION = "1.8.77"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.8.76
+  version: 1.8.77
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -294,6 +294,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md