sapphire 0.2.0 → 0.2.1

data/lib/sapphire/DSL/Browser/Hide.rb

@@ -2,7 +2,23 @@ module Sapphire
   module DSL
     module Browser
       def Hide(args)
-        IsHidden(args) == true
+        NullModifier.new(Hide.new(args, @page, @browser))
+      end
+
+      class Hide
+        def initialize(item, page, browser)
+          @item = item
+          @page = page
+          @browser = browser
+        end
+
+        def ModifyWith(item)
+          @modifier = item
+        end
+
+        def execute
+          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page, @browser).Hide(@item, @modifier), :modifier => @modifier }
+        end
       end
     end
   end

data/lib/sapphire/DSL/Browser/IsHidden.rb

@@ -2,25 +2,7 @@ module Sapphire
   module DSL
     module Browser
       def IsHidden(args)
-        @page.fields.each do |field|
-          field.keys.each do |field_key|
-            if(field_key == args)
-              begin
-                wait = Selenium::WebDriver::Wait.new(:timeout => 10)
-                element = wait.until { x = field[field_key].Find
-                    x and !x.displayed?
-                }
-                if(element)
-                  return element.displayed?
-                end
-              rescue
-               return true
-              end
-            end
-          end
-        end
 
-        raise "cannot find control matching " + args.to_s + " for page " + @page.to_s
       end
     end
   end

data/lib/sapphire/Strategies/HashStrategy.rb

@@ -22,6 +22,7 @@ module Sapphire
              return control.Equals(arg)
            end
         end
+
       end
     end
   end

data/lib/sapphire/Strategies/SymbolStrategy.rb

@@ -26,7 +26,28 @@ module Sapphire
           end
         end
 
-        raise "cannot find control matching " + args.to_s + " for page " + @page.to_s
+        raise "cannot find control matching " + item.to_s + " for page " + @page.to_s
+        end
+
+        def Hide(item, modifier)
+          @page.fields.each do |field|
+            field.keys.each do |field_key|
+              if(field_key == item)
+                begin
+                  wait = Selenium::WebDriver::Wait.new(:timeout => 10)
+                  element = wait.until { x = field[field_key].Find
+                      x and modifier.Modify(!x.displayed?)
+                  }
+                  if(element)
+                    return Evaluation.new(modifier.Modify(element.displayed?), modifier.Modify(true))
+                  end
+                rescue
+                 return Evaluation.new(true, true)
+                end
+              end
+            end
+          end
+          raise "cannot find control matching " + item.to_s + " for page " + @page.to_s
         end
 
         def Validate(hash)

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: albacore
-  requirement: &9358284 !ruby/object:Gem::Requirement
+  requirement: &9358704 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9358284
+  version_requirements: *9358704
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9358020 !ruby/object:Gem::Requirement
+  requirement: &9358404 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9358020
+  version_requirements: *9358404
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &9357672 !ruby/object:Gem::Requirement
+  requirement: &9358092 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9357672
+  version_requirements: *9358092
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email: