lib/page_magic/session.rb in page_magic-0.11.0.alpha8 vs lib/page_magic/session.rb in page_magic-1.0.0.alpha

@@ -5,40 +5,25 @@
 
     def initialize browser
       @raw_session = browser
     end
 
-    def define_page_mappings transitions
+    def define_transitions transitions
       @transitions = transitions
     end
 
     def current_page
       if transitions
-        mapping = find_mapped_page(current_path)
-        @current_page = mapping.new(self) if mapping
+        mapping = transitions.keys.find do |key|
+          current_url.include?(key)
+        end
+        @current_page = transitions[mapping].new(self) if transitions[mapping]
       end
       @current_page
     end
 
-    def find_mapped_page path
-      mapping = transitions.keys.find do |key|
-        string_matches?(path, key)
-      end
-      transitions[mapping]
-    end
-
-    def string_matches?(string, matcher)
-      if matcher.is_a?(Regexp)
-        string =~ matcher
-      elsif matcher.is_a?(String)
-        string == matcher
-      else
-        false
-      end
-    end
-
-    def visit(page, url: nil)
-      raw_session.visit url || page.url
+    def visit page
+      raw_session.visit page.url
       @current_page = page.new self
       self
     end
 
     def current_path
\ No newline at end of file