sapphire 0.7.7 → 0.7.8

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

@@ -1,8 +1,8 @@
 module Sapphire
   module DSL
     module Browser
-      def Create(item)
-        item.Create
+      def Create(item, &block)
+        item.Create(item) do block.call end
       end
     end
   end

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

@@ -0,0 +1,41 @@
+module Sapphire
+  module DSL
+    module Browser
+
+      def Matrix(symbol)
+        return Matrix.new(symbol)
+      end
+
+      class Matrix
+
+        attr_reader :id
+
+        def initialize(id)
+          @id = id
+        end
+
+        def Create(matrix, &block)
+          $matrix_variable = matrix.id
+          block.call
+          $matrix_variable = nil
+        end
+
+        def Using(matrix, &block)
+          raise "No matrix defined for: " + matrix.id if !$matrices.has_key? matrix.id
+
+          $matrices[matrix.id].each do |array|
+            array.each do |item|
+              item.call()
+            end
+            block.call()
+          end
+
+
+        end
+
+      end
+
+    end
+  end
+end
+

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

@@ -0,0 +1,10 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Using(item, &block)
+        item.Using(item) do block.call end
+      end
+    end
+  end
+end
+

data/lib/sapphire/Extensions/Hash.rb

@@ -10,6 +10,7 @@ class Hash < Object
 
   def Examine(item, comparator, &block)
 
+    flip = false
     key = GetKey(item) do |item| item.keys.first end
 
     return FieldNotDefinedEvaluation.new(key, $page) if !$page.Contains key and !Parameters.instance.Contains key
@@ -24,6 +25,8 @@ class Hash < Object
       end
     end
 
+    return Fix(Evaluation.new(Parameter(key), item.first[key]), comparator) if Parameters.instance.Contains(key) and field.nil?
+
     return FieldNotFoundEvaluation.new(key, $page, "selenium could not find the field") if field == nil
     evaluation = field.Evaluate(key, item, comparator, block)
 
@@ -35,6 +38,7 @@ class Hash < Object
       evaluation.left = right
     end
 
+
     return Fix(evaluation, comparator)
   end
 
@@ -88,4 +92,22 @@ class Hash < Object
     comparator = comparator.Create(evaluation)
     comparator
   end
+
+  def Using(items)
+    $matrices ||= {}
+
+    master_array = []
+    master_array = $matrices[$matrix_variable] if $matrices.has_key? $matrix_variable
+
+    array = []
+
+    items.keys.each do |key|
+      array << Proc.new { Parameter key => items[key] }
+    end
+
+    master_array << array
+
+    $matrices.merge! $matrix_variable => master_array
+  end
+
 end

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

@@ -84,6 +84,7 @@ module Sapphire
         begin
           value = value.Text if value.is_a? Control
           evaluation = block.call(self, value)
+
           wait = Selenium::WebDriver::Wait.new(:timeout => timeout)
             result = wait.until {
               evaluation = block.call(self, value)
@@ -99,7 +100,6 @@ 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|
@@ -109,15 +109,19 @@ module Sapphire
         end
 
         if item.is_a? Hash
+          return Substitute(key) if Parameters.instance.Contains(key)
           return Substitute(item[key]) if item.has_key? key
         end
 
+        return Parameter(key) if Parameters.instance.Contains(key)
+
         nil
       end
 
       def Substitute(item)
-        return Parameter(item) if Parameters.instance.Contains(item)
+
         return $page.Get(item) if $page.Contains(item)
+        return Parameter(item) if Parameters.instance.Contains(item)
 
         return item
       end

data/lib/sapphire/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000Z
+date: 2012-03-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9795012 !ruby/object:Gem::Requirement
+  requirement: &9870684 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9795012
+  version_requirements: *9870684
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9794760 !ruby/object:Gem::Requirement
+  requirement: &9870432 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9794760
+  version_requirements: *9870432
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &9794508 !ruby/object:Gem::Requirement
+  requirement: &9870180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9794508
+  version_requirements: *9870180
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -88,6 +88,7 @@ files:
 - lib/sapphire/DSL/Browser/Verbs/Exists.rb
 - lib/sapphire/DSL/Browser/Verbs/Exit.rb
 - lib/sapphire/DSL/Browser/Verbs/Has.rb
+- lib/sapphire/DSL/Browser/Verbs/Matrix.rb
 - lib/sapphire/DSL/Browser/Verbs/MouseOver.rb
 - lib/sapphire/DSL/Browser/Verbs/Navigate.rb
 - lib/sapphire/DSL/Browser/Verbs/On.rb
@@ -98,6 +99,7 @@ files:
 - lib/sapphire/DSL/Browser/Verbs/Start.rb
 - lib/sapphire/DSL/Browser/Verbs/Switch.rb
 - lib/sapphire/DSL/Browser/Verbs/Uncheck.rb
+- lib/sapphire/DSL/Browser/Verbs/Using.rb
 - lib/sapphire/DSL/Browser/Verbs/Virtually.rb
 - lib/sapphire/DSL/Browser/Verbs/Wait.rb
 - lib/sapphire/DSL/Comparisons/CheckedComparison.rb