kuhsaft 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1888dcf05a0ec09cdbc8e11da4342dc2ad852ed3
-  data.tar.gz: e5fe636466e862043f38105120251d592b132718
+  metadata.gz: eecde1b2e276afa2b521baaf04bd0312a4ec74d9
+  data.tar.gz: 257ed6496e7b45df88df4f8d556875164eef0013
 SHA512:
-  metadata.gz: 6306a8ffd5e2802eee8ad4629e591c52579be272b2ad84c58a5d63ec868a17843c7f0cd20014df551b47323e3c67ea5f33ff5977f42594098b2c28f6b06d2585
-  data.tar.gz: 16885f03b3401ba983a1f26573435722508f47b7b7f819ca6c61ffa34ae65065d0630b75a71f46b0097a55b340b2b282f15eee38eecdcf19e1277358734a2cf5
+  metadata.gz: 8ed475ede79f506ecfb728f9eefa525e9116f2cb956949cbf661ff13dd3953fa957e4285e38e44868a7acec6934ce2bec7c64f046f5613eaac217c3ca52ace7c
+  data.tar.gz: 131744bc047b4d30e1626f4c69b90d4f3c221f1f9ce6488ba59db4ad0371873676edf54c6d734ee18c3f4c5fc8b26ccc650754636d581fbad4f2b4bbd6a867b9

data/Rakefile

@@ -12,7 +12,7 @@ rescue LoadError
 end
 
 desc "Run specs"
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new(:spec => :setup)
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -24,6 +24,8 @@ end
 
 task :setup do
   Dir.chdir('spec/dummy') do
+    `bundle exec rake kuhsaft:install:migrations`
+    `bundle exec rails generate kuhsaft:install:assets`
     `bundle exec rake db:create`
     `bundle exec rake db:migrate`
     `bundle exec rake db:test:prepare`

data/app/controllers/kuhsaft/cms/admin_controller.rb

@@ -5,10 +5,6 @@ module Kuhsaft
       layout 'kuhsaft/cms/application'
       before_filter :set_content_locale
 
-      def url_options
-        { content_locale: I18n.locale }.merge(super)
-      end
-
       def set_content_locale
         if params[:content_locale].present?
           I18n.locale = params[:content_locale]

data/app/controllers/kuhsaft/pages_controller.rb

@@ -15,7 +15,8 @@ module Kuhsaft
       @page = Kuhsaft::Page.find_by_url(url)
 
       if @page.present? && @page.redirect? && @page.redirect_url.present?
-        redirect_to "/#{@page.redirect_url}"
+        redirect_url = @page.redirect_url.sub(/\A\/+/,'') # remove all preceding slashes
+        redirect_to "/#{redirect_url}"
       elsif @page.present?
         respond_with @page
       elsif @page.blank? && respond_to?(:handle_404)

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

@@ -3,7 +3,6 @@
     - pages.each do |page|
       %li.dd-item.dd3-item{ 'data-id' => page.id }
         .dd-handle.dd3-handle
-          handle
         .dd3-content{ class: page.state_class }
           = link_to page.title.presence, kuhsaft.edit_cms_page_path(page)
 

data/config/locales/kuhsaft.de.yml

@@ -5,6 +5,9 @@ de:
       admin:
         pages_nav: 'Seiten'
         assets_nav: 'Assets'
+      cms:
+        flash:
+          success: 'Seite wurde erfolgreich aktualisiert'
   kuhsaft:
     page_part:
       markdown: 'Formatierter Text'
@@ -44,4 +47,4 @@ de:
       title: 'Seiten Titel'
       slug: 'URL Segment'
       page_part_type: 'Element hinzufügen'
-      _destroy: 'Diese Element löschen'
+      _destroy: 'Diese Element löschen'

data/config/locales/kuhsaft.en.yml

@@ -5,6 +5,9 @@ en:
       admin:
         pages_nav: 'Pages'
         assets_nav: 'Assets'
+      cms:
+        flash:
+          success: 'Page was updated successfully'
   kuhsaft:
     page_part:
       markdown: 'Formatted Text'

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/controllers/kuhsaft/pages_controller_spec.rb

@@ -22,30 +22,6 @@ describe Kuhsaft::PagesController do
   end
 
   describe '#show' do
-    describe 'redirect' do
-      around(:each) do |example|
-        I18n.with_locale :de do
-          example.run
-        end
-      end
-
-      context 'when page is not a redirect page' do
-        it 'responds with page' do
-          page = FactoryGirl.create(:page, :slug => 'dumdidum', :url => 'de/dumdidum')
-          get :show,  { :url => page.slug, :use_route => :kuhsaft }
-          assigns(:page).should eq(page)
-        end
-      end
-
-      context 'when page is a redirect page' do
-        it 'redirects to the redirected url' do
-          page = FactoryGirl.create(:page, :page_type => 'redirect', :slug => 'dumdidum', :url => 'de/dumdidum', :redirect_url => 'de/redirect_page')
-          get :show,  { :url => page.slug, :use_route => :kuhsaft }
-          expect(response).to redirect_to("/de/redirect_page")
-        end
-      end
-    end
-
     describe 'routing' do
       context 'without url' do
         before do
@@ -90,7 +66,19 @@ describe Kuhsaft::PagesController do
         it 'redirects to the redirected url' do
           page = FactoryGirl.create(:page, :page_type => 'redirect', :slug => 'dumdidum', :url => 'de/dumdidum', :redirect_url => 'de/redirect_page')
           get :show,  { :url => page.slug, :use_route => :kuhsaft }
-          expect(response).to redirect_to("/de/redirect_page")
+          expect(response).to redirect_to('/de/redirect_page')
+        end
+
+        it 'redirects to invalid redirect urls with too many preceding slashes' do
+          page = FactoryGirl.create(:page, :page_type => 'redirect', :slug => 'dumdidum', :url => 'de/dumdidum', :redirect_url => '///de/redirect_page')
+          get :show,  { :url => page.slug, :use_route => :kuhsaft }
+          expect(response).to redirect_to('/de/redirect_page')
+        end
+
+        it 'redirects to root' do 
+          page = FactoryGirl.create(:page, :page_type => 'redirect', :slug => 'dumdidum', :url => 'de/dumdidum', :redirect_url => '/')
+          get :show,  { :url => page.slug, :use_route => :kuhsaft }
+          expect(response).to redirect_to('/')
         end
       end
     end

data/spec/spec_helper.rb

@@ -35,18 +35,8 @@ RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
 
   config.before :suite do
-
-    load File.expand_path("../dummy/Rakefile", __FILE__)
-    Dir.chdir(File.join(File.dirname(__FILE__), './dummy')) do
-      Rake::Task['kuhsaft:install:migrations'].invoke
-      Rails::Generators.invoke('kuhsaft:install:assets')
-    end
-
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)
-    # Drop all records and run any available migration
-    ActiveRecord::Base.connection.tables.each { |table| ActiveRecord::Base.connection.drop_table(table) }
-    ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
   end
 
   config.after :suite do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec