sapphire 0.5.3 → 0.5.4

data/lib/sapphire/DSL/Browser/{Browser.rb → Nouns/Browser.rb}

@@ -1,17 +1,17 @@
-module Sapphire
-  module DSL
-    module Browser
-      class Browser
-        def Close
-          sleep(2)
-          $browser.Close
-        end
-
-        def Switch
-          $browser.Switch
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      class Browser
+        def Close
+          sleep(2)
+          $browser.Close
+        end
+
+        def Switch
+          $browser.Switch
+        end
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{Day.rb → Nouns/Day.rb}

@@ -1,24 +1,24 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Day(value, compare1, compare2)
-        Day.new(value, compare1, compare2)
-      end
-
-      class Day
-
-        def initialize(value, compare1, compare2)
-          @value = value
-          @compare1 = compare1
-          @compare2 = compare2
-        end
-
-        def Differ()
-          return (@compare1 + @value) == @compare2
-        end
-
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Day(value, compare1, compare2)
+        Day.new(value, compare1, compare2)
+      end
+
+      class Day
+
+        def initialize(value, compare1, compare2)
+          @value = value
+          @compare1 = compare1
+          @compare2 = compare2
+        end
+
+        def Differ()
+          return (@compare1 + @value) == @compare2
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{Keys → Nouns}/Enter.rb

@@ -1,11 +1,11 @@
-module Sapphire
-  module DSL
-    module Browser
-      class Enter
-          def Press
-            $browser.Type("\n")
-          end
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Browser
+      class Enter
+          def Press
+            $browser.Type("\n")
+          end
+      end
+    end
+  end
 end

data/lib/sapphire/DSL/Browser/{Month.rb → Nouns/Month.rb}

@@ -1,24 +1,24 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Month(value, compare1, compare2)
-        Month.new(value, compare1, compare2)
-      end
-
-      class Month
-
-        def initialize(value, compare1, compare2)
-          @value = value
-          @compare1 = compare1
-          @compare2 = compare2
-        end
-
-        def Differ()
-          return (@compare1 >> @value) == @compare2
-        end
-
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Month(value, compare1, compare2)
+        Month.new(value, compare1, compare2)
+      end
+
+      class Month
+
+        def initialize(value, compare1, compare2)
+          @value = value
+          @compare1 = compare1
+          @compare2 = compare2
+        end
+
+        def Differ()
+          return (@compare1 >> @value) == @compare2
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -1,42 +1,42 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Should(item)
-        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)
-          if(results.left != results.right)
-            messages = []
-
-            messages << "expected: (nil)" if results.left == nil
-            messages << "expected: " + results.left.to_s if results.left != nil
-            messages << "got: (nil)" if results.right == nil
-            messages << "got: " + results.right.to_s if results.right != nil
-
-            raise ExpectationException.new(messages)
-          end
-          return
-        end
-
-        raise "Cannot act upon result " + results.to_s + " for page " + @page.to_s
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Should(item)
+        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)
+          if(results.left != results.right)
+            messages = []
+
+            messages << "expected: (nil)" if results.left == nil
+            messages << "expected: " + results.left.to_s if results.left != nil
+            messages << "got: (nil)" if results.right == nil
+            messages << "got: " + results.right.to_s if results.right != nil
+
+            raise ExpectationException.new(messages)
+          end
+          return
+        end
+
+        raise "Cannot act upon result " + results.to_s + " for page " + @page.to_s
+      end
+    end
+  end
+end
+

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

@@ -1,15 +1,15 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Track(hash)
-        $tracker ||= {}
-        $tracker.merge! hash
-      end
-
-      def Tracker(item)
-        $tracker[item]
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Track(hash)
+        $tracker ||= {}
+        $tracker.merge! hash
+      end
+
+      def Tracker(item)
+        $tracker[item]
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{Accept.rb → Verbs/Accept.rb}

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Accept(browser)
-        x = browser.new
-        x.Accept
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Browser
+      def Accept(item)
+        x = item.new
+        x.Accept
+      end
+    end
+  end
 end

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

@@ -0,0 +1,11 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Check(item)
+        item.With(:page => @page)
+        item.Check
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{IsHidden.rb → Verbs/Clear.rb}

@@ -1,10 +1,9 @@
-module Sapphire
-  module DSL
-    module Browser
-      def IsHidden(args)
-
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Clear(item)
+        item.Clear
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Click(item)
+        item.With(:page => @page)
+        item.Click
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{Close.rb → Verbs/Close.rb}

@@ -1,12 +1,11 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Exit(item)
-        x = item.new
-        x.Close
-      end
-    end
-  end
-end
-
-
+module Sapphire
+  module DSL
+    module Browser
+      def Exit(item)
+        item.Close
+      end
+    end
+  end
+end
+
+

data/lib/sapphire/DSL/Browser/{Compare.rb → Verbs/Compare.rb}

@@ -1,19 +1,19 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Compare(control1, control2, &block)
-        if(control1.is_a? Symbol)
-          control1text = GetPageField(control1).Text
-        else
-          control1text = control1
-        end
-        if(control2.is_a? Symbol)
-          control2text = GetPageField(control2).Text
-        else
-          control2text = control2
-        end
-        block.call(control1text, control2text)
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Browser
+      def Compare(control1, control2, &block)
+        if(control1.is_a? Symbol)
+          control1text = GetPageField(control1).Text
+        else
+          control1text = control1
+        end
+        if(control2.is_a? Symbol)
+          control2text = GetPageField(control2).Text
+        else
+          control2text = control2
+        end
+        block.call(control1text, control2text)
+      end
+    end
+  end
 end

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

@@ -0,0 +1,10 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Complete(page)
+        @page = page.Complete
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{Differ.rb → Verbs/Differ.rb}

@@ -1,19 +1,19 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Differ(arg)
-        return Differ.new(arg)
-      end
-
-      class Differ
-        def initialize(arg)
-          @arg = arg
-        end
-
-        def execute
-          return Evaluation.new(true, @arg.Differ) #args[0] is the value that should be the difference
-        end
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Browser
+      def Differ(arg)
+        return Differ.new(arg)
+      end
+
+      class Differ
+        def initialize(arg)
+          @arg = arg
+        end
+
+        def execute
+          return Evaluation.new(true, @arg.Differ) #args[0] is the value that should be the difference
+        end
+      end
+    end
+  end
 end

data/lib/sapphire/DSL/Browser/{Error.rb → Verbs/Error.rb}

@@ -1,26 +1,25 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Error(hash)
-        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
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Error(hash)
+        NullModifier.new(Error.new(hash, @page))
+      end
+
+      class Error
+        def initialize(item, page)
+          @item = item
+          @page = page
+        end
+
+        def ModifyWith(item)
+          @modifier = item
+        end
+
+        def execute
+           return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page).Error(@item), :modifier => @modifier }
+        end
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{Exists.rb → Verbs/Exists.rb}

@@ -1,22 +1,22 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Exists(symbol)
-        @page.fields.each do |field|
-          field.keys.each do |field_key|
-            if(field_key == symbol)
-              begin
-                x = field[field_key].FindWithoutWait
-                return x.displayed?
-              rescue
-                return false
-              end
-            end
-          end
-        end
-        false
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Exists(symbol)
+        @page.fields.each do |field|
+          field.keys.each do |field_key|
+            if(field_key == symbol)
+              begin
+                x = field[field_key].FindWithoutWait
+                return x.displayed?
+              rescue
+                return false
+              end
+            end
+          end
+        end
+        false
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{Hide.rb → Verbs/Hide.rb}

@@ -1,26 +1,25 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Hide(args)
-        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
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Hide(args)
+        NullModifier.new(Hide.new(args, @page))
+      end
+
+      class Hide
+        def initialize(item, page)
+          @item = item
+          @page = page
+        end
+
+        def ModifyWith(item)
+          @modifier = item
+        end
+
+        def execute
+          return { :value => SapphireConfig.Current.GetBy(@item.class).new(@page).Hide(@item, @modifier), :modifier => @modifier }
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,11 @@
+module Sapphire
+  module DSL
+    module Browser
+      def MouseOver(item)
+        item.With(:page => @page)
+        item.MouseOver
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{Navigate.rb → Verbs/Navigate.rb}

@@ -1,11 +1,11 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Navigate(page)
-        @page = @browser.NavigateTo(page)
-        @page.Init
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Navigate(page)
+        @page = $browser.NavigateTo(page)
+        @page.Init
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/{Press.rb → Verbs/Press.rb}

@@ -1,11 +1,9 @@
-module Sapphire
-  module DSL
-    module Browser
-
-      def Press(item)
-         item.new().Press
-      end
-
-    end
-  end
+module Sapphire
+  module DSL
+    module Browser
+      def Press(item)
+         item.Press
+      end
+    end
+  end
 end