sapphire 0.7.6 → 0.7.7

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

@@ -26,6 +26,14 @@ module Sapphire
         @item.Evaluate
       end
 
+      def left=(val)
+        @item.left=val
+      end
+
+      def right=(val)
+        @item.right=val
+      end
+
       def left
         @item.left
       end

data/lib/sapphire/DSL/Evaluations/Evaluation.rb

@@ -2,8 +2,8 @@ module Sapphire
   module DSL
     class Evaluation
 
-      attr_reader :left
-      attr_reader :right
+      attr_accessor :left
+      attr_accessor :right
 
       def initialize(left, right)
         @left = left

data/lib/sapphire/Extensions/Hash.rb

@@ -9,15 +9,38 @@ class Hash < Object
   end
 
   def Examine(item, comparator, &block)
-    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
+    key = GetKey(item) do |item| item.keys.first end
+
+    return FieldNotDefinedEvaluation.new(key, $page) if !$page.Contains key and !Parameters.instance.Contains key
+
+    field = $page.Get(key) if $page.Contains key
+
+    if(field.nil?)
+      key1 = GetKey(item) do |item| item[item.keys.first] end
+      if $page.Contains key1
+        field = $page.Get(key1)
+        flip = true
+      end
+    end
 
-    field = $page.Get(key)
     return FieldNotFoundEvaluation.new(key, $page, "selenium could not find the field") if field == nil
+    evaluation = field.Evaluate(key, item, comparator, block)
+
+    if(flip)
+      left = evaluation.left
+      right = evaluation.right
+
+      evaluation.right = left
+      evaluation.left = right
+    end
+
+    return Fix(evaluation, comparator)
+  end
 
-    return Fix(field.Evaluate(key, item, comparator, block), comparator)
+  def GetKey(item, &block)
+    return block.call(item.first) if item.first.is_a? Hash
+    return item.first.first if item.first.is_a? Array
   end
 
   def Show(item, comparator)

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

@@ -82,6 +82,7 @@ module Sapphire
         timeout ||= 5
 
         begin
+          value = value.Text if value.is_a? Control
           evaluation = block.call(self, value)
           wait = Selenium::WebDriver::Wait.new(:timeout => timeout)
             result = wait.until {
@@ -98,6 +99,7 @@ module Sapphire
       end
 
       def GetValue(item, key)
+        return Parameter(key) if Parameters.instance.Contains(key)
 
         if item.is_a? Array
           item.each do |sub_item|
@@ -107,12 +109,19 @@ module Sapphire
         end
 
         if item.is_a? Hash
-          return item[key] if item.has_key? key
+          return Substitute(item[key]) if item.has_key? key
         end
 
         nil
       end
 
+      def Substitute(item)
+        return Parameter(item) if Parameters.instance.Contains(item)
+        return $page.Get(item) if $page.Contains(item)
+
+        return item
+      end
+
     end
   end
 end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.7.6"
+  VERSION = "0.7.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000Z
+date: 2012-03-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver