spree_grid_faq 0.0.7 → 0.0.8

data/app/controllers/spree/questions_controller.rb

@@ -6,6 +6,7 @@ module Spree
       raise ActionController::RoutingError.new('No Matching Questions') if not params[:page].nil? and @questions.all.empty?
       
       @title = 'Frequently Asked Questions'
+      @canonical_url = questions_path(:page => (not params[:page].nil? and params[:page].to_i > 1 ? params[:page] : nil))
     end
 
     def browse
@@ -23,6 +24,8 @@ module Spree
       
       @title = @question.question
       @description = @question.description
+      
+      @canonical_url = question_path(@question)
     end
   end
 end

data/config/routes.rb

@@ -1,8 +1,8 @@
 Spree::Core::Engine.routes.draw do
   resources :questions, :only => [:show], :path => 'faq' do
     collection do
-      get '(/page-:page.html)', :action => :index, :as => ''
-      match '/browse/(*id)(/page-:page.html)', :action => :browse
+      get '(/page-:page)', :action => :index, :as => ''
+      match '/browse/(*id)(/page-:page)', :action => :browse
     end
   end
   

data/lib/spree_grid_faq/version.rb

@@ -1,3 +1,3 @@
 module SpreeGridFaq
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_grid_faq
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70131679115160 !ruby/object:Gem::Requirement
+  requirement: &70202760696500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70131679115160
+  version_requirements: *70202760696500
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70131679114780 !ruby/object:Gem::Requirement
+  requirement: &70202760696120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131679114780
+  version_requirements: *70202760696120
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70131679114240 !ruby/object:Gem::Requirement
+  requirement: &70202760695580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *70131679114240
+  version_requirements: *70202760695580
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70131679113740 !ruby/object:Gem::Requirement
+  requirement: &70202742211120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.4
   type: :development
   prerelease: false
-  version_requirements: *70131679113740
+  version_requirements: *70202742211120
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70131679113360 !ruby/object:Gem::Requirement
+  requirement: &70202742209780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131679113360
+  version_requirements: *70202742209780
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70131679112820 !ruby/object:Gem::Requirement
+  requirement: &70202742207760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70131679112820
+  version_requirements: *70202742207760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70131679112400 !ruby/object:Gem::Requirement
+  requirement: &70202742206600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131679112400
+  version_requirements: *70202742206600
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70131679111940 !ruby/object:Gem::Requirement
+  requirement: &70202742334400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70131679111940
+  version_requirements: *70202742334400
 description: Spree Grid FAQ adds a Frequently Asked Question section to your spree
   store.  It allows questions to be attached to existing taxons and products and was
   designe for Alarm Grid.