kuhsaft 1.4.3 → 1.5.0

data/app/controllers/kuhsaft/pages_controller.rb

@@ -3,11 +3,11 @@ module Kuhsaft
     respond_to :html
 
     def show
-      @url = "#{params[:locale]}/#{params[:url]}" if params[:url].present? && params[:locale].present?
-      @page = Kuhsaft::Page.find_by_url(@url)
-      if @page.present?
-        respond_with @page
-      else
+      url = locale.to_s
+      url += "/#{params[:url]}" if params[:url].present?
+      @page = Kuhsaft::Page.find_by_url(url)
+
+      unless @page.present?
         if respond_to?(:handle_404)
           handle_404
         else

data/config/routes.rb

@@ -9,5 +9,8 @@ Kuhsaft::Engine.routes.draw do
     root :to => 'pages#index'
   end
 
-  match '/:locale/*url' => 'pages#show'
+  scope ":locale", :locale => /#{I18n.available_locales.join('|')}/ do
+    resources :pages, :only => [:index]
+    match '*url' => 'pages#show'
+  end
 end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "1.4.3"
+  VERSION = "1.5.0"
 end

data/spec/controllers/kuhsaft/pages_controller_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Kuhsaft::PagesController do
+  subject { described_class }
+
+  describe '#show' do
+    context 'without url' do
+      before do
+        @page = FactoryGirl.create(:page, :url_de => 'de')
+      end
+
+      context 'with matching locale' do
+        it 'sets the corresponding page' do
+          I18n.with_locale(:de) do
+            get(:show,  { :use_route => :kuhsaft })
+          end
+          assigns(:page).should eq(@page)
+        end
+      end
+
+      context 'without matching locale' do
+        it 'raises a routing error' do
+          I18n.with_locale(:en) do
+            expect { get(:show,  { :use_route => :kuhsaft }) }.to raise_error(ActionController::RoutingError)
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -467,6 +467,7 @@ files:
 - lib/templates/kuhsaft/translations/add_translation.html.erb
 - Rakefile
 - README.md
+- spec/controllers/kuhsaft/pages_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/spec-image.png
 - spec/dummy/app/assets/javascripts/application.js
@@ -541,7 +542,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -429433574673147014
+      hash: 1500188424572130827
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -550,7 +551,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -429433574673147014
+      hash: 1500188424572130827
 requirements: []
 rubyforge_project: kuhsaft
 rubygems_version: 1.8.24
@@ -558,6 +559,7 @@ signing_key:
 specification_version: 3
 summary: A tool that helps you to manage your content within your app.
 test_files:
+- spec/controllers/kuhsaft/pages_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/spec-image.png
 - spec/dummy/app/assets/javascripts/application.js