skylinecms 3.1.0 → 3.2.0

data/.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+ydoc/*
+.yardoc
+pkg/*
+public/skyline/javascripts/doc/

data/CHANGELOG

@@ -1,6 +1,56 @@
 # Changelog for Skyline #
 
-## 3.1.0 (Juli 14, 2011) ##
+## 3.2.0 (November 1, 2011) ##
+
+### Core ###
+* [Core] Skyline is now an Engine! This changes quite a lot, please see doc/INSTALL
+* [Core] Skyline now works with Rails 3.0.x
+* [Core] Skyline now works on Ruby 1.9 (tested 1.9.2)
+* [Core] Add route constraints so they can be used in the implementation (Skyline::RouteConstraints)
+* [Core] Update will_paginate to rails compatible
+* [Core] Add TMail as gem dependency, it's no longer included in Rails
+* [Core] Update test_helpers and factory girl for rails3
+* [Core] Development versions now use the commit SHA1 as the patch version
+* [Core] Skyline does no longer force you to use Mootools in your application (Skyline itself still uses it)
+* [Core] Skyline does no longer overwrite the default form builder
+* [Core] Skyline now has a pluggable authentication interface. (Skyline::Authentication::User)
+
+### User interface (core) ###
+* [UI] Update tinyMCE to 3.4.4
+* [UI] Various fixes to the wysiwyg editor (mainly browser support)
+* [UI] Switch to unobtrusive rails helpers, include rails.js and update to mootools 1.3
+* [UI] Various minor UI fixes
+* [UI] Don't show section choice button if there are no sections to choose from.
+* [UI] Allow setting some parts of a Skyline.Panel with data- attributes
+* [UI] Fix drag & drop of last child of a subtree
+
+### Configuration (core) ###
+* [Config] Make the default skyline root route configurable (Configuration.default_route)
+* [Config] RSS section cache path is no longer required to be available unless you are using it
+
+### Referables (core) ###
+* [Referables] Add Linkable interface so we can browse for any object in the linkbrowser that defines this interface
+* [Referables] Use data-skyline-* attributes instead of our custom skyline-* so the wysiwyg is always valid HTML(5)
+* [Referables] Add InflineRef#compile_html, convert all doc to Yardoc
+
+### Articles ###
+* [Articles] Added support for `save_with_skip_version` so you can save an ArticleVersion without updating the version counter
+* [Articles] Added support for cloning
+* [Articles] Remove Article#enable_publishing? in favour of the documented Article.publishable?
+* [Articles] Remove Article#enable_locking? in favour of Article#lockable? and Article.lockable?
+* [Articles] Remove Article#enable_multiple_variants? in favour of Article.can_have_multiple_variants? and Article#can_have_multiple_variants?
+* [Articles] Remove unused Article#rollbackable?
+* [Articles] Add support for saving with_skip_version
+* [Articles] Fix destruction of last variant of a page that still has children
+
+### Media Library ###
+* [MediaLibrary] Add better caching to the Skyline::Media::DataController, also respond with a 404 if the image can't be found
+* [MediaLibrary] Fixed localizations for NL/EN
+
+### Content Elements ###
+* [ContentElements] Fix checkable_list editor for contentitems
+
+## 3.1.0 (July 14, 2011) ##
 
 ### Core ###
 * [Core] Update gemfile to work with bundler 1.0.7

data/Gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+
+gemspec
+
+group :test do
+  gem "factory_girl_rails", "1.1.0"
+  gem "shoulda", "2.9.1",        :require => "shoulda"
+end

data/Rakefile

@@ -1,12 +1,6 @@
 require File.dirname(__FILE__) + "/lib/skyline"
 require File.dirname(__FILE__) + "/lib/skyline/version"
 
-begin
-  require 'jeweler'
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end
-
 begin
   require 'yard'
 rescue LoadError
@@ -59,43 +53,6 @@ class Options < Hash
 end
 OPTIONS = Options.new
 
-namespace :gem do
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.version = Skyline.version
-    gemspec.name = "skylinecms"
-    gemspec.summary = "The new Ruby on Rails open source standard in content management"
-    gemspec.description = "Skyline is an extremely flexible and expandable open source content management system. Its feature rich interface allows for fast and intuitive management of websites."
-    gemspec.email = "info@digitpaint.nl"
-    gemspec.homepage = "http://www.skylinecms.nl"
-    gemspec.authors = ["DigitPaint"]
-  
-    gemspec.files.exclude "tasks/testing.rake"
-    gemspec.files.exclude "Gemfile"
-    gemspec.files.exclude ".gitignore"
-    gemspec.files.exclude "test/"
-  
-    gemspec.test_files = []
-  
-    gemspec.has_rdoc = false
-    gemspec.extra_rdoc_files = %w{README.md doc/MIGRATION.md}
-  
-    gemspec.add_dependency "thor", "0.12.0"
-  
-    gemspec.add_dependency "rails", "2.3.10"
-    gemspec.add_dependency "rack", "1.1.0"
-      
-    gemspec.add_dependency "polyglot", "0.2.6"
-    gemspec.add_dependency "sprockets", "1.0.2"
-    gemspec.add_dependency "mime-types", "1.16"
-    gemspec.add_dependency "rmagick", "2.9.1"
-    gemspec.add_dependency "hpricot", "0.8.2"
-    gemspec.add_dependency "guid", "0.1.1"
-    gemspec.add_dependency "will_paginate", "~>2.3.15"
-    gemspec.add_dependency "seed-fu", "~>1.2.0"
-  
-  end
-end
-
 namespace :doc do
   desc "Generate the Skyline CMS documentation (uses Yard)"
   YARD::Rake::YardocTask.new(:generate) do |t|

data/app/controllers/skyline/application_controller.rb

@@ -10,19 +10,21 @@ class Skyline::ApplicationController < ApplicationController
   
   class_inheritable_accessor :default_menu
   attr_accessor :current_menu
-  hide_action :default_menu, :default_menu=, :current_menu, :current_menu=, :menu
+  hide_action :default_menu, :default_menu=, :current_menu, :current_menu=, :menu, :javascript_redirect_to
   
 
   # Load all helpers
   Dir[Skyline.root + "app/helpers/**/*_helper.rb"].each do |helper|
-    helper helper.sub(Skyline.root + "app/helpers/","").sub(/_helper\.rb$/,"")
+    helper helper.sub(/^#{Regexp.escape((Skyline.root + "app/helpers/").to_s)}/,"").sub(/_helper\.rb$/,"")
   end
   
   # Load all plugin helpers so they can override stuff.
-  Dir[Skyline::PluginsManager.plugin_path + "*/app/helpers/**/*_helper.rb"].each do |helper|
-    helper helper.sub(/^#{Regexp.escape(Skyline::PluginsManager.plugin_path.to_s)}\/?.+?\/app\/helpers\//,"").sub(/_helper\.rb$/,"")
+  Dir[Rails.application.config.skyline_plugins_manager.plugin_path + "*/app/helpers/**/*_helper.rb"].each do |helper|
+    helper helper.sub(/^#{Regexp.escape(Rails.application.config.skyline_plugins_manager.plugin_path.to_s)}\/?.+?\/app\/helpers\//,"").sub(/_helper\.rb$/,"")
   end
   
+  define_callbacks :authenticate
+  
   
   class << self
         
@@ -57,17 +59,6 @@ class Skyline::ApplicationController < ApplicationController
       read_inheritable_attribute(:authorizations) || {}
     end
     
-    def insert_before_filter_after(identifier,*filters,&block)      
-      pos = 0
-      filter_chain.each_with_index do |f,i|
-        if f.identifier == identifier
-          pos = i
-          break
-        end
-      end
-      self.filter_chain.send(:update_filter_chain,filters, :before,pos+1, &block)
-    end
-    
   end
 
   protected
@@ -77,8 +68,8 @@ class Skyline::ApplicationController < ApplicationController
     I18n.locale = Skyline::Configuration.locale.present? ? Skyline::Configuration.locale : "en-US"
   end
   
-  def default_url_options(options=nil)
-    return if options.nil?
+  def default_url_options(options={})
+    return {} if options.blank?
     if options[:id].andand.kind_of?(Skyline::Article)
       {:type => options[:id].class}
     elsif options[:article_id].andand.kind_of?(Skyline::Article)
@@ -89,21 +80,28 @@ class Skyline::ApplicationController < ApplicationController
   # Returns the currently logged in user
   # --
   def current_user
-    @current_user
+    (self.respond_to?(:skyline_current_user) ? self.skyline_current_user : nil) || @current_user
   end  
   
   helper_method :current_user  
   
+  def current_user=(c)
+    @current_user = c
+  end
+  
   # Override this in the controller, all actions are protected by default
   def protect?; true; end
       
   # Authenticate the user
   def authenticate_user
     if self.protect? 
-      unless session[:user_id] && @current_user = Skyline::User.find_by_id(session[:user_id])
-        # Store location to go back to in session...
-        session[:before_login_url] = request.request_uri
-        return redirect_to(new_skyline_authentication_path)
+      run_callbacks :authenticate do
+        self.current_user = Skyline::Configuration.user_class.find_by_identification(session[:skyline_user_identification]) if !self.current_user && session[:skyline_user_identification]
+        unless self.current_user
+          # Store location to go back to in session...
+          session[:before_login_url] = request.fullpath
+          return redirect_to(new_skyline_authentication_path)
+        end
       end
     end
   end
@@ -171,7 +169,7 @@ class Skyline::ApplicationController < ApplicationController
   # Currently just logs an [AUTH] message and renders an UNAUTHORIZED text on the screen
   # --
   def handle_unauthorized_user
-    logger.warn("[AUTH] Unauthorized access to #{self.controller_name}/#{self.action_name} by #{@current_user.email} (#{@current_user.id})")
+    logger.warn("[AUTH] Unauthorized access to #{self.controller_name}/#{self.action_name} by #{current_user.email} (ID=#{current_user.id})")
     render(:text => "UNAUTHORIZED", :status => :unauthorized)    
   end
        
@@ -195,7 +193,7 @@ class Skyline::ApplicationController < ApplicationController
   #--
   def messages
     unless defined? @_messages
-      @_messages = session["_messages"] ||= ActionController::Flash::FlashHash.new
+      @_messages = session["_messages"] ||= ActionDispatch::Flash::FlashHash.new
       @_messages.sweep
     end
     @_messages
@@ -212,7 +210,7 @@ class Skyline::ApplicationController < ApplicationController
   #--
   def notifications
     unless defined? @_notifications
-      @_notifications = session["_notifications"] ||= ActionController::Flash::FlashHash.new
+      @_notifications = session["_notifications"] ||= ActionDispatch::Flash::FlashHash.new
       @_notifications.sweep
     end
     @_notifications
@@ -243,7 +241,8 @@ class Skyline::ApplicationController < ApplicationController
   
   def stack
     return @stack if @stack
-    @stack ||= Skyline::Content::Stack.new(@implementation,params[:types] || [])
+    types = params[:types].kind_of?(String) ? params[:types].split("/") : params[:types]
+    @stack ||= Skyline::Content::Stack.new(@implementation, types || [])
     @class = @stack.klass
   
     logger.debug "STACK classes: " + @stack.collect{|s| s.class}.inspect    
@@ -289,4 +288,9 @@ class Skyline::ApplicationController < ApplicationController
   end
   helper_method :object_url
     
+    
+  def javascript_redirect_to(url)
+    render :js => "window.location = '#{url.to_s.html_safe}';"
+  end 
+  
 end

data/app/controllers/skyline/articles_controller.rb

@@ -1,6 +1,7 @@
 class Skyline::ArticlesController < Skyline::ApplicationController
   
-  insert_before_filter_after :authentication, :find_article, :only => [:edit, :update, :destroy]
+  # insert_before_filter_after :authentication, :find_article, :only => [:edit, :update, :destroy]
+  set_callback :authenticate, :after, :find_article, :if => lambda{|c| %w{edit update destroy}.include?(c.action_name)  }
   
   authorize :index, :by => Proc.new{|user,controller,action| user.allow?(controller.article || controller.class_from_type, :index)  }
   authorize :create, :by => Proc.new{|user,controller,action| user.allow?(controller.article || controller.class_from_type, :create)  }  
@@ -45,9 +46,7 @@ class Skyline::ArticlesController < Skyline::ApplicationController
     end
     
     if request.xhr?
-      render :update do |p|
-  		  p.redirect_to @target
-      end
+      javascript_redirect_to @target
     else
 		  redirect_to @target
   	end
@@ -98,7 +97,7 @@ class Skyline::ArticlesController < Skyline::ApplicationController
     end
 
     
-    saved = false
+    @saved = false
     begin
       Skyline::Article.transaction do
         if params["clone_variant"] == "1"
@@ -118,7 +117,7 @@ class Skyline::ArticlesController < Skyline::ApplicationController
             @variant.save!
           end          
         end
-        saved = true
+        @saved = true
       end
     rescue ActiveRecord::RecordInvalid
       logger.debug "Article update failed: #{@article.errors.inspect}"
@@ -126,30 +125,11 @@ class Skyline::ArticlesController < Skyline::ApplicationController
     end
     
     if params[:article].has_key?(:move_behind)
-      # no notifications needed
-      render :update do |p|
-      end
+      render :nothing => true
     elsif request.xhr?
-      render :update do |p|
-        if saved
-          if @article.locked?
-            p.notification :success, t(:locked, :scope => [@article.class, :update, :flashes])
-            p << "$$('#article_#{@article.id} span')[0].addClass('locked')" if @article.kind_of?(Skyline::Page)
-          else
-            p.notification :success, t(:unlocked, :scope => [@article.class, :update, :flashes])
-            p << "$$('#article_#{@article.id} span')[0].removeClass('locked')" if @article.kind_of?(Skyline::Page)
-          end
-        else
-          if @article.locked?
-            p.message :error, t(:lock_failed, :scope => [@article.class, :update, :flashes])
-          else
-            p.message :error, t(:unlock_failed, :scope => [@article.class, :update, :flashes])
-          end
-        end
-        p.replace "article_security", :partial => "security"
-      end
+      render :action => :update
     else
-      if saved
+      if @saved
         notifications[:success] = t(:success, :scope => [@article.class, :update, :flashes])
         redirect_to edit_skyline_article_path(@article, :variant_id => @variant.id)
       else

data/app/controllers/skyline/authentications_controller.rb

@@ -1,24 +1,22 @@
 class Skyline::AuthenticationsController < Skyline::ApplicationController
   layout false
-  
-  def new
 
+  def new
   end
   
   def create
-    if user = Skyline::User.authenticate(params[:email], params[:password])      
+    if user = Skyline::Configuration.user_class.authenticate(params[:email], params[:password])      
       reset_session      
-      session[:user_id] = user.id
-      redirect_to skyline_articles_path(:type => Skyline::Page)
+      session[:skyline_user_identification] = user.identification
+      redirect_to skyline_root_path
     else
       messages.now[:error] = t(:error, :scope => [:authentication,:create,:flashes])
       render :action => :new
-    end
-    
+    end    
   end
   
   def destroy 
-    session[:user_id] = nil 
+    session[:skyline_user_identification] = nil 
     if request.xhr?
       render(:update){|p| p.redirect_to new_skyline_authentication_path }
     else    

data/app/controllers/skyline/browser/links_controller.rb

@@ -4,14 +4,18 @@ class Skyline::Browser::LinksController < Skyline::ApplicationController
     @pages = Skyline::Page.group_by_parent_id
     
     if params[:referable_type].present?
-      case params[:referable_type]
-        when "Skyline::MediaFile" then
-          @media_file = Skyline::MediaFile.find_by_id(params[:referable_id])
-          @media_dir = @media_file.directory if @media_file
-          @active_tab = "Skyline::MediaFile"
-        when "Skyline::Page" then
-          @page = Skyline::Page.find_by_id(params[:referable_id])
-          @active_tab = "Skyline::Page"          
+      if params[:referable_type] == "Skyline::MediaFile"
+        @media_file = Skyline::MediaFile.find_by_id(params[:referable_id])
+        @media_dir = @media_file.directory if @media_file
+        @active_tab = "Skyline::MediaFile"
+      elsif params[:referable_type] == "Skyline::Page"
+        @page = Skyline::Page.find_by_id(params[:referable_id])
+        @active_tab = "Skyline::Page"
+      elsif Skyline::Linkable.linkables.map(&:name).include?(params[:referable_type])
+        @linkable_type = Skyline::Linkable.linkables.find{|l| l.name == params[:referable_type]}
+        @linkable = @linkable_type.find_by_id(params[:referable_id])
+        @linkables = @linkable_type.all if @linkable
+        @active_tab = "Skyline::Linkable"
       end
     end
     

data/app/controllers/skyline/browser/tabs/linkables_controller.rb

@@ -0,0 +1,9 @@
+class Skyline::Browser::Tabs::LinkablesController < Skyline::ApplicationController
+  
+  def show
+    @linkable_type = Skyline::Linkable.linkables.find{|l| l.name == params[:id]}
+    @linkables = @linkable_type.all
+    @linkable = @linkable_type.find_by_id(params[:referable_id])    
+  end
+  
+end

data/app/controllers/skyline/browser/tabs/media_library/media_files_controller.rb

@@ -2,14 +2,6 @@ class Skyline::Browser::Tabs::MediaLibrary::MediaFilesController < Skyline::Appl
   def index
     @media_dir = Skyline::MediaDir.find(params[:media_dir_id])
     @media_file = @media_dir.files.find_by_id(params[:media_file_id])
-    
-    render :update do |p|
-      # if !params[:listonly]
-      #   p.replace_html("browserUploadPanel", :partial => "new", :locals => {:media_dir => @media_dir})
-      # end
-    	    	
-    	p.replace_html("browserContentPanel", :partial => "index")
-    end    
   end
   
   # show
@@ -22,10 +14,6 @@ class Skyline::Browser::Tabs::MediaLibrary::MediaFilesController < Skyline::Appl
   def show
     @media_file = Skyline::MediaFile.find(params[:id])
     @media_dir = @media_file.directory
-
-    render :update do |p|
-      p.replace("browserFileInfo", :partial => "show")
-    end 
   end
 
 end

data/app/controllers/skyline/content/editors/editable_list_controller.rb

@@ -5,10 +5,6 @@ class Skyline::Content::Editors::EditableListController < Skyline::Skyline2Contr
   
   def new
     @object = @source_object.send(@assoc.name).build
-    render :update do |p|
-      editor = Skyline::Editors::EditableList.new(["element"],@source_object,@source_klass.fields[params[:association].to_sym],@template)
-      p.insert_html :bottom, editor.js_object_name, editor.render_row(@object)
-    end
   end
   
   protected

data/app/controllers/skyline/content/editors/joinable_list_controller.rb

@@ -5,11 +5,8 @@ class Skyline::Content::Editors::JoinableListController < Skyline::Skyline2Contr
   
   def index
     @filter = filter_from_params_or_default
-    @elements = @target_klass.paginate_for_cms(:all,:page => params[:page], :per_page => 10, :self_referential => false, :filter => @filter)
+    @elements = @target_klass.paginate_for_cms(:page => params[:page], :per_page => 10, :self_referential => false, :filter => @filter).all
     @title_field = @target_klass.fields[@target_klass.settings.title_field]
-    render :update do |p|
-      p.replace_html "element_#{params[:association]}_browser", :partial => "list"
-    end
   end
   
   def new
@@ -19,24 +16,9 @@ class Skyline::Content::Editors::JoinableListController < Skyline::Skyline2Contr
     else
       @object = @target_klass.find(params[:target_id])
     end
-    render :update do |p|
-      editor = Skyline::Editors::JoinableList.new(["element"],@source_object,@source_klass.fields[params[:association].to_sym],@template)
-      p.insert_html :bottom, editor.js_object_name, editor.render_row(@object)
-#      p << "#{editor.js_object_name}.afterUpdate();"
-      if params[:add_multiple] != "true"
-        p.replace_html "element_#{params[:association]}_browser",
-          :partial => "add", 
-          :locals => {:source_object => @source_object,:target_class => @target_klass,:association => @assoc.name}        
-      end
-    end
   end
   
   def cancel
-    render :update do |p|
-      p.replace_html "element_#{params[:association]}_browser", 
-        :partial => "add", 
-        :locals => {:source_object => @source_object,:target_class => @target_klass,:association => @assoc.name}
-    end
   end
 
   protected