site_prism 2.0 → 2.1

data/README.md

@@ -409,6 +409,22 @@ of seconds to wait. Using the above example:
 @home.wait_until_search_field_invisible(10)
 ```
 
+#### CSS Selectors vs. XPath Expressions
+
+While the above examples all use CSS selectors to find elements, it is
+possible to use XPath expressions too. In SitePrism, everywhere that you
+can use a CSS selector, you can use an XPath expression. An example:
+
+```ruby
+class Home < SitePrism::Page
+  # CSS Selector:
+  element :first_name, "div#signup input[name='first-name']"
+
+  #same thing as an XPath expression:
+  element :first_name, :xpath, "//div[@id='signup']//input[@name='first-name']"
+end
+```
+
 #### Summary of what the element method provides:
 
 Given:

data/lib/site_prism/element_container.rb

@@ -1,34 +1,34 @@
 module SitePrism::ElementContainer
 
-  def element element_name, element_selector = nil
-    build element_name, element_selector do
+  def element element_name, *find_args 
+    build element_name, *find_args do
       define_method element_name.to_s do
-        find_first element_selector
+        find_first *find_args
       end
     end
   end
 
-  def elements collection_name, collection_selector = nil
-    build collection_name, collection_selector do
+  def elements collection_name, *find_args
+    build collection_name, *find_args do
       define_method collection_name.to_s do
-        find_all collection_selector
+        find_all *find_args
       end
     end
   end
   alias :collection :elements
 
-  def section section_name, section_class, section_selector
-    build section_name, section_selector do
+  def section section_name, section_class, *find_args
+    build section_name, *find_args do
       define_method section_name do
-        section_class.new find_first section_selector
+        section_class.new find_first *find_args
       end
     end
   end
 
-  def sections section_collection_name, section_class, section_collection_selector
-    build section_collection_name, section_collection_selector do
+  def sections section_collection_name, section_class, *find_args
+    build section_collection_name, *find_args do
       define_method section_collection_name do
-        find_all(section_collection_selector).collect do |element|
+        find_all(*find_args).collect do |element|
           section_class.new element
         end
       end
@@ -57,73 +57,73 @@ module SitePrism::ElementContainer
 
   private
   
-  def build name, selector
-    if selector.nil?
+  def build name, *find_args
+    if find_args.empty?
       create_no_selector name
     else
       add_to_mapped_items name
       yield
     end
-    add_checkers_and_waiters name, selector
+    add_checkers_and_waiters name, *find_args
   end
   
-  def add_checkers_and_waiters name, selector
-    create_existence_checker name, selector
-    create_waiter name, selector
-    create_visibility_waiter name, selector
-    create_invisibility_waiter name, selector
+  def add_checkers_and_waiters name, *find_args
+    create_existence_checker name, *find_args
+    create_waiter name, *find_args
+    create_visibility_waiter name, *find_args
+    create_invisibility_waiter name, *find_args
   end
   
-  def build_checker_or_waiter element_name, proposed_method_name, selector
-    if selector.nil?
+  def build_checker_or_waiter element_name, proposed_method_name, *find_args
+    if find_args.empty?
       create_no_selector element_name, proposed_method_name
     else
       yield
     end
   end
 
-  def create_existence_checker element_name, element_selector
+  def create_existence_checker element_name, *find_args
     method_name = "has_#{element_name.to_s}?"
-    build_checker_or_waiter element_name, method_name, element_selector do
+    build_checker_or_waiter element_name, method_name, *find_args do
       define_method method_name do
         Capybara.using_wait_time 0 do
-          element_exists? element_selector
+          element_exists? *find_args
         end
       end
     end
   end
 
-  def create_waiter element_name, element_selector
+  def create_waiter element_name, *find_args
     method_name = "wait_for_#{element_name.to_s}"
-    build_checker_or_waiter element_name, method_name, element_selector do
+    build_checker_or_waiter element_name, method_name, *find_args do
       define_method method_name do |timeout = Capybara.default_wait_time|
         Capybara.using_wait_time timeout do
-          element_exists? element_selector
+          element_exists? *find_args
         end
       end
     end
   end
 
-  def create_visibility_waiter element_name, element_selector
+  def create_visibility_waiter element_name, *find_args
     method_name = "wait_until_#{element_name.to_s}_visible"
-    build_checker_or_waiter element_name, method_name, element_selector do
+    build_checker_or_waiter element_name, method_name, *find_args do
       define_method method_name do |timeout = Capybara.default_wait_time|
         Capybara.using_wait_time timeout do
-          element_exists? element_selector
+          element_exists? *find_args
         end
         Timeout.timeout timeout, SitePrism::TimeOutWaitingForElementVisibility do
-          sleep 0.1 until find_first(element_selector).visible?
+          sleep 0.1 until find_first(*find_args).visible?
         end
       end
     end
   end
 
-  def create_invisibility_waiter element_name, element_selector
+  def create_invisibility_waiter element_name, *find_args
     method_name = "wait_until_#{element_name.to_s}_invisible"
-    build_checker_or_waiter element_name, method_name, element_selector do
+    build_checker_or_waiter element_name, method_name, *find_args do
       define_method method_name do |timeout = Capybara.default_wait_time|
         Timeout.timeout timeout, SitePrism::TimeOutWaitingForElementInvisibility do
-          sleep 0.1 while element_exists?(element_selector) && find_first(element_selector).visible?
+          sleep 0.1 while element_exists?(*find_args) && find_first(*find_args).visible?
         end
       end
     end

data/lib/site_prism/page.rb

@@ -49,16 +49,16 @@ module SitePrism
 
     private
 
-    def find_first selector
-      first selector
+    def find_first *find_args
+      first *find_args
     end
 
-    def find_all selector
-      all selector
+    def find_all *find_args
+      all *find_args
     end
 
-    def element_exists? selector
-      has_selector? selector
+    def element_exists? *find_args
+      has_selector? *find_args
     end
   end
 end

data/lib/site_prism/section.rb

@@ -24,16 +24,16 @@ module SitePrism
 
     private
 
-    def find_first selector
-      root_element.first selector
+    def find_first *find_args
+      root_element.first *find_args
     end
 
-    def find_all selector
-      root_element.all selector
+    def find_all *find_args
+      root_element.all *find_args
     end
 
-    def element_exists? selector
-      root_element.has_selector? selector
+    def element_exists? *find_args
+      root_element.has_selector? *find_args
     end
   end
 end

data/lib/site_prism/version.rb

@@ -1,4 +1,4 @@
 module SitePrism
-  VERSION = "2.0"
+  VERSION = "2.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site_prism
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '2.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara