test_server 0.2.2 → 0.2.3

data/app/controllers/application_controller.rb

@@ -5,8 +5,13 @@ module TestServer
       set :root, ::File.expand_path('../../', __FILE__)
       set :haml, :format => :html5
 
+      enable :protect_from_csrf
       enable :protection
       enable :session
+      enable :report_csrf_failure
+
+      register Padrino::Helpers
+      register Padrino::Routing
 
       use Rack::Deflater
       use Rack::Locale

data/app/controllers/javascript_controller.rb

@@ -18,7 +18,7 @@ module TestServer
         configure_caching(params)
       end
 
-      get '/xhr/url/?' do
+      get :url, map: '/xhr/url' do
         param :count, Integer, default: 10
         param :timeout, Integer, default: 10
         param :url, String
@@ -29,7 +29,7 @@ module TestServer
         @timeout = params[:timeout]
         @repeat  = %w{ on yes true t }.include?(params[:repeat])
 
-        haml :'xhr/show', layout: :application
+        render 'xhr/show', layout: :application
       end
     end
   end

data/app/controllers/streaming_controller.rb

@@ -21,11 +21,11 @@ module TestServer
         mime_type :stream, 'text/plain'
       end
 
-      get '/' do
+      get :index, map: '/' do
         redirect to('/default/')
       end
 
-      get '/default/?:count?' do
+      get :string, map: '/default' do
         param :count, Integer, default: 10
 
         count = params[:count]
@@ -40,7 +40,7 @@ module TestServer
         end
       end
 
-      get '/eicar/' do
+      get :eicar, map: '/eicar' do
         stream_data do |out|
           generate_eicar.each do |c|
             out << encode { c }

data/app/controllers/string_controller.rb

@@ -12,11 +12,11 @@ module TestServer
         configure_caching(params)
       end
 
-      get '/' do
+      get :index, map: '/' do
         redirect to('/default/')
       end
 
-      get '/default/?:count?' do
+      get :string, map: '/default' do
         param :count, Integer, default: 1
 
         encode do
@@ -24,13 +24,13 @@ module TestServer
         end
       end
 
-      get '/eicar/' do
+      get :eicar, map: '/eicar' do
         encode do
           generate_eicar.join
         end
       end
 
-      get '/sleep/?:count?' do
+      get :sleep, map: '/sleep' do
         param :count, Integer, default: 120
         sleep params[:count]
 
@@ -39,7 +39,7 @@ module TestServer
         end
       end
 
-      get '/random/?:count?' do
+      get :random, map: '/random' do
         param :count, Integer, default: 10
 
         encode do

data/lib/test_server/version.rb

@@ -1,4 +1,4 @@
 #main TestServer
 module TestServer
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/test_server.rb

@@ -19,6 +19,7 @@ require 'thor'
 require 'base64'
 require 'zlib'
 require 'digest/sha1'
+require 'padrino'
 
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/object/blank'

data/spec/features/fetch_data_via_javascript_spec.rb

@@ -47,7 +47,7 @@ describe 'Fetch data via javascript', :js do
       end
 
 
-      click_button('submit')
+      click_button('start')
 
       first '.ts-result-row'
 
@@ -74,6 +74,5 @@ describe 'Fetch data via javascript', :js do
         expect(find('#repeat').checked?).to be true
       end
     end
-
   end
 end

data/spec/features/fetch_test_data_plain_spec.rb

@@ -23,7 +23,7 @@ describe 'Fetch plain data' do
   end
 
   it 'downloads the data with multiplier' do
-    visit('/default/10')
+    visit('/default?count=10')
 
     expect(page.status_code).to eq 200
     expect(page.source.split(/\n/).size).to eq 10
@@ -78,7 +78,7 @@ describe 'Fetch plain data' do
 
   it 'supports long running requests' do
     timeout(3) do
-      visit('/sleep/2')
+      visit('/sleep?count=2')
     end
 
     expect(page.status_code).to eq 200
@@ -86,7 +86,7 @@ describe 'Fetch plain data' do
   end
 
   it 'supports random string' do
-    visit('/random/2')
+    visit('/random?count=2')
 
     expect(page.status_code).to eq 200
     expect(page.source.size).to eq 2

data/spec/features/fetch_test_data_via_streaming_spec.rb

@@ -17,21 +17,21 @@ describe 'Fetch Test Data via Streaming' do
   end
 
   it 'downloads stream' do
-    visit('/default/2')
+    visit('/default?count=2')
 
     expect(page.status_code).to be 200
     expect(page).to have_content('data')
   end
 
   it 'supports base64 encoding' do
-    visit('/default/2?base64')
+    visit('/default?count=2&base64')
 
     expect(page.status_code).to be 200
     expect(Base64.decode64(page.source.split(/\n/).last)).to include 'data'
   end
 
   it 'supports gzip encoding' do
-    visit('/default/2?gzip')
+    visit('/default?count=2&gzip')
 
     expect(page.status_code).to be 200
     expect(Base64.decode64(page.source.split(/\n/).last)).to include "\xC6\xC2\bODLT\x91\xCC \xC32\xC7tG \x85q\xDD\x11\xC8".force_encoding('ASCII-8bit')

data/test_server.gemspec

@@ -39,4 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'sinatra-advanced-routes'
   spec.add_runtime_dependency 'rack-cors'
   spec.add_runtime_dependency 'thor'
+  spec.add_runtime_dependency 'padrino'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test_server
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -347,6 +347,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: padrino
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Test server for proxies
 email:
 - dg1@vrnetze.de
@@ -374,7 +390,7 @@ files:
 - app/controllers/javascript_controller.rb
 - app/controllers/streaming_controller.rb
 - app/controllers/string_controller.rb
-- app/views/application.haml
+- app/views/layouts/application.haml
 - app/views/xhr/show.haml
 - bin/test_server
 - bower.json