ae_page_objects 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bccdd111c15cbfc24c720ab0ecb2df6615d817af
-  data.tar.gz: 640432edfc7bae3b61ab33c37cb878344a6fdb66
+  metadata.gz: 20c13f38ceabdcf27ecc3f89d9de3553c5787945
+  data.tar.gz: dcd428213ed6c1424727b40e0cd1583d4b6d2cc2
 SHA512:
-  metadata.gz: 9eccb45c332ac93f9b87c04065d834595d864b5eab6116d8d9cb469fac270a134baf4671c2c2087f7b1df6de22907807d93bad6347cef0e6758d3c293ca72adc
-  data.tar.gz: 9782f24bbc2f0eea7fdf7e9cef46b4bc2554ab15ed7c578aa247b55b8f4d1a0e6333c194e960672cede92e4f46ececea2d590ee97dd6414e80c12daa337c75f8
+  metadata.gz: b13c1d548b49b516dc2a8d71efb0676850fc04301044fe02118bd4f0ed899ad6d81850a3021181a104f5ba79cecba6af36fdbd0aa4d84400333bccb3ac1657ce
+  data.tar.gz: 5f390f9a20b9f5d459021cfb5bceef6c96c0dd08de671ba79baa9629329253e073ce8307482b37f96e87537bea86fe7b41f89d2dc3c22450a1d33375224d4b19

data/lib/ae_page_objects/core/application_router.rb

@@ -11,20 +11,55 @@ module AePageObjects
             routes.send("#{named_route}_path", *args)
           end
         end
-      end
 
-      class Rails23 < Base
-        def recognizes?(path, url)
-          ["GET", "PUT", "POST", "DELETE", "PATCH"].map(&:downcase).map(&:to_sym).each do |method|
-            route = ActionController::Routing::Routes.named_routes[path]
-            route.recognize(url, {:method => method})
+        def recognizes?(named_route, url)
+          url = normalize_url(url)
+
+          resolved_named_route = resolve_named_route(named_route)
 
-            return true if route && route.recognize(url, {:method => method})
+          [:get, :post, :put, :delete, :patch].each do |method|
+            resolved_route_from_url = resolve_url(url, method)
+
+            # The first resolved route matching named route is returned as
+            # Rails' routes are in priority order.
+            if resolved_named_route == resolved_route_from_url
+              return true
+            end
           end
 
           false
         end
 
+      private
+
+        def routes
+          raise NotImplementedError, "You must implement routes"
+        end
+
+        def normalize_url(url)
+          raise NotImplementedError, "You must implement normalize_url"
+        end
+
+        def router
+          raise NotImplementedError, "You must implement router"
+        end
+
+        def resolve_named_route(named_route)
+          requirements = router.named_routes[named_route].requirements
+          ResolvedRoute.new(requirements[:controller], requirements[:action])
+        end
+
+        def resolve_url(url, method)
+          recognized_path = router.recognize_path(url, {:method => method})
+          ResolvedRoute.new(recognized_path[:controller], recognized_path[:action])
+        rescue ActionController::RoutingError, ActionController::MethodNotAllowed
+        end
+
+        ResolvedRoute = Struct.new(:controller, :action)
+      end
+
+      class Rails23 < Base
+
       private
 
         def routes
@@ -36,21 +71,17 @@ module AePageObjects
             routes_class.new
           end
         end
-      end
 
-      class Rails3 < Base
-        def recognizes?(path, url)
-          url, router = url_and_router(url)
-
-          ["GET", "PUT", "POST", "DELETE", "PATCH"].each do |method|
-            router.recognize(request_for(url, method)) do |route, matches, params|
-              return true if route.name.to_s == path.to_s
-            end
-          end
+        def normalize_url(url)
+          url
+        end
 
-          false
+        def router
+          ActionController::Routing::Routes
         end
+      end
 
+      class Rails3 < Base
 
       private
 
@@ -66,11 +97,12 @@ module AePageObjects
           end
         end
 
-        def url_and_router(url)
-          url = Rack::Mount::Utils.normalize_path(url) unless url =~ %r{://}
-          router = ::Rails.application.routes.set
+        def normalize_url(url)
+          Rack::Mount::Utils.normalize_path(url) unless url =~ %r{://}
+        end
 
-          [url, router]
+        def router
+          ::Rails.application.routes
         end
 
         def routes
@@ -86,26 +118,21 @@ module AePageObjects
       class Rails32 < Rails3
 
       private
-        def url_and_router(url)
-          url = Journey::Router::Utils.normalize_path(url) unless url =~ %r{://}
-          router = ::Rails.application.routes.router
 
-          [url, router]
+        def normalize_url(url)
+          Journey::Router::Utils.normalize_path(url) unless url =~ %r{://}
         end
       end
 
       class Rails4 < Rails32
 
-        private
-        def url_and_router(url)
-          require 'action_dispatch/journey'
-          url = ActionDispatch::Journey::Router::Utils.normalize_path(url) unless url =~ %r{://}
-          router = ::Rails.application.routes.router
+      private
 
-          [url, router]
+        def normalize_url(url)
+          require 'action_dispatch/journey'
+          ActionDispatch::Journey::Router::Utils.normalize_path(url) unless url =~ %r{://}
         end
       end
-
     end
 
     def path_recognizes_url?(path, url)
@@ -134,7 +161,7 @@ module AePageObjects
           Recognizer::Rails3.new
         elsif ::Rails.version =~ /\A3\.2/
           Recognizer::Rails32.new
-        elsif ::Rails.version =~ /\A4\.[01]/
+        elsif ::Rails.version =~ /\A4\.[012]/
           Recognizer::Rails4.new
         else
           warn "[WARNING]: AePageObjects is not tested against Rails #{::Rails.version} and may behave in an undefined manner."

data/lib/ae_page_objects/exceptions.rb

@@ -42,4 +42,7 @@ module AePageObjects
 
   class WaitTimeoutError < Error
   end
+
+  class FrozenInTime < Error
+  end
 end

data/lib/ae_page_objects/util/waiter.rb

@@ -12,6 +12,7 @@ module AePageObjects
         end
 
         sleep(0.05)
+        raise FrozenInTime, "Time appears to be frozen" if Time.now == start_time
       end
 
       result

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Donnie Tognazzini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Capybara Page Objects pattern