kuhsaft 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a644e28bc6049a19a8878e3476d648d7257000e2
-  data.tar.gz: dd5345fd7f913827a6efb2056cd9f79dfb598f36
+  metadata.gz: eb1fd5cd01b12e0073bc958764ab539ee15cbb15
+  data.tar.gz: 5234c1898170292b3b0e58907ef2162438920206
 SHA512:
-  metadata.gz: a884c25283286b6a15e7b450e6467b870d9220c0e940af760ead60e369fb1a8a6ffaf1a8119d267c0b1ee7743a4f5b216810f0522fb0fc8ab620531198218daa
-  data.tar.gz: 95fb7cce42f9f7919ea94a4da3e9d47096e15651f32b56ddca2d188c84db3c9f104c1078dac92ae575a078c9c144adf384c21f40f16e32d0bfd254d36a3c1364
+  metadata.gz: 4615e27fd351dfbbb4574be8d1fa24548301dbc747658825d4e397f8033162b5549763e8a1af9131c1e0814f47b624be23c0ed84d4771db31f7c61d27cc24894
+  data.tar.gz: 03d92616ceefbfc8a7df1ab07322cfd7437bd5e518cc04338620ed126ff1c6fa11375c01ac6ff640d2418f240b14732f3a202bbf434cc5ed85100372ad9d1fa3

data/app/assets/javascripts/kuhsaft/cms/{application.js.coffee → application.js.coffee.erb}

@@ -8,14 +8,17 @@
 #= require jquery_ujs
 #= require jquery.ui.all
 #= require bootstrap
-#= require ckeditor/init
+#= require ckeditor-jquery
 #= require jquery.nestable
 #= require_tree .
 
-CKEDITOR.config.customConfig = '/assets/kuhsaft/cms/ck-config.js'
+# As @ryabrody & @k-graefenhain found out there is obviously a bug which causes the asset_path_helper to return paths always without digest:
+# https://github.com/rails/sprockets-rails/issues/66
+# That's why we need the environment switch here:
+CKEDITOR.config.customConfig = "<%= Rails.env.development? ? asset_path('kuhsaft/cms/ck-config.js') : asset_path('assets/' + Rails.application.assets.find_asset('kuhsaft/cms/ck-config.js').digest_path) %>"
 
 loadTextEditor = ->
-  CKEDITOR.replaceAll('editor')
+  CKEDITOR.replaceAll('ckeditor')
 
 checkPageType = ->
   redirect_url_input = $('#page_redirect_url')
@@ -46,7 +49,7 @@ window.initSubmitLinks = (selector = null)->
 
   selector.find('a.submit')
     .click (e)->
-      $('textarea.editor').each (index, elem) ->
+      $('textarea.ckeditor').each (index, elem) ->
         CKEDITOR.instances[elem.id].updateElement()
 
       form = $(this).closest('form')

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

@@ -150,7 +150,7 @@ form
       .control-label
         font-weight: bold
 
-textarea.editor
+textarea.ckeditor
   height: 263px
   display: block !important
   visibility: show !important

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

@@ -1,6 +1,6 @@
 module Kuhsaft
   module Cms
-    class AdminController < InheritedResources::Base
+    class AdminController < ActionController::Base
       respond_to :html
       layout 'kuhsaft/cms/application'
       before_filter :set_content_locale
@@ -16,4 +16,4 @@ module Kuhsaft
       end
     end
   end
-end
+end

data/app/helpers/kuhsaft/cms/pages_helper.rb

@@ -3,16 +3,20 @@ module Kuhsaft
     module PagesHelper
 
       def content_tab_active(page)
-        if page.errors.blank?
-          :active if page.persisted?
+        unless hide_content_tab?(page)
+          :active
         end
       end
 
       def metadata_tab_active(page)
-        if page.errors.present? || !page.persisted? || page.redirect?
+        if hide_content_tab?(page)
           :active
         end
       end
+
+      def hide_content_tab?(page)
+        page.redirect? || !page.translated? || !page.persisted? || page.errors.present?
+      end
     end
   end
 end

data/app/models/kuhsaft/page.rb

@@ -83,6 +83,10 @@ class Kuhsaft::Page < ActiveRecord::Base
     ancestors
   end
 
+  def translated?
+    url.present? && title.present? && slug.present?
+  end
+
   def link
     if bricks.count == 0 && children.count > 0
       children.first.link

data/app/views/kuhsaft/cms/bricks/create.js.haml

@@ -5,4 +5,4 @@ var newlyInsertedBrick = $("##{@brick.to_brick_item_id}")
 initSavePopover(newlyInsertedBrick)
 initSubmitLinks(newlyInsertedBrick)
 
-$(newlyInsertedBrick).find('textarea.editor').each(function (index, elem) { initCKEditor(elem.id) })
+$(newlyInsertedBrick).find('textarea.ckeditor').each(function (index, elem) { initCKEditor(elem.id) })

data/app/views/kuhsaft/cms/bricks/update.js.haml

@@ -5,4 +5,4 @@ var newlyInsertedBrick = $("##{@brick.to_brick_item_id}")
 initSavePopover(newlyInsertedBrick)
 initSubmitLinks(newlyInsertedBrick)
 
-$(newlyInsertedBrick).find('textarea.editor').each(function (index, elem) { initCKEditor(elem.id) })
+$(newlyInsertedBrick).find('textarea.ckeditor').each(function (index, elem) { initCKEditor(elem.id) })

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

@@ -1,7 +1,7 @@
 %ul.nav.nav-tabs.js-tabs
   %li{ :class => metadata_tab_active(@page) }
     = link_to t('.tab_metadata'), '#page-metadata', 'data-toggle' => :tab
-  - unless @page.redirect?
+  - unless hide_content_tab?(@page)
     %li{ :class => content_tab_active(@page) }
       = link_to t('.tab_content'), '#page-content', 'data-toggle' => :tab
 
@@ -22,7 +22,7 @@
       .form-actions
         = form.button :submit, :class => 'btn btn-primary'
 
-  - unless @page.redirect?
+  - unless hide_content_tab?(@page)
     #page-content.tab-pane{ :class => content_tab_active(@page) }
       - if @page.persisted?
         .clearfix

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

@@ -9,7 +9,7 @@
         = render brick
 
 - else
-  - cache [@page, I18n.locale] do
+  - cache [@page, I18n.locale, @page.children] do
     - unless @page.blank?
       .page-content
         -# TODO: refactor into scopes or simplify otherwise:

data/app/views/kuhsaft/text_bricks/text_brick/_edit.html.haml

@@ -1,2 +1,2 @@
-= form.input :text, :as => :text, :input_html => { :class => 'editor', :id => "#{brick.to_style_id}-text" }
-= form.input :read_more_text, :as => :text, :input_html => { :class => 'editor', :id => "#{brick.to_style_id}-read-more" }
+= form.input :text, :as => :text, :input_html => { :class => 'ckeditor', :id => "#{brick.to_style_id}-text" }
+= form.input :read_more_text, :as => :text, :input_html => { :class => 'ckeditor', :id => "#{brick.to_style_id}-read-more" }

data/lib/kuhsaft.rb

@@ -14,6 +14,5 @@ module Kuhsaft
   require 'ancestry'
   require 'bootstrap-sass'
   require 'haml'
-  require 'ckeditor'
-  require 'inherited_resources'
+  require 'ckeditor_rails'
 end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/lib/templates/kuhsaft/assets/ck-config.js.coffee

@@ -2,12 +2,14 @@ CKEDITOR.editorConfig = (config) ->
   config.language = "de"
   config.removeButtons = "Anchor,Underline,Strike,Subscript,Superscript"
   config.format_tags = "p;h1;h2;h3;h4;pre"
-  config.toolbarGroups = [["Format"],
-                          ["Bold", "Italic", "Underline", "Strike", "-", "Subscript", "Superscript"],
-                          ["Table", "HorizontalRule", "SpecialChar"], ["Link", "Unlink"],
-                          ["Undo", "Redo", "-", "RemoveFormat", "Cut", "Copy", "Paste"],
-                          ["Source", "-", "ShowBlocks", "-", "About"],
-                          ["Maximize"]]
+  config.toolbar = [["Format"],
+                    ["Bold", "Italic", "Underline", "Strike", "-", "Subscript", "Superscript"],
+                    ["Table", "HorizontalRule", "SpecialChar"], ["Link", "Unlink"],
+                    ["Undo", "Redo", "-", "RemoveFormat", "Cut", "Copy", "Paste"],
+                    ["Source", "-", "ShowBlocks", "-", "About"],
+                    ["Maximize"]]
+
+  true
 
 # FULL OPTIONS:
 #[

data/spec/dummy/app/assets/javascripts/kuhsaft/cms/ck-config.js.coffee

@@ -2,12 +2,14 @@ CKEDITOR.editorConfig = (config) ->
   config.language = "de"
   config.removeButtons = "Anchor,Underline,Strike,Subscript,Superscript"
   config.format_tags = "p;h1;h2;h3;h4;pre"
-  config.toolbarGroups = [["Format"],
-                          ["Bold", "Italic", "Underline", "Strike", "-", "Subscript", "Superscript"],
-                          ["Table", "HorizontalRule", "SpecialChar"], ["Link", "Unlink"],
-                          ["Undo", "Redo", "-", "RemoveFormat", "Cut", "Copy", "Paste"],
-                          ["Source", "-", "ShowBlocks", "-", "About"],
-                          ["Maximize"]]
+  config.toolbar = [["Format"],
+                    ["Bold", "Italic", "Underline", "Strike", "-", "Subscript", "Superscript"],
+                    ["Table", "HorizontalRule", "SpecialChar"], ["Link", "Unlink"],
+                    ["Undo", "Redo", "-", "RemoveFormat", "Cut", "Copy", "Paste"],
+                    ["Source", "-", "ShowBlocks", "-", "About"],
+                    ["Maximize"]]
+
+  true
 
 # FULL OPTIONS:
 #[

data/spec/helpers/kuhsaft/cms/pages_helper_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Kuhsaft::Cms::PagesHelper do
+  describe '#content_tab_active' do
+    it 'returns active when page has a title and no errors' do
+      @page = create(:page, title: 'Page 1', slug: 'page1')
+      expect(helper.content_tab_active(@page)).to be(:active)
+    end
+
+    it 'returns nil when page has no translation' do
+      @page = create(:page, title: 'Page 1', slug: 'page1')
+      I18n.with_locale :de do
+        expect(helper.content_tab_active(@page)).to be_nil
+      end
+    end
+  end
+
+  describe '#metadata_tab_active' do
+    it 'returns active when page is not translated' do
+      @page = create(:page, title: 'Page 1', slug: 'page1')
+      I18n.with_locale :de do
+        expect(helper.metadata_tab_active(@page)).to be(:active)
+      end
+    end
+  end
+
+  describe '#hide_content_tab?' do
+    it 'has a page without translations' do
+      @page = create(:page, title: 'Page 1', slug: 'page1')
+      I18n.with_locale :de do
+        expect(helper.hide_content_tab?(@page)).to be_true
+      end
+    end
+
+    it 'has a redirect page' do
+      @page = create(:page, title: 'Page 1', slug: 'page1', page_type: Kuhsaft::PageType::REDIRECT, redirect_url: 'en/references')
+      expect(helper.hide_content_tab?(@page)).to be_true
+    end
+
+    it 'has a not saved page' do
+      @page = Kuhsaft::Page.new
+      expect(helper.hide_content_tab?(@page)).to be_true
+    end
+  end
+end

data/spec/models/page_spec.rb

@@ -309,6 +309,20 @@ describe Kuhsaft::Page do
     end
   end
 
+  describe '#translated?' do
+    it 'returns true when page is translated' do
+      @page = create(:page, title: 'Page 1', slug: 'page1')
+      expect(@page.translated?).to be_true
+    end
+
+    it 'returns false when page has no translation' do
+      @page = create(:page, title: 'Page 1', slug: 'page1')
+      I18n.with_locale :de do
+        expect(@page.translated?).to be_false
+      end
+    end
+  end
+
   describe '#fulltext' do
     let :page do
       p = create(:page, :keywords => 'key words', :description => 'descrip tion', :title => 'my title')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -211,19 +211,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ckeditor
+  name: ckeditor_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: pg_search
   requirement: !ruby/object:Gem::Requirement
@@ -322,20 +322,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: inherited_resources
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -399,7 +385,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/assets/javascripts/kuhsaft/application.js.coffee
-- app/assets/javascripts/kuhsaft/cms/application.js.coffee
+- app/assets/javascripts/kuhsaft/cms/application.js.coffee.erb
 - app/assets/javascripts/kuhsaft/views/read_more_view.js.coffee
 - app/assets/stylesheets/kuhsaft/application.css.sass
 - app/assets/stylesheets/kuhsaft/cms/application.css.sass
@@ -556,7 +542,6 @@ files:
 - vendor/assets/stylesheets/nestable.css
 - Rakefile
 - README.md
-- spec/controllers/kuhsaft/cms/admin_controller_spec.rb
 - spec/controllers/kuhsaft/pages_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/spec-image.png
@@ -602,6 +587,7 @@ files:
 - spec/features/cms_pages_spec.rb
 - spec/features/search_spec.rb
 - spec/helpers/kuhsaft/cms/admin_helper_spec.rb
+- spec/helpers/kuhsaft/cms/pages_helper_spec.rb
 - spec/helpers/kuhsaft/pages_helper_spec.rb
 - spec/kuhsaft_spec.rb
 - spec/lib/brick_list_spec.rb
@@ -649,12 +635,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kuhsaft
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: A tool that helps you to manage your content within your app.
 test_files:
-- spec/controllers/kuhsaft/cms/admin_controller_spec.rb
 - spec/controllers/kuhsaft/pages_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/spec-image.png
@@ -700,6 +685,7 @@ test_files:
 - spec/features/cms_pages_spec.rb
 - spec/features/search_spec.rb
 - spec/helpers/kuhsaft/cms/admin_helper_spec.rb
+- spec/helpers/kuhsaft/cms/pages_helper_spec.rb
 - spec/helpers/kuhsaft/pages_helper_spec.rb
 - spec/kuhsaft_spec.rb
 - spec/lib/brick_list_spec.rb

data/spec/controllers/kuhsaft/cms/admin_controller_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe Kuhsaft::Cms::AdminController do
-  subject { described_class }
-
-  it { expect(Kuhsaft::Cms::AdminController.ancestors).to include(InheritedResources::Base) }
-end