js_spec 0.1.0 → 0.2.0

data/lib/js_spec/client.rb

@@ -0,0 +1,50 @@
+module JsSpec
+  class Client
+    class << self
+      def run(params={})
+        data = []
+        data << "selenium_host=#{CGI.escape(params[:selenium_host] || 'localhost')}"
+        data << "selenium_port=#{CGI.escape((params[:selenium_port] || 4444).to_s)}"
+        data << "spec_url=#{CGI.escape(params[:spec_url])}" if params[:spec_url]
+        response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) do |http|
+          http.post('/runners/firefox', data.join("&"))
+        end
+
+        body = response.body
+        if body.empty?
+          puts "SUCCESS"
+          return true
+        else
+          puts "FAILURE"
+          puts body
+          return false
+        end
+      end
+
+      def run_argv(argv)
+        params = {}
+        parser = OptionParser.new do |o|
+          o.banner = "JsSpec Runner"
+          o.banner << "\nUsage: #{$0} [options] [-- untouched arguments]"
+
+          o.on
+          o.on('-h', '--selenium_host=SELENIUM_HOST', "The host name of the Selenium Server relative to where this file is executed") do |host|
+            params[:selenium_host] = host
+          end
+
+          o.on('-p', '--selenium_port=SELENIUM_PORT', "The port of the Selenium Server relative to where this file is executed") do |port|
+            params[:selenium_port] = port
+          end
+
+          o.on('-u', '--spec_url=SPEC_URL', "The url of the js spec server, relative to the browsers running via the Selenium Server") do |spec_url|
+            params[:spec_url] = spec_url
+          end
+
+          o.on_tail
+        end
+        parser.order!(argv)
+        run params
+      end
+    end
+  end
+end

data/lib/js_spec/rack/response.rb

@@ -0,0 +1,5 @@
+Rack::Response.class_eval do
+  def ready?
+    status ? true : false
+  end
+end

data/lib/js_spec/rails_server.rb

@@ -2,10 +2,10 @@ module JsSpec
   class RailsServer < Server
     class << self
       def run(rails_root, server_options = {})
-        server_options[:Host] ||= Server::DEFAULT_HOST
-        server_options[:Port] ||= Server::DEFAULT_PORT
+        server_options[:Host] ||= DEFAULT_HOST
+        server_options[:Port] ||= DEFAULT_PORT
         Server.instance = new(rails_root, server_options[:Host], server_options[:Port])
-        Rack::Handler::Mongrel.run(Server.instance, server_options)
+        Server.instance.run server_options
       end
     end
 

data/lib/js_spec/resources/dir.rb

@@ -1,60 +1,60 @@
 module JsSpec
   module Resources
     class Dir < File
-    def locate(name)
-      if file = file(name)
-        file
-      else
-        locate_spec_runner(name)
+      def locate(name)
+        if file = file(name)
+          file
+        else
+          locate_spec_runner(name)
+        end
       end
-    end
 
-    def get
-      SpecDirRunner.new(self).get
-    end
+      def get(request, response)
+        SpecDirRunner.new(self).get(request, response)
+      end
 
-    def glob(pattern)
-      expanded_pattern = absolute_path + pattern
-      ::Dir.glob(expanded_pattern).map do |absolute_globbed_path|
-        relative_globbed_path = absolute_globbed_path.gsub(absolute_path, relative_path)
-        File.new(absolute_globbed_path, relative_globbed_path)
+      def glob(pattern)
+        expanded_pattern = absolute_path + pattern
+        ::Dir.glob(expanded_pattern).map do |absolute_globbed_path|
+          relative_globbed_path = absolute_globbed_path.gsub(absolute_path, relative_path)
+          File.new(absolute_globbed_path, relative_globbed_path)
+        end
       end
-    end
 
-    protected
-    def determine_child_paths(name)
-      absolute_child_path = "#{absolute_path}/#{name}"
-      relative_child_path = "#{relative_path}/#{name}"
-      [absolute_child_path, relative_child_path]
-    end
+      protected
+      def determine_child_paths(name)
+        absolute_child_path = "#{absolute_path}/#{name}"
+        relative_child_path = "#{relative_path}/#{name}"
+        [absolute_child_path, relative_child_path]
+      end
 
-    def locate_spec_runner(name)
-      if subdir = subdir(name)
-        subdir
-      elsif file = file(name + '.js')
-        SpecFileRunner.new(file)
-      else
-        raise "No specs found at #{relative_path}/#{name}."
+      def locate_spec_runner(name)
+        if subdir = subdir(name)
+          subdir
+        elsif file = file(name + '.js')
+          SpecFileRunner.new(file)
+        else
+          raise "No specs found at #{relative_path}/#{name}."
+        end
       end
-    end
 
-    def file(name)
-      absolute_file_path, relative_file_path = determine_child_paths(name)
-      if ::File.exists?(absolute_file_path) && !::File.directory?(absolute_file_path)
-        Resources::File.new(absolute_file_path, relative_file_path)
-      else
-        nil
+      def file(name)
+        absolute_file_path, relative_file_path = determine_child_paths(name)
+        if ::File.exists?(absolute_file_path) && !::File.directory?(absolute_file_path)
+          Resources::File.new(absolute_file_path, relative_file_path)
+        else
+          nil
+        end
       end
-    end
 
-    def subdir(name)
-      absolute_dir_path, relative_dir_path = determine_child_paths(name)
-      if ::File.directory?(absolute_dir_path)
-        Resources::Dir.new(absolute_dir_path, relative_dir_path)
-      else
-        nil
+      def subdir(name)
+        absolute_dir_path, relative_dir_path = determine_child_paths(name)
+        if ::File.directory?(absolute_dir_path)
+          Resources::Dir.new(absolute_dir_path, relative_dir_path)
+        else
+          nil
+        end
       end
     end
   end
-  end
 end

data/lib/js_spec/resources/file.rb

@@ -1,32 +1,32 @@
 module JsSpec
   module Resources
     class File
-    MIME_TYPES = {
+      MIME_TYPES = {
       '.js' => 'text/javascript',
       '.css' => 'text/css',
       '.png' => 'image/png',
       '.jpg' => 'image/jpeg',
       '.jpeg' => 'image/jpeg',
       '.gif' => 'image/gif',
-    }
+      }
 
-    attr_reader :absolute_path, :relative_path
+      attr_reader :absolute_path, :relative_path
 
-    def initialize(absolute_path, relative_path)
-      @absolute_path = absolute_path
-      @relative_path = relative_path
-    end
+      def initialize(absolute_path, relative_path)
+        @absolute_path = absolute_path
+        @relative_path = relative_path
+      end
 
-    def get
-      extension = ::File.extname(absolute_path)
-      Server.response.headers['Content-Type'] = MIME_TYPES[extension] || 'text/html'
-      ::File.read(absolute_path)
-    end
+      def get(request, response)
+        extension = ::File.extname(absolute_path)
+        response.headers['Content-Type'] = MIME_TYPES[extension] || 'text/html'
+        response.body = ::File.read(absolute_path)
+      end
 
-    def ==(other)
-      return false unless other.class == self.class
-      absolute_path == other.absolute_path && relative_path == other.relative_path
+      def ==(other)
+        return false unless other.class == self.class
+        absolute_path == other.absolute_path && relative_path == other.relative_path
+      end
     end
   end
-  end
 end

data/lib/js_spec/resources/runners/firefox1_runner.rb

@@ -0,0 +1,8 @@
+module JsSpec
+  module Resources
+    class Runners
+      class Firefox1Runner < FirefoxRunner
+      end
+    end
+  end
+end

data/lib/js_spec/resources/runners/firefox_runner.rb

@@ -1,90 +1,67 @@
 module JsSpec
   module Resources
     class Runners
-    class FirefoxRunner
-      class << self
-        def resume(guid, text)
-          responses[guid] = text
-          threads[guid].kill
-        end
-
-        def threads
-          @threads ||= {}
-        end
+      class FirefoxRunner
+        class << self
+          def resume(guid, text)
+            runner = instances.delete(guid)
+            runner.finalize(text)
+          end
 
-        def response_value(guid)
-          responses[guid]
-        ensure
-          responses.delete guid
-        end
+          def register_instance(runner)
+            instances[runner.guid] = runner
+          end
 
-        protected
-        def responses
-          @responses ||= {}
+          protected
+          def instances
+            @instances ||= {}
+          end
         end
-      end
 
-      include FileUtils
-      attr_reader :profile_dir
-
-      def initialize
-        profile_base = "#{::Dir.tmpdir}/js_spec/firefox"
-        mkdir_p profile_base
-        @profile_dir = "#{profile_base}/#{Time.now.to_i}"
-      end
-
-      def post
-        copy_profile_files
-        create_profile
-        wait_for_full_profile_to_be_created
-
-        guid = UUID.new
-        start_browser guid
-        thread = Thread.start {sleep}
-        self.class.threads[guid] = thread
-        thread.join
-
-        self.class.response_value guid
-      end
+        include FileUtils
+        attr_reader :guid, :profile_dir, :request, :response, :connection, :driver
 
-      protected
-      def copy_profile_files
-        dir = ::File.dirname(__FILE__)
-        firefox_profile_path = ::File.expand_path("#{dir}/../../../../resources/firefox")
-        system("cp -R #{firefox_profile_path} #{profile_dir}") || raise("Copying Firefox profile failed")
-      end
-
-      def create_profile
-        system("firefox -profile #{profile_dir} -chrome chrome://killff/content/kill.html") || raise("Initializing profile failed")
-      end
-
-      def wait_for_full_profile_to_be_created
-        Timeout.timeout(5) do
-          wait_for_file_lock_to_go_away
+        def initialize(request, response)
+          profile_base = "#{::Dir.tmpdir}/js_spec/firefox"
+          mkdir_p profile_base
+          @profile_dir = "#{profile_base}/#{Time.now.to_i}"
+          @guid = UUID.new
+          @request = request
+          @response = response
+          @connection = Server.connection
         end
-      end
 
-      def start_browser(guid)
-        Thread.start do
-          system("firefox -profile #{profile_dir} http://localhost:8080/specs?guid=#{guid}") || raise("Starting Firefox failed")
+        def post(request, response)
+          FirefoxRunner.register_instance self
+          spec_url = (request && request['spec_url']) ? request['spec_url'] : spec_suite_url
+          parsed_spec_url = URI.parse(spec_url)
+          @driver = Selenium::SeleniumDriver.new(
+            request['selenium_host'] || 'localhost',
+            (request['selenium_port'] || 4444).to_i,
+            '*firefox',
+            "#{parsed_spec_url.scheme}://#{parsed_spec_url.host}:#{parsed_spec_url.port}"
+          )
+          driver.start
+          Thread.start do
+            url = "#{spec_url}?guid=#{guid}"
+            driver.open(url)
+          end
+          response.status = nil
         end
-      end
 
-      def wait_for_file_lock_to_go_away
-        loop do
-          return if lock_is_gone? && lock_remains_gone?
+        def finalize(text)
+          driver.stop
+          response.status = 200
+          response.body = text
+          connection.send_response(*response.finish)
         end
-      end
 
-      def lock_is_gone?
-        !::File.exists?("#{profile_dir}/parent.lock")
-      end
+        protected
 
-      def lock_remains_gone?
-        sleep 0.5
-        lock_is_gone?
+        def spec_suite_url
+          "#{Server.root_url}/specs"
+        end
       end
     end
   end
-  end
-end
+end

data/lib/js_spec/resources/runners.rb

@@ -1,16 +1,15 @@
 dir = File.dirname(__FILE__)
-require File.expand_path("#{dir}/runners/firefox_runner")
 
 module JsSpec
   module Resources
     class Runners
-    def locate(name)
-      if name == 'firefox'
-        FirefoxRunner.new
-      else
-        raise "Invalid path #{name}"
+      def locate(name)
+        if name == 'firefox'
+          FirefoxRunner.new(Server.request, Server.response)
+        else
+          raise "Invalid path #{name}"
+        end
       end
     end
   end
-  end
 end

data/lib/js_spec/resources/spec_dir_runner.rb

@@ -1,15 +1,15 @@
 module JsSpec
   module Resources
     class SpecDirRunner < SpecRunner
-    attr_reader :dir
+      attr_reader :dir
 
-    def initialize(dir)
-      @dir = dir
-    end
+      def initialize(dir)
+        @dir = dir
+      end
 
-    def spec_files
-      dir.glob("/**/*_spec.js")
+      def spec_files
+        dir.glob("/**/*_spec.js")
+      end
     end
   end
-  end
 end

data/lib/js_spec/resources/spec_file_runner.rb

@@ -1,15 +1,15 @@
 module JsSpec
   module Resources
     class SpecFileRunner < SpecRunner
-    attr_reader :file
+      attr_reader :file
 
-    def initialize(file)
-      @file = file
-    end
+      def initialize(file)
+        @file = file
+      end
 
-    def spec_files
-      [file]
+      def spec_files
+        [file]
+      end
     end
   end
-  end
 end

data/lib/js_spec/resources/spec_runner.rb

@@ -1,8 +1,9 @@
 module JsSpec
   module Resources
     class SpecRunner
-    def get
-      html = <<-HTML
+      def get(request, response)
+        guid = (request && request['guid']) || 'null';
+        html = <<-HTML
         <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
         <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko">
         <head>
@@ -11,19 +12,23 @@ module JsSpec
         <link rel="stylesheet" type="text/css" href="/core/JSSpec.css" />
         <script type="text/javascript" src="/core/diff_match_patch.js"></script>
         <script type="text/javascript" src="/core/JSSpec.js"></script>
+        <script type="text/javascript" src="/core/jquery.js"></script>
         <script type="text/javascript" src="/core/JSSpecExtensions.js"></script>
-      HTML
-      spec_files.each do |file|
-        html << %{<script type="text/javascript" src="#{file.relative_path}"></script>\n}
-      end
+        HTML
+        spec_files.each do |file|
+          html << %{<script type="text/javascript" src="#{file.relative_path}"></script>\n}
+        end
 
-      html << <<-HTML
+        html << <<-HTML
+        <script type="text/javascript">
+          JSSpec.guid = '#{guid}';
+        </script>
         </head>
         <body></body>
         </html>
-      HTML
-      html.gsub(/^        /, "")
+        HTML
+        response.body = html.gsub(/^        /, "")
+      end
     end
   end
-  end
-end
+end

data/lib/js_spec/resources/suite.rb

@@ -1,24 +1,24 @@
 module JsSpec
   module Resources
     class Suite
-    class << self
-      def locate(id)
-        new id
+      class << self
+        def locate(id)
+          new id
+        end
       end
-    end
 
-    attr_reader :id
-    def initialize(id)
-      @id = id
-    end
+      attr_reader :id
+      def initialize(id)
+        @id = id
+      end
 
-    def locate(name)
-      if name == 'finish'
-        SuiteFinish.new self
-      else
-        raise ArgumentError, "Invalid path: #{name}"
+      def locate(name)
+        if name == 'finish'
+          SuiteFinish.new self
+        else
+          raise ArgumentError, "Invalid path: #{name}"
+        end
       end
     end
   end
-  end
 end

data/lib/js_spec/resources/suite_finish.rb

@@ -1,20 +1,20 @@
 module JsSpec
   module Resources
     class SuiteFinish
-    attr_reader :suite
-    def initialize(suite)
-      @suite = suite
-    end
+      attr_reader :suite
+      def initialize(suite)
+        @suite = suite
+      end
 
-    def post
-      guid = Server.request['guid']
-      if guid
-        Runners::FirefoxRunner.resume(guid, Server.request['text'])
-      else
-        STDOUT.puts Server.request['text']
+      def post(request, response)
+        guid = request['guid']
+        if guid
+          Runners::FirefoxRunner.resume(guid, request['text'])
+        else
+          STDOUT.puts request['text']
+        end
+        ""
       end
-      ""
     end
   end
-  end
 end

data/lib/js_spec/server.rb

@@ -1,8 +1,5 @@
 module JsSpec
   class Server
-    DEFAULT_HOST = "127.0.0.1"
-    DEFAULT_PORT = 8080
-    
     class << self
       attr_accessor :instance
 
@@ -10,19 +7,17 @@ module JsSpec
         server_options[:Host] ||= DEFAULT_HOST
         server_options[:Port] ||= DEFAULT_PORT
         @instance = new(spec_root_path, implementation_root_path, public_path, server_options[:Host], server_options[:Port])
-        Rack::Handler::Mongrel.run(instance, server_options)
-      end
-
-      def default_url
-        "http://#{DEFAULT_HOST}:#{DEFAULT_PORT}"
+        instance.run server_options
       end
 
       def spec_root_path; instance.spec_root_path; end
       def implementation_root_path; instance.implementation_root_path; end
       def public_path; instance.public_path; end
       def core_path; instance.core_path; end
+      def connection; instance.connection; end
       def request; instance.request; end
       def response; instance.response; end
+      def root_url; instance.root_url; end
     end
 
     attr_reader :host, :port, :spec_root_path, :implementation_root_path, :core_path, :public_path
@@ -36,21 +31,30 @@ module JsSpec
       @host = host
       @port = port
     end
-    
+
+    def run(options)
+      ::Thin::Server.start(
+        ::Thin::Backends::JsSpecServer.new(options[:Host], options[:Port]),
+        options[:Port],
+        self
+      )
+    end
+
     def call(env)
+      self.connection = env['js_spec.connection']
       self.request = Rack::Request.new(env)
       self.response = Rack::Response.new
       method = request.request_method.downcase.to_sym
-      response.body = get_resource.send(method)
+      get_resource(request).send(method, request, response)
       response.finish
     ensure
+      self.connection = nil
       self.request = nil
       self.response = nil
     end
-    
-    def run(path)
-      system(%{firefox "http://#{host}:#{port}/#{path}"})
-      Suite.new
+
+    def connection
+      Thread.current[:connection]
     end
 
     def request
@@ -60,8 +64,16 @@ module JsSpec
     def response
       Thread.current[:response]
     end
+
+    def root_url
+      "http://#{host}:#{port}"
+    end
     
     protected
+    def connection=(connection)
+      Thread.current[:connection] = connection
+    end
+
     def request=(request)
       Thread.current[:request] = request
     end
@@ -70,12 +82,12 @@ module JsSpec
       Thread.current[:response] = response
     end
 
-    def path_parts
+    def path_parts(req)
       request.path_info.split('/').reject { |part| part == "" }
     end
 
-    def get_resource
-      path_parts.inject(Resources::WebRoot.new(public_path)) do |resource, child_resource_name|
+    def get_resource(request)
+      path_parts(request).inject(Resources::WebRoot.new(public_path)) do |resource, child_resource_name|
         resource.locate(child_resource_name)
       end
     rescue Exception => e