site_prism 1.4 → 2.0

data/lib/site_prism/element_container.rb

@@ -3,7 +3,7 @@ module SitePrism::ElementContainer
   def element element_name, element_selector = nil
     build element_name, element_selector do
       define_method element_name.to_s do
-        find_one element_selector
+        find_first element_selector
       end
     end
   end
@@ -20,7 +20,7 @@ module SitePrism::ElementContainer
   def section section_name, section_class, section_selector
     build section_name, section_selector do
       define_method section_name do
-        section_class.new find_one section_selector
+        section_class.new find_first section_selector
       end
     end
   end
@@ -96,10 +96,9 @@ module SitePrism::ElementContainer
   def create_waiter element_name, element_selector
     method_name = "wait_for_#{element_name.to_s}"
     build_checker_or_waiter element_name, method_name, element_selector do
-      define_method method_name do |*args| #used to use block args, but they don't work under ruby 1.8 :(
-        timeout = args.shift || Capybara.default_wait_time
+      define_method method_name do |timeout = Capybara.default_wait_time|
         Capybara.using_wait_time timeout do
-          element_waiter element_selector
+          element_exists? element_selector
         end
       end
     end
@@ -108,17 +107,12 @@ module SitePrism::ElementContainer
   def create_visibility_waiter element_name, element_selector
     method_name = "wait_until_#{element_name.to_s}_visible"
     build_checker_or_waiter element_name, method_name, element_selector do
-      define_method method_name do |*args|
-        timeout = args.shift || Capybara.default_wait_time
+      define_method method_name do |timeout = Capybara.default_wait_time|
         Capybara.using_wait_time timeout do
-          element_waiter element_selector
+          element_exists? element_selector
         end
-        begin
-          Timeout.timeout(timeout) do
-            sleep 0.1 until find_one(element_selector).visible?
-          end
-        rescue Timeout::Error
-          raise SitePrism::TimeOutWaitingForElementVisibility.new("#{element_name} did not become visible")
+        Timeout.timeout timeout, SitePrism::TimeOutWaitingForElementVisibility do
+          sleep 0.1 until find_first(element_selector).visible?
         end
       end
     end
@@ -127,14 +121,9 @@ module SitePrism::ElementContainer
   def create_invisibility_waiter element_name, element_selector
     method_name = "wait_until_#{element_name.to_s}_invisible"
     build_checker_or_waiter element_name, method_name, element_selector do
-      define_method method_name do |*args|
-        timeout = args.shift || Capybara.default_wait_time
-        begin
-          Timeout.timeout(timeout) do
-            sleep 0.1 while element_exists?(element_selector) && find_one(element_selector).visible?
-          end
-        rescue Timeout::Error
-          raise SitePrism::TimeOutWaitingForElementInvisibility.new("#{element_name} did not become invisible")
+      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?
         end
       end
     end

data/lib/site_prism/page.rb

@@ -49,8 +49,8 @@ module SitePrism
 
     private
 
-    def find_one selector
-      find selector
+    def find_first selector
+      first selector
     end
 
     def find_all selector
@@ -60,10 +60,6 @@ module SitePrism
     def element_exists? selector
       has_selector? selector
     end
-
-    def element_waiter selector
-      wait_until { element_exists? selector }
-    end
   end
 end
 

data/lib/site_prism/section.rb

@@ -24,8 +24,8 @@ module SitePrism
 
     private
 
-    def find_one selector
-      root_element.find selector
+    def find_first selector
+      root_element.first selector
     end
 
     def find_all selector
@@ -35,10 +35,6 @@ module SitePrism
     def element_exists? selector
       root_element.has_selector? selector
     end
-
-    def element_waiter selector
-      Capybara.current_session.wait_until { element_exists? selector }
-    end
   end
 end
 

data/lib/site_prism/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site_prism
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '2.0'
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement