watir-classic 3.2.0 → 3.3.0

data/CHANGES

@@ -1,3 +1,12 @@
+== 3.3.0 - 2012/10/27
+
+* Add support for optional Element#style property argument, which allows to get specific css style attribute value.
+* Add support for locating Link by a :name. Fixes #42.
+* Avoid endless loop when focusing elements inside of a frame. Closes #41. 
+* Cookies#delete handles the situation if browser is on about:blank.
+* Remove Image#file_created_date method since IE does not provide accurate information. Closes #36.
+* Use MultiJSON gem instead of the Yajl::Ruby gem as a dependency for parsing #execute_script results.
+
 == 3.2.0 - 2012/09/17
 
 * Add Element#browser method as an alias for Element#page_container.

data/Gemfile.lock

@@ -1,78 +1,78 @@
-PATH
-  remote: .
-  specs:
-    watir-classic (3.2.0.rc1)
-      ffi (~> 1.0)
-      nokogiri
-      rautomation (~> 0.7.2)
-      user-choices
-      win32-process (>= 0.5.5)
-      win32screenshot
-      windows-pr (>= 0.6.6)
-      yajl-ruby
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.0.0)
-    childprocess (0.3.4)
-      ffi (~> 1.0, >= 1.0.6)
-    diff-lcs (1.1.3)
-    ffi (1.1.3-x86-mingw32)
-    hoe (3.0.8)
-      rake (~> 0.8)
-    mini_magick (3.2.1)
-      subexec (~> 0.0.4)
-    nokogiri (1.5.5-x86-mingw32)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    rake (0.9.2.2)
-    rautomation (0.7.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    s4t-utils (1.0.4)
-      hoe (>= 1.3.0)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    subexec (0.0.4)
-    syntax (1.0.0)
-    tilt (1.3.3)
-    user-choices (1.1.6.1)
-      builder (>= 2.1.2)
-      s4t-utils (>= 1.0.3)
-      xml-simple (>= 1.0.11)
-    win32-api (1.4.8-x86-mingw32)
-    win32-process (0.7.0)
-      ffi (>= 1.0.0)
-    win32screenshot (1.0.7)
-      ffi (~> 1.0)
-      mini_magick (~> 3.2.1)
-      rautomation (~> 0.7.0)
-    windows-api (0.4.2)
-      win32-api (>= 1.4.5)
-    windows-pr (1.2.2)
-      win32-api (>= 1.4.5)
-      windows-api (>= 0.3.0)
-    xml-simple (1.1.1)
-    yajl-ruby (1.1.0-x86-mingw32)
-    yard (0.8.2.1)
-
-PLATFORMS
-  x86-mingw32
-
-DEPENDENCIES
-  childprocess
-  rspec (~> 2.3)
-  sinatra
-  syntax
-  watir-classic!
-  yard
+PATH
+  remote: .
+  specs:
+    watir-classic (3.2.0)
+      ffi (~> 1.0)
+      multi_json
+      nokogiri
+      rautomation (~> 0.7.2)
+      user-choices
+      win32-process (>= 0.5.5)
+      win32screenshot
+      windows-pr (>= 0.6.6)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.1.3)
+    childprocess (0.3.4)
+      ffi (~> 1.0, >= 1.0.6)
+    diff-lcs (1.1.3)
+    ffi (1.1.3-x86-mingw32)
+    hoe (3.0.8)
+      rake (~> 0.8)
+    mini_magick (3.2.1)
+      subexec (~> 0.0.4)
+    multi_json (1.3.6)
+    nokogiri (1.5.5-x86-mingw32)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
+    rake (0.9.2.2)
+    rautomation (0.7.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
+    s4t-utils (1.0.4)
+      hoe (>= 1.3.0)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    subexec (0.0.4)
+    syntax (1.0.0)
+    tilt (1.3.3)
+    user-choices (1.1.6.1)
+      builder (>= 2.1.2)
+      s4t-utils (>= 1.0.3)
+      xml-simple (>= 1.0.11)
+    win32-api (1.4.8-x86-mingw32)
+    win32-process (0.7.0)
+      ffi (>= 1.0.0)
+    win32screenshot (1.0.7)
+      ffi (~> 1.0)
+      mini_magick (~> 3.2.1)
+      rautomation (~> 0.7.0)
+    windows-api (0.4.2)
+      win32-api (>= 1.4.5)
+    windows-pr (1.2.2)
+      win32-api (>= 1.4.5)
+      windows-api (>= 0.3.0)
+    xml-simple (1.1.1)
+    yard (0.8.2.1)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  childprocess
+  rspec (~> 2.3)
+  sinatra
+  syntax
+  watir-classic!
+  yard

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.3.0

data/lib/watir-classic/cookies.rb

@@ -39,6 +39,7 @@ module Watir
       # there's got to be some easier way to do this
       uri = URI.parse(@page_container.url)
       domain = uri.host
+      return unless domain
 
       paths = uri.path.split("/").reduce([]) do |paths, path|
         paths << "#{paths.last}/#{path}".squeeze("/")
@@ -71,10 +72,11 @@ module Watir
       each {|cookie| delete cookie[:name]}
     end
 
+    private
+
     def delete_with_options name, options={}
       add name, nil, options
     end
 
-    private :delete_with_options
   end
 end

data/lib/watir-classic/element.rb

@@ -113,9 +113,16 @@ module Watir
     end
 
     # return the css style as a string
-    def style
+    def style(property=nil)
       assert_exists
-      ole_object.style.cssText
+      css = ole_object.style.cssText
+
+      if property
+       properties = Hash[css.downcase.split(";").map { |p| p.split(":").map(&:strip) }]
+       properties[property]
+      else
+        css
+      end
     end
 
     # Return the innerText of the object or an empty string if the object is
@@ -343,7 +350,7 @@ module Watir
     def focus
       assert_exists
       assert_enabled
-      @page_container.focus
+      @container.focus
       ole_object.focus(0)
     end
 

data/lib/watir-classic/ie.rb

@@ -3,7 +3,7 @@ require 'watir-classic/core'
 require 'watir-classic/close_all'
 require 'watir-classic/ie-process'
 require 'watir-classic/screenshot'
-require 'yajl'      
+require 'multi_json'      
 
 # these switches need to be deleted from ARGV to enable the Test::Unit
 # functionality that grabs

data/lib/watir-classic/image.rb

@@ -8,7 +8,6 @@ module Watir
   class Image < Element
     attr_ole :alt
     attr_ole :src
-    attr_ole :file_created_date, :fileCreatedDate
 
     # this method produces the properties for an image as an array
     def image_string_creator
@@ -55,7 +54,7 @@ module Watir
     # If the Disk cache is full (tools menu -> Internet options -> Temporary Internet Files), it may produce incorrect responses.
     def loaded?
       assert_exists
-      !file_created_date.empty? && file_size != -1
+      file_size != -1
     end
     
     # this method highlights the image (in fact it adds or removes a border around the image)

data/lib/watir-classic/link.rb

@@ -7,12 +7,12 @@ module Watir
   class Link < Element
     attr_ole :type
     attr_ole :href
+    attr_ole :name
 
     # if an image is used as part of the link, this will return true
     def link_has_image
       assert_exists
-      return true if @o.getElementsByTagName("IMG").length > 0
-      return false
+      @o.getElementsByTagName("IMG").length > 0
     end
     
     # this method returns the src of an image, if an image is used as part of the link

data/lib/watir-classic/page-container.rb

@@ -47,7 +47,7 @@ module Watir
         result = document.getElementById(wrapper).innerHTML
       end
 
-      Yajl::Parser.parse(result) rescue nil
+      MultiJson.load(result)["value"] rescue nil
     end
 
     # The HTML of the current page
@@ -99,7 +99,7 @@ module Watir
           document.getElementsByTagName('head')[0].appendChild(json2)
         } 
 
-        return JSON.stringify((function() {#{source}})());
+        return JSON.stringify({value: (function() {#{source}})()});
       })()
       ]
     end

data/spec/element_spec.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+require File.expand_path("watirspec/spec_helper", File.dirname(__FILE__))
+
+describe "Element" do
+
+  before :each do
+    browser.goto(WatirSpec.url_for("non_control_elements.html"))
+  end
+
+  describe "#style" do
+    it "returns the style attribute if the property exists" do
+      el = browser.div(:id, 'best_language')
+      el.style("color").should == "red"
+      el.style("text-decoration").should == "underline"
+      el.style("cursor").should == "pointer"
+    end
+  end
+
+end

data/spec/link_spec.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+require File.expand_path("watirspec/spec_helper", File.dirname(__FILE__))
+
+describe "Link" do
+  before do
+    browser.goto(WatirSpec.url_for("non_control_elements.html"))
+  end
+
+  context "#exists?" do
+    it "finds link by a name" do
+      browser.a(:name => "bad_attribute").should exist
+    end
+  end
+end

data/spec/select_list_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require File.expand_path("watirspec/spec_helper", File.dirname(__FILE__))
+
+describe "SelectList" do
+  before do
+    browser.goto(WatirSpec.url_for("frames.html"))
+  end
+
+  context "#select" do
+    it "selects option within frame" do
+      list = browser.frame.select_list
+      list.should exist
+      list.should be_selected("value1")
+      list.select "value2"
+      list.should be_selected("value2")
+    end
+  end
+end

data/watir-classic.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'ffi', '~>1.0'
   s.add_dependency 'rautomation', '~>0.7.2'
   s.add_dependency 'user-choices'
-  s.add_dependency 'yajl-ruby'
+  s.add_dependency 'multi_json'
   s.add_dependency 'win32screenshot'
 
   s.add_development_dependency("rspec", "~>2.3")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir-classic
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-process
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -303,7 +303,10 @@ files:
 - lib/watir-classic/window.rb
 - lib/watir-classic/xpath_locator.rb
 - spec/browser_spec.rb
+- spec/element_spec.rb
 - spec/implementation.rb
+- spec/link_spec.rb
+- spec/select_list_spec.rb
 - watir-classic.gemspec
 - watir.gif
 homepage: http://watir.com/
@@ -333,5 +336,8 @@ specification_version: 3
 summary: Automated testing tool for web applications.
 test_files:
 - spec/browser_spec.rb
+- spec/element_spec.rb
 - spec/implementation.rb
+- spec/link_spec.rb
+- spec/select_list_spec.rb
 has_rdoc: