skylinecms 3.2.0 → 3.3.0

data/.yardopts

@@ -7,4 +7,4 @@ app/helpers/skyline/*.rb
 -
 doc/INSTALL.md
 doc/MIGRATION.md
-doc/Bundler.md
+doc/concepts.md

data/CHANGELOG

@@ -1,5 +1,55 @@
 # Changelog for Skyline #
 
+## 3.3.0 (March 16th, 2012) ##
+
+### Core ###
+* [Core] Skyline now works with Rails 3.2.2
+* [Core] Dependency updates for sprockets, shoulda, factory-girl and seed-fu
+* [Core] Fixed lot's of Rails deprecation issues
+* [Core] Allow setting of renderable by string within global namespace
+* [Core] Fix for bug with VERSION display in some git
+* [Core] Observers are added to applications observers instead of overwriting them
+
+### User Interface (Core) ###
+* [UI] Remove unused menu_for helper
+* [UI] Changes to form_for and fields_for syntax
+* [UI] Fix logout link to no longer use :url =>
+* [UI] Update javascript to work with newer sprockets gem
+
+### Plugin management (Core) ###
+* [Plugins] Fix view_paths for skyline plugins
+
+### Articles ###
+* [Articles] Add API for publication/depublication callbacks
+* [Articles] Added created_at and updated_at to publication rollback
+
+### Content elements ###
+* [Content Elements] Redirect to content list for selected item after new/create/edit/delete
+
+### Media Library
+* [MediaLibrary] Media files edit and delete are available through javascript only
+* [MediaLibrary] Do not allow image links with only one size parameter (default to 0x0 image)
+
+### Sections (builtin) ###
+* [Sections] Empty values for MediaSection's dimensions resulted in 0-values for width and height.
+* [Sections] rss_feed method no longer protected in RssSection
+
+### Test ###
+* [Test] Fix Test_section_test: @small_image_no_refs used wrong order for dimensions
+* [Test] Do not use CGI Escaping for JSON in tests
+* [Test] Update reference to test media file in integration test to use more flexible relative path
+* [Test] Fixes for locales-test: load skyline locales as in initializer, I18n.backend.send(:translations) to get all values
+
+### Documentation ###
+* [Documentation] Add link to api
+* [Documentation] Update migration documentation
+* [Documentation] Add concepts documentation
+
+### Settings and users ###
+* [Users] Allow creation of users that were previously deleted
+* [Users] Correctly revoke all grants from a user upon deletion
+
+
 ## 3.2.0 (November 1, 2011) ##
 
 ### Core ###

data/README.md

@@ -2,6 +2,7 @@ Skyline CMS
 ===========
 
 **Homepage**:  [http://www.skylinecms.nl](http://www.skylinecms.nl)   
+**Documentation**:  [http://api.skylinecms.nl](http://api.skylinecms.nl)   
 **Twitter**:   Follow [skylinecms](http://www.twitter.com/skylinecms) on twitter  
 **Git**:       [http://github.com/digitpaint/skyline](http://github.com/digitpaint/skyline)   
 **Author**:    DigitPaint  
@@ -30,14 +31,21 @@ either be featured as lists or shown individually
 Installation and usage
 ----------------------
 
-Check out our [getting start guide](http://www.skylinecms.nl/documentation/guides/getting_started) to get Skyline
-up and running. 
+Start with our {file:doc/INSTALL.md installation instructions} to get Skyline up and running.
+
+It might be a good idea to read about {file:doc/concepts.md the basic Skyline concepts}.
 
 For further information, see our documentation and guides on
-[www.skylinecms.nl/documentation](http://www.skylinecms.nl/documentation).
+[www.skylinecms.nl/documentation](http://www.skylinecms.nl/documentation) (currently outdated).
 
 If you're running into problems, don't hesitate to contact us!
 
+Updating
+--------
+
+See our {file:doc/MIGRATION.md migration instructions} to update from one Skyline version to another. 
+
+
 Copyright
 ---------
 

data/app/controllers/skyline/application_controller.rb

@@ -8,7 +8,7 @@ class Skyline::ApplicationController < ApplicationController
   
   around_filter Skyline::ArticleVersionObserver.instance
   
-  class_inheritable_accessor :default_menu
+  class_attribute :default_menu
   attr_accessor :current_menu
   hide_action :default_menu, :default_menu=, :current_menu, :current_menu=, :menu, :javascript_redirect_to
   
@@ -25,6 +25,7 @@ class Skyline::ApplicationController < ApplicationController
   
   define_callbacks :authenticate
   
+  class_attribute :authorization_hash
   
   class << self
         
@@ -42,7 +43,7 @@ class Skyline::ApplicationController < ApplicationController
     def authorize(*actions)
       options = actions.extract_options!
       raise ArgumentError, "You must specify the :by option" if !options.has_key?(:by)
-      authorizations = read_inheritable_attribute(:authorizations) || {}
+      authorizations = self.authorization_hash || {}
       if actions.any?
         actions.each do |a|
           authorizations[a] ||= [] 
@@ -52,11 +53,11 @@ class Skyline::ApplicationController < ApplicationController
         authorizations[:*] ||= []
         authorizations[:*] << options[:by]        
       end
-      write_inheritable_attribute(:authorizations,authorizations)
+      self.authorization_hash = authorizations
     end
     
     def authorizations
-      read_inheritable_attribute(:authorizations) || {}
+      self.authorization_hash || {}
     end
     
   end
@@ -115,7 +116,7 @@ class Skyline::ApplicationController < ApplicationController
       up.each do |k,v|
         if k == "_delete"
           v.each do |delete_id|
-            current_user.user_preferences.remove(delete_id)
+            current_user.user_preferences.remove_key(delete_id)
           end
         else
           current_user.user_preferences.set(k,v)

data/app/controllers/skyline/articles_controller.rb

@@ -58,7 +58,7 @@ class Skyline::ArticlesController < Skyline::ApplicationController
     end
     
     if @variant.editable_by?(current_user)
-      @variant.edit_by!(current_user) 
+      @variant.edit_by!(current_user)
     else
       messages.now[:error] = render_to_string(:partial => "currently_editing")      
       return render(:action => "edit_preview_only")
@@ -101,7 +101,7 @@ class Skyline::ArticlesController < Skyline::ApplicationController
     begin
       Skyline::Article.transaction do
         if params["clone_variant"] == "1"
-          @variant = @variant.clone()
+          @variant = @variant.dup()
           
           # Dirty hack so AR thinks this object isn't new.
           @variant.attributes = new_variant.attributes.except("version")
@@ -133,8 +133,8 @@ class Skyline::ArticlesController < Skyline::ApplicationController
         notifications[:success] = t(:success, :scope => [@article.class, :update, :flashes])
         redirect_to edit_skyline_article_path(@article, :variant_id => @variant.id)
       else
-        if @variant.errors.on(:version)
-          messages.now[:error] = @variant.errors.on(:version)
+        if @variant.errors[:version]
+          messages.now[:error] = @variant.errors[:version]
         else
           messages.now[:error] = t(:error, :scope => [@article.class, :update, :flashes])
         end

data/app/controllers/skyline/content_controller.rb

@@ -64,7 +64,7 @@ class Skyline::ContentController < Skyline::Skyline2Controller
   
   def delete
     @element = stack.last
-    if request.post?
+    if request.post? || request.xhr?
       if @element.destroy
         notifications[:success] = t(:successfully_deleted, :scope => [:content, :flashes], :class => @element.class.singular_name)
       else
@@ -73,9 +73,7 @@ class Skyline::ContentController < Skyline::Skyline2Controller
     end
     respond_to do |format|
       format.html{ redirect_after(:delete) }
-      format.js do
-        render(:update){|p| p.redirect_to controller.send(:redirect_url_after,:delete) }
-      end
+      format.js { javascript_redirect_to(redirect_url_after(:delete)) }
     end
   end
   

data/app/controllers/skyline/media/data_controller.rb

@@ -30,6 +30,7 @@ class Skyline::Media::DataController < Skyline::ApplicationController
     else
       if params[:size].present?
         size = params[:size].to_s.split("x").map{|v| v.to_i }
+        size = [0, 0] unless size.count == 2
         size = nil if size[0] == @file.width && size[1] >= @file.height || size[1] == @file.height && size[0] >= @file.width
       else
         size = nil

data/app/controllers/skyline/site/media_files_data_controller.rb

@@ -30,6 +30,7 @@ class Skyline::Site::MediaFilesDataController < ApplicationController
     else
       if params[:size].present?
         size = params[:size].to_s.split("x").map{|v| v.to_i }
+        size = [0, 0] unless size.count == 2
         size = nil if size[0] == @file.width && size[1] >= @file.height || size[1] == @file.height && size[0] >= @file.width
       else
         size = nil

data/app/controllers/skyline/user_preferences_controller.rb

@@ -4,7 +4,7 @@ class Skyline::UserPreferencesController < Skyline::ApplicationController
       user_preference = ActiveSupport::JSON.decode(params[:skyline_up])
       
       if user_preference.values.first == "_delete"
-        current_user.user_preferences.remove(user_preference.keys.first)
+        current_user.user_preferences.remove_key(user_preference.keys.first)
         up = {}
       else
         current_user.user_preferences.set(user_preference.keys.first, user_preference.values.first)

data/app/controllers/skyline/users_controller.rb

@@ -19,7 +19,11 @@ class Skyline::UsersController < Skyline::ApplicationController
   end
   
   def create
-    @user = Skyline::User.new(params[:user])
+    if (@user = Skyline::User.find_by_email(params[:user][:email])) && @user.is_destroyed
+      @user.reactivate(params[:user])
+    else
+      @user = Skyline::User.new(params[:user])
+    end
     
     if @user.save
       notifications[:success] = t(:success, :scope => [:user,:create,:flashes])

data/app/controllers/skyline/variant_current_editor_controller.rb

@@ -27,7 +27,12 @@ class Skyline::VariantCurrentEditorController < Skyline::ApplicationController
   end
   
   def process(request,*args)
-    logger.silence(ActiveSupport::BufferedLogger::Severity::FATAL){ super }
+    old_level = Rails.logger.level
+    Rails.logger.level = Logger::FATAL
+    
+    super
+  ensure
+    Rails.logger.level = old_level
   end  
   
   protected

data/app/controllers/skyline/variants_controller.rb

@@ -9,8 +9,8 @@ class Skyline::VariantsController < Skyline::ApplicationController
     return handle_unauthorized_user unless Skyline::Configuration.enable_multiple_variants
     
     if params[:variant_id]
-      variant_to_clone = @article.variants.find_by_id(params[:variant_id])
-      variant = variant_to_clone.clone
+      variant_to_dup = @article.variants.find_by_id(params[:variant_id])
+      variant = variant_to_dup.dup
       variant.save
     else
       variant = @article.variants.create

data/app/helpers/skyline/content_helper.rb

@@ -135,7 +135,7 @@ module Skyline::ContentHelper
   end
   
   def record_with_errors(content, record, field)
-    if record.errors.on(field.attribute_name) 
+    if record.errors[field.attribute_name]
       content_tag("div", content.html_safe, :class => "fieldWithErrors")
     else
       content

data/app/helpers/skyline/editors/editor.rb

@@ -10,9 +10,9 @@ module Skyline::Editors
           Skyline::Editors::TextField.new(name_chain,record,field,template)
         end
       rescue NameError => e
-        RAILS_DEFAULT_LOGGER.warn(" Editor instantiation error ".center(50,"="))
-        RAILS_DEFAULT_LOGGER.warn(e.to_s + "\n" + e.backtrace.join("\n"))
-        RAILS_DEFAULT_LOGGER.warn("=" * 50)      
+        Rails.logger.warn(" Editor instantiation error ".center(50,"="))
+        Rails.logger.warn(e.to_s + "\n" + e.backtrace.join("\n"))
+        Rails.logger.warn("=" * 50)
         Skyline::Editors::TextField.new(name_chain,record,field,template)
       end
     
@@ -51,11 +51,11 @@ module Skyline::Editors
       if self.respond_to? :output_without_errors
         out << field_with_errors([field_prefix, output_without_errors, field_suffix].join.html_safe)
       end
-      content_tag("div",out.html_safe, :id  => "field_#{input_id(field_names)}", :class => "editor #{"invalid" if record.errors.on(field.attribute_name)}")
+      content_tag("div",out.html_safe, :id  => "field_#{input_id(field_names)}", :class => "editor #{"invalid" if record.errors[field.attribute_name].any?}")
     end
   
     def errors
-      errors = record.errors.on(field.attribute_name)
+      errors = record.errors[field.attribute_name]
       if errors.kind_of?(Array)
         errors.flatten.to_sentence
       else
@@ -70,7 +70,7 @@ module Skyline::Editors
     end
   
     def field_with_errors(content)
-      if self.record.errors.on(self.field.attribute_name) 
+      if self.record.errors[self.field.attribute_name].any?
         content_tag("div", content.html_safe, :class => "fieldWithErrors")
       else
         content

data/app/helpers/skyline/editors/joinable_list.rb

@@ -4,7 +4,7 @@ class Skyline::Editors::JoinableList < Skyline::Editors::Editor
   
   def initialize(names,record,field,template)
     super
-    RAILS_DEFAULT_LOGGER.debug("@attribute => #{@attribute_names.inspect}")
+    Rails.logger.debug("@attribute => #{@attribute_names.inspect}")
 
     @reflection = self.field.reflection
     if @reflection.macro == :has_many

data/app/helpers/skyline/form_helper.rb

@@ -9,6 +9,7 @@ module Skyline::FormHelper
   
   def skyline_fields_for(record_or_name_or_array, *args, &block)
     options = args.extract_options!
+    args = [nil] if args == []
     with_custom_field_error_proc do
       self.fields_for(record_or_name_or_array, *(args << options.merge(:builder => Skyline::FormBuilder)), &proc)    
     end    

data/app/helpers/skyline/menu_helper.rb

@@ -18,14 +18,6 @@ module Skyline::MenuHelper
     content_tag("li", link_to(t(scope.last, :scope => [:navigation, scope[-2]]), url, url_options), options)
   end
 
-  def menu_for(*scope, &block)
-    return unless controller.current_menu[0, scope.size] == scope
-    @_menu_scope = scope
-    menu = capture(&block)
-    @_menu_scope = []
-    concat(menu)
-  end
-  
   def current_menu_scope(scope)
     (@_menu_scope || []) + scope
   end

data/app/helpers/skyline/presenters/presenter.rb

@@ -32,13 +32,13 @@ class Skyline::Presenters::Presenter
     
   
   def edit_button(record)
-		link_to button_text(:edit),{:action => "edit", :types => stack.url_types(:down => [record.id]), :return_to  => url_for({:filter => params[:filter]})}, :class => "button small"
+    link_to button_text(:edit),{:action => "edit", :types => stack.url_types(:down => [record.id]), :return_to  => url_for({:types => record.class.to_s.underscore.pluralize, :filter => params[:filter]})}, :class => "button small"
   end
   
   def delete_button(record)
     link_to(
       button_text(:delete), 
-      {:action => "delete",:types => stack.url_types(:down => [record.id]),:return_to  => url_for({})},
+      {:action => "delete",:types => stack.url_types(:down => [record.id]),:return_to  => url_for({:types => record.class.to_s.underscore.pluralize})},
       :remote => true,
       :confirm => t(:confirm_deletion, :scope => [:content,:list], :class => self.fieldset.singular_name), 
       :class => "button small red")

data/app/middleware/skyline/sprockets_middleware.rb

@@ -16,9 +16,8 @@ class Skyline::SprocketsMiddleware
   end
   
   def register_load_location(*paths)
-    all_paths = paths.map { |path| Dir[Pathname.new(@environment.root.absolute_location) + path].sort }.flatten.compact
-    all_paths.each do |p|
-      @environment.register_load_location(p)
+    paths.each do |p|
+      @environment.append_path(p)
     end
   end
   
@@ -40,7 +39,6 @@ class Skyline::SprocketsMiddleware
     end
       
     if path && content = self.render(path)
-    
       resp = ::Rack::Response.new do |res|
         res.status = 200
         res.headers["Content-Type"] = "text/javascript"
@@ -62,10 +60,7 @@ class Skyline::SprocketsMiddleware
   end
   
   def render(path)
-    pathname = @environment.find(path.to_s)
-    @preprocessor = Sprockets::Preprocessor.new(@environment, :strip_comments => @options[:strip_comments])
-    @preprocessor.require(pathname.source_file)
-    @preprocessor.concatenation.to_s
+    @environment.find_asset(path.to_s).to_s
   end
     
 end

data/app/models/skyline/article.rb

@@ -12,7 +12,7 @@ class Skyline::Article < ActiveRecord::Base
     
     def self.inherited(subclass)
       super      
-      subclass.set_table_name subclass.name.underscore.gsub("/","_")
+      subclass.table_name = subclass.name.underscore.gsub("/","_")
       
       parentclass = subclass.parent
       parentclass.class_eval do
@@ -43,9 +43,7 @@ class Skyline::Article < ActiveRecord::Base
     attr_accessor :to_be_published    
   end
 
-  extend ActiveSupport::Memoizable
-
-  set_table_name :skyline_articles
+  self.table_name = "skyline_articles"
   
   # Associations
   has_many :versions, :class_name => "Skyline::ArticleVersion" 
@@ -64,6 +62,10 @@ class Skyline::Article < ActiveRecord::Base
   before_destroy :confirm_destroyability
   after_destroy :reset_ref_object
   after_destroy :destroy_variants
+  
+  # Custom callbacks
+  define_callbacks :publication
+  define_callbacks :depublication
 
   # Validations
   validate :has_at_least_one_variant
@@ -132,8 +134,10 @@ class Skyline::Article < ActiveRecord::Base
     raise StandardError, "can't be depublished because this page is persistent" if self.persistent?
     
     if self.published_publication
-      self.published_publication.destroy unless self.keep_history?
-      self.published_publication = nil
+      self.run_callbacks :depublication do
+        self.published_publication.destroy unless self.keep_history?
+        self.published_publication = nil
+      end
     end
     
     self.published_publication_data = nil
@@ -209,29 +213,29 @@ class Skyline::Article < ActiveRecord::Base
     false
   end
 
-  def clone
-    s = super.tap do |clone|
-      clone.created_at = nil
-      clone.updated_at = nil
-      clone.default_variant_id = nil
-      clone.default_variant_data_id = nil
-      clone.default_variant = nil
-      clone.default_variant_data = nil
-      clone.published_publication_id = nil
-      clone.published_publication_data_id = nil      
+  def dup
+    s = super.tap do |dup|
+      dup.created_at = nil
+      dup.updated_at = nil
+      dup.default_variant_id = nil
+      dup.default_variant_data_id = nil
+      dup.default_variant = nil
+      dup.default_variant_data = nil
+      dup.published_publication_id = nil
+      dup.published_publication_data_id = nil
       
-      clone.publications.clear
-      clone.versions.clear          
-      clone.variants.clear  
+      dup.publications.clear
+      dup.versions.clear
+      dup.variants.clear
           
       self.variants.each do |variant| 
-        variant_clone = variant.clone
-        clone.variants << variant_clone
-        variant_clone.article = clone
-        variant_clone.article_id = nil
-        self.becomes_default_variant_after_save = variant_clone if variant == self.default_variant
+        variant_dup = variant.dup
+        dup.variants << variant_dup
+        variant_dup.article = dup
+        variant_dup.article_id = nil
+        self.becomes_default_variant_after_save = variant_dup if variant == self.default_variant
       end
-      clone
+      dup
     end
   end