Remove hexpress dependency

Author: nlalonde

lib/onebox.rb

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

lib/onebox/engine.rb

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

lib/onebox/engine/github_commit_onebox.rb

@@ -5,14 +5,7 @@ class GithubCommitOnebox
       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]}"

lib/onebox/engine/github_gist_onebox.rb

@@ -5,12 +5,7 @@ module Engine
     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]}"

lib/onebox/engine/github_pullrequest_onebox.rb

@@ -5,14 +5,7 @@ class GithubPullRequestOnebox
       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]}"

lib/onebox/engine/google_play_app_onebox.rb

@@ -5,13 +5,7 @@ class GooglePlayAppOnebox
       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
 

lib/onebox/engine/pubmed_onebox.rb

@@ -4,12 +4,7 @@ class PubmedOnebox
       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
 

lib/onebox/engine/twitter_status_onebox.rb

@@ -5,14 +5,7 @@ class TwitterStatusOnebox
       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
 

lib/onebox/version.rb

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

onebox.gemspec

@@ -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"

spec/lib/onebox/engine_spec.rb

@@ -66,21 +66,6 @@ class OneboxEngineTripleEqual
     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