gametel 0.5.4 → 0.5.5

data/features/navigation.feature

@@ -10,5 +10,5 @@ Feature: Navigation through the screens of the application
 
   Scenario: Navigating to a screen starting with a current screen
     Given I am on the the ViewsMenuScreen
-    When I navigate to the Controls screen 
+    When I continue navigating to the Controls screen 
     Then I should see the text "Checkbox 1" on the screen

data/features/step_definitions/navigation_steps.rb

@@ -2,11 +2,14 @@ When /^I navigate to the Controls screen$/ do
   navigate_to(ControlsScreen)
 end
 
+When /^I continue navigating to the Controls screen$/ do
+  continue_navigation_to(ControlsScreen)
+end
+
 When /^I navigate to the Buttons screen using the "(.*?)" route$/ do |route|
   navigate_to(ButtonScreen, :using => route.to_sym)
 end
 
 Given /^I am on the the ViewsMenuScreen$/ do
-  on(MainMenuScreen).views
-  on(ViewsMenuScreen)
+  navigate_to(ViewsMenuScreen)
 end

data/lib/gametel/navigation.rb

@@ -1,58 +1,21 @@
+require 'page_navigation'
+
 module Gametel
   #
   # Module to facilitate create new gametel screen objects in
   # definitions.
   #
   module Navigation
-
-    class << self
-      attr_reader :navigation_routes
-
-      def routes=(routes)
-        @navigation_routes = routes
-      end
-    end
+    include PageNavigation
 
     #
     # create a new screen given a class name
     #
     def on(cls, &block)
-      @current_screen = cls.new
+      @current_screen = @current_page = cls.new
       block.call @current_screen if block
       @current_screen
     end
 
-    #
-    # Navigate to a specific screen following a predefined path.
-    #
-    def navigate_to(screen_cls, how = {:using => :default}, &block)
-      path = path_for how
-      from = @current_screen ? @current_screen.class : path[0][0]
-      from_index = find_index_for(path, from)
-      to_index = find_index_for(path, screen_cls) - 1
-      navigate_through_pages(path[from_index..to_index])
-      on(screen_cls, &block)
-    end
-
-    private
-
-    def path_for(how)
-      path = Gametel::Navigation.navigation_routes[how[:using]]
-      fail("Gametel::Navigation route :#{how[:using].to_s} not found") unless path
-      path
-    end
-
-    def find_index_for(path, item)
-      path.each_with_index { |each, index| return index if each[0] == item}
-    end
-
-    def navigate_through_pages(pages)
-      pages.each do |cls, method|
-        page = on(cls)
-        fail("Navigation method not specified on #{cls}.  Please call the ") unless page.respond_to? method
-        page.send method
-      end
-    end
-
   end
 end

data/lib/gametel/version.rb

@@ -1,3 +1,3 @@
 module Gametel
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gametel
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brazenhead
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.4
+- !ruby/object:Gem::Dependency
+  name: page_navigation
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement