page_navigation 0.4 → 0.5

data/ChangeLog

@@ -1,3 +1,6 @@
+=== Version 0.5 / 2013-2-1
+* Fixed with continue_navigation_to not picking the page after @current_page
+
 === Version 0.4 / 2013-1-28
 * Fixed typo in homepage entry for gemspec
 

data/Gemfile

@@ -1,6 +1,10 @@
 source 'https://rubygems.org'
 
 gem 'rake'
+gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i
+gem 'growl'
+gem 'guard-rspec'
+
 
 # Specify your gem's dependencies in page_navigation.gemspec
 gemspec

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :cli => '--color --format doc' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/lib/page_navigation.rb

@@ -56,7 +56,11 @@ module PageNavigation
   def navigate_to(page_cls, how = {:using => :default}, &block)
     path = path_for how
     to_index = find_index_for(path, page_cls)-1
-    navigate_through_pages(path[0..to_index])
+    if to_index == -1
+      return on(page_cls, &block)
+    else
+      navigate_through_pages(path[0..to_index])
+    end
     on(page_cls, &block)
   end
 
@@ -73,10 +77,13 @@ module PageNavigation
   #
   def continue_navigation_to(page_cls, how = {:using => :default}, &block)
     path = path_for how
-    from_index = find_index_for(path, @current_page.class)
+    from_index = find_index_for(path, @current_page.class)+1
     to_index = find_index_for(path, page_cls)-1
-    navigate_through_pages([path[from_index]]) if from_index == to_index
-    navigate_through_pages(path[from_index..to_index]) unless from_index == to_index
+    if from_index == to_index
+      navigate_through_pages([path[from_index]]) 
+    else
+      navigate_through_pages(path[from_index..to_index]) 
+    end
     on(page_cls, &block)
   end
 

data/lib/page_navigation/version.rb

@@ -1,3 +1,3 @@
 module PageNavigation
-  VERSION = "0.4"
+  VERSION = "0.5"
 end

data/spec/lib/page_navigation_spec.rb

@@ -80,9 +80,6 @@ describe PageNavigation do
     }
     @navigator.current_page = FactoryTestPage.new
     f_page = FactoryTestPage.new
-    FactoryTestPage.should_receive(:new).and_return(f_page)
-    f_page.should_receive(:respond_to?).with(:a_method).and_return(true)
-    f_page.should_receive(:a_method)
     a_page = AnotherPage.new
     AnotherPage.should_receive(:new).and_return(a_page)
     a_page.should_receive(:respond_to?).with(:b_method).and_return(true)
@@ -96,7 +93,7 @@ describe PageNavigation do
                    [AnotherPage, :b_method],
                    [YetAnotherPage, :c_method]]
     }
-    @navigator.current_page = AnotherPage.new
+    @navigator.current_page = FactoryTestPage.new
     fake_page = AnotherPage.new
     AnotherPage.should_receive(:new).and_return(fake_page)
     fake_page.should_receive(:respond_to?).with(:b_method).and_return(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_navigation
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -40,6 +40,7 @@ files:
 - .rvmrc
 - ChangeLog
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -63,7 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1356991560583607743
+      hash: -3548323590874822099
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -72,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1356991560583607743
+      hash: -3548323590874822099
 requirements: []
 rubyforge_project: page_naigation
 rubygems_version: 1.8.24