onebox 1.5.26 → 1.5.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05649c644732f05cdc3b32e9441b18aecded53af
-  data.tar.gz: 4220d436537207993f525ec875306d3ac834948c
+  metadata.gz: 58182bba2fd139c8beccf6360c69b9d77da12145
+  data.tar.gz: 4a5eaeb8eccb8847fe7d91f4fa708802f3d9067d
 SHA512:
-  metadata.gz: 822c076371814b31ace66052448400057075db839fd899d61725cbdf5a51edf64334adfbf0c3aed9fb48c808a5a92a1d105e6684f80bcc5fe09d57860829b70e
-  data.tar.gz: 38ba0dc0b9b22b2d9bff772d03102f00bafc18146e6db552dbe585c665def6786f234d6467a2b593cf1474182ad0665fb3f96d66333862a6c2bf672a154ed1b8
+  metadata.gz: 5442a57cd27a042fbc57d187c2918dcf0e688cd9bd3bbafa4511d31fbf026d789cab4b834be43b653f058a79b82fb1d4abc4702d76f824075142d2a6dcd9f20c
+  data.tar.gz: b139cba62ebb754cc7d508811f36800dd27ac5a6426a97f25a166031b56020ad503b2160245b54411f90e87a358981799594dfa28e1b9c4391f1cbf9614a97a3

data/lib/onebox/engine/google_calendar_onebox.rb

@@ -3,7 +3,7 @@ module Onebox
     class GoogleCalendarOnebox
       include Engine
 
-      matches_regexp /^(https?:)?\/\/(www\.google\.[\w.]{2,}|goo\.gl)\/calendar\/.+$/
+      matches_regexp /^(https?:)?\/\/((www|calendar)\.google\.[\w.]{2,}|goo\.gl)\/calendar\/.+$/
       always_https
 
       def to_html

data/lib/onebox/engine/imgur_onebox.rb

@@ -11,7 +11,7 @@ module Onebox
         imgur_data = get_imgur_data
         return "<video width='#{imgur_data[:"player:width"]}' height='#{imgur_data[:"player:height"]}' controls autoplay loop><source src='#{imgur_data[:"player:stream"]}' type='video/mp4'><source src='#{imgur_data[:"player:stream"].gsub('mp4', 'webm')}' type='video/webm'></video>" if imgur_data[:"player:stream"]
         return "<a href='#{url}' target='_blank'><img src='#{imgur_data[:image]}' alt='Imgur' height='#{imgur_data[:"image:height"]}' width='#{imgur_data[:"image:width"]}'></a>" if imgur_data[:image]
-        return "<div><a href='#{url}' target='_blank'><img src='#{imgur_data[:"image0:src"]}' alt='Imgur'></a><div style='position: absolute;top: 0;z-index: 935;width: 100%;height: 30px;overflow: hidden;font-size: 12px;color: #fff;background-color: rgba(0, 0, 0, 0.8);'><div style='padding-left: 10px;padding-right: 10px;overflow: hidden;text-overflow: ellipsis;word-wrap: normal;white-space: nowrap;'><a style='width: 100%;font-size: 13px;line-height: 30px;color: #ccc;text-decoration: none;' target='_blank' href='#{url}'>[Album] #{imgur_data[:title]}</a></div></div></div>" if imgur_data[:"image0:src"]
+        return "<div class='onebox imgur-album'><a href='#{url}' target='_blank'><span class='outer-box'><span class='inner-box'><span class='album-title'>[Album] #{imgur_data[:title]}</span></span></span><img src='#{imgur_data[:"image0:src"]}' alt='Imgur'></a></div>" if imgur_data[:"image0:src"]
         return nil
       end
 

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -1,3 +1,5 @@
+require 'htmlentities'
+
 module Onebox
   module Engine
     class WhitelistedGenericOnebox
@@ -34,6 +36,7 @@ module Onebox
           cnn.com
           collegehumor.com
           coursera.org
+          codepen.io
           cracked.com
           dailymail.co.uk
           dailymotion.com
@@ -228,10 +231,11 @@ module Onebox
       def data
         if raw.is_a?(Hash)
           raw[:link] ||= link
+          raw[:title] = HTMLEntities.new.decode(raw[:title])
           return raw
         end
 
-        data_hash = { link: link, title: raw.title, description: raw.description }
+        data_hash = { link: link, title: HTMLEntities.new.decode(raw.title), description: raw.description }
         data_hash[:image] = raw.images.first if raw.images && raw.images.first
         data_hash[:type] = raw.type if raw.type
 

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.5.26"
+  VERSION = "1.5.27"
 end

data/onebox.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'mustache'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6.6'
   spec.add_runtime_dependency 'moneta', '~> 0.8'
+  spec.add_runtime_dependency 'htmlentities', '~> 4.3.4'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.4'

data/templates/whitelistedgeneric.mustache

@@ -1,4 +1,4 @@
-<img src="{{image}}" class="thumbnail"/>
+{{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
 
 <h3><a href='{{{link}}}'>{{title}}</a></h3>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.26
+  version: 1.5.27
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -68,6 +68,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement