sapphire 0.7.3 → 0.7.4

data/lib/sapphire/Adapters/Selenium/RubySeleniumWebDriver.rb

@@ -93,16 +93,37 @@ module Sapphire
         self.browser.get self.CurrentUrl
       end
 
-      def ShouldNavigateTo(page, comparator)
-        if(page.is_a? Class)
-          $page = page.new
-        else
-          $page = page
+      def GetValue(item, key)
+
+        if item.is_a? Array
+          item.each do |sub_item|
+            value = GetValue(sub_item, key)
+            return value if !value.nil?
+          end
+        end
+
+        if item.is_a? Class and key.nil?
+          return item.new
         end
 
+        if item.is_a? Hash
+          return item[key] if item.has_key? key
+        end
+
+        nil
+      end
+
+      def ShouldNavigateTo(page, comparator)
+
+        $page = GetValue(page, nil)
+        $page ||= page
+
+        timeout = GetValue(page, :wait)
+        timeout ||= 20
+
         $page.Init
 
-        wait = Selenium::WebDriver::Wait.new(:timeout => 20)
+        wait = Selenium::WebDriver::Wait.new(:timeout => timeout)
         begin
           item = wait.until {
             x = self.CurrentUrl.upcase.start_with?($page.Url.upcase)

data/lib/sapphire/DSL/Browser/Nouns/Second.rb

@@ -26,7 +26,7 @@ module Sapphire
         end
 
         def Differ(comparator)
-          return Fix(DifferComparison.new(Evaluation.new(@compare1 + @value, @compare2)), comparator)
+          return Fix(DifferComparison.new(Evaluation.new((@compare2 - @compare1).to_i, @value)), comparator)
         end
 
         def Fix(evaluation, comparator)

data/lib/sapphire/DSL/Browser/Verbs/Remove.rb

@@ -12,7 +12,6 @@ module Sapphire
                 return nil
               }
             rescue
-              puts "Cant find item!"
               return nil
             end
          end

data/lib/sapphire/DSL/Comparisons/Comparison.rb

@@ -26,6 +26,14 @@ module Sapphire
         @item.Evaluate
       end
 
+      def left
+        @item.left
+      end
+
+      def right
+        @item.right
+      end
+
       def execute
         @item.execute
       end

data/lib/sapphire/DSL/Evaluators/Show.rb

@@ -1,8 +1,8 @@
 module Sapphire
   module DSL
     module Browser
-      def Show(item)
-        Evaluator.new(item) do |item, comparator| item.Show(item, comparator) end
+      def Show(*item)
+        Evaluator.new(item) do |item, comparator| item.first.Show(item, comparator) end
       end
     end
   end

data/lib/sapphire/Extensions/Hash.rb

@@ -9,32 +9,15 @@ class Hash < Object
   end
 
   def Examine(item, comparator, &block)
-    key = item.keys.first
-    field = $page.Get(key)
-    value = item[key]
+    key = item.first.keys.first if item.first.is_a? Hash
+    key = item.first.first if item.first.is_a? Array
 
     return FieldNotDefinedEvaluation.new(key, $page) if !$page.Contains key
 
-    begin
-      return FieldNotFoundEvaluation.new(key, $page, "selenium could not find the field") if field == nil
-
-      begin
-        wait = Selenium::WebDriver::Wait.new(:timeout => 5)
-          result = wait.until {
-            evaluation = block.call(field, value)
-            y = evaluation.Evaluate()
-            comparator = EqualsComparison.new(evaluation) if evaluation == nil
-            evaluation if comparator.Compare(y == true, true)
-          }
-
-        return Fix(result, comparator)
-      rescue => e
-        return FieldNotFoundEvaluation.new(key, $page, e.to_s)
-      end
+    field = $page.Get(key)
+    return FieldNotFoundEvaluation.new(key, $page, "selenium could not find the field") if field == nil
 
-    rescue => e
-      return FieldNotFoundEvaluation.new(key, $page, e.to_s)
-    end
+    return Fix(field.Evaluate(key, item, comparator, block), comparator)
   end
 
   def Show(item, comparator)

data/lib/sapphire/Extensions/Symbol.rb

@@ -43,49 +43,35 @@ class Symbol
   end
 
   def Selected(item, comparator)
-    Examine(item, comparator) do |field|
+    Examine(item, comparator) do |field, value|
       field.Selected
     end
   end
 
   def Checked(item, comparator)
-    Examine(item, comparator) do |field|
+    Examine(item, comparator) do |field, value|
       field.Checked
     end
   end
 
   def Show(item, comparator)
-    Examine(item, comparator) do |field|
+    Examine(item, comparator) do |field, value|
       field.Visible
     end
   end
 
   def Examine(key, comparator, &block)
-    field = $page.Get(key)
-    element = field.Find(comparator)
-
-    return Evaluation.new(true, true) if element.nil? and comparator.Compare(true, false)
+    item = key
+    key = item.first if item.is_a? Array
     return FieldNotDefinedEvaluation.new(key, $page) if !$page.Contains key
 
-    begin
-      return FieldNotFoundEvaluation.new(key, $page, "selenium could not find the field") if field == nil
-
-      begin
-        wait = Selenium::WebDriver::Wait.new(:timeout => 5)
-          result = wait.until {
-            y = comparator.Compare(block.call(field), true)
-            y if y == true
-          }
-
+    field = $page.Get(key)
+    return FieldNotFoundEvaluation.new(key, $page, "selenium could not find the field") if field == nil
 
-        return Fix(Evaluation.new(block.call(field), true), comparator)
-      rescue => e
-        return FieldNotFoundEvaluation.new(key, $page, e.to_s)
-      end
+    element = field.Find(comparator)
+    return Evaluation.new(true, true) if element.nil? and comparator.Compare(true, false)
 
-    rescue => e
-      return FieldNotFoundEvaluation.new(key, $page, e.to_s)
-    end
+    return Fix(field.Evaluate(key, item, comparator, block), comparator)
   end
 
   def Fix(evaluation, comparator)

data/lib/sapphire/UI/Functions.rb

@@ -3,7 +3,6 @@ module ChildProcess
     module Lib
 
       def self.create_proc(cmd, opts = {})
-        puts "1"
         cmd_ptr = F.from_string cmd
 
         flags   = 0

data/lib/sapphire/WebAbstractions/Controls/AlertBox.rb

@@ -10,7 +10,7 @@ module Sapphire
       end
 
       def Visible()
-        $driver.AlertShown()
+        Evaluation.new($driver.AlertShown(), true)
       end
 
       def Find(comparator = nil)

data/lib/sapphire/WebAbstractions/Controls/Base/Control.rb

@@ -51,7 +51,7 @@ module Sapphire
 
       def Visible
         control = self.Find
-        control.displayed?
+        Evaluation.new(control.displayed?, true)
       end
 
       def Equals(value, comparator)
@@ -74,6 +74,45 @@ module Sapphire
         #error land
         return Evaluation.new(text, values)
       end
+
+      def Evaluate(key, arg, comparator, block)
+
+        value = GetValue(arg, key)
+        timeout = GetValue(arg, :wait)
+        timeout ||= 5
+
+        begin
+          evaluation = block.call(self, value)
+          wait = Selenium::WebDriver::Wait.new(:timeout => timeout)
+            result = wait.until {
+              evaluation = block.call(self, value)
+              y = evaluation.Evaluate()
+              comparator = EqualsComparison.new(evaluation) if evaluation == nil
+              evaluation if comparator.Compare(y == true, true)
+            }
+
+          return result
+        rescue
+          return Evaluation.new(evaluation.left, evaluation.right)
+        end
+      end
+
+      def GetValue(item, key)
+
+        if item.is_a? Array
+          item.each do |sub_item|
+            value = GetValue(sub_item, key)
+            return value if !value.nil?
+          end
+        end
+
+        if item.is_a? Hash
+          return item[key] if item.has_key? key
+        end
+
+        nil
+      end
+
     end
   end
 end

data/lib/sapphire/WebAbstractions/Controls/CheckBox.rb

@@ -2,7 +2,7 @@ module Sapphire
   module WebAbstractions
     class CheckBox < Control
        def Check (value)
-        checked = self.Checked
+        checked = self.Checked().Evaluate()
 
         if value && checked
           return;
@@ -17,7 +17,7 @@ module Sapphire
 
       def Checked
         radio = self.Find
-        radio.attribute("checked") != nil
+        Evaluation.new(radio.attribute("checked") != nil, true)
       end
 
       def Clear

data/lib/sapphire/WebAbstractions/Controls/List.rb

@@ -14,7 +14,14 @@ module Sapphire
             return  EqualsComparison.new(Evaluation.new(item.text, value))
           end
         end
-        return  EqualsComparison.new(Evaluation.new("Value not found in list", value))
+
+        #if here then it couldnt make a match, build up the list of values
+        alltext = []
+        x.each do |item|
+          alltext << item.text
+        end
+
+        return  EqualsComparison.new(Evaluation.new(alltext, value))
       end
 
       def In(values, comparator)

data/lib/sapphire/WebAbstractions/Controls/RadioButton.rb

@@ -14,13 +14,13 @@ module Sapphire
       def Selected
         radio = self.Find
         val = radio.attribute("selected")
-        return val != nil
+        return Evaluation.new(val != nil, true)
       end
 
       def Visible
         radio = self.Find
         x = radio.attribute("disabled")
-        return (x == "false")
+        Evaluation.new((x == "false"), true)
       end
 
     end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-28 00:00:00.000000000Z
+date: 2012-03-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9907608 !ruby/object:Gem::Requirement
+  requirement: &9733176 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9907608
+  version_requirements: *9733176
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9907356 !ruby/object:Gem::Requirement
+  requirement: &9732924 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9907356
+  version_requirements: *9732924
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &9907104 !ruby/object:Gem::Requirement
+  requirement: &9732672 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9907104
+  version_requirements: *9732672
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email: