sapphire 0.1.2 → 0.2.0

data/lib/sapphire.rb

@@ -8,11 +8,13 @@ require 'Forwardable'
 require 'win32ole'
 require 'json'
 
+require File.expand_path(File.dirname(__FILE__) +'/sapphire/Strategies/Strategy.rb', __FILE__)
 Dir[File.dirname(__FILE__) + '/sapphire/Testing/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/Configuration/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/WebAbstractions/Controls/Base/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/WebAbstractions/Controls/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/DataAbstractions/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/sapphire/Strategies/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/DSL/Browser/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/DSL/Configuration/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/DSL/Data/*.rb'].each {|file| require file }
@@ -21,6 +23,7 @@ Dir[File.dirname(__FILE__) + '/sapphire/DSL/TestPlans/*.rb'].each {|file| requir
 
 module Sapphire
   module Sapphire
+    include DSL::Strategies
     include DSL::Scenarios
     include DSL::Browser
     include DSL::Configuration

data/lib/sapphire/Configuration/SapphireConfig.rb

@@ -0,0 +1,30 @@
+module Sapphire
+  module Configuration
+    class SapphireConfig
+
+      def initialize
+        @@config = {}
+
+        Add Symbol => SymbolStrategy
+        Add Class => ClassStrategy
+        Add Hash => HashStrategy
+      end
+
+      def self.Current
+        @@instance ||= SapphireConfig.new
+      end
+
+      def Add(hash)
+        @@config = @@config.merge(hash)
+      end
+
+      def GetBy(symbol)
+        if(@@config.has_key? symbol)
+          return @@config[symbol]
+        end
+
+        return DefaultStrategy
+      end
+    end
+  end
+end

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

@@ -2,8 +2,22 @@ module Sapphire
   module DSL
     module Browser
       def Error(hash)
-       ExecuteHashAgainstControl(hash) do |control, arg|
-          return control.Equals(arg)
+        NullModifier.new(Error.new(hash, @page, @browser))
+      end
+
+      class Error
+        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).Error(@item), :modifier => @modifier }
         end
       end
     end

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

@@ -1,12 +1,12 @@
 module Sapphire
   module DSL
     module Browser
-      def ExecuteHashAgainstControl(hash, &block)
+      def ExecuteHashAgainstControl(hash, page, &block)
         hash.keys.each do |key|
-          @page.fields.each do |field|
+          page.fields.each do |field|
             field.keys.each do |field_key|
               if(field_key == key)
-                block.call(field[key], hash[key])
+                block.call(field[field_key], hash[key])
                 return
               end
             end

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

@@ -5,9 +5,11 @@ module Sapphire
       def Equals(value)
         x = self.FindAll
         x.each do |item|
-          return true if item.text == value
+          if item.text == value
+            return Evaluation.new(item.text, value)
+          end
         end
-        return false
+        return Evaluation.new("Value not found in list", value)
       end
     end
   end

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

@@ -2,7 +2,28 @@ module Sapphire
   module DSL
     module Browser
       def Not(item)
-        !item
+        Not.new(item)
+      end
+
+      class Not
+
+        def initialize(item)
+          @item = item
+          @item.ModifyWith self
+        end
+
+        def Modify(item)
+          return @modifier.Modify(!item) if @modifier != nil
+          !item
+        end
+
+        def Evaluate(evaluation)
+          evaluation.left.should_not == evaluation.right
+        end
+
+        def execute
+          @item.execute
+        end
       end
     end
   end

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

@@ -2,7 +2,7 @@ module Sapphire
   module DSL
     module Browser
       def Set(hash)
-        ExecuteHashAgainstControl(hash) do |control, arg|
+        ExecuteHashAgainstControl(hash, @page) do |control, arg|
           control.Set arg
         end
       end

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

@@ -2,7 +2,30 @@ module Sapphire
   module DSL
     module Browser
       def Should(item)
-        item.should == true
+        results = item.execute()
+
+        if results.is_a? Hash
+          @page = results[:page] if results[:page] != nil
+          value = results[:value]
+          modifier = results[:modifier]
+
+          if value.is_a? Hash
+            @page = value[:page] if value[:page] != nil
+            sub_value = value[:value]
+            modifier.Evaluate(sub_value)
+            return
+          end
+          modifier.Evaluate(value)
+
+          return
+        end
+
+        if(results.is_a? Evaluation)
+          results.left.should == results.right
+          return
+        end
+
+        raise "Cannot act upon result " + results.to_s + " for page " + @page.to_s
       end
     end
   end

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

@@ -2,25 +2,22 @@ module Sapphire
   module DSL
     module Browser
       def Show(item)
-        if(item.is_a? Hash)
-          ExecuteHashAgainstControl(item) do |control, arg|
-            wait = Selenium::WebDriver::Wait.new(:timeout => 10)
-            text = wait.until { x = control
-              x unless (!x.Equals(arg) && x.Equals(""))
-            }
+        NullModifier.new(Show.new(item, @page, @browser))
+      end
+
+      class Show
+        def initialize(item, page, browser)
+          @item = item
+          @page = page
+          @browser = browser
+        end
+
+        def ModifyWith(item)
+          @modifier = item
+        end
 
-            return text.Equals(arg)
-          end
-        elsif(item.is_a? Symbol)
-          return IsVisible(item) == true
-        elsif(item.is_a? Class)
-          temp, @page = @browser.ShouldNavigateTo item
-          @page.Init
-          return temp
-        else
-          @page = item
-          @page.Init
-          return true
+        def execute
+          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page, @browser).Show(@item, @modifier), :modifier => @modifier }
         end
       end
     end

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

@@ -1,8 +1,24 @@
 module Sapphire
   module DSL
     module Browser
+
       def Transition(url)
-        @browser.ShouldTransitionTo url
+        NullModifier.new(Transition.new(url, @browser))
+      end
+
+      class Transition
+        def initialize(item, browser)
+          @item = item
+          @browser = browser
+        end
+
+        def ModifyWith(item)
+          @modifier = item
+        end
+
+        def execute
+          @modifier.Modify(@browser.ShouldTransitionTo(@item))
+        end
       end
     end
   end

data/lib/sapphire/DSL/Data/Exist.rb

@@ -2,7 +2,23 @@ module Sapphire
   module DSL
     module Data
       def Exist(value)
-        value != nil
+        Not(Exist.new(value, @page, @browser))
+      end
+
+      class Exist
+        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).Exists(@item), :modifier => @modifier }
+        end
       end
     end
   end

data/lib/sapphire/DSL/Data/Validate.rb

@@ -2,12 +2,22 @@ module Sapphire
   module DSL
     module Data
       def Validate(hash)
-        hash.keys.each do |key|
-          if(hash[key].is_a? Symbol)
-            return GetPageField(hash[key]).Equals(key.to_s)
-          else
-            return key.to_s == hash[key].to_s
-          end
+        NullModifier.new(Validate.new(hash, @page, @browser))
+      end
+
+      class Validate
+        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).Validate(@item), :modifier => @modifier }
         end
       end
     end

data/lib/sapphire/Strategies/ClassStrategy.rb

@@ -3,9 +3,9 @@ module Sapphire
     module Strategies
       class ClassStrategy < Strategy
         def Show(item, modifier)
-          temp, @page = @browser.ShouldNavigateTo item
+          evaluation, @page = @browser.ShouldNavigateTo item
           @page.Init
-          {:page => @page, :value => modifier.Modify(temp) }
+          {:page => @page, :value => evaluation }
         end
       end
     end

data/lib/sapphire/Strategies/DefaultStrategy.rb

@@ -5,7 +5,11 @@ module Sapphire
         def Show(item, modifier)
           @page = item
           @page.Init
-          {:page => @page, :value => modifier.Modify(true)}
+          {:page => @page, :value => Evaluation.new(true, true)}
+        end
+
+        def Exists(item)
+          Evaluation.new(item, nil)
         end
       end
     end

data/lib/sapphire/Strategies/Evaluation.rb

@@ -0,0 +1,16 @@
+module Sapphire
+  module DSL
+    module Strategies
+      class Evaluation
+
+        attr_reader :left
+        attr_reader :right
+
+        def initialize(left, right)
+          @left = left
+          @right = right
+        end
+      end
+    end
+  end
+end

data/lib/sapphire/Strategies/HashStrategy.rb

@@ -3,14 +3,23 @@ module Sapphire
     module Strategies
       class HashStrategy < Strategy
         def Show(item, modifier)
-           ExecuteHashAgainstControl(item) do |control, arg|
+           ExecuteHashAgainstControl(item, @page) do |control, arg|
               wait = Selenium::WebDriver::Wait.new(:timeout => 10)
               text = wait.until { x = control
-                x if (x.Equals(arg) || (!x.Equals("")))
+                x unless (!x.Equals(arg) && x.Equals(""))
               }
 
-              puts arg
-              modifier.Modify(text.Equals(arg))
+              return text.Equals(arg)
+           end
+        end
+
+        def Validate(hash)
+          Evaluation.new(hash.keys.first.to_s, hash[hash.keys.first].to_s)
+        end
+
+        def Error(item)
+          ExecuteHashAgainstControl(item, @page) do |control, arg|
+             return control.Equals(arg)
            end
         end
       end

data/lib/sapphire/Strategies/NullModifier.rb

@@ -8,9 +8,14 @@ class NullModifier
     @modifier = item
   end
 
-  def Modify(arg)
-    return @modifier.Modify(arg) if @modifier != nil
-    arg if @modifier == nil
+  def Modify(item)
+    return @modifier.Modify(item) if @modifier != nil
+    item if @modifier == nil
+  end
+
+  def Evaluate(evaluation)
+    return @modifier.Evaluate(evaluation) if @modifier != nil
+    evaluation.left.should == evaluation.right if @modifier == nil
   end
 
   def execute

data/lib/sapphire/Strategies/SymbolStrategy.rb

@@ -14,13 +14,13 @@ module Sapphire
                     result = wait.until { y = modifier.Modify(x.displayed?)
                       y unless y == false
                     }
-                    return result
+                    return Evaluation.new(modifier.Modify(x.displayed?), modifier.Modify(true))
                   rescue
-                    return false
+                    return Evaluation.new(true, "An error occurred.")
                   end
                 end
               rescue
-               return false
+               return Evaluation.new(true, "An error occurred.")
               end
             end
           end
@@ -28,6 +28,10 @@ module Sapphire
 
         raise "cannot find control matching " + args.to_s + " for page " + @page.to_s
         end
+
+        def Validate(hash)
+          GetPageField(hash[hash.keys.first]).Equals(hash.keys.first.to_s)
+        end
       end
     end
   end

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

@@ -50,7 +50,7 @@ module Sapphire
       def FindAllBy(symbol)
         wait = Selenium::WebDriver::Wait.new(:timeout => 10)
         element = wait.until { x = @browser.find_elements symbol, @hash.fetch(symbol)
-            x
+            x unless x.count == 0
         }
       end
 
@@ -86,7 +86,7 @@ module Sapphire
       end
 
       def Equals(value)
-         self.Text == value
+         Evaluation.new(self.Text, value)
       end
     end
   end

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

@@ -56,11 +56,12 @@ module Sapphire
           nav.AlternateUrls.each do |url|
             temp = self.CurrentUrl.upcase.start_with?("HTTP://" + url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + url.upcase)
             if(temp)
+              temp = Evaluation.new(self.CurrentUrl.upcase.start_with?("HTTP://" + url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + url.upcase), true)
               return temp, nav
             end
           end
         end
-
+        temp = Evaluation.new(self.CurrentUrl.upcase.start_with?("HTTP://" + nav.Url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + nav.Url.upcase), true)
         return temp, nav
       end
 
@@ -75,11 +76,11 @@ module Sapphire
 
       def ShouldTransitionTo(url)
         if(url.instance_of?(String))
-          temp = self.CurrentUrl.upcase.start_with?("HTTP://" + url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + url.upcase)
+          temp = Evaluation.new(self.CurrentUrl.upcase.start_with?("HTTP://" + url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + url.upcase), true)
           @rootUrl = url
         else
           x = url.new().Url
-          temp = self.CurrentUrl.upcase.start_with?("HTTP://" + x.upcase) || temp = self.CurrentUrl.upcase.start_with?("HTTPS://" + x.upcase)
+          temp = Evaluation.new(self.CurrentUrl.upcase.start_with?("HTTP://" + x.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + x.upcase), true)
           @rootUrl = x
         end
 

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

@@ -11,7 +11,7 @@ module Sapphire
       attr_reader :browser
 
       def initialize
-        #@browser = Selenium::WebDriver.for :ie
+        @browser = Selenium::WebDriver.for :ie
         super(@browser)
         $browser = @browser
       end

data/lib/sapphire/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
+date: 2011-08-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: albacore
-  requirement: &9415884 !ruby/object:Gem::Requirement
+  requirement: &9358284 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9415884
+  version_requirements: *9358284
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9415584 !ruby/object:Gem::Requirement
+  requirement: &9358020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9415584
+  version_requirements: *9358020
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &9415296 !ruby/object:Gem::Requirement
+  requirement: &9357672 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9415296
+  version_requirements: *9357672
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -54,6 +54,7 @@ extra_rdoc_files: []
 files:
 - lib/sapphire/Configuration/AttrMethods.rb
 - lib/sapphire/Configuration/Config.rb
+- lib/sapphire/Configuration/SapphireConfig.rb
 - lib/sapphire/DataAbstractions/Database.rb
 - lib/sapphire/DataAbstractions/NonQuery.rb
 - lib/sapphire/DataAbstractions/Query.rb
@@ -116,6 +117,7 @@ files:
 - lib/sapphire/DSL/TestPlans/TestPlan.rb
 - lib/sapphire/Strategies/ClassStrategy.rb
 - lib/sapphire/Strategies/DefaultStrategy.rb
+- lib/sapphire/Strategies/Evaluation.rb
 - lib/sapphire/Strategies/HashStrategy.rb
 - lib/sapphire/Strategies/NullModifier.rb
 - lib/sapphire/Strategies/Strategy.rb