kuhsaft 1.8.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48c854f81cbe7f88f0a9512cd2f5cc2c2ba080a2
-  data.tar.gz: 4027155e3d1457db220d0eb760f52532861b2f36
+  metadata.gz: cdb395046c4e56187d9f092401a4f1d5ed4c1680
+  data.tar.gz: 72d98cdb63209815fbcc094935b9cbec4cfc24b2
 SHA512:
-  metadata.gz: bb2ec761d28e18fc45c9859e42b40a19d34f5796638f2ad6856ae3371944fae906e5d61f256336771dafdad1a78e6a03b6c68005612da74024749cd88cd65483
-  data.tar.gz: cf2f3963a64c2e27e3d6701c58274d379060d92187d8967c21b105d19938290a5092b4fa6e973aae67d25c9181bd3bc2729668d970618a4cfa81bc25c32530f9
+  metadata.gz: 7b5f78b5dbe7d069bbcebe544e9736e321a08adac1b7c02b9b88599bba6b44df05ff954e13c37c9ec8b92298f792237f78edc651c398e7bad311457ba7ca023e
+  data.tar.gz: a802f2f2ecc7f1b21763d3c0af745a436ab2aa5b22ff92fffd13f96bc52c4dddac923656b9b4ab9a53ae72da65d57d462a8ba570b10a2c1f8ee2f233f4c1cb9f

data/README.md

