red-glass 0.0.5 → 0.0.6

data/lib/red-glass/red_glass.rb

@@ -1,10 +1,6 @@
 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, :recording
@@ -13,30 +9,11 @@ class RedGlass
 
   def initialize(driver, opts={})
     @driver = driver
-    @driver.navigate.add_observer self
-    @driver.add_observer self, :found_element_event
     @opts = opts
+    opts[:listener].red_glass = self if opts[:listener]
     @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
     start_server

data/lib/red-glass/red_glass_listener.rb

@@ -0,0 +1,18 @@
+require 'selenium/webdriver/support/abstract_event_listener'
+
+class RedGlassListener < Selenium::WebDriver::Support::AbstractEventListener
+  attr_accessor :red_glass
+
+  def after_navigate_back(driver)
+    @red_glass.reload
+  end
+
+  def after_navigate_forward(driver)
+    @red_glass.reload
+  end
+
+  def after_navigate_to(url, driver)
+    @red_glass.reload
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: red-glass
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2013-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70111554035260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111554035260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &70111554034700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111554034700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70111554034020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +53,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111554034020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70111554033120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.32.0
   type: :runtime
   prerelease: false
-  version_requirements: *70111554033120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.32.0
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70111554032200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111554032200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70111554031060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111554031060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70111554030360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70111554030360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -165,12 +216,9 @@ files:
 - lib/red-glass/public/stylesheets/ui-lightness/jquery-ui-1.8.23.custom.css
 - lib/red-glass/red-glass-app.rb
 - lib/red-glass/red_glass.rb
+- lib/red-glass/red_glass_listener.rb
 - lib/red-glass/views/index.erb
 - lib/red-glass.rb
-- 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: 
@@ -191,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! 'Red Glass: Selenium event pane'

data/lib/Selenium/driver.rb

@@ -1,16 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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