deelay 0.3.0 → 0.3.1

data/Gemfile

@@ -1,16 +1,9 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in deelay.gemspec
-gemspec
-gem 'sinatra', "~>1.3.3"
-gem 'thin'
+gem 'rake'
 gem 'async_sinatra'
-
-group :development do
-  gem 'shotgun'
-end
+gem 'thin'
 
 group :test do
-  gem "rack-test"
-  gem "rspec"
+  gem 'rack-test'
 end

data/Rakefile

@@ -1,7 +1,9 @@
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require 'rake/testtask'
 
-desc "Run specs"
-RSpec::Core::RakeTask.new
+desc "Run tests"
+Rake::TestTask.new do |t|
+  t.pattern = "test/test_*.rb"
+end
 
-task :default => :spec
+task :default => :test

data/deelay.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rake"
+  # s.add_development_dependency "rake"
   # s.add_runtime_dependency "rest-client"
 end

data/lib/deelay.rb

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

data/lib/deelay/app.rb

@@ -1,13 +1,35 @@
-require "sinatra/async"
+require 'sinatra/async'
+require 'uri'
 
 module Deelay
   class App < Sinatra::Base
     register Sinatra::Async
 
-    aget '/:delay' do |delay|
-      EM.add_timer(delay.to_i/1000) do
-        async_schedule { redirect Deelay.parse(request.query_string) }
+    aget '/:delay' do
+      resource_url = parse(request.query_string)
+
+      EM.add_timer(params[:delay].to_i / 1000) do
+        em_async_schedule { redirect resource_url }
       end
     end
+
+    private
+
+    def parse(url)
+      unescaped_url = ::URI.unescape(url)
+
+      raise "Invalid URL" if (::URI::regexp =~ unescaped_url).nil?
+      return unescaped_url
+    end
+
+    # swaps env when testing
+    def em_async_schedule
+      o = self.class.environment
+      self.class.set :environment, :normal
+      async_schedule { yield }
+    ensure
+      self.class.set :environment, o
+    end
   end
 end
+

data/lib/deelay/version.rb

@@ -1,3 +1,3 @@
 module Deelay
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/test_deelay_app.rb

@@ -0,0 +1,50 @@
+require 'minitest/autorun'
+require 'eventmachine'
+require 'sinatra/async/test'
+
+require_relative '../lib/deelay'
+
+Sinatra::Base.set :environment, :test
+
+class TestDeelayApp < MiniTest::Unit::TestCase
+  include Sinatra::Async::Test::Methods
+
+  def app
+    Deelay::App.new
+  end
+
+  def test_redirect_on_valid_request
+      get "/10?http://testurl.com"
+      em_async_continue
+      assert_equal "http://testurl.com", last_response.location
+      assert_equal 302, last_response.status
+  end
+
+  def test_redirect_on_valid_request_with_port
+      get "/10?http://testurl.com:1234"
+      em_async_continue
+      assert_equal "http://testurl.com:1234", last_response.location
+      assert_equal 302, last_response.status
+  end
+
+  def test_no_query
+    get "/10"
+    assert_raises(RuntimeError) do
+      em_async_continue(0.1)
+    end
+  end
+
+  def test_no_link
+    get "/10?"
+    assert_raises(RuntimeError) do
+      em_async_continue(0.1)
+    end
+  end
+
+  def test_no_scheme_link
+    get "/10?testurl.com"
+    assert_raises(RuntimeError) do
+      em_async_continue(0.1)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deelay
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2013-09-01 00:00:00.000000000 Z
+dependencies: []
 description: Delay proxy for http resources
 email:
 - gbiesiadecki@gmail.com
@@ -46,9 +30,8 @@ files:
 - lib/deelay.rb
 - lib/deelay/app.rb
 - lib/deelay/homepage.rb
-- lib/deelay/parse.rb
 - lib/deelay/version.rb
-- spec/deelay_app_spec.rb
+- test/test_deelay_app.rb
 homepage: http://deelay.me
 licenses: []
 post_install_message: 
@@ -63,16 +46,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3755310507841361791
+      hash: 3411104809723433661
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3755310507841361791
 requirements: []
 rubyforge_project: deelay
 rubygems_version: 1.8.25
@@ -80,4 +60,4 @@ signing_key:
 specification_version: 3
 summary: Delay proxy
 test_files:
-- spec/deelay_app_spec.rb
+- test/test_deelay_app.rb

data/lib/deelay/parse.rb

@@ -1,10 +0,0 @@
-require "uri"
-
-module Deelay
-  def self.parse(url)
-    resource_url = URI.unescape(url)
-    raise "Invalid URL" if (URI::regexp =~ resource_url).nil?
-
-    return resource_url
-  end
-end

data/spec/deelay_app_spec.rb

@@ -1,41 +0,0 @@
-require_relative '../lib/deelay'
-require 'rspec'
-require 'rack/test'
-
-Sinatra::Base.set :environment, :test
-
-describe "Deelay::App" do
-  include Rack::Test::Methods
-
-  def app
-    Deelay::App
-  end
-
-  context "when url invalid" do
-    it "raise error if query is not a valid url" do
-      expect { get "/10?testurl.com" }.to raise_error
-      expect { get "/10?" }.to raise_error
-    end
-
-    it "raise error if no query" do
-      expect { get "/10" }.to raise_error
-    end
-  end
-
-  context "when url valid" do
-    it "redirects request to specified url" do
-      get "/10?http://testurl.com"
-      last_response.location.should == "http://testurl.com"
-    end
-
-    it "redirects request" do
-      get "/10?http://testurl.com"
-      last_response.status.should == 302
-    end
-
-    it "redirects request with port" do
-      get "/10?http://testurl.com:1234"
-      last_response.status.should == 302
-    end
-  end
-end