onebox 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3386135fe238f1228c6b420da7c007f37b240144
-  data.tar.gz: 234fa7e682c6d57c4091711165eb3d050eea3e8d
+  metadata.gz: a7e63f64363e58311aad66504fd91ba7940eb2b3
+  data.tar.gz: 18d611e2867fd927ffb4835d30845886ae938411
 SHA512:
-  metadata.gz: 4998b0699bdc9b3d95b32b6fe25a15cc4ff44cb64c3e8140fbd6c5bb9d711a65be7716b40dfc80f77f2c7d380d3a4bd0fb21ea52d90a388499f6bf978d999704
-  data.tar.gz: 46e1dadcbd1f02a55d8f5a1af4ae26870c476aa57f4d06bca57e690ce2de5115043303987d9334ffccfc5f408e8bb9ba69c21a9496226156e63c370bac060489
+  metadata.gz: 5140e35dcaefd82ae6a685ae9683095fbb5f4b674c03a4fa4d9c654c9cbe16dd68e9eab4848f0c293d6968c0f5626c20dad83fe6208071d96cde6cf946723186
+  data.tar.gz: 3755590cec94084263a1a542d094d4fe60e980c3a4b78058edaf0c2d6fdd1cca5ce64b93acb181e0f948624f8188bd19a4a7c1eeb6b8faa777eeea4ff357ab35

data/README.md

@@ -3,8 +3,8 @@ onebox
 
   - [![Gem Version](https://badge.fury.io/rb/onebox.png)](https://rubygems.org/gems/onebox)
   - [![Code Climate](https://codeclimate.com/github/dysania/onebox.png)](https://codeclimate.com/github/dysania/onebox)
-  - [![Build Status](https://travis-ci.org/dysania/onebox.png)](https://travis-ci.org/dysania/onebox)
-  - [![Dependency Status](https://gemnasium.com/dysania/onebox.png)](https://gemnasium.com/dysania/onebox)
+  - [![Build Status](https://travis-ci.org/discourse/onebox.png)](https://travis-ci.org/discourse/onebox)
+  - [![Dependency Status](https://gemnasium.com/discourse/onebox.png)](https://gemnasium.com/discourse/onebox)
 
 
 Onebox is a library for turning media URLs into simple HTML previews of the resource.

data/lib/onebox.rb

@@ -2,8 +2,6 @@ require "open-uri"
 require "multi_json"
 require "nokogiri"
 require "mustache"
-require "hexpress"
-require "hexpress/web"
 require "ostruct"
 require "moneta"
 require "cgi"

data/lib/onebox/engine.rb

@@ -81,10 +81,6 @@ module Onebox
         100
       end
 
-      def matches(&block)
-        matches_regexp(Hexpress.new(&block).to_r)
-      end
-
       def matches_regexp(r)
         class_variable_set :@@matcher, r
       end

data/lib/onebox/engine/github_commit_onebox.rb

@@ -5,14 +5,7 @@ module Onebox
       include LayoutSupport
       include JSON
 
-      matches do
-        http
-        maybe("www.")
-        domain("github")
-        tld("com")
-        anything
-        with("/commit/")
-      end
+      matches_regexp Regexp.new("^http(?:s)?://(?:www\.)?(?:(?:\w)+\.)?(github)\.com(?:/)?(?:.)*/commit/")
 
       def url
         "https://api.github.com/repos/#{match[:owner]}/#{match[:repository]}/commits/#{match[:sha]}"

data/lib/onebox/engine/github_gist_onebox.rb

@@ -5,12 +5,7 @@ module Onebox
     class GithubGistOnebox
       include Engine
 
-      matches do
-        http
-        with("gist.")
-        domain("github")
-        tld("com")
-      end
+      matches_regexp Regexp.new("^http(?:s)?://gist\\.(?:(?:\\w)+\\.)?(github)\\.com(?:/)?")
 
       def url
         "https://api.github.com/gists/#{match[:sha]}"

data/lib/onebox/engine/github_pullrequest_onebox.rb

@@ -5,14 +5,7 @@ module Onebox
       include LayoutSupport
       include JSON
 
-      matches do
-        http
-        maybe("www.")
-        domain("github")
-        tld("com")
-        anything
-        with("/pull/")
-      end
+      matches_regexp Regexp.new("^http(?:s)?://(?:www\\.)?(?:(?:\\w)+\\.)?(github)\\.com(?:/)?(?:.)*/pull/")
 
       def url
         "https://api.github.com/repos/#{match[:owner]}/#{match[:repository]}/pulls/#{match[:number]}"

data/lib/onebox/engine/google_play_app_onebox.rb

@@ -5,13 +5,7 @@ module Onebox
       include LayoutSupport
       include HTML
 
-      matches do
-        http
-        with("play.")
-        domain("google")
-        tld("com")
-        with("/store/apps/")
-      end
+      matches_regexp Regexp.new("^http(?:s)?://play\\.(?:(?:\\w)+\\.)?(google)\\.com(?:/)?/store/apps/")
 
       private
 

data/lib/onebox/engine/image_onebox.rb

@@ -6,6 +6,11 @@ module Onebox
       matches_regexp /^(https?:)?\/\/.+\.(png|jpg|jpeg|gif|bmp|tif|tiff)(\?.*)?$/i
 
       def to_html
+        # Fix Dropbox image links
+        if /^https:\/\/www.dropbox.com\/s\//.match @url
+          @url.gsub!("https://www.dropbox.com","https://dl.dropboxusercontent.com")
+        end
+
         "<a href='#{@url}' target='_blank'><img src='#{@url}'></a>"
       end
     end

data/lib/onebox/engine/pubmed_onebox.rb

@@ -4,12 +4,7 @@ module Onebox
       include Engine
       include LayoutSupport
 
-      matches do
-        http
-        domain("www.ncbi.nlm.nih")
-        tld("gov")
-        has("/pubmed/")
-      end
+      matches_regexp Regexp.new("^http(?:s)?://(?:(?:\\w)+\\.)?(www.ncbi.nlm.nih)\\.gov(?:/)?/pubmed/")
 
       private
 

data/lib/onebox/engine/twitter_status_onebox.rb

@@ -5,14 +5,7 @@ module Onebox
       include LayoutSupport
       include HTML
 
-      matches do
-        http
-        maybe("www.")
-        domain("twitter")
-        tld("com")
-        anything
-        has("/status/")
-      end
+      matches_regexp Regexp.new("^http(?:s)?://(?:www\\.)?(?:(?:\\w)+\\.)?(twitter)\\.com(?:/)?(?:.)*/status/")
 
       private
 

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.3.8"
+  VERSION = "1.3.9"
 end

data/onebox.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["holla@jzeta.com", "vyki.englert@gmail.com", "robin.ward@gmail.com"]
   spec.description   = %q{A gem for turning URLs into previews.}
   spec.summary       = spec.description
-  spec.homepage      = "https://github.com/dysania/onebox"
+  spec.homepage      = "https://github.com/discourse/onebox"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "multi_json", "~> 1.7"
   spec.add_runtime_dependency "mustache", "~> 0.99"
   spec.add_runtime_dependency "nokogiri", "~> 1.6.1"
-  spec.add_runtime_dependency "hexpress", "~> 1.2"
   spec.add_runtime_dependency "moneta", "~> 0.7"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/lib/onebox/engine_spec.rb

@@ -66,21 +66,6 @@ describe Onebox::Engine do
     end
   end
 
-  describe ".matches" do
-    class OneboxEngineMatches
-      include Onebox::Engine
-
-      matches do
-        find "foo.com"
-      end
-    end
-
-    it "sets @@matcher to a regular expression" do
-      regex = OneboxEngineMatches.class_variable_get(:@@matcher)
-      expect(regex).to be_a(Regexp)
-    end
-  end
-
 end
 
 describe ".onebox_name" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -54,20 +54,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.1
-- !ruby/object:Gem::Dependency
-  name: hexpress
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
@@ -335,7 +321,7 @@ files:
 - templates/twitterstatus.mustache
 - templates/whitelistedgeneric.mustache
 - templates/wikipedia.mustache
-homepage: https://github.com/dysania/onebox
+homepage: https://github.com/discourse/onebox
 licenses:
 - MIT
 metadata: {}