@@ -1,4 +1,6 @@
-[![Build Status](https://api.travis-ci.org/screenconcept/kuhsaft.png)](http://travis-ci.org/screenconcept/kuhsaft)
+[![Build Status](https://travis-ci.org/screenconcept/kuhsaft.png)](https://travis-ci.org/screenconcept/kuhsaft)
+[![Code Climate](https://codeclimate.com/github/screenconcept/kuhsaft.png)](https://codeclimate.com/github/screenconcept/kuhsaft)
+[![Gem Version](https://badge.fury.io/rb/kuhsaft.png)](http://badge.fury.io/rb/kuhsaft)
 
 # Kuhsaft. A CMS as simple as it could be
 
@@ -223,13 +225,6 @@ Building a navigation is simple, access to the page tree is available through th
       end
     end
 
-## Use the `page_title` attribute in your app
-
-Kuhsaft::Pages will provide a `%title` tag containing its `page_title` (or the required `title`if no title is present). Simply yield for `:head` in your `application.html` to use it.
-
-    %head
-      = yield(:head)
-
 ## Modifying the backend navigation
 
 Simply override the default partial for the main navigation in your app with your own file at `kuhsaft/cms/admin/_main_navigation.html.haml`

data/Rakefile

@@ -1,19 +1,8 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
 
-require 'rspec'
+require "bundler/gem_tasks"
+require 'rake/testtask'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec) do |specs|
-  specs.rspec_opts = %w{--color}
-end
-
-task :default => :spec
-
 begin
   require 'rdoc/task'
 rescue LoadError
@@ -23,7 +12,7 @@ rescue LoadError
 end
 
 desc "Run specs"
-RSpec::Core::RakeTask.new(:spec => :setup)
+RSpec::Core::RakeTask.new
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -33,14 +22,4 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 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`
-  end
-end
-
-Bundler::GemHelper.install_tasks
+task :default => [:spec]

data/app/assets/javascripts/kuhsaft/cms/application.js.coffee

@@ -5,8 +5,8 @@
 # the compiled file.
 #
 #= require jquery
-#= require jquery-ui
 #= require jquery_ujs
+#= require jquery.ui.all
 #= require bootstrap
 #= require ckeditor/init
 #= require jquery.nestable
@@ -90,4 +90,4 @@ $(document).ready ->
     pageTree = $('.dd').nestable('serialize')
     url = '/cms/pages/sort'
     $.post(url, { page_tree: pageTree }, "json")
-  )
+  )

data/app/assets/stylesheets/kuhsaft/cms/application.css.sass

@@ -10,9 +10,6 @@ $borderRadiusLarge: 0px
 $borderRadiusSmall: 0px
 
 @import bootstrap
-@import compass/css3
-@import nestable
-
 // base styles
 
 body
@@ -32,7 +29,7 @@ form
 .breadcrumb
   background: #fff
   opacity: 0.4
-  +single-transition(all, 0.3s)
+  @include transition(all, 0.3s)
 
 .breadcrumb:hover
   opacity: 1
@@ -58,12 +55,12 @@ form
   padding: 0.5em
 
   .btn
-    +opacity(0)
-    +single-transition(oapcity, 0.2s)
+    opacity: 0
+    @include transition(opacity, 0.2s)
 
   &:hover
     .btn
-      +opacity(1)
+      opacity: 1
 
 .btn-toolbar
   margin-top: 0
@@ -163,5 +160,4 @@ textarea.editor
   .controls
     min-height: 271px
 
-@import nestable
 @import bootstrap-responsive

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

@@ -5,15 +5,15 @@ 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]
         end
       end
-
-      def url_options
-        { content_locale: I18n.locale }.merge(super)
-      end
     end
   end
 end

data/app/controllers/kuhsaft/pages_controller.rb

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

data/app/models/kuhsaft/asset.rb

@@ -1,5 +1,5 @@
 class Kuhsaft::Asset < ActiveRecord::Base
-  scope :by_date, order('updated_at DESC')
+  scope :by_date, -> { order('updated_at DESC') }
   mount_uploader :file, Kuhsaft::AssetUploader
   
   def file_type
@@ -23,4 +23,4 @@ class Kuhsaft::Asset < ActiveRecord::Base
   def filename
     try(:file).try(:file).try(:filename)
   end
-end
+end

data/app/models/kuhsaft/brick_type.rb

@@ -1,8 +1,8 @@
 module Kuhsaft
   class BrickType < ActiveRecord::Base
     attr_accessible :disabled, :class_name, :group
-    scope :grouped, order('`group`, `id` asc')
-    scope :enabled, where(:enabled => true)
-    scope :constrained, lambda { |list| where(:class_name => list) }
+    scope :grouped, -> { order('`group`, `id` asc') }
+    scope :enabled, -> { where(:enabled => true) }
+    scope :constrained, ->(list) { where(:class_name => list) }
   end
 end

data/app/models/kuhsaft/page.rb

@@ -9,7 +9,6 @@ class Kuhsaft::Page < ActiveRecord::Base
   acts_as_brick_list
 
   translate :title,
-    :page_title,
     :slug,
     :keywords,
     :description,
@@ -18,7 +17,6 @@ class Kuhsaft::Page < ActiveRecord::Base
     :url
 
   attr_accessible :title,
-    :page_title,
     :slug,
     :redirect_url,
     :url,
@@ -29,16 +27,16 @@ class Kuhsaft::Page < ActiveRecord::Base
     :published,
     :position
 
-  default_scope order('position ASC')
+  default_scope { order('position ASC') }
 
-  scope :published, where(:published => Kuhsaft::PublishState::PUBLISHED)
+  scope :published, -> { where(:published => Kuhsaft::PublishState::PUBLISHED) }
 
   # TODO: cleanup page_types (content pages => nil or PageType::CONTENT
-  scope :content_page, where(
+  scope :content_page, -> { where(
     ["page_type is NULL or page_type = ?",
-     Kuhsaft::PageType::CONTENT])
+     Kuhsaft::PageType::CONTENT]) }
 
-  scope :navigation, lambda{ |slug|
+  scope :navigation, ->(slug) {
     where(locale_attr(:slug) => slug).where(
       locale_attr(:page_type) => Kuhsaft::PageType::NAVIGATION) }
 

data/app/uploaders/kuhsaft/asset_brick_asset_uploader.rb

@@ -13,7 +13,7 @@ class Kuhsaft::AssetBrickAssetUploader < CarrierWave::Uploader::Base
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "uploads/#{model.class.name.underscore.gsub(/^kuhsaft/,'cms')}/#{mounted_as}/#{model.id}"
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:

data/app/uploaders/kuhsaft/image_brick_image_uploader.rb

@@ -12,7 +12,7 @@ module Kuhsaft
     # Override the directory where uploaded files will be stored.
     # This is a sensible default for uploaders that are meant to be mounted:
     def store_dir
-      "uploads/#{model.class.name.underscore.gsub(/^kuhsaft/,'cms')}/#{mounted_as}/#{model.id}"
+      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
     end
 
     # Provide a default URL as a default if there hasn't been a file uploaded:

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

@@ -10,7 +10,6 @@
     = simple_form_for @page, :url => url, :html => { :class => 'form-horizontal' } do |form|
       = form.input :title, :required => false, :input_html => { :class => :span5 }
       = form.input :slug, :required => false, :input_html => { :class => :span5 }
-      = form.input :page_title, :required => false, :input_html => { :class => :span5 }
       = form.input :parent_id, :collection => Kuhsaft::Page.flat_tree, :label_method => :nesting_name, :selected => params[:parent_id].presence || @page.parent_id.presence, :prompt => 'None', :input_html => { :class => :span3 }
       = form.input :page_type, :collection => Kuhsaft::PageType.all, :prompt => false, :input_html => { :class => :span3 }
       = form.input :redirect_url, :as => :string

data/app/views/kuhsaft/pages/show.html.haml

@@ -1,17 +1,12 @@
-= content_for :head do
-  %title= @page.page_title.present? ? @page.page_title : @page.title
-
 - if @page.bricks.map(&:type).include? "Kuhsaft::PlaceholderBrick"
   - unless @page.blank?
     .page-content
-      -# TODO: refactor into scopes or simplify otherwise:
-      - @page.bricks.localized.select(&:valid?).each do |brick|
+      - @page.bricks.localized.each do |brick|
         = render brick
 
 - else
   - cache [@page, I18n.locale] do
     - unless @page.blank?
       .page-content
-        -# TODO: refactor into scopes or simplify otherwise:
-        - @page.bricks.localized.select(&:valid?).each do |brick|
+        - @page.bricks.localized.each do |brick|
           = render brick

data/config/locales/kuhsaft.de.yml

@@ -5,9 +5,6 @@ de:
       admin:
         pages_nav: 'Seiten'
         assets_nav: 'Assets'
-      cms:
-        flash:
-          success: 'Seite wurde erfolgreich aktualisiert'
   kuhsaft:
     page_part:
       markdown: 'Formatierter Text'
@@ -47,4 +44,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,9 +5,6 @@ en:
       admin:
         pages_nav: 'Pages'
         assets_nav: 'Assets'
-      cms:
-        flash:
-          success: 'Page was updated successfully'
   kuhsaft:
     page_part:
       markdown: 'Formatted Text'

data/config/locales/models/kuhsaft/page/de.yml

@@ -8,7 +8,6 @@ de:
       kuhsaft/page:
         title: 'Titel'
         slug: 'URL Name'
-        page_title: 'Seitentitel (im Browser)'
         keywords: 'Stichwörter'
         description: 'Beschreibung'
         redirect_url: 'Redirect URL'

data/config/routes.rb

@@ -15,6 +15,6 @@ Kuhsaft::Engine.routes.draw do
     resources :pages,
       :only => [:index],
       :defaults => { :locale => I18n.locale }
-    match '(*url)' => 'pages#show', :as => :page
+    get '(*url)' => 'pages#show', :as => :page
   end
 end

data/lib/kuhsaft.rb

@@ -8,11 +8,12 @@ module Kuhsaft
   require 'simple_form'
   require 'carrierwave'
   require 'rdiscount'
-  require 'compass'
-  require 'compass-rails'
+  require 'bourbon'
   require 'jquery-rails'
+  require 'jquery-ui-rails'
   require 'ancestry'
   require 'bootstrap-sass'
   require 'haml'
   require 'ckeditor'
+  require 'protected_attributes'
 end

data/lib/kuhsaft/searchable.rb

@@ -33,7 +33,6 @@ module Kuhsaft
           {
             :against => {
               locale_attr(:title)       => 'A',
-              locale_attr(:page_title)  => 'A',
               locale_attr(:keywords)    => 'B',
               locale_attr(:description) => 'C',
               locale_attr(:fulltext)    => 'C',
@@ -62,10 +61,9 @@ module Kuhsaft
             stmt = ""
             stmt += "#{locale_attr(:keywords)} LIKE ? OR "
             stmt += "#{locale_attr(:title)} LIKE ? OR "
-            stmt += "#{locale_attr(:page_title)} LIKE ? OR "
             stmt += "#{locale_attr(:description)} LIKE ? OR "
             stmt += "#{locale_attr(:fulltext)} LIKE ?"
-            where(stmt, *(["%#{query}%"] * 5))
+            where(stmt, *(["%#{query}%"] * 4))
           end
         }
       end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "1.8.6"
+  VERSION = "2.0.0"
 end

data/spec/controllers/kuhsaft/pages_controller_spec.rb

@@ -22,6 +22,30 @@ 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
@@ -66,19 +90,7 @@ 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')
-        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('/')
+          expect(response).to redirect_to("/de/redirect_page")
         end
       end
     end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <%= yield(:head) %>
+  <title>Dummy</title>
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'