skylinecms 3.2.0 → 3.3.0

data/app/models/skyline/user_preference.rb

@@ -1,5 +1,5 @@
 class Skyline::UserPreference < ActiveRecord::Base
-  set_table_name :skyline_user_preferences
+  self.table_name = "skyline_user_preferences"
   
   belongs_to :user, :class_name => "::#{Skyline::Configuration.user_class.name}"
   
@@ -26,7 +26,7 @@ class Skyline::UserPreference < ActiveRecord::Base
       self.exists?(["`#{self.table_name}`.`key` LIKE ?", "#{key}.%"])
     end
     
-    def remove(key)
+    def remove_key(key)
       self.delete_all("`#{self.table_name}`.`key` LIKE '#{key}.%'")
     end
         

data/app/models/skyline/variant.rb

@@ -53,24 +53,28 @@ class Skyline::Variant < Skyline::ArticleVersion
     raise StandardError, "can't be published if its dirty" if self.changed? || self.data.changed?
     
     if self.valid?
-      self.prepare_data_to_be_published!(false)
+      self.article.run_callbacks :publication do
+        self.prepare_data_to_be_published!(false)
 
-      published_publication = self.clone_to_class(self.article.publications)
-      published_publication.save
+        published_publication = self.dup_to_class(self.article.publications)
+        published_publication.created_at = Time.now
+        published_publication.updated_at = Time.now
+        published_publication.save
 
-      self.article.published_publication = published_publication
-      self.article.url_part = published_publication.data.url_part if published_publication.data.respond_to?(:url_part)
-      self.article.published_publication_data = published_publication.data
-      self.article.set_default_variant(self)
-      self.article.save!
+        self.article.published_publication = published_publication
+        self.article.url_part = published_publication.data.url_part if published_publication.data.respond_to?(:url_part)
+        self.article.published_publication_data = published_publication.data
+        self.article.set_default_variant(self)
+        self.article.save!
 
-      unless self.article.keep_history?
-        self.article.publications.each do |publication|
-          publication.destroy if publication != published_publication
+        unless self.article.keep_history?
+          self.article.publications.each do |publication|
+            publication.destroy if publication != published_publication
+          end
         end
-      end
 
-      published_publication
+        published_publication
+      end
     else
       self.prepare_data_to_be_published!(false)
       false
@@ -158,7 +162,7 @@ class Skyline::Variant < Skyline::ArticleVersion
   
   def create_data
     if self.data.new_record?
-      self.data.save(false)
+      self.data.save(:validate => false)
       self.data_id = self.data.id
     end
   end

data/app/observers/skyline/version_stamper.rb

@@ -36,7 +36,7 @@ class Skyline::VersionStamper < ActiveRecord::Observer
   end
   
   def logger
-    RAILS_DEFAULT_LOGGER
+    Rails.logger
   end
   
 end

data/app/templates/skyline/page/default/index.html.erb

@@ -16,6 +16,6 @@
   <% assign(:heading_level,1) %>
   
   <%= render_collection(article_version.sections) %>
-  <%= @body %>
+  <%= @body.andand.html_safe %>
 </body>
 </html>

data/app/views/skyline/articles/_security.html.erb

@@ -13,7 +13,7 @@
         </tbody>
       </table>
       <% if  @variant.editable_by?(current_user) && current_user.allow?(@article, :lock) %>
-        <%= skyline_form_for(:article, @article, :url => skyline_article_path(@article, :variant_id => @variant), :html => {:method => "put"}, :remote => true) do |f| %>
+        <%= skyline_form_for(@article, {:as => :article, :url => skyline_article_path(@article, :variant_id => @variant), :html => {:method => "put"}, :remote => true}) do |f| %>
           <div class="button" style="margin-top: 5px">
     		    <% if @article.locked? %>
     		      <%= f.hidden_field :locked, :value => "0" %>

data/app/views/skyline/articles/edit.html.erb

@@ -1,4 +1,4 @@
-<%= skyline_form_for @article, :as => :article, :url => skyline_article_path(@article), :html => {:method => :put, :id => "page_form"} do |a| %>
+<%= skyline_form_for @article, {:as => :article, :url => skyline_article_path(@article), :html => {:method => :put, :id => "page_form"}} do |a| %>
   <dl id="contentPanel" class="panel">    
     <%= a.fields_for :variants_attributes, @variant, :index => 1 do |v| %>
       <%= v.fields_for :data_attributes, v.object.data do |vd| %>

data/app/views/skyline/content/{list.rhtml → list.html.erb}

@@ -1,15 +1,15 @@
 <% content_for :header do %>
   <% if @stack.size > 1 %>
-    <%= @title = t(:title_sublisting, :scope => [:content, :list], :group => @stack.klass.plural_name, :title => @stack[-2].class.singular_name + " " + @stack[-2].human_id.to_s) %>
+    <%= @title = t(:title_sublisting, :scope => [:content, :list], :group => @stack.klass.plural_name, :title => @stack[-2].class.singular_name + " " + @stack[-2].human_id.to_s).html_safe %>
   <% else %>
-    <%= @title = t(:title, :scope => [:content, :list], :class => @stack.klass.plural_name) %> 
+    <%= @title = t(:title, :scope => [:content, :list], :class => @stack.klass.plural_name).html_safe %> 
   <% end %>
 <% end %>
 
 <%= Skyline::Presenters::Table.new(@elements,stack.klass,self).output %>
 
 <% content_for :meta do %>
-  <%= render :partial => "add", :locals => {:klass => stack.klass, :record => stack.current, :return_to => url_for({})} %>	
+  <%= render :partial => "add", :locals => {:klass => stack.klass, :record => stack.current, :return_to => url_for(:types => stack.klass.to_s.underscore.pluralize)} %>	
   <%= render :partial => "filter" if stack.klass.filterable? %>
 <% end %>
 

data/app/views/skyline/content_sections/_tags.html.erb

@@ -1,4 +1,4 @@
-<%= skyline_fields_for "article[variants_attributes][1][sections_attributes][#{guid}][sectionable_attributes]", sectionable do |s| %>
+<%= skyline_fields_for sectionable, :as => "article[variants_attributes][1][sections_attributes][#{guid}][sectionable_attributes]" do |s| %>
   <table class="fields" id="section-<%=guid%>-tags">
     <tbody>
       <tr>

data/app/views/skyline/shared/_header_area.html.erb

@@ -4,7 +4,7 @@
 
     <div id="usernavigation">
       <%= t(:logged_in_as, :user => h(current_user.display_name), :scope => [:authentication]).html_safe  %>
-      (<%= link_to t(:logout, :scope => [:authentication]), :url => skyline_authentication_path, :method => :delete, :remote => true  %>)
+      (<%= link_to t(:logout, :scope => [:authentication]), skyline_authentication_path, :method => :delete, :remote => true  %>)
     </div>
   </div>
 

data/app/views/skyline/users/_new.html.erb

@@ -1,3 +1,3 @@
-<%= skyline_form_for :user, @user, :url => skyline_users_path(), :remote => true, :method => :post do |f|%>
+<%= skyline_form_for @user, {:as => :user, :url => skyline_users_path(), :remote => true, :method => :post} do |f|%>
   <%=  render :partial =>  "form", :locals => {:f => f, :password_attribute => :password, :password_confirmation_attribute => :password_confirmation}  %>
 <% end %>

data/config/initializers/middlewares.rb

@@ -8,11 +8,15 @@ Rails.application.config.middleware.insert_before(
 # Only needed for development, the files will be cached in Production.
 # --
 Rails.application.config.middleware.use(Skyline::SprocketsMiddleware, Rails.public_path, "skyline/javascripts/src", :cache => (Rails.env == "production") ) do |env|
+  env.register_load_location("")
   env.register_load_location("skyline/src")
   env.register_load_location("skyline/vendor/*")
+  env.register_load_location("skyline/vendor/fancyupload/")
+  env.register_load_location("skyline/vendor/mootools/")
+  
   env.register_load_location("skyline.editor/src")  
   env.register_load_location("skyline.editor/vendor/*")
-  env.register_load_location("skyline.editor/vendor/tinymce/jscripts/*")  
+  env.register_load_location("skyline.editor/vendor/tinymce/jscripts/*")
   
   env.map "skyline/javascripts/application.js", "skyline/javascripts/src/application.js"
   env.map "skyline/javascripts/skyline.js", "skyline/javascripts/src/skyline.js"  

data/config/initializers/mime_types.rb

@@ -103,12 +103,6 @@ mime_types = {
                     audio/x-midi
                     application/x-midi
                     audio/ac3},
-  :pdf =>        %w{application/pdf
-                    application/x-pdf
-                    application/acrobat
-                    applications/vnd.pdf
-                    text/pdf
-                    text/x-pdf},
   :excel =>      %w{application/vnd.ms-excel
                     application/msexcel
                     application/x-msexcel

data/config/initializers/observers.rb

@@ -1,5 +1,5 @@
 unless ( File.basename($0) == "rake" && ARGV.include?("skyline:db:migrate") )
-  ActiveRecord::Base.observers = [
+  ActiveRecord::Base.observers += [
     "Skyline::FileCacheSweeper", 
     "Skyline::ArticleVersionObserver"
   ]

data/config/locales/en-US.yml

@@ -631,7 +631,7 @@
     add_a_new: Add %{class}
     add_more: Add more %{class}
     pagination:
-      number_of: "Nubmer of %{class}:"
+      number_of: "Number of %{class}:"
       pages: "Pages:"
       next: "Next »"
       previous: "Previous »"

data/db/fixtures/roles_and_rights.rb

@@ -1,5 +1,5 @@
 if !Object.const_defined?(:Rails)
-  require File.dirname(__FILE__) + "/../../../../../config/environment"
+  require File.dirname(__FILE__) + "/../../../../config/environment"
 end
 
 def log(str)
@@ -38,15 +38,15 @@ Skyline::Right.connection.execute("DELETE FROM skyline_rights_skyline_roles WHER
 log "\n== Creating roles"
 
 stfu do
-  Skyline::Role.seed_many(:name,[
+  Skyline::Role.seed(:name,
     {:name => "super", :system => true}
-  ])
+  )
 end
 
 log "\n== Creating rights"
 
 stfu do 
-  Skyline::Right.seed_many(:name,[
+  Skyline::Right.seed(:name,
     {:name => "media_dir_create"},
     {:name => "media_dir_update"},
     {:name => "media_dir_delete"},
@@ -91,7 +91,7 @@ stfu do
     {:name => "user_delete"},
   
     {:name => "tinymce_edit_html"} # Defines wether or not to show the "edit html" button in the toolbar
-  ])
+  )
 end
 
 log "\n== Mapping Rights to Roles"

data/db/fixtures/roots.rb

@@ -1,5 +1,5 @@
 if !Object.const_defined?(:Rails)
-  require File.dirname(__FILE__) + "/../../../../../config/environment"
+  require File.dirname(__FILE__) + "/../../../../config/environment"
 end
 
 # ========================================================================

data/doc/concepts.md

@@ -0,0 +1,37 @@
+Skyline concepts
+================
+
+To get a better understanding of Skyline here's a quick overview of the main building blocks.
+
+Pages
+-----
+
+Skyline is primarily built around pages. Pages are ordered into a tree which represents the structure of the
+website. Pages consist of two parts: static data and sections and they inherit their properties from articles.
+
+Articles
+--------
+
+Article is a container class that adds the functionality needed to add sections, versioning, publication
+and other cool stuff. Pages are articles too. You can subclass the `Article` class to create your
+own custom editable object (A news item for instance)
+
+Sections
+--------
+
+Sections are elements that are predefined and are used as building blocks for content. Skyline has a number of
+sections built in but you can also add new sections.
+
+
+Rendering
+---------
+
+Skyline articles are rendered by the show action of the Skyline::Site::PagesController this controller can be overwritten if
+for instance you need to render a specific page template for an element that is not directly linked to a page.
+Like articles.
+
+Settings
+--------
+
+Settings can be used to link articles to pages but also to set defaults like templates or colors which
+then can be used in the templates.

data/lib/skyline/belongs_to_referable.rb

@@ -43,7 +43,7 @@ module Skyline::BelongsToReferable
     
     base.send(:cattr_accessor, :referable_contents)
     base.send(:attr_accessor, :previous_referables)
-    base.send(:alias_method_chain, :clone, :referable_content)
+    base.send(:alias_method_chain, :dup, :referable_content)
     
     
     base.send("referable_contents=", [])
@@ -112,13 +112,13 @@ module Skyline::BelongsToReferable
   end
   
   # @private
-  def clone_with_referable_content
-    clone_without_referable_content.tap do |clone|      
+  def dup_with_referable_content
+    dup_without_referable_content.tap do |dup|
       if self.referable_contents.any?
         self.referable_contents.each do |field|
           if self.send(field).present?
-            clone.send("#{field}_id=", nil)
-            clone.send("#{field}=", self.send(field).clone)
+            dup.send("#{field}_id=", nil)
+            dup.send("#{field}=", self.send(field).dup)
           end
         end
       end

data/lib/skyline/content/class_meta_data.rb

@@ -1,6 +1,6 @@
 module Skyline::Content
   module ClassMetaData
-      
+    
     # Returns singular name of this class, falls back on standard Rails humanization
     def singular_name
       self.settings.singular_label
@@ -72,7 +72,7 @@ module Skyline::Content
       return get_settings if settings.nil? && !block_given?
       s = MetaData::ClassSettings.new(settings.update(:owner => self))
       yield s if block_given?
-      write_inheritable_attribute(:settings,s)
+      self.cmd_settings = s
       after_set_settings!
       s
     end
@@ -99,7 +99,8 @@ module Skyline::Content
     end
     
     def get_settings
-      read_inheritable_attribute(:settings) || write_inheritable_attribute(:settings,MetaData::ClassSettings.new(:owner => self))
+      self.cmd_settings = MetaData::ClassSettings.new(:owner => self) unless self.cmd_settings.present?
+      self.cmd_settings
     end
   end
 end

data/lib/skyline/content/content.rb

@@ -3,25 +3,35 @@ module Skyline::Content
   module Content
     def self.included(obj)
       obj.extend(KlassMethods)
-     
-       if obj.ancestors.include?( ::ActiveRecord::Base)
-         obj.class_eval do 
-           after_save :process_after_save
+      
+      if obj.ancestors.include?( ::ActiveRecord::Base)
+        obj.class_eval do
+          after_save :process_after_save
+          
+          # Attributes for module settings (replacement for read/write_inheritable*)
+          # Values for FieldMetaData
+          class_attribute :fmd_field_hash
+          class_attribute :fmd_ungrouped_field_list
+          class_attribute :fmd_field_order_value
+          # Settings for ClassMetaData
+          class_attribute :cmd_settings
+          # List of possible export formats for Exportable
+          class_attribute :exportable_formats
            
-           scope :published, lambda {
-             if obj.publishable?
-               {:conditions => {:published => true}}
-             else
-               {}
-             end
-           }
+          scope :published, lambda {
+            if obj.publishable?
+              {:conditions => {:published => true}}
+            else
+              {}
+            end
+          }
 
-           scope :with_site, {}
-         end         
-       end
-     end 
+          scope :with_site, {}
+        end
+      end
+    end
      
-     module KlassMethods  #:nodoc:
+    module KlassMethods  #:nodoc:
     
       def content?
         true
@@ -174,7 +184,7 @@ module Skyline::Content
         return nil if self_referential_associations.empty?
         
         self_referential_associations.collect do |assoc| 
-          (assoc.options[:foreign_key] || assoc.primary_key_name).to_s + " is null" 
+          (assoc.options[:foreign_key] || assoc.foreign_key).to_s + " is null"
         end.join(" AND ")
       end
     
@@ -272,7 +282,7 @@ module Skyline::Content
          params = {}
          if tempid = k.to_s[/^n__?(n?\d+)/,1]
            # new
-           params.update(assoc.source_reflection.primary_key_name => target_id)
+           params.update(assoc.source_reflection.foreign_key => target_id)
            params.update(position_column => order_map[tempid]) if position_column           
            self.send(assoc.through_reflection.name).build(v.update(params))
          else

data/lib/skyline/content/exportable.rb

@@ -4,8 +4,8 @@ module Skyline::Content
     
     # List of possible export formats for this class
     def export_formats
-      read_inheritable_attribute(:export_formats) || []
-    end      
+      self.exportable_formats || []
+    end
     
     # Set a list of possible export format for this class
     # [DOC]
@@ -17,7 +17,7 @@ module Skyline::Content
         class << self; self; end.send(:define_method, "export_#{format}"){}
       end
       if formats.any?
-        write_inheritable_attribute(:export_formats,formats)
+        self.exportable_formats = formats
         class << self; self; end.send(:define_method,:exportable?) do
           true
         end

data/lib/skyline/content/field_meta_data.rb

@@ -153,15 +153,15 @@ module Skyline::Content
       options = options_from_params_with_default fields      
       fields = fields.first if fields.any? && fields.first.kind_of?(Array)
       options.reverse_merge! field_create_defaults(options)
-  
+      
       fields.each do |field_name|
         options.update(:name => field_name, :owner => self)
         if self.fields.has_key?(field_name)
-          write_inheritable_hash(:fields,{field_name => MetaData::Field.from(self.fields[field_name],options)})
+          self.fmd_field_hash = self.fields.merge(field_name => MetaData::Field.from(self.fields[field_name],options))
         else
-          write_inheritable_hash(:fields,{field_name => MetaData::Field.new(options)})
+          self.fmd_field_hash = self.fields.merge(field_name => MetaData::Field.new(options))
         end
-        self.ungrouped_fields << field_name 
+        self.fmd_ungrouped_field_list = self.ungrouped_fields << field_name
         yield self.fields[field_name] if block_given?
         after_field_create!(self.fields[field_name])
       end
@@ -184,8 +184,8 @@ module Skyline::Content
       field_group = MetaData::FieldGroup.new(options.update(:owner => self, :name => name))
       yield field_group if block_given?
       
-      write_inheritable_attribute(:ungrouped_fields,self.ungrouped_fields.dup << name)
-      write_inheritable_hash(:fields,{name => field_group}) 
+      self.fmd_ungrouped_field_list = self.ungrouped_fields.dup << name
+      self.fmd_field_hash = self.fields.merge(name => field_group)
       
       field_group
     end
@@ -194,9 +194,10 @@ module Skyline::Content
     #   field_order :name,:naw,:body
     def field_order(*order)
       if order.empty?
-        read_inheritable_attribute(:field_order) || write_inheritable_attribute(:field_order,order)
+        self.fmd_field_order_value = order unless self.fmd_field_order_value.present?
+        self.fmd_field_order_value
       else
-        write_inheritable_attribute(:field_order,order)
+        self.fmd_field_order_value = order
       end
     end
     
@@ -209,7 +210,7 @@ module Skyline::Content
     # <tt>Array[Symbol]</tt>:: Field names of fields which are writable.
     #--
     def writable_fields #:nodoc:
-      self.fields.select do |k,v| 
+      self.fields.select do |k,v|
         if v.kind_of?(MetaData::Field) && v.editor == :file && !v.hidden_in(:edit)
           true
         else
@@ -231,11 +232,11 @@ module Skyline::Content
     end
     
     def fields #:nodoc:
-      read_inheritable_attribute(:fields) || write_inheritable_hash(:fields,{})
+      self.fmd_field_hash || {}
     end
             
     def ungrouped_fields #:nodoc:
-      read_inheritable_attribute(:ungrouped_fields) || write_inheritable_attribute(:ungrouped_fields,[])
+      self.fmd_ungrouped_field_list || []
     end
     
     # @deprecated