kuhsaft 0.2.3 → 0.2.4

data/CHANGELOG.md

@@ -6,6 +6,13 @@
 
 - fix README on how to integrate devise (rails31) ([@effkay][])
 
+## 0.2.4 - August 29, 2011
+
+### Improvements
+
+- handle 404s with an ActionController::RoutingError, controllers can optionally implement a `handle_404` method to change behavior ([@manufaktor][])
+- Backend now shows the hierarchy breadcrumb when creating a new page ([@manufaktor][])
+
 ### New features
 
 ## 0.2.3 - August 19, 2011

data/app/controllers/kuhsaft/pages_controller.rb

@@ -6,7 +6,15 @@ module Kuhsaft
     
     def show
       @page = Kuhsaft::Page.find_by_url(params[:url])
-      respond_with @page
+      if @page.present?
+        respond_with @page
+      else
+        if respond_to?(:handle_404)
+          handle_404
+        else
+          raise ActionController::RoutingError.new('Not Found')
+        end
+      end
     end
     
     private

data/app/views/kuhsaft/cms/pages/new.html.haml

@@ -2,5 +2,9 @@
   - Kuhsaft::Page.translation_locales.each do |locale|
     %li{ :class => (:current if params[:locale] == locale.to_s) }= link_to locale.to_s, new_cms_page_path(:locale => locale)
 
+.page-tree-breadcrumb
+  - available_parent_pages.each do |parent_page|
+    = link_to((parent_page[:title].presence || parent_page.title), parent_page[:link].presence || edit_cms_page_path(parent_page))
+
 .box-container    
   = render :partial => 'form', :locals => { :url => cms_pages_path, :page_title => t('.new') }

data/config/locales/kuhsaft.en.yml

@@ -1,4 +1,5 @@
 en:
+  404: '404, Page not found'
   layouts:
     kuhsaft:
       admin:
@@ -13,8 +14,10 @@ en:
           create: 'Create new page'
         new:
           new: 'Creating new page'
+          pages: 'Pages'
         edit:
           edit_html: 'Editing page: <span>%{title}</span>'
+          pages: 'Pages'
         branch:
           add: 'Add page'
           create: 'Create new page'

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/controllers/pages_controller_spec.rb

@@ -5,8 +5,8 @@ describe Kuhsaft::PagesController do
   
   before do
     set_lang :en
-    # create page with slug=english-title
-    @page = Factory.create :page
+    # create page with slug=english-title-1
+    @page = Factory(:page)
   end
   
   after do
@@ -16,8 +16,15 @@ describe Kuhsaft::PagesController do
   
   describe 'should render successfully' do
     it '#show' do
-      get :show, :locale => 'en', :url => '/english-title'
+      get :show, :locale => 'en', :url => 'english-title-1'
+      response.response_code.should eq(200)
       response.should be_success
     end
   end
+  
+  describe 'should render 404' do
+    it 'should raise RoutingError by default' do
+      expect{ get :show, :locale => 'en', :url => '/i-dont-know' }.to raise_error(ActionController::RoutingError)
+    end
+  end
 end

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,11 @@
 module ApplicationHelper
+  def available_parent_pages
+    pages = []
+    pages << { :title => t('kuhsaft.cms.pages.new.pages'), :link => cms_pages_path(:locale => :en) }
+    if params[:parent_id].present?
+      parent_page = Kuhsaft::Page.find(params[:parent_id])
+      pages += parent_page.parent_pages
+    end
+    pages << { :title => t('kuhsaft.cms.pages.new.new_page'), :link => '#' }
+  end
 end

data/spec/helpers/application_helper_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe ApplicationHelper do
+  context 'when the user creates a toplevel page' do
+    describe '#available_parent_pages' do
+      it 'should return the 2 pages' do
+        helper.available_parent_pages.should have(2).pages
+      end
+    end  
+  end
+  
+  describe '#available_parent_pages' do
+    before do
+      page1, page2, page3 = create_page_tree
+      helper.stub!(:params).and_return(:parent_id => page3.id)
+    end    
+    
+    it 'should return the parent pages' do
+      helper.available_parent_pages.should have_at_least(3).pages
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kuhsaft
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - "Immanuel H\xC3\xA4ussermann"
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 Z
+date: 2011-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
@@ -412,6 +412,7 @@ files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/factories.rb
+- spec/helpers/application_helper_spec.rb
 - spec/helpers/pages_helper_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/kuhsaft_spec.rb
@@ -493,6 +494,7 @@ test_files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/factories.rb
+- spec/helpers/application_helper_spec.rb
 - spec/helpers/pages_helper_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/kuhsaft_spec.rb