bauxite 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d90a3d4658ed9ac9f71ffbfc989e956009eba62
-  data.tar.gz: fade31201508e4f84f42c166fb72434768116665
+  metadata.gz: 45b66aed675fe032b372046709145824f739bf72
+  data.tar.gz: 98ff7bbb6d5c6403673d17f74505441cb2c9cc41
 SHA512:
-  metadata.gz: 64776eb1c7583528003712713d0ab598676d67b71b16afbf9d7fcca09c7d3747609e8869ac8be8d63450d18e771ee9f478b04f75c0195c8fc5691b6e47d42efe
-  data.tar.gz: 9b0c620a2bd86b78622cb88065d9db7a640d962f81067449ce2aafb523b973e904c2a130e58ac497ac20e9afc8ec94d22a72f57d62fe2c2a84e12d3c4ca22733
+  metadata.gz: 144ae5211549b179126d1b283d64a508b7af92e4bccb56f8fdedad1dbd5a3635d2ca1b3628008f186ecc53c167d00a9e9f18cc90f8253ec5fa3b9940e85b0478
+  data.tar.gz: 74b2c389aa65c1b22ec7528cba3309856f0a0ca9b4080d74ad4556645054f99ac84609825a9d1be1120d3aa8acbd1ea81404ace15abec50e9750685146af2c35

data/doc/Bauxite/Action.html

@@ -1341,8 +1341,14 @@ href="Action.html#method-i-assert">assert</a> for more details):</p>
           <div class="method-source-code" id="return_action-source">
             <pre><span class="ruby-comment"># File lib/bauxite/actions/return.rb, line 58</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">return_action</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">vars</span>)
+        <span class="ruby-keyword">if</span> <span class="ruby-identifier">vars</span> <span class="ruby-operator">==</span> [<span class="ruby-string">&#39;*&#39;</span>]
+                <span class="ruby-ivar">@ctx</span>.<span class="ruby-identifier">variables</span>[<span class="ruby-string">&#39;__RETURN__&#39;</span>] = <span class="ruby-identifier">vars</span>
+                <span class="ruby-keyword">return</span> <span class="ruby-keyword">true</span>
+        <span class="ruby-keyword">end</span>
+
         <span class="ruby-identifier">rets</span> = <span class="ruby-ivar">@ctx</span>.<span class="ruby-identifier">variables</span>[<span class="ruby-string">&#39;__RETURN__&#39;</span>] <span class="ruby-operator">||</span> []
-        <span class="ruby-ivar">@ctx</span>.<span class="ruby-identifier">variables</span>[<span class="ruby-string">&#39;__RETURN__&#39;</span>] = <span class="ruby-identifier">rets</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">vars</span>
+        <span class="ruby-ivar">@ctx</span>.<span class="ruby-identifier">variables</span>[<span class="ruby-string">&#39;__RETURN__&#39;</span>] = <span class="ruby-identifier">rets</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">vars</span> <span class="ruby-keyword">unless</span> <span class="ruby-identifier">rets</span>.<span class="ruby-identifier">include?</span> <span class="ruby-string">&#39;*&#39;</span>
+        <span class="ruby-keyword">true</span>
 <span class="ruby-keyword">end</span></pre>
           </div>
           
@@ -1905,7 +1911,11 @@ href="Context.html#method-i-expand">Bauxite::Context#expand</a>).</p>
             <pre><span class="ruby-comment"># File lib/bauxite/actions/write.rb, line 34</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">write</span>(<span class="ruby-identifier">selector</span>, <span class="ruby-identifier">text</span>)
         <span class="ruby-ivar">@ctx</span>.<span class="ruby-identifier">find</span>(<span class="ruby-identifier">selector</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">e</span><span class="ruby-operator">|</span>
-                <span class="ruby-identifier">e</span>.<span class="ruby-identifier">clear</span>
+                <span class="ruby-keyword">begin</span>
+                        <span class="ruby-identifier">e</span>.<span class="ruby-identifier">clear</span>
+                <span class="ruby-keyword">rescue</span> <span class="ruby-constant">Selenium</span><span class="ruby-operator">::</span><span class="ruby-constant">WebDriver</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span><span class="ruby-operator">::</span><span class="ruby-constant">UnknownError</span> <span class="ruby-comment"># user-editable...</span>
+                        <span class="ruby-comment"># do nothing (if this should fail, it will in the line below)</span>
+                <span class="ruby-keyword">end</span>
                 <span class="ruby-identifier">e</span>.<span class="ruby-identifier">send_keys</span>(<span class="ruby-identifier">text</span>)
         <span class="ruby-keyword">end</span>
 <span class="ruby-keyword">end</span></pre>

data/doc/Bauxite/Context.html

@@ -1876,7 +1876,17 @@ variables is restored.</p>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">with_vars</span>(<span class="ruby-identifier">vars</span>)
         <span class="ruby-identifier">current</span> = <span class="ruby-ivar">@variables</span>
         <span class="ruby-ivar">@variables</span> = <span class="ruby-ivar">@variables</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-identifier">vars</span>)
-        <span class="ruby-keyword">yield</span>
+        <span class="ruby-identifier">ret_vars</span> = <span class="ruby-keyword">nil</span>
+
+        <span class="ruby-identifier">ret</span> = <span class="ruby-keyword">yield</span>
+        
+        <span class="ruby-identifier">returned</span> = <span class="ruby-ivar">@variables</span>[<span class="ruby-string">&#39;__RETURN__&#39;</span>]
+        <span class="ruby-keyword">if</span> <span class="ruby-identifier">returned</span> <span class="ruby-operator">==</span> [<span class="ruby-string">&#39;*&#39;</span>]
+                <span class="ruby-identifier">ret_vars</span> = <span class="ruby-ivar">@variables</span>.<span class="ruby-identifier">clone</span>
+                <span class="ruby-identifier">ret_vars</span>.<span class="ruby-identifier">delete</span> <span class="ruby-string">&#39;__RETURN__&#39;</span>
+        <span class="ruby-keyword">elsif</span> <span class="ruby-identifier">returned</span> <span class="ruby-operator">!=</span> <span class="ruby-keyword">nil</span>
+                <span class="ruby-identifier">ret_vars</span> = <span class="ruby-ivar">@variables</span>.<span class="ruby-identifier">select</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">k</span>,<span class="ruby-identifier">v</span><span class="ruby-operator">|</span> <span class="ruby-identifier">returned</span>.<span class="ruby-identifier">include?</span> <span class="ruby-identifier">k</span> }
+        <span class="ruby-keyword">end</span>
 <span class="ruby-keyword">rescue</span> <span class="ruby-constant">StandardError</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
         <span class="ruby-identifier">e</span>.<span class="ruby-identifier">instance_variable_set</span> <span class="ruby-string">&quot;@variables&quot;</span>, <span class="ruby-ivar">@variables</span>
         <span class="ruby-keyword">def</span> <span class="ruby-identifier">e</span>.<span class="ruby-identifier">variables</span>
@@ -1885,6 +1895,8 @@ variables is restored.</p>
         <span class="ruby-identifier">raise</span>
 <span class="ruby-keyword">ensure</span>
         <span class="ruby-ivar">@variables</span> = <span class="ruby-identifier">current</span>
+        <span class="ruby-ivar">@variables</span>.<span class="ruby-identifier">merge!</span>(<span class="ruby-identifier">ret_vars</span>) <span class="ruby-keyword">if</span> <span class="ruby-identifier">ret_vars</span>
+        <span class="ruby-identifier">ret</span>
 <span class="ruby-keyword">end</span></pre>
           </div>
           

data/doc/created.rid

@@ -1,4 +1,4 @@
-Mon, 10 Feb 2014 10:59:18 -0300
+Tue, 11 Feb 2014 14:16:18 -0300
 README.md	Mon, 10 Feb 2014 10:55:53 -0300
 lib/bauxite/actions/js.rb	Mon, 27 Jan 2014 11:02:44 -0300
 lib/bauxite/actions/exec.rb	Mon, 27 Jan 2014 11:02:44 -0300
@@ -10,14 +10,14 @@ lib/bauxite/actions/ruby.rb	Mon, 27 Jan 2014 11:02:44 -0300
 lib/bauxite/actions/store.rb	Mon, 27 Jan 2014 11:02:44 -0300
 lib/bauxite/actions/assertv.rb	Mon, 27 Jan 2014 11:02:44 -0300
 lib/bauxite/actions/alias.rb	Mon, 27 Jan 2014 11:02:44 -0300
-lib/bauxite/actions/tryload.rb	Mon, 10 Feb 2014 09:50:17 -0300
+lib/bauxite/actions/tryload.rb	Tue, 11 Feb 2014 14:10:05 -0300
 lib/bauxite/actions/test.rb	Tue, 04 Feb 2014 13:02:27 -0300
 lib/bauxite/actions/load.rb	Mon, 27 Jan 2014 11:02:44 -0300
 lib/bauxite/actions/submit.rb	Tue, 28 Jan 2014 16:05:51 -0300
 lib/bauxite/actions/open.rb	Wed, 29 Jan 2014 09:10:40 -0300
 lib/bauxite/actions/reset.rb	Mon, 27 Jan 2014 11:02:44 -0300
 lib/bauxite/actions/capture.rb	Mon, 10 Feb 2014 09:50:17 -0300
-lib/bauxite/actions/write.rb	Mon, 27 Jan 2014 11:02:44 -0300
+lib/bauxite/actions/write.rb	Mon, 10 Feb 2014 18:14:54 -0300
 lib/bauxite/actions/failif.rb	Tue, 04 Feb 2014 11:03:59 -0300
 lib/bauxite/actions/setif.rb	Tue, 04 Feb 2014 11:05:42 -0300
 lib/bauxite/actions/replace.rb	Mon, 27 Jan 2014 11:02:44 -0300
@@ -26,14 +26,14 @@ lib/bauxite/actions/echo.rb	Mon, 27 Jan 2014 11:02:44 -0300
 lib/bauxite/actions/set.rb	Mon, 27 Jan 2014 11:02:44 -0300
 lib/bauxite/actions/params.rb	Mon, 27 Jan 2014 11:02:44 -0300
 lib/bauxite/actions/debug.rb	Tue, 04 Feb 2014 14:06:05 -0300
-lib/bauxite/actions/return.rb	Mon, 27 Jan 2014 11:02:44 -0300
+lib/bauxite/actions/return.rb	Tue, 11 Feb 2014 14:10:05 -0300
 lib/bauxite/actions/click.rb	Mon, 10 Feb 2014 10:46:11 -0300
 lib/bauxite/actions/doif.rb	Mon, 03 Feb 2014 11:48:07 -0300
 lib/bauxite/actions/source.rb	Mon, 27 Jan 2014 11:02:44 -0300
 lib/bauxite/actions/break.rb	Mon, 27 Jan 2014 11:02:44 -0300
 lib/bauxite/core/selector.rb	Wed, 29 Jan 2014 09:10:40 -0300
 lib/bauxite/core/errors.rb	Mon, 27 Jan 2014 11:02:44 -0300
-lib/bauxite/core/context.rb	Mon, 10 Feb 2014 09:50:17 -0300
+lib/bauxite/core/context.rb	Tue, 11 Feb 2014 14:10:05 -0300
 lib/bauxite/core/parser.rb	Tue, 28 Jan 2014 16:48:43 -0300
 lib/bauxite/core/action.rb	Wed, 05 Feb 2014 12:11:16 -0300
 lib/bauxite/core/logger.rb	Wed, 05 Feb 2014 12:11:16 -0300

data/lib/bauxite/actions/return.rb

@@ -56,7 +56,13 @@ class Bauxite::Action
 	#
 	# :category: Action Methods
 	def return_action(*vars)
+		if vars == ['*']
+			@ctx.variables['__RETURN__'] = vars
+			return true
+		end
+
 		rets = @ctx.variables['__RETURN__'] || []
-		@ctx.variables['__RETURN__'] = rets + vars
+		@ctx.variables['__RETURN__'] = rets + vars unless rets.include? '*'
+		true
 	end
 end

data/lib/bauxite/actions/tryload.rb

@@ -65,17 +65,7 @@ private
 		end
 		
 		lambda do
-			ret_vars = nil
-			@ctx.with_vars var_hash do
-				yield file
-				rets = @ctx.variables['__RETURN__']
-				if rets == ['*']
-					ret_vars = @ctx.variables
-				elsif rets != nil 
-					ret_vars = @ctx.variables.select { |k,v| rets.include? k }
-				end
-			end
-			@ctx.variables.merge!(ret_vars) if ret_vars
+			@ctx.with_vars(var_hash) { yield file }
 		end
 	end
 end

data/lib/bauxite/actions/write.rb

@@ -33,7 +33,11 @@ class Bauxite::Action
 	# :category: Action Methods
 	def write(selector, text)
 		@ctx.find(selector) do |e|
-			e.clear
+			begin
+				e.clear
+			rescue Selenium::WebDriver::Error::UnknownError # user-editable...
+				# do nothing (if this should fail, it will in the line below)
+			end
 			e.send_keys(text)
 		end
 	end

data/lib/bauxite/core/context.rb

@@ -710,7 +710,17 @@ module Bauxite
 		def with_vars(vars)
 			current = @variables
 			@variables = @variables.merge(vars)
-			yield
+			ret_vars = nil
+
+			ret = yield
+			
+			returned = @variables['__RETURN__']
+			if returned == ['*']
+				ret_vars = @variables.clone
+				ret_vars.delete '__RETURN__'
+			elsif returned != nil
+				ret_vars = @variables.select { |k,v| returned.include? k }
+			end
 		rescue StandardError => e
 			e.instance_variable_set "@variables", @variables
 			def e.variables
@@ -719,6 +729,8 @@ module Bauxite
 			raise
 		ensure
 			@variables = current
+			@variables.merge!(ret_vars) if ret_vars
+			ret
 		end
 		
 	private

data/lib/bauxite.rb

@@ -22,7 +22,7 @@
 
 #--
 module Bauxite
-	VERSION = "0.6.7"
+	VERSION = "0.6.8"
 end
 #++
 

data/test/return/f1.bxt

@@ -0,0 +1,2 @@
+load f2.bxt
+return my_var

data/test/return/f2.bxt

@@ -0,0 +1,2 @@
+load f3.bxt
+return *

data/test/return/f3.bxt

@@ -0,0 +1,2 @@
+load f4.bxt
+return *

data/test/return/f4.bxt

@@ -0,0 +1,2 @@
+set my_var my_value
+return my_var

data/test/return.bxt

@@ -0,0 +1,2 @@
+load return/f1.bxt
+assertv "my_value" "${my_var}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bauxite
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Patricio Zavolinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -209,6 +209,11 @@ files:
 - test/parsers.csv
 - test/parsers.html
 - test/parsers/page.html
+- test/return.bxt
+- test/return/f1.bxt
+- test/return/f2.bxt
+- test/return/f3.bxt
+- test/return/f4.bxt
 - test/ruby.bxt
 - test/ruby/custom.rb
 - test/select.bxt