onebox 1.9.20 → 1.9.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 419d39dcf42db192d7a4ad9b9433d9116b8681a1fe0dc26f7769e483ab96e70a
-  data.tar.gz: c982a68192d84f2f68baeb470554b7153ccbfe7d9536e92080031f1ad9d60bb6
+  metadata.gz: 28fed1b823b219fc6c2a79da05780d57b31a267b01d511ddace59e56a74c25f5
+  data.tar.gz: fe64ab418c72f1cc58fd84692cf3033ef68488cea9c4918c575a0fcd016ab443
 SHA512:
-  metadata.gz: 3e9be16ec4a7830baae8ed2169a4f18ab2c73efd46035c408c7ce13eddb628dd0e47bcd04e4f883421f0b2629387bb9db8b801ac8e36bcb5374292f20ebcb45e
-  data.tar.gz: adf223e50bfa42f55aeb7f15696dc2ccd2f9616bacb1d2e3b022c4a7dc4f0e66d193cf1527d86f38c2eb0ea723dfee4fd0aae01281935b20511c2da8a01b3d5a
+  metadata.gz: efa8c02adf4fdfab9e50ce3a8827eb57184189f5f36beb186495e9978f9c6f33b969c51020485f3a97bd85c09ffb71b0398bec7e9ae853177f5f4a0c1c11ffd6
+  data.tar.gz: 6f5ae220a2523ce9f100e3e83eeea9ad3c2ddfcbc488e1f29cd486017c4fd95df058e15d9ff6d4c3752fc8d546e22ab13e79f8db340841fb19c199ee0300541e

data/README.md

@@ -46,30 +46,6 @@ preview = Onebox.preview(url)
 "#{preview}" == preview.to_s #=> true
 ```
 
-Onebox has its own caching system but you can also provide (or turn off) your own system:
-
-``` ruby
-require "onebox"
-
-url = "http://www.amazon.com/gp/product/B005T3GRNW/ref=s9_simh_gw_p147_d0_i2"
-preview = Onebox.preview(url, cache: Rails.cache)
-"#{preview}" == preview.to_s #=> true
-```
-
-In addition you can set your own options with this handy interface:
-
-``` ruby
-require "onebox"
-
-Onebox.options = {
-  cache: Rails.cache
-}
-
-url = "http://www.amazon.com/gp/product/B005T3GRNW/ref=s9_simh_gw_p147_d0_i2"
-preview = Onebox.preview(url)
-"#{preview}" == preview.to_s #=> true
-```
-
 Ruby Support
 ------------
 

data/lib/onebox.rb

@@ -6,7 +6,6 @@ require "multi_json"
 require "nokogiri"
 require "mustache"
 require "ostruct"
-require "moneta"
 require "cgi"
 require "net/http"
 require "digest"
@@ -15,7 +14,6 @@ require_relative "onebox/sanitize_config"
 
 module Onebox
   DEFAULTS = {
-    cache: Moneta.new(:Memory, expires: true, serializer: :json),
     connect_timeout: 5,
     timeout: 10,
     max_download_kb: (10 * 1024), # 10MB
@@ -29,6 +27,11 @@ module Onebox
   @@options = DEFAULTS
 
   def self.preview(url, options = Onebox.options)
+    # onebox does not have native caching
+    unless Onebox::Helpers.blank?(options[:cache])
+      warn "Onebox no longer has inbuilt caching so `cache` option will be ignored."
+    end
+
     Preview.new(url, options)
   end
 

data/lib/onebox/engine.rb

@@ -13,7 +13,6 @@ module Onebox
     end
 
     attr_reader :url, :uri
-    attr_reader :cache
     attr_reader :timeout
 
     DEFAULT = {}
@@ -28,10 +27,12 @@ module Onebox
       @options
     end
 
-    def initialize(link, cache = nil, timeout = nil)
+    def initialize(link, timeout = nil)
       @options = DEFAULT
       class_name = self.class.name.split("::").last.to_s
-      self.options = Onebox.options[class_name] || {} #Set the engine options extracted from global options.
+
+      # Set the engine options extracted from global options.
+      self.options = Onebox.options[class_name] || {}
 
       @url = link
       @uri = URI(link)
@@ -39,7 +40,6 @@ module Onebox
         @uri.scheme = 'https'
         @url = @uri.to_s
       end
-      @cache = cache || Onebox.options.cache
       @timeout = timeout || Onebox.options.timeout
     end
 
@@ -63,13 +63,6 @@ module Onebox
 
     private
 
-    def record
-      url_result = url
-      result = cache.fetch(url_result) { data }
-      cache[url_result] = result if cache.respond_to?(:key?)
-      result
-    end
-
     # raises error if not defined in onebox engine
     # in each onebox, uses either Nokogiri or StandardEmbed to get raw HTML from url
     def raw

data/lib/onebox/engine/google_maps_onebox.rb

@@ -38,7 +38,7 @@ module Onebox
       # Matches URLs for the old Google Maps domain which we occasionally get redirected to
       matches_regexp :canonical,  %r"^(?:https?:)?//maps\.google(?:\.(?:\w{2,}))+/maps\?"
 
-      def initialize(url, cache = nil, timeout = nil)
+      def initialize(url, timeout = nil)
         super
         resolve_url!
       rescue Net::HTTPServerException, Timeout::Error, Net::HTTPError, Errno::ECONNREFUSED, RuntimeError => err

data/lib/onebox/engine/image_onebox.rb

@@ -18,7 +18,6 @@ module Onebox
         end
 
         escaped_url = ::Onebox::Helpers.normalize_url_for_output(@url)
-
         <<-HTML
           <a href="#{escaped_url}" target="_blank" class="onebox">
             <img src="#{escaped_url}">

data/lib/onebox/engine/reddit_image_onebox.rb

@@ -26,7 +26,7 @@ module Onebox
             </aside>
           HTML
         else
-          html = Onebox::Engine::WhitelistedGenericOnebox.new(@url, @cache, @timeout).to_html
+          html = Onebox::Engine::WhitelistedGenericOnebox.new(@url, @timeout).to_html
           return if Onebox::Helpers.blank?(html)
           html
         end

data/lib/onebox/engine/video_onebox.rb

@@ -12,6 +12,11 @@ module Onebox
       end
 
       def to_html
+        # Fix Dropbox image links
+        if @url[/^https:\/\/www.dropbox.com\/s\//]
+          @url.sub!("https://www.dropbox.com", "https://dl.dropboxusercontent.com")
+        end
+
         escaped_url = ::Onebox::Helpers.normalize_url_for_output(@url)
         <<-HTML
           <div class="onebox video-onebox">

data/lib/onebox/engine/youtube_onebox.rb

@@ -45,7 +45,7 @@ module Onebox
           HTML
         else
           # for channel pages
-          html = Onebox::Engine::WhitelistedGenericOnebox.new(@url, @cache, @timeout).to_html
+          html = Onebox::Engine::WhitelistedGenericOnebox.new(@url, @timeout).to_html
           return if Onebox::Helpers.blank?(html)
           html.gsub!(/['"]\/\//, "https://")
           html

data/lib/onebox/layout.rb

@@ -8,12 +8,10 @@ module Onebox
 
     VERSION = "1.0.0"
 
-    attr_reader :cache
     attr_reader :record
     attr_reader :view
 
-    def initialize(name, record, cache)
-      @cache = cache
+    def initialize(name, record)
       @record = Onebox::Helpers.symbolize_keys(record)
 
       # Fix any relative paths
@@ -28,9 +26,7 @@ module Onebox
     end
 
     def to_html
-      result = cache.fetch(checksum) { render(details) }
-      cache[checksum] = result if cache.respond_to?(:key?)
-      result
+      render(details)
     end
 
     private

data/lib/onebox/layout_support.rb

@@ -8,7 +8,7 @@ module Onebox
     end
 
     def layout
-      @layout ||= Layout.new(self.class.onebox_name, record, @cache)
+      @layout ||= Layout.new(self.class.onebox_name, data)
     end
 
     def to_html

data/lib/onebox/mixins/git_blob_onebox.rb

@@ -25,9 +25,9 @@ module Onebox
       }
 
       module InstanceMethods
-        def initialize(link, cache = nil, timeout = nil)
-          super link, cache , timeout
-          #merge engine options from global Onebox.options interface
+        def initialize(link, timeout = nil)
+          super link, timeout
+          # merge engine options from global Onebox.options interface
           # self.options = Onebox.options["GithubBlobOnebox"] #  self.class.name.split("::").last.to_s
           # self.options = Onebox.options[self.class.name.split("::").last.to_s] #We can use this a more generic approach. extract the engine class name automatically
 
@@ -174,9 +174,9 @@ module Onebox
 
               cr = calc_range(m, contents_lines_size)    #calculate the range of lines for output
               selected_one_liner = cr[:selected_one_liner] #if url is a one-liner calc_range will return it
-              from           = cr[:from]
-              to             = cr[:to]
-              @truncated     = cr[:truncated]
+              from = cr[:from]
+              to = cr[:to]
+              @truncated = cr[:truncated]
               range_provided = cr[:range_provided]
               @cr_results = cr
 

data/lib/onebox/preview.rb

@@ -2,7 +2,6 @@
 
 module Onebox
   class Preview
-    attr_reader :cache
 
     # see https://bugs.ruby-lang.org/issues/14688
     client_exception = defined?(Net::HTTPClientException) ? Net::HTTPClientException : Net::HTTPServerException
@@ -11,7 +10,6 @@ module Onebox
     def initialize(link, parameters = Onebox.options)
       @url = link
       @options = parameters
-      @cache = options.cache
       @engine_class = Matcher.new(@url).oneboxed
     end
 
@@ -72,7 +70,7 @@ module Onebox
       return nil unless @engine_class
       return @engine if @engine
 
-      @engine = @engine_class.new(@url, cache)
+      @engine = @engine_class.new(@url)
       @engine.options = @options
       @engine
     end

data/lib/onebox/version.rb

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

data/onebox.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'multi_json', '~> 1.11'
   spec.add_runtime_dependency 'mustache'
   spec.add_runtime_dependency 'nokogiri', '~> 1.7'
-  spec.add_runtime_dependency 'moneta', '~> 1.0'
   spec.add_runtime_dependency 'htmlentities', '~> 4.3'
   spec.add_runtime_dependency 'sanitize'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.9.20
+  version: 1.9.21
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -54,20 +54,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: moneta
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement