red-glass 0.0.3 → 0.0.4

data/lib/Selenium/driver.rb

@@ -0,0 +1,16 @@
+require 'observer'
+
+module Selenium
+  module WebDriver
+    class Driver
+      include SearchContext
+      include Observable
+
+      def found_element(element)
+        changed
+        notify_observers element
+      end
+
+    end # Driver
+  end # WebDriver
+end # Selenium

data/lib/Selenium/element.rb

@@ -0,0 +1,23 @@
+require 'observer'
+
+module Selenium
+  module WebDriver
+    class Element
+      include SearchContext
+      include Observable
+
+      def click
+        result = bridge.clickElement @id
+        changed
+        notify_observers
+        result
+      end
+
+      def found_element(element)
+        changed
+        notify_observers element
+      end
+
+    end
+  end
+end

data/lib/Selenium/navigation.rb

@@ -0,0 +1,17 @@
+require 'observer'
+
+module Selenium
+  module WebDriver
+    class Navigation
+      include Observable
+
+      def to(url)
+        result = @bridge.get url
+        changed
+        notify_observers url
+        result
+      end
+
+    end
+  end
+end

data/lib/Selenium/search_context.rb

@@ -0,0 +1,29 @@
+module Selenium
+  module WebDriver
+    module SearchContext
+
+      def find_element(*args)
+        how, what = extract_args(args)
+
+        unless by = FINDERS[how.to_sym]
+          raise ArgumentError, "cannot find element by #{how.inspect}"
+        end
+
+        result = bridge.find_element_by by, what.to_s, ref
+        self.found_element result
+        result
+      end
+
+      def find_elements(*args)
+        how, what = extract_args(args)
+
+        unless by = FINDERS[how.to_sym]
+          raise ArgumentError, "cannot find elements by #{how.inspect}"
+        end
+
+        bridge.find_elements_by by, what.to_s, ref
+      end
+
+    end # SearchContext
+  end # WebDriver
+end # Selenium

data/lib/red-glass/red_glass.rb

@@ -1,31 +1,64 @@
 require "selenium-webdriver"
 require "uuid"
 require "net/http"
+require_relative "../Selenium/driver"
+require_relative "../Selenium/element"
+require_relative "../Selenium/navigation"
+require_relative "../Selenium/search_context"
 
 class RedGlass
-  attr_accessor :driver, :test_id, :opts, :port, :pid
+  attr_accessor :driver, :test_id, :opts, :port, :pid, :recording
 
   PROJ_ROOT = File.dirname(__FILE__).to_s
 
   def initialize(driver, opts={})
     @driver = driver
+    @driver.navigate.add_observer self
+    @driver.add_observer self, :found_element_event
     @opts = opts
+    @recording = false
+  end
+
+  def update(url=nil)
+    if @recording
+      reload
+    end
+  end
+
+  def click_event(url=nil)
+    if @recording
+      reload if !has_red_glass_js?
+    end
+  end
+
+  def found_element_event(element)
+    if @recording
+      element.add_observer self, :click_event
+    end
   end
 
   def start
     set_config
-    if !is_server_ready? 1
-      @pid = Process.spawn("ruby","#{PROJ_ROOT}/red-glass-app.rb")
-      raise "Red Glass server could not bet started." if !is_server_ready?
-      Process.detach @pid
-    end
+    start_server
     uuid = UUID.new
     @test_id = uuid.generate
     load_js
+    @recording = true
+  end
+
+  def reload
+    set_config
+    start_server
+    load_js
+  end
+
+  def pause
+    @recording = false
   end
 
   def stop
     Process.kill('INT', @pid)
+    @recording = false
   end
 
   private
@@ -47,6 +80,14 @@ class RedGlass
     is_server_ready
   end
 
+  def start_server
+    if !is_server_ready? 1
+      @pid = Process.spawn("ruby","#{PROJ_ROOT}/red-glass-app.rb")
+      raise "Red Glass server could not bet started." if !is_server_ready?
+      Process.detach @pid
+    end
+  end
+
   def set_config
     @port = @opts[:red_glass_port].nil? ? '4567' : @opts[:red_glass_port].to_s
     ENV['red_glass_port'] = @port
@@ -77,11 +118,15 @@ class RedGlass
     @driver.execute_script raw_js
   end
 
+  def has_red_glass_js?
+    @driver.execute_script "var hasRedGlass = typeof jQuery().redGlass == 'function' ? true : false; return hasRedGlass"
+  end
+
   def load_red_glass_js
     raw_js = File.open(File.expand_path("#{PROJ_ROOT}/public/scripts/jquery.red-glass-0.1.0.js"), 'rb').read
-    @driver.execute_script raw_js
+    @driver.execute_script raw_js if !has_red_glass_js?
     @driver.execute_script("jQuery(document).redGlass('#{@test_id}', '#{@port}')")
-    @driver.execute_script "jQuery.noConflict(true)"
+    #@driver.execute_script "jQuery.noConflict(true)"
   end
 
 end

data/lib/red-glass/views/index.erb

@@ -39,7 +39,6 @@
   </div>
   <div id="waiting" class="prepend-8 span-8 append-8 last">
     <h1>Waiting for events</h1>
-    <img class="push-3" src="/images/ajax-loader.gif"/>
   </div>
 </div>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: red-glass
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70208572273860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70208572273860
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70208572273240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70208572273240
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70208572272580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70208572272580
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70208572271860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70208572271860
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70208572271180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70208572271180
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70208572270400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70208572270400
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70208572285860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,12 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70208572285860
 description: Red Glass works alongside Selenium to observe browser events, and provides
   an interactive log which illustrates changes to the DOM during an automation session.
 email: frankj.ohara@gmail.com
@@ -202,7 +167,11 @@ files:
 - lib/red-glass/red_glass.rb
 - lib/red-glass/views/index.erb
 - lib/red-glass.rb
-homepage: http://rubygems.org/gems/red-glass
+- lib/Selenium/driver.rb
+- lib/Selenium/element.rb
+- lib/Selenium/navigation.rb
+- lib/Selenium/search_context.rb
+homepage: https://github.com/fohara/red-glass
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -222,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ! 'Red Glass: Selenium event pane'