blade 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a205b84cda0e15047ee832ddd16ec0def59e788
-  data.tar.gz: 4544bf65ab82d61421825efcd7249e59c3ee454f
+  metadata.gz: 071f84dc1d8ddf2ebe1db5eab1342725efeee1f6
+  data.tar.gz: 9422e19dbe9257f3f531d7d30ffa686d43f8e49e
 SHA512:
-  metadata.gz: efaa9386cb6042ad8720956badc98a551b837fdffe56df3bd0d547e7640f87124df9cab5560e1b2b3f8e710a12b5062ded7cf1764b96a00150b7804b2a84d660
-  data.tar.gz: afbac6fb74d822b8c866e0d3fd0c8d57c8bd2fb8b3a7b10e42c99630db05b03dd9416326011da5e7cb5bfa80f1bbf204774fb85cb766326caf0143210dca1937
+  metadata.gz: b624e473f3bcd2e1a13472cb4d3c9fd8044740c2d81f55ae42193326a7349ba4f40c6d876395edb225831d0c907000ed1ba7feb06f81f23c2a73cdf15f5234bc
+  data.tar.gz: d0c251529467263493f7b0e2d594e56bfc8347303163a0726be54648335fee89610b87798ed7b1ef95a61ede908cf78ca59ab93b24de2eb8d59284a5b2943993

data/blade.gemspec

@@ -22,14 +22,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency "blade-qunit_adapter", "~> 0.4.0"
+  spec.add_dependency "blade-qunit_adapter", "~> 1.20.0"
   spec.add_dependency "activesupport", ">= 3.0.0"
   spec.add_dependency "coffee-script", "~> 2.4.0"
   spec.add_dependency "coffee-script-source", "~> 1.9.0"
   spec.add_dependency "curses", "~> 1.0.0"
   spec.add_dependency "eventmachine", "~> 1.0.0"
-  # Lock to 1.1.1 to avoid Promise error in 1.1.2 with Chrome 43
-  # "Uncaught TypeError: Cannot read property '_state' of undefined"
   spec.add_dependency "faye", "1.1.1"
   spec.add_dependency "sprockets", "~> 3.2.0"
   spec.add_dependency "thin", "~> 1.6.0"

data/exe/blade

@@ -1,10 +1,4 @@
 #!/usr/bin/env ruby
 
 require "blade"
-
-if ARGV.empty?
-  Blade::CLI.new.runner
-else
-  Blade.initialize!
-  Blade::CLI.start(ARGV)
-end
+Blade::CLI.start(ARGV)

data/lib/blade.rb

@@ -2,7 +2,6 @@ require "active_support/all"
 require "eventmachine"
 require "faye"
 require "pathname"
-require "ostruct"
 require "yaml"
 
 require "blade/version"
@@ -11,6 +10,14 @@ require "blade/cli"
 module Blade
   extend self
 
+  CONFIG_DEFAULTS = {
+    framework: :qunit,
+    port: 9876,
+    build: { path: "." }
+  }
+
+  CONFIG_FILENAMES = %w( blade.yml .blade.yml )
+
   @components = []
 
   def register_component(component)
@@ -22,30 +29,27 @@ module Blade
 
   autoload :Model, "blade/model"
   autoload :Assets, "blade/assets"
-  autoload :RackAdapter, "blade/rack_adapter"
+  autoload :Config, "blade/config"
+  autoload :RackAdapter, "blade/rack/adapter"
+  autoload :RackRouter, "blade/rack/router"
   autoload :Session, "blade/session"
   autoload :TestResults, "blade/test_results"
-  autoload :CombinedTestResults, "blade/combined_test_results"
-
-  extend Forwardable
-  def_delegators "Server.client", :subscribe, :publish
 
-  DEFAULT_FRAMEWORK = :qunit
-  DEFAULT_PORT = 9876
+  delegate :subscribe, :publish, to: Server
 
-  attr_reader :config, :plugins
+  attr_reader :config
 
   def start(options = {})
     return if running?
     clean_tmp_path
 
     initialize!(options)
-    load_interface!
+    load_interface
 
     handle_exit
 
     EM.run do
-      @components.each { |c| c.start if c.respond_to?(:start) }
+      @components.each { |c| c.try(:start) }
       @running = true
     end
   end
@@ -53,7 +57,7 @@ module Blade
   def stop
     return if @stopping
     @stopping = true
-    @components.each { |c| c.stop if c.respond_to?(:stop) }
+    @components.each { |c| c.try(:stop) }
     EM.stop if EM.reactor_running?
     @running = false
   end
@@ -63,15 +67,27 @@ module Blade
   end
 
   def initialize!(options = {})
-    @options ||= {}.with_indifferent_access
-    @options.merge! options
+    return if @initialized
+    @initialized = true
 
-    setup_config!
-    load_plugins!
-    load_adapter!
+    options = CONFIG_DEFAULTS.deep_merge(blade_file_options).deep_merge(options)
+    @config = Blade::Config.new options
+
+    config.load_paths = Array(config.load_paths)
+    config.logical_paths = Array(config.logical_paths)
+
+    if config.build?
+      config.build.logical_paths = Array(config.build.logical_paths)
+      config.build.path ||= "."
+    end
+
+    config.plugins ||= {}
+
+    load_plugins
+    load_adapter
   end
 
-  def url(path = "")
+  def url(path = "/")
     "http://localhost:#{config.port}#{path}"
   end
 
@@ -100,57 +116,24 @@ module Blade
       end
     end
 
-    def load_config_file!
-      filename = ".blade.yml"
-      if File.exists?(filename)
-        @options.reverse_merge!(YAML.load_file(filename))
-      end
-    end
-
-    def setup_config!
-      load_config_file!
-      options = @options.except(:plugins)
-
-      if options_for_interface = @options[options[:interface]]
-        options.merge! options_for_interface
-      end
-
-      options[:framework] ||= DEFAULT_FRAMEWORK
-      options[:port] ||= DEFAULT_PORT
-      options[:load_paths] = Array(options[:load_paths])
-      options[:logical_paths] = Array(options[:logical_paths])
-
-      if build_options = options.delete(:build)
-        build_options[:logical_paths] = Array(build_options[:logical_paths])
-        build_options[:path] ||= "."
-        options[:build] = OpenStruct.new(build_options)
-      end
-
-      @config = OpenStruct.new(options)
-
-      setup_plugin_config!
-    end
-
-    def setup_plugin_config!
-      @plugins = OpenStruct.new
-
-      plugin_options = @options[:plugins] || {}
-
-      plugin_options.each do |name, plugin_config|
-        plugins[name] = OpenStruct.new(config: OpenStruct.new(plugin_config))
+    def blade_file_options
+      if filename = CONFIG_FILENAMES.detect { |name| File.exists?(name) }
+        YAML.load_file(filename)
+      else
+        {}
       end
     end
 
-    def load_interface!
+    def load_interface
       require "blade/interface/#{config.interface}"
     end
 
-    def load_adapter!
+    def load_adapter
       require "blade/#{config.framework}_adapter"
     end
 
-    def load_plugins!
-      plugins.to_h.keys.each do |name|
+    def load_plugins
+      config.plugins.keys.each do |name|
         require "blade/#{name}_plugin"
       end
     end

data/lib/blade/assets.rb

@@ -7,7 +7,7 @@ module Blade::Assets
 
   @environments = {}
 
-  def environment(name = :blade, context_name = nil)
+  def environment(name = :user, context_name = nil)
     cache_name = [name, context_name].compact.map(&:to_s).uniq.join("-")
 
     @environments[cache_name] ||= Sprockets::Environment.new do |env|
@@ -54,7 +54,15 @@ module Blade::Assets
   end
 
   def user_load_paths
-    Blade.config.load_paths.map { |a| Pathname.new(a) }
+    Blade.config.load_paths.flat_map do |load_path|
+      if load_path.is_a?(Hash)
+        load_path.flat_map do |gem_name, paths|
+          Array(paths).map{ |path| gem_pathname(gem_name).join(path) }
+        end
+      else
+        Pathname.new(load_path)
+      end
+    end
   end
 
   def adapter_load_paths
@@ -84,7 +92,7 @@ module Blade::Assets
     end
 
     def get_mtime(logical_path)
-      environment_for(:user)[logical_path].mtime
+      environment(:user)[logical_path].mtime
     rescue Exception => e
       e.to_s
     end

data/lib/blade/cli.rb

@@ -16,4 +16,11 @@ class Blade::CLI < Thor
     Blade.initialize!
     Blade::Assets.build
   end
+
+  desc "config", "Inspect Blade.config"
+  def config
+    require "pp"
+    Blade.initialize!
+    pp Blade.config
+  end
 end

data/lib/blade/config.rb

@@ -0,0 +1,15 @@
+class Blade::Config < ActiveSupport::HashWithIndifferentAccess
+  def method_missing(method, *args)
+    case method
+    when /=$/
+      self[$`] = args.first
+    when /\?$/
+      self[$`].present?
+    else
+      if self[method].is_a?(Hash) && !self[method].is_a?(self.class)
+        self[method] = self.class.new(self[method])
+      end
+      self[method]
+    end
+  end
+end

data/lib/blade/interface/ci.rb

@@ -4,8 +4,8 @@ module Blade::CI
 
   def start
     @completed_sessions = 0
+    @failures = []
 
-    log "# Running"
     Blade.subscribe("/results") do |details|
       process_result(details)
     end
@@ -13,11 +13,15 @@ module Blade::CI
 
   private
     def process_result(details)
-      if details.has_key?("status")
-        log details["status"] == "pass" ? "." : "F"
+      if status = details[:status]
+        STDOUT.print status_dot(status)
+
+        if status == "fail"
+          @failures << details
+        end
       end
 
-      if details["completed"]
+      if details[:completed]
         process_completion
       end
     end
@@ -26,26 +30,30 @@ module Blade::CI
       @completed_sessions += 1
 
       if done?
-        log "\n"
-        display_results_and_exit
+        EM.add_timer 2 do
+          display_failures
+          STDOUT.puts
+          exit_with_status_code
+        end
       end
     end
 
-    def done?
-      @completed_sessions == (Blade.config.expected_sessions || 1)
+    def status_dot(status)
+      Blade::TestResults::STATUS_DOTS[status]
     end
 
-    def display_results_and_exit
-      results = Blade::Session.combined_test_results
-      display results
-      exit results.failed? ? 1 : 0
+    def done?
+      @completed_sessions == (Blade.config.expected_sessions || 1)
     end
 
-    def log(message)
-      STDERR.print message.to_s
+    def display_failures
+      @failures.each do |details|
+        STDERR.puts "\n\n#{status_dot(details[:status])} #{details[:name]} (#{Blade::Session.find(details[:session_id])})"
+        STDERR.puts details[:message]
+      end
     end
 
-    def display(message)
-      STDOUT.puts message.to_s
+    def exit_with_status_code
+      exit @failures.any? ? 1 : 0
     end
 end

data/lib/blade/interface/runner.rb

@@ -6,9 +6,6 @@ module Blade::Runner
 
   autoload :Tab, "blade/interface/runner/tab"
 
-  extend Forwardable
-  def_delegators "Blade::Runner", :create_window
-
   COLOR_NAMES = %w( white yellow green red )
   PADDING = 1
 
@@ -48,19 +45,14 @@ module Blade::Runner
     handle_stale_tabs
 
     Blade.subscribe("/results") do |details|
-      session = Blade::Session.find(details["session_id"])
+      session = Blade::Session.find(details[:session_id])
 
-      if tab = Tab.find(session.id)
-        if details["line"] && tab.active?
-          Tab.content_window.addstr(details["line"] + "\n")
-          Tab.content_window.noutrefresh
-        end
-        tab.draw
-      else
+      unless tab = Tab.find(session.id)
         tab = Tab.create(id: session.id)
         tab.activate if Tab.size == 1
       end
 
+      tab.draw
       Curses.doupdate
     end
   end

data/lib/blade/interface/runner/tab.rb

@@ -1,10 +1,8 @@
 class Blade::Runner::Tab < Blade::Model
-  extend Forwardable
-  def_delegators "Blade::Runner", :colors, :create_window
+  delegate :colors, :create_window, to: Blade::Runner
 
   class << self
-    extend Forwardable
-    def_delegators "Blade::Runner", :create_window
+    delegate :create_window, to: Blade::Runner
 
     attr_reader :window, :state_window, :content_window
 
@@ -82,6 +80,7 @@ class Blade::Runner::Tab < Blade::Model
     window.attroff(color)
     window.addstr(" ║")
     window.addstr "╝   ╚"
+    draw_test_results
   end
 
   def draw_inactive
@@ -92,10 +91,36 @@ class Blade::Runner::Tab < Blade::Model
     window.addstr "═════"
   end
 
+  def draw_test_results
+    tabs.content_window.clear
+    failures = []
+
+    session.test_results.results.each do |result|
+      tabs.content_window.addstr(status_dot(result))
+      failures << result if result[:status] == "fail"
+    end
+
+    failures.each do |result|
+      tabs.content_window.addstr("\n\n")
+      tabs.content_window.attron(Curses::A_BOLD)
+      tabs.content_window.attron(colors.red)
+      tabs.content_window.addstr("#{status_dot(result)} #{result[:name]}\n")
+      tabs.content_window.attroff(colors.red)
+      tabs.content_window.attroff(Curses::A_BOLD)
+      tabs.content_window.addstr(result[:message])
+    end
+
+    tabs.content_window.noutrefresh
+  end
+
   def dot
     state == "pending" ? "○" : "●"
   end
 
+  def status_dot(result)
+    Blade::TestResults::STATUS_DOTS[result[:status]]
+  end
+
   def index
     tabs.all.index(self)
   end
@@ -124,9 +149,6 @@ class Blade::Runner::Tab < Blade::Model
 
     tabs.state_window.addstr(session.to_s)
     tabs.state_window.noutrefresh
-
-    tabs.content_window.addstr(session.test_results.to_s)
-    tabs.content_window.noutrefresh
   end
 
   def deactivate

data/lib/blade/rack/adapter.rb

@@ -0,0 +1,78 @@
+class Blade::RackAdapter
+  include Blade::RackRouter
+
+  route "", to: :redirect_to_index
+  route "/", to: :index
+  route "/blade*", environment: :blade
+  route "/blade/adapter*", environment: :adapter
+  route "/blade/websocket*", to: :websocket
+  default_route environment: :user
+
+  delegate :environment, to: Blade::Assets
+
+  attr_reader :request, :env
+
+  def initialize
+    Blade.initialize!
+  end
+
+  def call(env)
+    @env = env
+    @request = Rack::Request.new(env)
+
+    route = find_route(request.path_info)
+    base_path, action = route.values_at(:base_path, :action)
+
+    rewrite_path!(base_path)
+
+    case
+    when action[:environment]
+      environment(action[:environment]).call(env)
+    when action[:to]
+      send(action[:to])
+    end
+  end
+
+  def index
+    request.path_info = "/index.html"
+    response = environment(:blade).call(env)
+    response = add_session_cookie(response) if needs_session_cookie?
+    response.to_a
+  end
+
+  def redirect_to_index
+    Rack::Response.new.tap do |response|
+      path = request.path
+      path = path + "/" unless path.last == "/"
+      response.redirect(path)
+    end.to_a
+  end
+
+  def websocket
+    faye_adapter.call(env)
+  end
+
+  private
+    def needs_session_cookie?
+      Blade.running? && !Blade::Session.find(request.cookies[Blade::Session::KEY])
+    end
+
+    def add_session_cookie(response)
+      user_agent = UserAgent.parse(request.user_agent)
+      session = Blade::Session.create(user_agent: user_agent)
+      status, headers, body = response
+      response = Rack::Response.new(body, status, headers)
+      response.set_cookie(Blade::Session::KEY, session.id)
+      response
+    end
+
+    def rewrite_path!(path = nil)
+      return if path.nil?
+      request.path_info = request.path_info.sub(path, "").presence || "/"
+      request.script_name = request.script_name + path
+    end
+
+    def faye_adapter
+      @faye_adapter ||= Faye::RackAdapter.new(mount: "/", timeout: 25)
+    end
+end

data/lib/blade/rack/router.rb

@@ -0,0 +1,36 @@
+module Blade::RackRouter
+  extend ActiveSupport::Concern
+
+  DEFAULT = :*
+
+  included do
+    cattr_accessor(:routes) { Hash.new }
+  end
+
+  class_methods do
+    def route(path, action)
+      pattern = /^\/?#{path.gsub(/\*/, ".*")}$/
+      base_path = path.match(/([^\*]*)\*?/)[1]
+      routes[path] = { action: action, pattern: pattern, base_path: base_path }
+      self.routes = routes.sort_by { |path, value| -path.size }.to_h
+      routes[path]
+    end
+
+    def default_route(action)
+      routes[DEFAULT] = { action: action }
+    end
+
+    def find_route(path)
+      if route = routes.detect { |key, details| path =~ details[:pattern] }
+        route[1]
+      else
+        routes[DEFAULT]
+      end
+    end
+  end
+
+  private
+    def find_route(*args)
+      self.class.find_route(*args)
+    end
+end

data/lib/blade/server.rb

@@ -21,9 +21,20 @@ module Blade::Server
     @client ||= Faye::Client.new(websocket_url)
   end
 
+  def subscribe(channel)
+    client.subscribe(channel) do |message|
+      yield message.with_indifferent_access
+    end
+  end
+
+  def publish(channel, message)
+    client.publish(channel, message)
+  end
+
   private
     def app
       Rack::Builder.app do
+        use Rack::ShowExceptions
         run Blade::RackAdapter.new
       end
     end

data/lib/blade/session.rb

@@ -1,4 +1,6 @@
 class Blade::Session < Blade::Model
+  KEY = "blade_session"
+
   class << self
     def create(attributes)
       model = super

data/lib/blade/test_results.rb

@@ -1,81 +1,52 @@
 class Blade::TestResults
-  attr_reader :session_id, :state, :lines, :passes, :failures, :total
+  STATUS_DOTS = { pass: ".", fail: "✗" }.with_indifferent_access
+
+  attr_reader :session_id, :state, :results, :total, :failures
 
   def initialize(session_id)
     @session_id = session_id
     reset
 
     Blade.subscribe("/tests") do |details|
-      if details["session_id"] == session_id
-        process_test_result(details)
+      if details[:session_id] == session_id
+        event = details.delete(:event)
+        try("process_#{event}", details)
       end
     end
   end
 
   def reset
-    @lines = []
-    @passes = []
-    @failures = []
+    @results = []
     @state = "pending"
     @total = 0
+    @failures = 0
   end
 
-  def process_test_result(details)
-    publication = {}
-
-    case details["event"]
-    when "begin"
-      reset
-      @state = "running"
-      @total = details["total"]
-      @lines << publication[:line] = "1..#{@total}"
-    when "result"
-      args = details.values_at("name", "message")
-
-      if details["status"] == "pass"
-        line = Pass.new(*args).to_s
-        @passes << line
-      else
-        line = Failure.new(*args).to_s
-        @failures << line
-        @state = "failing"
-      end
-      @lines << line
-
-      publication.merge!(line: line, status: details["status"])
-    when "end"
-      @state = failures.any? ? "failed" : "finished"
-      publication[:completed] = true
-    end
-
-    publication.merge!(state: state, session_id: session_id)
-    Blade.publish("/results", publication)
+  def process_begin(details)
+    reset
+    @state = "running"
+    @total = details[:total]
+    publish(total: @total)
   end
 
-  def to_s
-    lines.join("\n") + "\n"
-  end
+  def process_result(details)
+    result = details.slice(:status, :name, :message)
+    @results << result
 
-  class Pass
-    def initialize(name, message)
-      @name = name
-      @message = message
+    if result[:status] == "fail"
+      @state = "failing"
+      @failures += 1
     end
 
-    def to_s(number = nil)
-      ["ok", number, @name, message].compact.join(" ")
-    end
+    publish(result)
+  end
 
-    def message
-      unless @message.nil?
-        "\n" + @message.gsub(/^/, "# ").chomp
-      end
-    end
+  def process_end(details)
+    @state = failures.zero? ? "finished" : "failed"
+    publish(completed: true)
   end
 
-  class Failure < Pass
-    def to_s(*args)
-      "not #{super}"
-    end
+  def publish(message = {})
+    Blade.publish("/results", message.merge(state: state, session_id: session_id))
   end
 end

data/lib/blade/version.rb

@@ -1,3 +1,3 @@
 module Blade
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blade
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Javan Makhmali
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -215,16 +215,16 @@ files:
 - lib/blade/assets.rb
 - lib/blade/assets/builder.rb
 - lib/blade/cli.rb
-- lib/blade/combined_test_results.rb
 - lib/blade/component.rb
+- lib/blade/config.rb
 - lib/blade/interface/ci.rb
 - lib/blade/interface/runner.rb
 - lib/blade/interface/runner/tab.rb
 - lib/blade/model.rb
-- lib/blade/rack_adapter.rb
+- lib/blade/rack/adapter.rb
+- lib/blade/rack/router.rb
 - lib/blade/server.rb
 - lib/blade/session.rb
-- lib/blade/test_helper.rb
 - lib/blade/test_results.rb
 - lib/blade/version.rb
 homepage: https://github.com/javan/blade

data/lib/blade/combined_test_results.rb

@@ -1,42 +0,0 @@
-class Blade::CombinedTestResults
-  attr_reader :sessions, :all_test_results
-
-  def initialize(sessions)
-    @sessions = sessions
-    @all_test_results = sessions.map(&:test_results)
-  end
-
-  def total
-    sum(totals)
-  end
-
-  def lines(type = :results)
-    sessions.flat_map do |session|
-      session.test_results.send(type).map do |line|
-        line.sub(/ok/, "ok [#{session}]")
-      end
-    end
-  end
-
-  def to_s
-    lines = ["1..#{total}"] + lines(:failures) + lines(:passes)
-    lines.join("\n")
-  end
-
-  def failed?
-    states.include?("failed")
-  end
-
-  private
-    def sum(values)
-      values.inject(0) { |sum, total| sum + total }
-    end
-
-    def totals
-      all_test_results.map(&:total).compact
-    end
-
-    def states
-      all_test_results.map(&:state)
-    end
-end

data/lib/blade/rack_adapter.rb

@@ -1,81 +0,0 @@
-class Blade::RackAdapter
-  extend Forwardable
-  def_delegators "Blade::Assets", :environment
-
-  PATH = "/blade"
-  ADAPTER_PATH = PATH + "/adapter"
-  WEBSOCKET_PATH = PATH + "/websocket"
-
-  def initialize(app = nil, options = {})
-    Blade.initialize!
-
-    if app.is_a?(Hash)
-      @options = app
-    else
-      @app, @options = app, options
-    end
-
-    @mount_path = @options[:mount]
-    @mount_path_pattern = /^#{@mount_path}/
-
-    @blade_path_pattern = /^#{PATH}/
-    @adapter_path_pattern = /^#{ADAPTER_PATH}/
-    @websocket_path_pattern = /^#{WEBSOCKET_PATH}/
-  end
-
-  def call(env)
-    unless @mount_path.nil?
-      if env["PATH_INFO"] =~ @mount_path_pattern
-        env["PATH_INFO"].sub!(@mount_path_pattern, "")
-      elsif @app
-        return @app.call(env)
-      end
-    end
-
-    case env["PATH_INFO"]
-    when ""
-      add_forward_slash(env)
-    when "/"
-      env["PATH_INFO"] = "index.html"
-      response = environment(:blade).call(env)
-      response_with_session(response, env)
-    when @websocket_path_pattern
-      bayeux.call(env)
-    when @adapter_path_pattern
-      env["PATH_INFO"].sub!(@adapter_path_pattern, "")
-      environment(:adapter).call(env)
-    when @blade_path_pattern
-      env["PATH_INFO"].sub!(@blade_path_pattern, "")
-      environment(:blade).call(env)
-    else
-      environment(:user).call(env)
-    end
-  end
-
-  private
-    def bayeux
-      @bayeux ||= Faye::RackAdapter.new(mount: WEBSOCKET_PATH, timeout: 25)
-    end
-
-    def add_forward_slash(env)
-      path = @mount_path || env["REQUEST_PATH"] || env["SCRIPT_NAME"]
-      redirect_to(File.join(path.to_s, "/"))
-    end
-
-    def redirect_to(location, status = 301)
-      [status, { Location: location }, []]
-    end
-
-    def response_with_session(response, env)
-      if Blade.running?
-        user_agent = UserAgent.parse(env["HTTP_USER_AGENT"])
-        session = Blade::Session.create(user_agent: user_agent)
-        status, headers, body = response
-        response = Rack::Response.new(body, status, headers)
-        response.set_cookie("blade_session", session.id)
-        response.finish
-      else
-        response
-      end
-    end
-end

data/lib/blade/test_helper.rb

@@ -1,7 +0,0 @@
-require "blade"
-require "minitest/autorun"
-
-ActiveSupport.test_order = :random
-
-class Blade::TestCase < ActiveSupport::TestCase
-end