bauxite 0.6.18 → 0.6.19

data/lib/bauxite/selectors/json.rb

@@ -1,88 +1,88 @@
-#--
-# Copyright (c) 2014 Patricio Zavolinsky
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#++
-
-require 'json'
-
-class Bauxite::Selector
-	# Select a field in a JSON document.
-	#
-	# The JSON selector syntax is:
-	#     # For objects:
-	#     json=key           # {"key":1}               => 1
-	#     json=key.subkey    # {"key":{"subkey":2}}    => 2
-	#     json=key[0]        # {"key": [3]}            => 3
-	#     json=key[1].subkey # {"key": [{"subkey":4}]} => 4
-	#     json=key.length    # {"key": [5]}            => 1
-	#
-	#     # For arrays:
-	#     json=[0]           # [1]                     => 1
-	#     json=[1].value     # [{"value": 2}]          => 2
-	#     json=length        # [3]                     => 1
-	#
-	# For example:
-	#     # assuming {"key": [{"subkey":4},{"val":"42"}]}
-	#     assert json=key[0].subkey 4
-	#     assert json=key[1].val 42
-	#     assert json=key.length 2
-	#     # => these assertions would pass
-	#
-	# :category: Selector Methods
-	def json(arg, &block)
-		source = JSON::parse(@ctx.driver.page_source.sub(/^<html[^>]*>.*<pre>/, '').sub(/<\/pre>.*<\/html>$/, ''))
-		element = _json_find(source, arg)
-		raise Selenium::WebDriver::Error::NoSuchElementError, "Cannot find JSON element: #{arg}" unless element
-
-		element = element.to_s
-		def element.text; self; end
-		def element.tag_name; 'json'; end
-		yield element if block_given?
-		element
-	end
-	
-private
-	def _json_find(parent, selector)
-		if selector[0] == '['
-			delim = selector.index(']')
-			raise ArgumentError, "Invalid format for JSON selector (missing closing ']'): #{selector}" unless delim
-			i = selector[1...delim].to_i
-			selector = selector[delim+1..-1]
-			parent = parent[i]
-			return parent if selector == ''
-		end
-		if selector[0] == '.'
-			selector = selector[1..-1]
-		end
-		if selector == 'length' and parent.respond_to? :size
-			return parent.size
-		end
-
-		delim = selector.index(/[\[.]/)
-		if delim
-			target = parent[selector[0...delim]]
-			return unless target
-			rest = selector[delim..-1]
-			_json_find(target, rest)
-		else
-			parent[selector]
-		end
-	end
-end
+#--
+# Copyright (c) 2014 Patricio Zavolinsky
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+
+require 'json'
+
+class Bauxite::Selector
+	# Select a field in a JSON document.
+	#
+	# The JSON selector syntax is:
+	#     # For objects:
+	#     json=key           # {"key":1}               => 1
+	#     json=key.subkey    # {"key":{"subkey":2}}    => 2
+	#     json=key[0]        # {"key": [3]}            => 3
+	#     json=key[1].subkey # {"key": [{"subkey":4}]} => 4
+	#     json=key.length    # {"key": [5]}            => 1
+	#
+	#     # For arrays:
+	#     json=[0]           # [1]                     => 1
+	#     json=[1].value     # [{"value": 2}]          => 2
+	#     json=length        # [3]                     => 1
+	#
+	# For example:
+	#     # assuming {"key": [{"subkey":4},{"val":"42"}]}
+	#     assert json=key[0].subkey 4
+	#     assert json=key[1].val 42
+	#     assert json=key.length 2
+	#     # => these assertions would pass
+	#
+	# :category: Selector Methods
+	def json(arg, &block)
+		source = JSON::parse(@ctx.driver.page_source.sub(/^<html[^>]*>.*<pre>/, '').sub(/<\/pre>.*<\/html>$/, ''))
+		element = _json_find(source, arg)
+		raise Selenium::WebDriver::Error::NoSuchElementError, "Cannot find JSON element: #{arg}" unless element
+
+		element = element.to_s
+		def element.text; self; end
+		def element.tag_name; 'json'; end
+		yield element if block_given?
+		element
+	end
+	
+private
+	def _json_find(parent, selector)
+		if selector[0] == '['
+			delim = selector.index(']')
+			raise ArgumentError, "Invalid format for JSON selector (missing closing ']'): #{selector}" unless delim
+			i = selector[1...delim].to_i
+			selector = selector[delim+1..-1]
+			parent = parent[i]
+			return parent if selector == ''
+		end
+		if selector[0] == '.'
+			selector = selector[1..-1]
+		end
+		if selector == 'length' and parent.respond_to? :size
+			return parent.size
+		end
+
+		delim = selector.index(/[\[.]/)
+		if delim
+			target = parent[selector[0...delim]]
+			return unless target
+			rest = selector[delim..-1]
+			_json_find(target, rest)
+		else
+			parent[selector]
+		end
+	end
+end

data/lib/bauxite/selectors/sid.rb

@@ -1,38 +1,38 @@
-#--
-# Copyright (c) 2014 Patricio Zavolinsky
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#++
-
-class Bauxite::Selector
-	# Select an element by id suffix.
-	#
-	# This is the default selector. Any selector strings that do not contain an
-	# equal sign (i.e. '=') will use this selector.
-	#
-	# For example:
-	#     # assuming <div id="strange_uuid_like_stuff_myDiv">foo</div>
-	#     assert sid=myDiv "foo"
-	#     # => matches the element above.
-	#
-	# :category: Selector Methods
-	def sid(arg, &block)
-		selenium_find(:css, "[id$='#{arg.gsub("'", "\\'")}']", &block)
-	end
-end
+#--
+# Copyright (c) 2014 Patricio Zavolinsky
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+
+class Bauxite::Selector
+	# Select an element by id suffix.
+	#
+	# This is the default selector. Any selector strings that do not contain an
+	# equal sign (i.e. '=') will use this selector.
+	#
+	# For example:
+	#     # assuming <div id="strange_uuid_like_stuff_myDiv">foo</div>
+	#     assert sid=myDiv "foo"
+	#     # => matches the element above.
+	#
+	# :category: Selector Methods
+	def sid(arg, &block)
+		selenium_find(:css, "[id$='#{arg.gsub("'", "\\'")}']", &block)
+	end
+end

data/lib/bauxite/selectors/smart.rb

@@ -1,80 +1,80 @@
-#--
-# Copyright (c) 2014 Patricio Zavolinsky
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#++
-
-class Bauxite::Selector
-	# Select an element by applying different Selector strategies.
-	#
-	# This selector tries to find elements by using the following strategies:
-	# 1. default (id suffix)
-	# 2. by +name+
-	# 3. by +class_name+
-	# 4. by +id+ fragment (the +id+ contains the text specified)
-	# 5. by +placeholder+ attribute
-	# 6. by text content (unless the element is a label)
-	# 7. by radio/checkbox/button/submit value
-	# 8. by referenced element (find a label by its text, then find the element
-	#    pointed by the label's +for+ attribute)
-	# 9. by child element (find a label by its text, then find the first
-	#    element child control element, including input, select, textarea and
-	#    button).
-	#
-	# For example:
-	#     # assuming <label>By label parent<input type="text" value="By label parent"/></label>
-	#     assert "smart=By label parent" "By label parent"
-	#     # => the assertion succeeds.
-	#
-	# :category: Selector Methods
-	def smart(arg, &block)
-		b = lambda { |e| e }
-		target   = _smart_try_find { sid(arg, &b)                    }
-		target ||= _smart_try_find { selenium_find(:name, arg)       }
-		target ||= _smart_try_find { selenium_find(:class_name, arg) }
-		target ||= _smart_try_find { attr("id*:"+arg, &b)            }
-		target ||= _smart_try_find { attr("placeholder:"+arg, &b)    }
-		quoted_arg = "'"+arg.gsub("'", "\\'")+"'"
-		target ||= _smart_try_find do
-			selenium_find(:css, ["input[type='checkbox'][value=#{quoted_arg}]",
-				"input[type='radio'][value=#{quoted_arg}]",
-				"input[type='button'][value=#{quoted_arg}]",
-				"input[type='submit'][value=#{quoted_arg}]"
-				].join(',')
-			)
-		end
-		return yield target if target
-		
-		target = selenium_find(:xpath, "//*[contains(text(), '#{arg.gsub("'", "\\'")}')]")
-		return yield target unless target.tag_name.downcase == 'label'
-		label = target
-		id = label['for']
-		return yield selenium_find(:id, id) if id
-		
-		target = _smart_try_find { label.find_element(:css, "input, select, textarea, button") }
-		return yield target if target
-	end
-	
-private
-	def _smart_try_find()
-		@ctx.with_driver_timeout(0) { yield }
-	rescue StandardError => e
-		nil
-	end
-end
+#--
+# Copyright (c) 2014 Patricio Zavolinsky
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+
+class Bauxite::Selector
+	# Select an element by applying different Selector strategies.
+	#
+	# This selector tries to find elements by using the following strategies:
+	# 1. default (id suffix)
+	# 2. by +name+
+	# 3. by +class_name+
+	# 4. by +id+ fragment (the +id+ contains the text specified)
+	# 5. by +placeholder+ attribute
+	# 6. by text content (unless the element is a label)
+	# 7. by radio/checkbox/button/submit value
+	# 8. by referenced element (find a label by its text, then find the element
+	#    pointed by the label's +for+ attribute)
+	# 9. by child element (find a label by its text, then find the first
+	#    element child control element, including input, select, textarea and
+	#    button).
+	#
+	# For example:
+	#     # assuming <label>By label parent<input type="text" value="By label parent"/></label>
+	#     assert "smart=By label parent" "By label parent"
+	#     # => the assertion succeeds.
+	#
+	# :category: Selector Methods
+	def smart(arg, &block)
+		b = lambda { |e| e }
+		target   = _smart_try_find { sid(arg, &b)                    }
+		target ||= _smart_try_find { selenium_find(:name, arg)       }
+		target ||= _smart_try_find { selenium_find(:class_name, arg) }
+		target ||= _smart_try_find { attr("id*:"+arg, &b)            }
+		target ||= _smart_try_find { attr("placeholder:"+arg, &b)    }
+		quoted_arg = "'"+arg.gsub("'", "\\'")+"'"
+		target ||= _smart_try_find do
+			selenium_find(:css, ["input[type='checkbox'][value=#{quoted_arg}]",
+				"input[type='radio'][value=#{quoted_arg}]",
+				"input[type='button'][value=#{quoted_arg}]",
+				"input[type='submit'][value=#{quoted_arg}]"
+				].join(',')
+			)
+		end
+		return yield target if target
+		
+		target = selenium_find(:xpath, "//*[contains(text(), '#{arg.gsub("'", "\\'")}')]")
+		return yield target unless target.tag_name.downcase == 'label'
+		label = target
+		id = label['for']
+		return yield selenium_find(:id, id) if id
+		
+		target = _smart_try_find { label.find_element(:css, "input, select, textarea, button") }
+		return yield target if target
+	end
+	
+private
+	def _smart_try_find()
+		@ctx.with_driver_timeout(0) { yield }
+	rescue StandardError => e
+		nil
+	end
+end

data/lib/bauxite/selectors/window.rb

@@ -1,77 +1,77 @@
-#--
-# Copyright (c) 2014 Patricio Zavolinsky
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#++
-
-class Bauxite::Selector
-	# Change the selector scope to the given window and finds an element in that
-	# window.
-	#
-	# This is a composite selector. The window selector syntax is:
-	#     window=|window_name|child_selector
-	#
-	# Where +window_name+ is the name or url pattern of the target window, 
-	# +child_selector+ is any selector available that matches the target
-	# element inside the target window.
-	#
-	# Note that the '|' character can be replaced with any single-character
-	# delimiter.
-	#
-	# For example:
-	#     # assuming <div id='label'>hello!</div> in popup.html
-	#     js "window.w = window.open('popup.html', 'mypopup')"
-	#     assert "window=|mypopup|label" "hello!"
-	#     # => this assertion would pass
-	#     
-	#     assert "window=|popup.html|label" "hello!"
-	#     # => this assertion would pass
-	#
-	# :category: Selector Methods
-	def window(arg, &block)
-		current = @ctx.driver.window_handle
-		
-		delimiter = arg[0]
-		name,child = arg[1..-1].split(delimiter, 2)
-		
-		pattern = /#{name}/
-		if name =~ /^\/.*\/[imxo]*$/
-			pattern = eval(name)
-		end
-
-		match = @ctx.driver.window_handles.find do |h|
-			@ctx.driver.switch_to.window h
-			@ctx.driver.current_url =~ pattern
-		end
-		
-		name = match if match
-		begin
-			@ctx.driver.switch_to.window name
-		rescue StandardError => e
-			@ctx.driver.switch_to.window current
-			raise Bauxite::Errors::AssertionError, "Cannot find a window matching '#{name}' (either by name exact match or by url regex)." + e.message 
-		end
-		
-		begin
-			find(child, &block)
-		ensure
-			@ctx.driver.switch_to.window current
-		end
-	end
-end
+#--
+# Copyright (c) 2014 Patricio Zavolinsky
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+
+class Bauxite::Selector
+	# Change the selector scope to the given window and finds an element in that
+	# window.
+	#
+	# This is a composite selector. The window selector syntax is:
+	#     window=|window_name|child_selector
+	#
+	# Where +window_name+ is the name or url pattern of the target window, 
+	# +child_selector+ is any selector available that matches the target
+	# element inside the target window.
+	#
+	# Note that the '|' character can be replaced with any single-character
+	# delimiter.
+	#
+	# For example:
+	#     # assuming <div id='label'>hello!</div> in popup.html
+	#     js "window.w = window.open('popup.html', 'mypopup')"
+	#     assert "window=|mypopup|label" "hello!"
+	#     # => this assertion would pass
+	#     
+	#     assert "window=|popup.html|label" "hello!"
+	#     # => this assertion would pass
+	#
+	# :category: Selector Methods
+	def window(arg, &block)
+		current = @ctx.driver.window_handle
+		
+		delimiter = arg[0]
+		name,child = arg[1..-1].split(delimiter, 2)
+		
+		pattern = /#{name}/
+		if name =~ /^\/.*\/[imxo]*$/
+			pattern = eval(name)
+		end
+
+		match = @ctx.driver.window_handles.find do |h|
+			@ctx.driver.switch_to.window h
+			@ctx.driver.current_url =~ pattern
+		end
+		
+		name = match if match
+		begin
+			@ctx.driver.switch_to.window name
+		rescue StandardError => e
+			@ctx.driver.switch_to.window current
+			raise Bauxite::Errors::AssertionError, "Cannot find a window matching '#{name}' (either by name exact match or by url regex)." + e.message 
+		end
+		
+		begin
+			find(child, &block)
+		ensure
+			@ctx.driver.switch_to.window current
+		end
+	end
+end