bauxite 0.4.6 → 0.5.0

data/lib/bauxite/core/context.rb

@@ -292,7 +292,7 @@ module Bauxite
 		#
 		def exec_action(text, log = true, file = '<unknown>', line = 0)
 			data = Context::parse_action_default(text, file, line)
-			_exec_parsed_action(data[:action], data[:args], text, log, file, line)
+			exec_parsed_action(data[:action], data[:args], log, text, file, line)
 		end
 		
 		# Executes the specified +file+.
@@ -303,9 +303,42 @@ module Bauxite
 		#
 		def exec_file(file)
 			@parser.parse(file) do |action, args, text, file, line|
-				_exec_parsed_action(action, args, text, true, file, line)
+				exec_parsed_action(action, args, true, text, file, line)
 			end
 		end
+
+		# Executes the specified action handling errors, logging and debug
+		# history.
+		#
+		# This method if part of the action execution chain and is intended
+		# for advanced use (e.g. in complex actions). To execute an Action
+		# directly, the #exec_action method is preferred.
+		#
+		# If +log+ is +true+, log the action execution (default behavior).
+		#
+		# For example:
+		#     ctx.exec_action 'open "http://www.ruby-lang.org"'
+		#     # => navigates to www.ruby-lang.org
+		#
+		def exec_parsed_action(action, args, log = true, text = nil, file = nil, line = nil)
+			ret = handle_errors(true) do
+				
+				action =  get_action(action, args, text, file, line)
+				
+				if log
+					@logger.log_cmd(action) do
+						Readline::HISTORY << action.text
+						exec_action_object(action)
+					end
+				else
+					exec_action_object(action)
+				end
+			end
+			handle_errors(true) do
+				ret.call if ret.respond_to? :call # delayed actions (after log_cmd)
+			end
+		end
+
 		
 		# Executes the +block+ inside a rescue block applying standard criteria of
 		# error handling.
@@ -474,7 +507,7 @@ module Bauxite
 		# for advanced use (e.g. in complex actions). To execute an Action
 		# directly, the #exec_action method is preferred.
 		#
-		def get_action(action, args, text, file, line)
+		def get_action(action, args, text = nil, file = nil, line = nil)
 			while (alias_action = @aliases[action])
 				action = alias_action[:action]
 				args   = alias_action[:args].map do |a|
@@ -495,6 +528,8 @@ module Bauxite
 			end
 			
 			text = ([action] + args.map { |a| '"'+a.gsub('"', '""')+'"' }).join(' ') unless text
+			file = @variables['__FILE__'] unless file
+			line = @variables['__LINE__'] unless line
 			
 			Action.new(self, action, args, text, file, line)
 		end
@@ -521,6 +556,35 @@ module Bauxite
 			action.execute
 		end
 
+		# Executes the specified +action+ and returns +true+ if the action
+		# succeeds and +false+ otherwise.
+		# 
+		# This method is intended to simplify conditional actions that execute
+		# different code depending on the outcome of an action execution.
+		#
+		# For example:
+		#     if ctx.try_exec_action(action, args)
+		#         # => when action succeeds...
+		#     else
+		#         # => when action fails...
+		#     end
+		#
+		def try_exec_action(action, args)
+			action = get_action(action, args)
+			
+			with_timeout Bauxite::Errors::AssertionError do
+				with_vars({ '__TIMEOUT__' => 0}) do
+					begin
+						ret = exec_action_object(action)
+						ret.call if ret.respond_to? :call
+						true
+					rescue Bauxite::Errors::AssertionError
+						false
+					end
+				end
+			end
+		end
+
 		
 		# ======================================================================= #
 		# :section: Metadata
@@ -668,25 +732,6 @@ module Bauxite
 			end
 		end
 		
-		def _exec_parsed_action(action, args, text, log, file, line)
-			ret = handle_errors(true) do
-				
-				action =  get_action(action, args, text, file, line)
-				
-				if log
-					@logger.log_cmd(action) do
-			    		Readline::HISTORY << action.text
-						exec_action_object(action)
-					end
-				else
-					exec_action_object(action)
-				end
-			end
-			handle_errors(true) do
-				ret.call if ret.respond_to? :call # delayed actions (after log_cmd)
-			end
-		end
-		
 		# ======================================================================= #
 		# Hacks required to overcome the String#split(' ') behavior of folding the
 		# space characters, coupled with CSV not supporting a regex as :col_sep.

data/lib/bauxite.rb

@@ -22,7 +22,7 @@
 
 #--
 module Bauxite
-	VERSION = "0.4.6"
+	VERSION = "0.5.0"
 end
 #++
 

data/test/doif.bxt

@@ -0,0 +1,6 @@
+set first john
+set last doe
+doif john ${first} assertv doe ${last}
+doif john ${first} set is_john true
+assertv true ${is_john}
+doif smith ${last} load smith_specific_text.bxt

data/test/setif.bxt

@@ -0,0 +1,3 @@
+set name john
+setif is_john true assertv "/John/i" "${name}"
+assertv true ${is_john}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bauxite
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Patricio Zavolinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -122,6 +122,7 @@ files:
 - lib/bauxite/actions/break.rb
 - lib/bauxite/actions/click.rb
 - lib/bauxite/actions/debug.rb
+- lib/bauxite/actions/doif.rb
 - lib/bauxite/actions/echo.rb
 - lib/bauxite/actions/exec.rb
 - lib/bauxite/actions/failif.rb
@@ -135,6 +136,7 @@ files:
 - lib/bauxite/actions/ruby.rb
 - lib/bauxite/actions/select.rb
 - lib/bauxite/actions/set.rb
+- lib/bauxite/actions/setif.rb
 - lib/bauxite/actions/source.rb
 - lib/bauxite/actions/store.rb
 - lib/bauxite/actions/submit.rb
@@ -168,6 +170,7 @@ files:
 - test/default_selector_var.bxt
 - test/delay.bxt
 - test/delay/page.html
+- test/doif.bxt
 - test/exec.bxt
 - test/extension.bxt.manual
 - test/extension/custom.rb
@@ -193,6 +196,7 @@ files:
 - test/select/page.html
 - test/selectors.bxt
 - test/selectors/page.html
+- test/setif.bxt
 - test/smart_selector.bxt
 - test/smart_selector/page.html
 - test/stdin.bxt