deelay 0.4.0 → 0.5.0

data/lib/deelay.rb

@@ -1,3 +1,4 @@
 require_relative "deelay/version"
 require_relative "deelay/homepage"
+require_relative "deelay/utils"
 require_relative "deelay/app"

data/lib/deelay/app.rb

@@ -1,20 +1,20 @@
 require 'sinatra/async'
-require 'uri'
 
 module Deelay
   class App < Sinatra::Base
     register Sinatra::Async
 
     aget '/:delay' do
-      url = parse_query_string(request.query_string)
+      url = Deelay.parse_query_string(request.query_string)
       redirect_to url
     end
 
     aget '/:delay/*' do
-      url = parse_splat(params[:splat].join("/"), request.query_string)
+      url = Deelay.parse_splat(params[:splat].join("/"), request.query_string)
       redirect_to url
     end
 
+
     private
 
     def redirect_to(url, delay = 0)
@@ -23,35 +23,13 @@ module Deelay
       end
     end
 
-    def parse_query_string(raw_url)
-      escaped_url = ::URI.unescape(raw_url)
-      raise ArgumentError, "Missing URL" if request.query_string.empty?
-
-      url = (escaped_url =~ /^http:\/\// ? "" : "http://") + escaped_url
-      return url
-    end
-
-    def parse_splat(raw_url, query_string)
-      raise ArgumentError, "Missing URL" if raw_url.empty?
-
-      escaped_url = ::URI.unescape(raw_url)
-      url = escaped_url.sub(/^http:\//, "http://")
-      url = "http://" + url if url !~ /^http:\/\//
-      url << "?" + request.query_string if !request.query_string.empty?
-      return url
-    end
-
-    def validate(url)
-      raise "Invalid url" if url =~ /(http|https)/
-    end
-
     # swaps env when testing
     def em_async_schedule
-      o = self.class.environment
+      env = self.class.environment
       self.class.set :environment, :normal
       async_schedule { yield }
     ensure
-      self.class.set :environment, o
+      self.class.set :environment, env
     end
   end
 end

data/lib/deelay/utils.rb

@@ -0,0 +1,21 @@
+require 'uri'
+
+module Deelay
+  def self.parse_query_string(query_string)
+    escaped_url = ::URI.unescape(query_string)
+    raise ArgumentError, "Missing URL" if query_string.empty?
+
+    url = (escaped_url =~ /^http:\/\// ? "" : "http://") + escaped_url
+    return url
+  end
+
+  def self.parse_splat(splat, query_string)
+    raise ArgumentError, "Missing URL" if splat.empty?
+
+    escaped_url = ::URI.unescape(splat)
+    url = escaped_url.sub(/^http:\//, "http://")
+    url = "http://" + url if url !~ /^http:\/\//
+    url << "?" + query_string if !query_string.empty?
+    return url
+  end
+end

data/lib/deelay/version.rb

@@ -1,3 +1,3 @@
 module Deelay
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deelay
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -30,6 +30,7 @@ files:
 - lib/deelay.rb
 - lib/deelay/app.rb
 - lib/deelay/homepage.rb
+- lib/deelay/utils.rb
 - lib/deelay/version.rb
 - test/test_deelay_app.rb
 homepage: http://deelay.me
@@ -46,7 +47,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2051873546142903568
+      hash: 3462912169812269730
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: