watirsplash 2.3.2 → 2.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    watirsplash (2.3.1)
+    watirsplash (2.3.2)
       bundler (~> 1.0)
       rake (= 0.8.7)
       require_all
@@ -22,8 +22,7 @@ GEM
       commonwatir (>= 1.9.2)
     hoe (2.12.3)
       rake (~> 0.8)
-    json_pure (1.5.4)
-      spruz (~> 0.2.8)
+    json_pure (1.6.1)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
     nokogiri (1.5.0-x86-mingw32)
@@ -41,7 +40,7 @@ GEM
     rubyzip (0.9.4)
     s4t-utils (1.0.4)
       hoe (>= 1.3.0)
-    selenium-webdriver (2.5.0)
+    selenium-webdriver (2.7.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
       json_pure
@@ -50,7 +49,6 @@ GEM
       win32-process
     spork-local_process (0.0.1)
       spork (~> 0.9.0.rc9)
-    spruz (0.2.13)
     subexec (0.0.4)
     syntax (1.0.0)
     thor (0.14.6)
@@ -65,7 +63,7 @@ GEM
       rautomation (~> 0.6.3)
       win32-process (>= 0.5.5)
       windows-pr (>= 0.6.6)
-    watir-webdriver (0.3.3)
+    watir-webdriver (0.3.4)
       selenium-webdriver (>= 0.2.2)
     win32-api (1.4.8-x86-mingw32)
     win32-process (0.6.5)
@@ -90,6 +88,6 @@ DEPENDENCIES
   spork (~> 0.9.0.rc9)
   spork-local_process
   watir (= 2.0.2)
-  watir-webdriver (~> 0.3.3)
+  watir-webdriver (~> 0.3.4)
   watirsplash!
   win32screenshot (~> 1.0.5)

data/History.rdoc

@@ -1,3 +1,9 @@
+=== Version 2.4.0 / 2011-09-25
+
+ * add WatirSplash::Browser.exist? method
+ * redirect all method invocations on WatirSplash::Browser.current when method doesn't exist in WatirSplash::Browser class itself
+
+
 === Version 2.3.2 / 2011-09-25
 
  * add support for spork-local_process

data/lib/watirsplash/browser.rb

@@ -10,7 +10,7 @@ module WatirSplash
         browser.execute_script "window.__browserErrorMessage = undefined"
         raise JavaScriptError, "JavaScript error: #{error_message}"
       end
-      
+
       browser.execute_script %q[
         if (!window.onErrorFn) {
           window.onErrorFn = function(errorMsg, url, lineNumber) {
@@ -26,7 +26,7 @@ module WatirSplash
           window.onerror = window.onErrorFn;
         }]
     end
-          
+
     class << self
 
       attr_accessor :current
@@ -35,6 +35,12 @@ module WatirSplash
         prepare Watir::Browser.new
       end    
 
+      def exist?
+        current && current.exists?
+      end
+
+      alias_method :exists?, :exist?
+
       private
 
       def prepare browser
@@ -43,6 +49,19 @@ module WatirSplash
         browser
       end
 
+      def method_missing name, *args
+        if current.respond_to?(name)
+          instance_eval %Q[
+          def #{name}(*args)
+            current.send(:#{name}, *args) {yield}
+          end
+          ]
+          send(name, *args) {yield}
+        else
+          super
+        end
+      end
+
     end
   end
 end

data/lib/watirsplash/html_formatter.rb

@@ -32,12 +32,12 @@ module WatirSplash
 
     def example_started(example) # :nodoc:
       @files_saved_during_example.clear
-      example.metadata[:description] += "#{example.metadata[:location].scan(/:\d+$/)} (#{Time.now.strftime("%H:%M:%S")})"
+      example.metadata[:description] += "#{example.metadata[:location].scan(/:\d+$/).flatten.first} (#{Time.now.strftime("%H:%M:%S")})"
       super
     end
 
     def extra_failure_content(exception) # :nodoc:
-      if WatirSplash::Browser.current && WatirSplash::Browser.current.exists?
+      if WatirSplash::Browser.exists?
         save_screenshot
         save_html
       end

data/lib/watirsplash/page/base.rb

@@ -16,8 +16,7 @@ module WatirSplash
         if browser
           @browser = browser 
         else
-          reuse_current = WatirSplash::Browser.current && WatirSplash::Browser.current.exists?
-          @browser = reuse_current ? WatirSplash::Browser.current : (WatirSplash::Browser.current = WatirSplash::Browser.new)
+          @browser = WatirSplash::Browser.exists? ? WatirSplash::Browser.current : (WatirSplash::Browser.current = WatirSplash::Browser.new)
           @browser.goto @@url
         end
       end

data/lib/watirsplash/version.rb

@@ -1,6 +1,6 @@
 module WatirSplash
   module Version
-    WATIRSPLASH = "2.3.2"
+    WATIRSPLASH = "2.4.0"
 
     # possible runtime dependencies
     WATIR = "2.0.2"

data/spec/browser_spec.rb

@@ -31,6 +31,28 @@ describe WatirSplash::Browser do
     }.not_to raise_error
   end
 
+  it ".exist? && .exists?" do
+    WatirSplash::Browser.current = nil
+    WatirSplash::Browser.should_not exist
+
+    WatirSplash::Browser.new
+    WatirSplash::Browser.should exist
+
+    WatirSplash::Browser.close
+    WatirSplash::Browser.should_not exist
+
+    WatirSplash::Browser.should respond_to(:exists?)
+  end
+
+  it "redirects missing method calls to browser object" do
+    b = WatirSplash::Browser.new
+    WatirSplash::Browser.should_not respond_to(:goto)
+    expect {
+      WatirSplash::Browser.goto "google.com"
+    }.to_not raise_exception
+    b.title.should =~ /google/i
+  end
+
   after :each do
     WatirSplash::Browser.current.close
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 31
   prerelease: 
   segments: 
   - 2
-  - 3
-  - 2
-  version: 2.3.2
+  - 4
+  - 0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -173,7 +173,7 @@ rubyforge_project:
 rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
-summary: watirsplash 2.3.2
+summary: watirsplash 2.4.0
 test_files: 
 - spec/browser_spec.rb
 - spec/page_spec.rb