skylinecms 3.1.0 → 3.2.0

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

@@ -6,8 +6,8 @@ class Skyline::Editors::List < Skyline::Editors::Editor
   private
   def option_tags
     list = case field.list
-      when Array, Hash : field.list
-      when Proc : perform_proc(field.list)
+      when Array, Hash then field.list
+      when Proc then perform_proc(field.list)
     end
     options_for_select(list,field.attribute_value(self.record))
   end

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

@@ -8,6 +8,7 @@ class Skyline::Editors::PageBrowser < Skyline::Editors::Editor
     input_id_prefix = input_id(attr_names)                        # ie: element_image_attributes
     
     association = field.name.to_s.gsub(/_id$/, "")                # ie: image
+    
     location = nil
     if record.respond_to?(association)
       location = :model

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

@@ -5,10 +5,9 @@ class Skyline::Editors::Wysiwyg < Skyline::Editors::Editor
       record.send(field.name), 
       :class => "wysiwyg", 
       :rows => 15,
-      :cols => 90,
       :id => self.tag_id,
-      :style => params_to_styles(field.style)
-    ), :class => "section")
+      :style => "width: 100%; height: 5px; #{params_to_styles(field.style)}"
+    ).html_safe, :class => "section")
     out << self.tinymce_js
   end
   

data/app/helpers/skyline/form_helper.rb

@@ -0,0 +1,36 @@
+module Skyline::FormHelper
+  
+  def skyline_form_for(record_or_name_or_array, *args, &proc)
+    options = args.extract_options!
+    with_custom_field_error_proc do
+      self.form_for(record_or_name_or_array, *(args << options.merge(:builder => Skyline::FormBuilder)), &proc)    
+    end
+  end
+  
+  def skyline_fields_for(record_or_name_or_array, *args, &block)
+    options = args.extract_options!
+    with_custom_field_error_proc do
+      self.fields_for(record_or_name_or_array, *(args << options.merge(:builder => Skyline::FormBuilder)), &proc)    
+    end    
+  end
+  
+  
+  protected
+  
+  # Override the default ActiveRecordHelper behaviour of wrapping the input.
+  # This gets taken care of semantically by adding an error class to the LI tag
+  # containing the input.
+  # @private
+  FIELD_ERROR_PROC = proc do |html_tag, instance_tag|
+    html_tag
+  end
+
+  def with_custom_field_error_proc(&block)
+    default_field_error_proc = ::ActionView::Base.field_error_proc
+    ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
+    yield
+  ensure
+    ::ActionView::Base.field_error_proc = default_field_error_proc
+  end  
+  
+end

data/app/helpers/skyline/media/files_helper.rb

@@ -1,6 +1,6 @@
 module Skyline::Media::FilesHelper
   def skyline_media_dir_files_path_with_session_information(media_dir)
-    session_key = ActionController::Base.session_options[:session_key] || ActionController::Base.session_options[:key]
+    session_key = Rails.application.config.session_options[:key]
     skyline_media_dir_files_path(media_dir, session_key => cookies[session_key], request_forgery_protection_token => form_authenticity_token)
   end
 end

data/app/helpers/skyline/message_generator.rb

@@ -2,8 +2,8 @@
 class Skyline::MessageGenerator
   include ActionView::Helpers::JavaScriptHelper
   
-  def initialize(type,message,options={})
-    (@options = options || {}).update(:type => "'#{escape_javascript(type.to_s)}'")
+  def initialize(type, message, options={})
+    (@options = options || {}).update(:type => type.to_s)
     @message = message
   end
   
@@ -11,11 +11,20 @@ class Skyline::MessageGenerator
     options = @options.dup
     options.each do |k,v|
       options[k] = case v
-        when Hash : self.options_for_javascript(v)
+        when Hash then v.to_json
         else v
       end
     end    
-    "new #{self.js_object}('#{self.escape_javascript(@message)}',#{self.options_for_javascript(options)})"
+    
+    js_options = [:area] 
+    options_str = options.keys.map do |k|
+      str = js_options.include?(k.to_sym) ? options[k] : "'#{escape_javascript(options[k])}'"
+      "#{k} : #{str}"
+    end.join(", ")
+    
+    
+    
+    "new #{self.js_object}('#{self.escape_javascript(@message)}',{#{options_str.html_safe}})".html_safe
   end
   
   def to_str

data/app/helpers/skyline/pages_helper.rb

@@ -28,7 +28,7 @@ module Skyline::PagesHelper
       out << ": "
     end
     out << form.select(:template, templates_for_select(object) )
-    out.join
+    out.join.html_safe
   end
   
   def templates_for_select(object)

data/app/helpers/skyline/plugin_helper.rb

@@ -8,7 +8,7 @@ module Skyline::PluginHelper
     plugin_template = template.sub(".html.erb", "_#{name}.html.erb")
     
     logger.debug "Looking for template #{plugin_template} in plugins..."
-    Dir[Skyline::PluginsManager.plugin_path + "*/app/views/#{plugin_template}"].each do |file|      
+    Dir[Rails.application.config.skyline_plugins_manager.plugin_path + "*/app/views/#{plugin_template}"].each do |file|      
       if Rails.env == "development"
         concat render(:inline => File.read(file), :layout => nil)
       else

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

@@ -36,9 +36,12 @@ class Skyline::Presenters::Presenter
   end
   
   def delete_button(record)
-    link_to_remote button_text(:delete),{ 
-                   :url => {:action => "delete",:types => stack.url_types(:down => [record.id]),:return_to  => url_for({})},
-                   :confirm => t(:confirm_deletion, :scope => [:content,:list], :class => self.fieldset.singular_name) }, :class => "button small red"
+    link_to(
+      button_text(:delete), 
+      {:action => "delete",:types => stack.url_types(:down => [record.id]),:return_to  => url_for({})},
+      :remote => true,
+      :confirm => t(:confirm_deletion, :scope => [:content,:list], :class => self.fieldset.singular_name), 
+      :class => "button small red")
   end
 
     
@@ -94,7 +97,8 @@ class Skyline::Presenters::Presenter
       
       case field.editor
         # :publish editor is temporary editor created by the presenter itself.
-        when :publish : [content ? image_tag("/skyline/images/icons/true.gif", :alt => t(:true, :scope => [:icons])) : image_tag("/skyline/images/icons/false.gif", :alt => t(:true, :scope => [:icons])),{:class => "center"}]
+        when :publish
+          [content ? image_tag("/skyline/images/icons/true.gif", :alt => t(:true, :scope => [:icons])) : image_tag("/skyline/images/icons/false.gif", :alt => t(:true, :scope => [:icons])),{:class => "center"}]
         else normalize_content(content,field)          
       end
     end        
@@ -102,15 +106,15 @@ class Skyline::Presenters::Presenter
   
   def normalize_content(content,field=nil)
     case content 
-      when /<.+?>/ : 
+      when /<.+?>/ then 
         if field.filter_html == false
           content.to_s
         else
           truncate(simple_format(strip_tags(content.gsub("<br />", "<br />\n").gsub("</p>", "</p>\n"))),150)
         end
-      when String : truncate(content,150)
-      when TrueClass,FalseClass : [(content ? image_tag("/skyline/images/icons/true.gif") : image_tag("/skyline/images/icons/false.gif")),{:class => "center"}]
-      when Date,Time : l(content, :format => :long)
+      when String then truncate(content,:length => 150)
+      when TrueClass,FalseClass then [(content ? image_tag("/skyline/images/icons/true.gif") : image_tag("/skyline/images/icons/false.gif")),{:class => "center"}]
+      when Date,Time then l(content, :format => :long)
       else content.to_s
     end 
   end

data/app/helpers/skyline/ref_object_helper.rb

@@ -58,27 +58,29 @@ module Skyline::RefObjectHelper
       end
 
       
-      deselect_button = link_to_function(button_text(:delete), "Application.Browser.unlink('#{options[:container]}');", :class => "button small red delete")
-      browse_button = link_to_function(button_text(:browse), "Application.Browser.browse#{browser.to_s.camelcase}For('#{options[:container]}');", :class => "button small")
+      deselect_button = link_to_function(button_text(:delete), "Application.Browser.unlink('#{options[:container]}');", :class => "button small red delete").html_safe
+      browse_button = link_to_function(button_text(:browse), "Application.Browser.browse#{browser.to_s.camelcase}For('#{options[:container]}');", :class => "button small").html_safe
     
-      c << content_tag("div", :class => "not-linked") do
+      c << content_tag("div", {:class => "not-linked"}) do
         nl = []
-        nl << content_tag("span",t(:nothing_selected, :scope => [:browser,browser]), :class => "title")
+        nl << content_tag("span",t(:nothing_selected, :scope => [:browser,browser]), {:class => "title"}, false)
         nl << browse_button
+        nl.join.html_safe
       end
       
-      c << content_tag("div", :class => "linked") do
+      c << content_tag("div", {:class => "linked"}) do
         l = []
         referable_title = content_tag("span", ref_object_title(linked_form.object.andand.referable) + " ", :id => linked_form.dom_id(:title), :class => "title referable_title")
         l << t(:links_to, :scope => [:browser,browser], :referable_title => referable_title)
         l << deselect_button
         l << "&nbsp;"
         l << browse_button
+        l.join.html_safe
       end
       
-      c = content_tag("div", c.join, :class => "relatesTo #{"linked" if linked_form.object.present? && !linked_form.object.andand.marked_for_destruction?}")
+      c = content_tag("div", c.join.html_safe, :class => "relatesTo #{"linked" if linked_form.object.present? && !linked_form.object.andand.marked_for_destruction?}")
     end
 
-    content_tag("div", c, :id => form_builder.dom_id(field), :class => css_class) + form_builder.fieldset_errors(field).to_s
+    content_tag("div", c, :id => form_builder.dom_id(field), :class => css_class) + form_builder.fieldset_errors(field)
   end
 end

data/app/helpers/skyline/translation_helper.rb

@@ -21,7 +21,7 @@ module Skyline::TranslationHelper
     klass_index = options[:scope].index(klass)
     options[:raise] = true
     
-    klass.self_and_descendants_from_active_record.map do |superklass|
+    klass.lookup_ancestors.map do |superklass|
       begin
         o = options.dup
         o[:scope][klass_index] = superklass.name.underscore.sub(/^skyline\//, "")

data/app/helpers/skyline/tree_helper.rb

@@ -80,8 +80,6 @@ module Skyline::TreeHelper
     nodes ||= []
     open_nodes = options[:open_nodes] || []
     
-    logger.warn("ON #{open_nodes.inspect}");
-    
     nodes.each do |node|
       selected = options[:selected].present? ? options[:selected].id == node.id : false
       li = link_to(options[:node_content].call(node), options[:node_url].call(node), :class => (selected ? "selected" : nil), :title => options[:node_title].call(node))
@@ -95,7 +93,7 @@ module Skyline::TreeHelper
       tags << content_tag("li",li , :id => "#{options[:id_prefix]}_#{node.id}", :class => (node_class.any? ? node_class.join(" ") : nil))
     end
     
-    content_tag("ul",tags.join("\n"));
+    content_tag("ul",tags.join("\n").html_safe);
   end
   
   # Get's the current user preferred open nodes

data/app/middleware/skyline/flash_session_cookie_middleware.rb

@@ -8,8 +8,13 @@ class Skyline::FlashSessionCookieMiddleware
 
   def call(env)
     if env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/
+      if @session_key.respond_to?(:call)
+        sk = @session_key.call
+      else
+        sk = @session_key
+      end      
       params = ::Rack::Utils.parse_query(env['QUERY_STRING'])
-      env['HTTP_COOKIE'] = [ @session_key, params[@session_key] ].join('=').freeze unless params[@session_key].nil?
+      env['HTTP_COOKIE'] = [ sk, params[sk] ].join('=').freeze unless params[sk].nil?
     end
     @app.call(env)
   end

data/app/middleware/skyline/plugins_loader_middleware.rb

@@ -4,7 +4,7 @@ class Skyline::PluginsLoaderMiddleware
   end
 
   def call(env)
-    Skyline::PluginsManager.load_all!    
+    Rails.application.config.skyline_plugins_manager.load_all!    
     @app.call(env)
   end
 end

data/app/middleware/skyline/sprockets_middleware.rb

@@ -15,7 +15,7 @@ class Skyline::SprocketsMiddleware
     yield(self) if block_given?
   end
   
-  def register_load_location(paths)
+  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)

data/app/models/skyline/article.rb

@@ -23,7 +23,7 @@ class Skyline::Article < ActiveRecord::Base
       subclass.class_eval do
         has_one :article, :foreign_key => "published_publication_data_id", :class_name => parentclass.name
         
-        named_scope :published, {
+        scope :published, {
           :include => [:article],
           :conditions => "skyline_articles.published_publication_data_id = #{self.table_name}.id"
         }
@@ -48,16 +48,19 @@ class Skyline::Article < ActiveRecord::Base
   set_table_name :skyline_articles
   
   # Associations
-  has_many :versions, :class_name => "Skyline::ArticleVersion"
+  has_many :versions, :class_name => "Skyline::ArticleVersion" 
+  # Variants well be destroyed in the after_destroy!! (Don't try to destro the versions!)
   has_many :variants, :class_name => "Skyline::Variant"
   has_many :publications, :class_name => "Skyline::Publication", :dependent => :destroy
   belongs_to :published_publication, :class_name => "Skyline::Publication"
   belongs_to :default_variant, :class_name => "Skyline::Variant"
 
   # Scopes
-  named_scope :published, {:conditions => "published_publication_id IS NOT NULL"}  
+  scope :published, {:conditions => "published_publication_id IS NOT NULL"}  
 
   # Callbacks
+  after_initialize :build_variant_with_data  
+  after_save :set_default_variant_after_save
   before_destroy :confirm_destroyability
   after_destroy :reset_ref_object
   after_destroy :destroy_variants
@@ -68,6 +71,9 @@ class Skyline::Article < ActiveRecord::Base
   accepts_nested_attributes_for :variants
 
   attr_protected :locked unless Skyline::Configuration.enable_locking
+  
+  # Stores a variant that will become the default variant AFTER save
+  attr_accessor :becomes_default_variant_after_save
 
   class << self
     def to_param
@@ -86,10 +92,27 @@ class Skyline::Article < ActiveRecord::Base
     # Is this type of article publishable?
     # 
     # @return [true,false] Wether or not this article type can be published
-    # @abstract Implement in subclass if needed, true is a sensible default.
+    # @abstract Implement in subclass if needed, true is the default.
     def publishable?
       true
     end
+    
+    # Can this type of article be locked?
+    #
+    # @return [true,false] Wether or not this article type can be locked
+    # @abstract Implement in subclass if needed, true is the default
+    def lockable?
+      true
+    end
+    
+    # Can this type of article have multiple variants?
+    #
+    # @return [true,false]
+    # @abstract Implement in subclass if needed, true is the default
+    def can_have_multiple_variants?
+      true
+    end
+    
   end
 
   # Has this article been puslished?
@@ -159,25 +182,57 @@ class Skyline::Article < ActiveRecord::Base
     self.renderable?
   end
   
-  
-  def rollbackable?
-    true
+  # Can this article instance be locked? 
+  # 
+  # Defaults to the Skyline::Article.lockable?
+  #
+  # @see Skyline::Article.lockable?
+  def lockable?
+    self.class.lockable?
   end
   
+  # Can this article instance have multiple variants?
+  #
+  # Defaults to Skyline::Article.can_have_multiple_variants?
+  #
+  # @see Skyline::Article.can_have_multiple_variants?
+  def can_have_multiple_variants?
+    self.class.can_have_multiple_variants?
+  end
+
+  # Do we need to keep the history of this article?
+  # 
+  # If true, this article will have multiple publications, if false, there is only one published publication.
+  # 
+  # @return [true, false] Default is false
   def keep_history?
     false
   end
-  
-  def enable_publishing?
-    true
-  end
-  
-  def enable_multiple_variants?
-    true
-  end
-  
-  def enable_locking?
-    true
+
+  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      
+      
+      clone.publications.clear
+      clone.versions.clear          
+      clone.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
+      end
+      clone
+    end
   end
 
 
@@ -187,25 +242,28 @@ class Skyline::Article < ActiveRecord::Base
   # @param user [Skyline::User,Integer] The user or user id to check the access for.
   # @return [true,false] True if the user can edit this page, false otherwise
   def editable_by?(user)
-    user = user.kind_of?(Skyline::User) ? user : Skyline::User.find_by_id(user)    
+    user = user.kind_of?(Skyline::Configuration.user_class) ? user : Skyline::Configuration.user_class.find_by_identification(user)    
     self.locked? && user.allow?(:page_lock) || !self.locked?
   end  
 
   
   def set_default_variant!(variant)
-    return if variant.id == self.default_variant_id && variant.data_id == self.default_variant_data_id
-    self.attributes = {:default_variant_id => variant.id, :default_variant_data_id => variant.data_id}
-    self.save(false)
+    if set_default_variant(variant)
+      self.save(:validate => false)
+    end
   end
   
   def set_default_variant(variant)
-    return if variant.id == self.default_variant_id && variant.data_id == self.default_variant_data_id
+    return false if variant.id == self.default_variant_id && variant.data_id == self.default_variant_data_id
     self.attributes = {:default_variant_id => variant.id, :default_variant_data_id => variant.data_id}
+    true
   end  
 
   # The class that provides our custom data fields.
   # 
   # @return [Class,false] False if we don't have an inner Data class, the inner Data class if there is one.
+  # 
+  # TODO : Dataleak waiting to happen (!!)
   def data_class
     # Note: We can't use memoize here, because it freezes the class
     return @_data_class unless @_data_class.nil?
@@ -231,21 +289,31 @@ class Skyline::Article < ActiveRecord::Base
     nil
   end
   
+  # Multisite interface
   def sites
     [Skyline::Site.new]
   end
   
+  # Multisite interface  
   def site
     Skyline::Site.new
   end  
   
+  # Multisite interface  
   def renderable_scope
     Skyline::Rendering::Scopes::Wildcard.new
   end  
   
   protected
   
-  def after_initialize
+  def set_default_variant_after_save
+    if self.becomes_default_variant_after_save && self.becomes_default_variant_after_save != self.default_variant
+      self.set_default_variant!(self.becomes_default_variant_after_save)
+      self.becomes_default_variant_after_save = nil
+    end
+  end
+  
+  def build_variant_with_data
     if self.new_record?
       v = self.variants.build(:article => self)
       self.default_variant_data = v.data
@@ -253,12 +321,12 @@ class Skyline::Article < ActiveRecord::Base
   end
   
   def has_at_least_one_variant
-    self.errors.add "must have at least one Variant" if self.variants.empty?
+    self.errors.add :variants, "must have at least one Variant" if self.variants.empty?
   end  
 
   
   def confirm_destroyability
-    raise StandardError, "can't be destroyed because this page is persistent" if self.persistent?
+    raise StandardError, "can't be destroyed because this article is persistent" if self.persistent?
   end  
 
   # Reset ref objects that refer to this now removed Article.