RubyGems - terminus - Versions diffs - 0.4.0 → 0.5.0 - Mend

terminus 0.4.0 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (48) hide show

data/bin/terminus +5 -5
data/lib/capybara/driver/terminus.rb +24 -13
data/lib/terminus.rb +21 -15
data/lib/terminus/application.rb +6 -6
data/lib/terminus/browser.rb +77 -60
data/lib/terminus/client.rb +33 -16
data/lib/terminus/client/browser.rb +10 -9
data/lib/terminus/client/phantom.js +25 -3
data/lib/terminus/client/phantomjs.rb +44 -7
data/lib/terminus/connector.rb +2 -2
data/lib/terminus/connector/server.rb +15 -15
data/lib/terminus/connector/socket_handler.rb +11 -11
data/lib/terminus/controller.rb +62 -26
data/lib/terminus/headers.rb +25 -0
data/lib/terminus/host.rb +6 -6
data/lib/terminus/node.rb +36 -22
data/lib/terminus/proxy.rb +81 -45
data/lib/terminus/proxy/driver_body.rb +14 -15
data/lib/terminus/proxy/external.rb +12 -6
data/lib/terminus/proxy/rewrite.rb +7 -6
data/lib/terminus/public/compiled/terminus-min.js +3 -3
data/lib/terminus/public/compiled/terminus.js +225 -180
data/lib/terminus/public/pathology.js +87 -87
data/lib/terminus/public/terminus.js +138 -93
data/lib/terminus/server.rb +7 -7
data/lib/terminus/timeouts.rb +8 -8
data/lib/terminus/views/bootstrap.erb +7 -7
data/lib/terminus/views/index.erb +4 -4
data/lib/terminus/views/infinite.html +4 -4
data/spec/1.1/reports/android.txt +874 -0
data/spec/{reports → 1.1/reports}/chrome.txt +72 -69
data/spec/{reports → 1.1/reports}/firefox.txt +72 -69
data/spec/{reports → 1.1/reports}/opera.txt +72 -69
data/spec/{reports → 1.1/reports}/phantomjs.txt +72 -69
data/spec/{reports → 1.1/reports}/safari.txt +72 -69
data/spec/{spec_helper.rb → 1.1/spec_helper.rb} +5 -2
data/spec/{terminus_driver_spec.rb → 1.1/terminus_driver_spec.rb} +2 -2
data/spec/{terminus_session_spec.rb → 1.1/terminus_session_spec.rb} +2 -2
data/spec/2.0/reports/android.txt +815 -0
data/spec/2.0/reports/chrome.txt +806 -0
data/spec/2.0/reports/firefox.txt +812 -0
data/spec/2.0/reports/opera.txt +806 -0
data/spec/2.0/reports/phantomjs.txt +803 -0
data/spec/2.0/reports/safari.txt +806 -0
data/spec/2.0/spec_helper.rb +21 -0
data/spec/2.0/terminus_spec.rb +25 -0
metadata +41 -32
data/spec/reports/android.txt +0 -875

data/lib/terminus/headers.rb ADDED

@@ -0,0 +1,25 @@
+module Terminus
+  class Headers
+    def initialize(values)
+      @hash = {}
+      values.each do |key, value|
+        @hash[normalize_key(key)] = value
+      end
+    end
+    def [](key)
+      @hash[normalize_key(key)]
+    end
+  private
+    def normalize_key(key)
+      key.downcase.
+          gsub(/^http_/, '').
+          gsub(/_/, '-')
+    end
+  end
+end

data/lib/terminus/host.rb CHANGED

@@ -1,27 +1,27 @@
 module Terminus
   class Host
     attr_reader :host, :port
     def initialize(uri)
       @scheme = uri.scheme if uri.respond_to?(:scheme)
       @host   = uri.host
       @port   = uri.port
     end
     def scheme
       @scheme || 'http'
     end
     def eql?(other)
       host == other.host and
       port == other.port
     end
     alias :== :eql?
     def hash
       [host, port].hash
     end
   end
 end

data/lib/terminus/node.rb CHANGED

@@ -1,74 +1,88 @@
 module Terminus
   class Node
     attr_reader :id
     def initialize(browser, id, driver = nil)
       @browser, @id, @driver = browser, id, driver
     end
     def checked?
       !!self['checked']
     end
-    def selected?
-      !!self['selected']
-    end
     def click
       page    = @browser.page_id
       options = @driver ? @driver.options : {}
       value = if @browser.connector
         @browser.ask([:click, @id, options], false)
       else
         command = @browser.tell([:click, @id, options])
         result = @browser.wait_with_timeout(:click_response) do
           @browser.result(command) || (@browser.page_id != page)
         end
         Hash === result ? result[:value] : nil
       end
       if String === value
         raise Capybara::TimeoutError, value
       end
     end
     def drag_to(node)
       @browser.ask([:drag, {:from => @id, :to => node.id}])
     end
+    def ==(other)
+      Terminus::Node === other and @id == other.id
+    end
+    alias :eql? :==
     def find(xpath)
       @browser.ask([:find, xpath, @id]).map { |id| Node.new(@browser, id) }
     end
+    def hash
+      @id.hash
+    end
+    # Capybara invokes `node.native ==` to determine node equality
+    def native
+      self
+    end
     def select
       @browser.ask([:select, @id])
     end
+    def selected?
+      !!self['selected']
+    end
     def set(value)
       result = @browser.ask([:set, @id, value])
       raise Capybara::NotSupportedByDriverError.new if result == 'not_allowed'
     end
     def trigger(event_type)
       @browser.ask([:trigger, @id, event_type])
     end
     def unselect
       allowed = @browser.ask([:unselect, @id])
       raise Capybara::UnselectNotAllowed.new unless allowed
     end
     def to_s
       "<#{self.class.name} #{@id}>"
     end
     alias :inspect :to_s
     alias :select_option :select
     alias :unselect_option :unselect
     SYNC_DSL_METHODS = [ [:[], :attribute],
                          [:[]=, :set_attribute],
                          :tag_name,
@@ -76,7 +90,7 @@ module Terminus
                          :value,
                          [:visible?, :is_visible]
                        ]
     SYNC_DSL_METHODS.each do |method|
       if Array === method
         name, command = *method
@@ -87,7 +101,7 @@ module Terminus
         @browser.ask([command, @id, *args])
       end
     end
   end
 end

data/lib/terminus/proxy.rb CHANGED

@@ -1,96 +1,132 @@
 module Terminus
   class Proxy
     CONTENT_TYPES   = %w[text/plain text/html]
     BASIC_RESOURCES = %w[/favicon.ico /robots.txt]
     MAX_REDIRECTS   = 5
     REDIRECT_CODES  = [301, 302, 303, 305, 307]
     INFINITE_REDIRECT_RESPONSE = [
       200,
       {'Content-Type' => 'text/html'},
       [File.read(ROOT + '/terminus/views/infinite.html')]
     ]
+    ERROR_PAGE = ERB.new(<<-HTML)
+      <!doctype html>
+      <html>
+        <head>
+          <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        </head>
+        <body>
+          <h1><%= error.class %>: <%=ERB::Util.h error.message %></h1>
+          <ul>
+            <% error.backtrace.each do |line| %>
+              <li><%=ERB::Util.h line %></li>
+            <% end %>
+          </ul>
+        </body>
+      </html>
+    HTML
     autoload :DriverBody, ROOT + '/terminus/proxy/driver_body'
     autoload :External,   ROOT + '/terminus/proxy/external'
     autoload :Rewrite,    ROOT + '/terminus/proxy/rewrite'
     def self.[](app)
       @proxies ||= {}
       @proxies[app] ||= new(app)
     end
     def self.content_type(response)
       type = response[1].find { |key, _| key =~ /^content-type$/i }
       type && type.last.split(';').first
     end
     def initialize(app)
       app = External.new(app) if Host === app
       @app = app
       @redirects = 0
     end
     def call(env)
       add_cookies(env)
-      response = @app.call(env)
+      response = forward_request(env)
       store_cookies(env, response)
-      if REDIRECT_CODES.include?(response.first)
-        @redirects += 1
-        if @redirects > MAX_REDIRECTS
-          @redirects = 0
-          response = INFINITE_REDIRECT_RESPONSE
-        end
-      else
-        @redirects = 0
-      end
-      if location = response[1].keys.grep(/^location$/i).first
-        app_host = URI.parse('http://' + env['HTTP_HOST']).host
-        response[1][location] = Terminus.rewrite_remote(response[1][location], app_host).to_s
-      end
-      return response if response.first == -1 or              # async response
-             REDIRECT_CODES.include?(response.first) or       # redirects
-             BASIC_RESOURCES.include?(env['PATH_INFO']) or    # not pages - favicon etc
-             env.has_key?('HTTP_X_REQUESTED_WITH')            # Ajax calls
-      content_type = Proxy.content_type(response)
-      return response unless CONTENT_TYPES.include?(content_type)
-      response[1] = response[1].dup
-      response[1].delete_if { |key, _| key =~ /^content-length$/i }
-      response[2] = DriverBody.new(env, response)
-      response
+      response = detect_infinite_redirect(response)
+      rewrite_response(env, response)
     end
   private
     def add_cookies(env)
       return unless External === @app
       cookies = Terminus.cookies.get_cookies(env['REQUEST_URI'])
       env['HTTP_COOKIE'] = (cookies + [env['HTTP_COOKIE']]).compact.join('; ')
-    rescue => e
-      puts e.message
     end
     def store_cookies(env, response)
       set_cookie = response[1].keys.grep(/^set-cookie$/i).first
       return unless set_cookie
       host = External === @app ? @app.uri.host : env['HTTP_HOST']
       endpoint = "http://#{host}#{env['PATH_INFO']}"
       [*response[1][set_cookie]].compact.each do |cookie|
         cookie.split(/\s*,\s*(?=\S+=)/).each do |value|
           Terminus.cookies.set_cookie(endpoint, value)
         end
       end
     end
+    def forward_request(env)
+      env.delete('HTTP_REFERER') if Terminus.visited?(env['REQUEST_URI'])
+      @app.call(env)
+    rescue => error
+      [500, {'Content-Type' => 'text/html'}, [ERROR_PAGE.result(binding)]]
+    end
+    def detect_infinite_redirect(response)
+      if REDIRECT_CODES.include?(response.first)
+        @redirects += 1
+        if @redirects > MAX_REDIRECTS
+          @redirects = 0
+          response = INFINITE_REDIRECT_RESPONSE
+        end
+      else
+        @redirects = 0
+      end
+      response
+    end
+    def rewrite_response(env, response)
+      rewrite_location(env, response)
+      return response if return_unmodified?(env, response)
+      response[1] = response[1].dup
+      response[1].delete_if { |key, _| key =~ /^content-length$/i }
+      response[2] = DriverBody.new(env, response)
+      response
+    end
+    def rewrite_location(env, response)
+      return unless location = response[1].keys.grep(/^location$/i).first
+      app_host = URI.parse('http://' + env['HTTP_HOST']).host
+      response[1][location] = Terminus.rewrite_remote(response[1][location], app_host).to_s
+    end
+    def return_unmodified?(env, response)
+      return true if response.first == -1 or                  # async response
+             REDIRECT_CODES.include?(response.first) or       # redirects
+             BASIC_RESOURCES.include?(env['PATH_INFO']) or    # not pages - favicon etc
+             env.has_key?('HTTP_X_REQUESTED_WITH')            # Ajax calls
+      content_type = Proxy.content_type(response)
+      return true unless CONTENT_TYPES.include?(content_type)
+      false
+    end
   end
 end

data/lib/terminus/proxy/driver_body.rb CHANGED

@@ -1,10 +1,10 @@
 module Terminus
   class Proxy
     class DriverBody
       ASYNC_BROWSERS = %w[Android]
-      TEMPLATE = ERB.new(<<-DRIVER)
+      TEMPLATE = ERB.new(<<-HTML)
         <script type="text/javascript" id="terminus-data">
           TERMINUS_STATUS = <%= @response.first %>;
           TERMINUS_HEADERS = {};
@@ -24,7 +24,7 @@ module Terminus
             (function() {
               var head = document.getElementsByTagName('head')[0],
                   script = document.createElement('script');
               script.type = 'text/javascript';
               script.src = '<%= @host %>/bootstrap.js';
               head.appendChild(script);
@@ -39,9 +39,8 @@ module Terminus
             }, 0);
           </script>
         <% end %>
-      DRIVER
+      HTML
       def initialize(env, response)
         @env      = env
         @response = response
@@ -49,35 +48,35 @@ module Terminus
         @host     = "http://#{@env['SERVER_NAME']}:#{Terminus.port}"
         @async    = ASYNC_BROWSERS.include?(UserAgent.parse(env['HTTP_USER_AGENT']).browser)
       end
       def each(&block)
         script_injected = false
         @source = ''
         @body.each do |fragment|
           @source << fragment
           output = inject_script(fragment)
           script_injected ||= (output != fragment)
           block.call(output)
         end
         unless script_injected
           block.call(TEMPLATE.result(binding))
         end
       end
     private
       def inject_script(fragment)
         fragment.gsub(/((?:^\s*)?<\/body>)/i) do
-          TEMPLATE.result(binding) + $1
+          TEMPLATE.result(binding) + ($1 || '')
         end
       end
       def page_source
         @source.inspect.gsub('</script>', '</scr"+"ipt>')
       end
     end
   end
 end

data/lib/terminus/proxy/external.rb CHANGED

@@ -1,25 +1,31 @@
 module Terminus
   class Proxy
     class External < Rack::Proxy
+      attr_reader :uri
       def initialize(uri)
         @uri = uri
       end
       def rewrite_env(env)
         env = env.dup
         env['SERVER_NAME'] = @uri.host
         env['SERVER_PORT'] = @uri.port
         env['HTTP_HOST']   = "#{@uri.host}:#{@uri.port}"
         env.delete('HTTP_ACCEPT_ENCODING')
         if scheme = @uri.scheme
           env['rack.url_scheme'] = scheme
         end
+        if %w[PUT POST].include?(env['REQUEST_METHOD'])
+          env['CONTENT_LENGTH'] ||= '0'
+        end
         env
       end
       def call(env)
         dock_host = env['SERVER_NAME']
         response = super
@@ -29,6 +35,6 @@ module Terminus
         response
       end
     end
   end
 end