skylinecms 3.0.8 → 3.1.0

data/app/models/skyline/image_ref.rb

@@ -15,17 +15,21 @@ class Skyline::ImageRef < Skyline::InlineRef
     src = "broken.jpg"
     
     if self.referable_id.present? && image = self.referable_type.constantize.find_by_id(self.referable_id)
-      if html_options["width"].blank? || html_options["height"].blank?
-        dimen = image.dimension
-        html_options.reverse_merge! dimen
+      if (html_options["width"].blank? || html_options["height"].blank?) && image.dimension
+        html_options.reverse_merge! image.dimension
+      end
+      
+      if html_options["width"].present? && html_options["height"].present?
+        src = image.url("#{html_options["width"]}x#{html_options["height"]}")        
+      else
+        src = image.url
       end
-      src = image.url("#{html_options["width"]}x#{html_options["height"]}")
     end
     
     skyline_ref_id = options[:nullify] ? "" : self.id
     
     if skyline_attr
-      skyline_prefix = "/skyline"
+      skyline_prefix = "/#{Skyline::Configuration.url_prefix}"
       html_options.update "skyline-ref-id" => skyline_ref_id, "skyline-referable-id" => self.referable_id, "skyline-referable-type" => self.referable_type
     end
     option_str = html_options.collect{|k,v| "#{k}=\"#{v}\""}.join(" ")

data/app/models/skyline/inline_ref.rb

@@ -42,7 +42,7 @@ class Skyline::InlineRef < Skyline::RefObject
       del = (old_refs - updated_refs)
       unless del.blank?
         self.destroy_all("id IN(#{del.join(',')})") 
-        logger.warn("[InlineRef] Destroying refs for #{refering_object.class.name} id: #{refering_object.id} column: #{refering_column_name}. Ref's destroyed: #{del.inspect}")
+        logger.debug("[InlineRef] Destroying refs for #{refering_object.class.name} id: #{refering_object.id} column: #{refering_column_name}. Ref's destroyed: #{del.inspect}")
       end
                   
       [h.to_html, updated_refs]
@@ -100,6 +100,7 @@ class Skyline::InlineRef < Skyline::RefObject
     def find_ref_ids_for_object(refering_object, refering_column_name)            
       Skyline::InlineRef.connection.select_values("SELECT id FROM #{self.table_name} WHERE refering_id = '#{refering_object.id}' AND refering_type = '#{refering_object.class.name}' AND refering_column_name = '#{refering_column_name.to_s}'").map(&:to_i)
     end
+    
     # create ref_object from html node
     #
     # ==== Parameters
@@ -125,7 +126,7 @@ class Skyline::InlineRef < Skyline::RefObject
         result
       end
    
-      new_ref = skyline_class.find_by_id_and_refering_type_and_refering_id(id,refering_object.class.name,refering_object.id) if id
+      new_ref = skyline_class.find_by_id_and_refering_type_and_refering_id_and_refering_column_name(id,refering_object.class.name,refering_object.id,refering_column_name.to_s) if id
       new_ref ||= skyline_class.new
 
       new_ref.previous_referable = new_ref.referable.dup if new_ref.referable

data/app/models/skyline/link_section_link.rb

@@ -1,13 +1,13 @@
 # @private
 class Skyline::LinkSectionLink < ActiveRecord::Base
-  include Skyline::ContentItem
+  include Skyline::BelongsToReferable
   include Skyline::Positionable
   
   set_table_name :skyline_link_section_links
   
   self.positionable_scope = :link_section_id
   
-  referable_content :linked
+  belongs_to_referable :linked
   delegate :url, :external?, :file?, :blank?, :to => :linked
   
   belongs_to :link_section

data/app/models/skyline/media_file.rb

@@ -28,14 +28,8 @@ class Skyline::MediaFile < Skyline::MediaNode
   def thumbnail(width=100,height=100)
     img = Magick::Image::read(self.file_path).first
     
-    org_w = img.columns
-    org_h = img.rows
-        
-    if (width.to_i > org_w || height.to_i > org_h) 
-      width = [width.to_i, org_w].min
-      height = [height.to_i, org_h].min
-    end
-
+    width,height = self.proportional_dimension(width,height,img.columns,img.rows)
+    
     stream = img.change_geometry!("#{width}x#{height}"){ |c,r,i| i.resize!(c,r) }
     stream.to_blob        
   end
@@ -49,6 +43,35 @@ class Skyline::MediaFile < Skyline::MediaNode
     {"width" => self.width, "height" => self.height}
   end
   
+  # Calculate the proportional dimension of this media file
+  # this method will never go beyond the bounds of org_w and org_h.
+  # 
+  # @param width [Integer] The target width of this calculation
+  # @param height [Integer] The target height of this calculation
+  # @param org_w [Integer] The original width
+  # @param org_h [Integer] The origin height
+  #
+  # @return Array<Integer,Integer> The new width and height
+  def proportional_dimension(width,height,org_w = self.width, org_h = self.height)
+    return nil if org_w.blank? && org_h.blank?
+
+    # Make sure we don't go beyond the actual size!
+    if (width.to_i > org_w || height.to_i > org_h) 
+      width = [width.to_i, org_w].min
+      height = [height.to_i, org_h].min
+    end
+    
+    w_factor = width.to_f / org_w.to_f
+    h_factor = height.to_f / org_h.to_f
+    factor = case 
+      when w_factor == 0 then h_factor
+      when h_factor == 0 then w_factor
+      else [w_factor, h_factor].min
+    end
+    
+    [(org_w*factor).round, (org_h*factor).round]
+  end
+  
   # sanitize filename and set correct mime-type for IO object of file data
   #
   # ==== Parameters
@@ -78,9 +101,9 @@ class Skyline::MediaFile < Skyline::MediaNode
 
   def url(prefix=nil)
     if prefix
-      "/media_dirs/#{self.parent_id}/media_files_data/#{prefix}/#{self.name}"
+      "/media/dirs/#{self.parent_id}/data/#{prefix}/#{self.name}"
     else
-      "/media_dirs/#{self.parent_id}/media_files_data/#{self.name}"
+      "/media/dirs/#{self.parent_id}/data/#{self.name}"
     end
   end
   

data/app/models/skyline/page.rb

@@ -34,7 +34,6 @@ class Skyline::Page < Skyline::Article
     end
   end
   
-  include Skyline::SearchableItem
   include Skyline::Positionable
   self.positionable_scope = :parent_id
   
@@ -51,13 +50,6 @@ class Skyline::Page < Skyline::Article
   named_scope :with_default_data, {:include => [:default_variant_data, :default_variant, :published_publication]}
   
   default_scope :order => "position"
-  
-  indexer_option :if => :published_publication_id_changed?
-  
-  searchable_field :title => lambda{|article| article.published_publication_data.title},
-                   :url => :url,
-                   :documentdate => lambda{|article| article.published_publication.updated_at.to_time.utc.iso8601(3)},
-                   :body => lambda{|article| article.published_publication.to_text}
  
   class << self
     extend ActiveSupport::Memoizable
@@ -105,6 +97,7 @@ class Skyline::Page < Skyline::Article
           def identical_to_publication?
             self["published_publication_variant_id"] == self["default_variant_id"] && self["published_publication_version"] == self["default_variant_version"]
           end
+          def open; true; end
         end
 
         out[o.parent_id] ||= []
@@ -114,7 +107,7 @@ class Skyline::Page < Skyline::Article
     end
     
     def root
-      self.find_by_parent_id(nil)
+      self.first(:conditions => "parent_id IS NULL")
     end
     
     # build menu of certain level
@@ -132,6 +125,14 @@ class Skyline::Page < Skyline::Article
       menu
     end
     
+    # Find the page by url_parts and return the page and url_parts left over after we've found
+    # the deepest page.
+    #
+    # @param [Array<String>] url_parts The url_parts to look for
+    # @param [Skyline::Page] root An optional root to search in.
+    # 
+    # @return [Array<Skyline::Page,Array<String>>] First return parameter is the deepest page we found (can be nil), 
+    #   the second return is the url_parts not consumed by the found page.
     def find_by_url(url_parts, root = nil)
       root ||= self.root
       return nil unless root

data/app/models/skyline/section.rb

@@ -20,7 +20,7 @@ class Skyline::Section < ActiveRecord::Base
   end
   
   def clone
-    returning super do |clone|
+    super.tap do |clone|
       clone.sectionable = self.sectionable.clone
     end
   end  

data/app/models/skyline/sections/content_collection_section.rb

@@ -1,6 +1,6 @@
 # @private
 class Skyline::Sections::ContentCollectionSection < ActiveRecord::Base
-  include Skyline::SectionItem
+  include Skyline::Sections::Interface
   include Skyline::Taggable
   taggable_scope lambda{|ccs| ccs.content_type}
   

data/app/models/skyline/sections/content_item_section.rb

@@ -1,6 +1,6 @@
 # @private
 class Skyline::Sections::ContentItemSection < ActiveRecord::Base
-  include Skyline::SectionItem
+  include Skyline::Sections::Interface
 
   belongs_to :content_item, :polymorphic => true
   

data/app/models/skyline/sections/heading_section.rb

@@ -1,6 +1,6 @@
 # @private
 class Skyline::Sections::HeadingSection < ActiveRecord::Base
-  include Skyline::SectionItem
+  include Skyline::Sections::Interface
   
   self.default_interface = false
 end

data/app/models/skyline/sections/iframe_section.rb

@@ -1,7 +1,7 @@
 # @private
 class Skyline::Sections::IframeSection < ActiveRecord::Base
-  extend Skyline::UrlValidation  
-  include Skyline::SectionItem
+  extend UrlValidation  
+  include Skyline::Sections::Interface
   
   validates_numericality_of :width, :height
   validates_presence_of :url

data/app/models/skyline/sections/link_section.rb

@@ -1,6 +1,6 @@
 # @private
 class Skyline::Sections::LinkSection < ActiveRecord::Base
-  include Skyline::SectionItem
+  include Skyline::Sections::Interface
   include NestedAttributesPositioning  
   
   has_many :links, :class_name => "Skyline::LinkSectionLink", :dependent => :destroy

data/app/models/skyline/sections/media_section.rb

@@ -1,13 +1,40 @@
 # @private
 class Skyline::Sections::MediaSection < ActiveRecord::Base
-  include Skyline::SectionItem
-  include Skyline::ContentItem
+  include Skyline::Sections::Interface
+  include Skyline::BelongsToReferable
   
   ALIGNMENT = %w{left right block_left block_right block_center}
   
-  referable_content :linked
-
+  # The media linked to this section
+  belongs_to_referable :media
+  
+  # An optional link
+  belongs_to_referable :link
+  
   validates_numericality_of :width, :height, :allow_nil => true
   
-  delegate :url, :external?, :to => :linked
+  delegate :url, :external?, :to => :media
+  
+  def width
+    self.dimension[0]
+  end
+  
+  def height
+    self.dimension[1]
+  end
+  
+  def dimension
+    width = self[:width].to_i
+    height = self[:height].to_i
+    if self.media.present? 
+      proportional = self.media.proportional_dimension(width,height)
+      if proportional
+        width,height = proportional
+      else
+        width,height = self.media.width,self.media.height
+      end
+    end
+
+    [width,height]
+  end
 end

data/app/models/skyline/sections/page_fragment_section.rb

@@ -1,6 +1,6 @@
 # @private
 class Skyline::Sections::PageFragmentSection < ActiveRecord::Base
-  include Skyline::SectionItem
+  include Skyline::Sections::Interface
 
   belongs_to :page_fragment, :class_name => "Skyline::PageFragment"
   

data/app/models/skyline/sections/raw_section.rb

@@ -1,6 +1,6 @@
 # @private
 class Skyline::Sections::RawSection < ActiveRecord::Base
-  include Skyline::SectionItem
+  include Skyline::Sections::Interface
     
   def to_text
     HTML::FullSanitizer.new.sanitize(self.body)

data/app/models/skyline/sections/redirect_section.rb

@@ -1,14 +1,14 @@
 # @private
 class Skyline::Sections::RedirectSection < ActiveRecord::Base
-  include Skyline::SectionItem
-  include Skyline::ContentItem
+  include Skyline::Sections::Interface
+  include Skyline::BelongsToReferable
   
-  referable_content :linked
+  belongs_to_referable :linked
   
   validates_numericality_of :delay
 
   def url(request)
-    if self.linked.external? 
+    if self.linked.external? || self.linked.url =~ /:\/\//
       self.linked.url
     else
       request.protocol + request.host_with_port + self.linked.url

data/app/models/skyline/sections/rss_section.rb

@@ -3,8 +3,8 @@ require 'fileutils'
 # @private
 class Skyline::Sections::RssSection < ActiveRecord::Base
   extend ActiveSupport::Memoizable
-  extend Skyline::UrlValidation  
-  include Skyline::SectionItem
+  extend UrlValidation  
+  include Skyline::Sections::Interface
 
   
   validates_numericality_of :show_count
@@ -21,6 +21,10 @@ class Skyline::Sections::RssSection < ActiveRecord::Base
 
   def title
     self.rss_feed ? self.rss_feed[:title] : ""
+  end
+  
+  def link
+    self.rss_feed ? self.rss_feed[:link] : ""
   end      
 
   def items
@@ -43,6 +47,7 @@ class Skyline::Sections::RssSection < ActiveRecord::Base
         feed = {
           :title => channel.title,
           :description => channel.description, 
+          :link => channel.link,
           :copyright => channel.copyright,
           :category => channel.category.andand.content,
           :date => channel.date,

data/app/models/skyline/sections/splitter_section.rb

@@ -1,6 +1,6 @@
 # @private
 class Skyline::Sections::SplitterSection < ActiveRecord::Base
-  include Skyline::SectionItem
+  include Skyline::Sections::Interface
   
   self.default_interface = false
 end

data/app/models/skyline/sections/wysiwyg_section.rb

@@ -1,11 +1,11 @@
 # @private
 class Skyline::Sections::WysiwygSection < ActiveRecord::Base
-  include Skyline::SectionItem
-  include Skyline::Referable
+  include Skyline::Sections::Interface
+  include Skyline::HasManyReferablesIn
   
   self.default_interface = false
   
-  referable_field :body
+  has_many_referables_in :body
   
   def to_text
     HTML::FullSanitizer.new.sanitize(self.body)

data/app/models/skyline/site.rb

@@ -16,7 +16,7 @@ class Skyline::Site
   end
   
   def renderer(options = {})
-    Skyline::Renderer.new(options.merge(:site => self))
+    Skyline::Rendering::Renderer.new(options.merge(:site => self))
   end
   
   def named_scope_with_site_for(article_data_class)

data/app/models/skyline/user.rb

@@ -5,6 +5,7 @@ class Skyline::User < ActiveRecord::Base
   has_many :rights, :class_name => "Skyline::Right", 
     :finder_sql => 'SELECT DISTINCT r.* FROM skyline_rights AS r, skyline_grants AS g JOIN skyline_rights_skyline_roles AS rr ON rr.role_id = g.role_id WHERE g.user_id = #{id} AND r.id = rr.right_id'
   
+  has_many :user_preferences, :class_name => "Skyline::UserPreference"  
     
   # This must be set to change the password (by the user himself)
   attr_accessor :current_password
@@ -139,7 +140,6 @@ class Skyline::User < ActiveRecord::Base
   # Display the name or e-mailaddress of the user for
   # display purposes.
   def display_name
-    return self.name
     self.name.present? ? self.name : self.email
   end
   

data/app/models/skyline/user_preference.rb

@@ -0,0 +1,69 @@
+class Skyline::UserPreference < ActiveRecord::Base
+  set_table_name :skyline_user_preferences
+  
+  belongs_to :user, :class_name => "Skyline::User"
+  
+  class << self
+    def set(key, value)
+      raise ArgumentError.new("Cannot put hash into a value") if !parent_is_hash?(key)
+      prefs = flatten_preferences({key => value})
+      
+      prefs.each do |k, v|
+        joined_key = "#{k.join('.')}."
+        self.delete_all("`#{self.table_name}`.`key` LIKE '#{joined_key}%'")
+        self.create(:key => joined_key, :encoded_value => v.to_yaml)
+      end
+    end
+    
+    def get(key)
+      user_preferences = self.find(:all, :conditions => "`#{self.table_name}`.`key` LIKE \"#{key}.%\"")
+      
+      return nil unless user_preferences.any?
+      user_preferences.size == 1 && user_preferences.first.key == "#{key}." ? user_preferences.first.value : expand_preferences(user_preferences, key)
+    end
+    
+    def has_key?(key)
+      self.exists?(["`#{self.table_name}`.`key` LIKE ?", "#{key}.%"])
+    end
+    
+    def remove(key)
+      self.delete_all("`#{self.table_name}`.`key` LIKE '#{key}.%'")
+    end
+        
+    private
+    
+    def flatten_preferences(rest, cur_key = [])
+      rest.inject({}) do |acc, (k, v)|
+        if v.kind_of?(Hash)
+          # append key
+           acc.merge!(flatten_preferences(v, cur_key + [k]))
+        else
+          # set value
+          acc[cur_key + [k]] = v
+        end
+        acc
+      end
+    end
+    
+    def expand_preferences(preferences, query_key)   
+      e = preferences.inject({}) do |acc, p|
+        acc.merge!(p.key.sub(/#{query_key}./,"").split(".").reverse.inject(p.value) { |mem, var| {var => mem} })
+        acc
+      end
+    end
+    
+    def parent_is_hash?(key)
+      key_array = key.split(".")
+      key_array.pop
+      
+      return true if key_array.empty?
+      
+      !self.exists?(["`#{self.table_name}`.`key` LIKE ?", "#{key_array.join('.')}."])
+    end
+  end
+  
+  #return unserialized value
+  def value()
+    return ::YAML.parse(self.encoded_value).transform
+  end
+end

data/app/models/skyline/variant.rb

@@ -152,7 +152,7 @@ class Skyline::Variant < Skyline::ArticleVersion
   
   def create_data
     if self.data.new_record?
-      self.data.save
+      self.data.save(false)
       self.data_id = self.data.id
     end
   end

data/app/templates/skyline/sections/content_item_section/default/index.html.erb

@@ -2,5 +2,5 @@
 <% object = content_item_section.content_item_type.constantize.for_content_item_section.find_by_id(content_item_section.content_item_id) %>
 
 <% if object %>
-  <%= render :partial => "#{object_type}", :locals => {object_type.to_sym => object} %>
+  <%= render :partial => "/#{object_type}", :locals => {object_type.to_sym => object} %>
 <% end %>

data/app/templates/skyline/sections/media_section/default/index.html.erb

@@ -1,15 +1,15 @@
-<% 
-  has_block = media_section.alignment == "block_left" || media_section.alignment == "block_right" || media_section.alignment == "block_center"
-  alignment = has_block ? media_section.alignment.split("_")[1]: media_section.alignment 
-%>
+<% block_alignment = media_section.alignment.to_s[/^block_(.+)/,1] %>
 
-<% if media_section.andand.linked.present? %>
-  <%= "<div class=\"block\">" if has_block %>
-  <div class="media <%= alignment %>" style="width: <%= media_section.width %>px;" >
-    <img src="<%= media_section.url %>" alt="<%= media_section.caption %>" />
+<% if media_section.andand.media.present? %>
+  <%= "<div class=\"block\">" if block_alignment %>
+  <div class="media <%= block_alignment || media_section.alignment  %>" style="width: <%= media_section.width %>px;" >
+    <% image = capture do %>
+      <img src="<%= media_section.media.url %>" alt="<%= media_section.caption %>" />
+    <% end %>
+    <%= media_section.link.present? ? link_to(image,media_section.link.url) : image %>
     <% if media_section.caption.present? %>
       <p class="caption"><%= media_section.caption %></p>
     <% end %>
   </div>
-  <%= "</div>" if has_block %>
+  <%= "</div>" if block_alignment %>
 <% end %>

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

@@ -0,0 +1,34 @@
+<table class="listing" id="article_index">
+  <thead>
+    <tr>
+      <th class="icon"></th>
+      <th><%= @articles.first.class.human_attribute_name(:title) %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @articles.each do |article| %>
+      <tr class="<%= cycle("odd","even") %>">
+        <td class="icon center"><%= tick_image(article.published?) %></td>
+        <th>
+          <%= article.title.blank? ? "&nbsp;" : article.title %>
+        </th>
+        <td class="right">
+          <%= link_to button_text(:edit), edit_skyline_article_path(article), :class => "button small" %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<script type="text/javascript" charset="utf-8">
+  (function(){
+    var f = $("article_index")
+    var t = new Skyline.Table(f);
+                                                                                                          
+    // Make sure the contentPanel resizes our table!
+    f.getParent().addComponentEvent("skyline.layout","resize",function(panel,w,h){
+      $('article_index').retrieve("skyline.table").resize(w, "100%");
+    });    
+  })();
+</script>

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

@@ -18,9 +18,12 @@
             <div class="innerpanel">
               <% begin %>
                 <% content = capture do  %>
-                  <div class="body">
-                    <%= render :partial => "skyline/articles/#{a.object.class.name.demodulize.underscore}/header", :locals => {:a => a, :v => v, :vd => vd} %>
-                  </div>                  
+                  <% partial_content = render(:partial => "skyline/articles/#{a.object.class.name.demodulize.underscore}/header", :locals => {:a => a, :v => v, :vd => vd}) %>
+                  <% if partial_content.present?  %>
+                    <div class="body">
+                      <%= partial_content %>
+                    </div>                  
+                  <% end %>
                 <% end %>
               <% rescue ActionView::MissingTemplate %>
                 <% content = "" %>
@@ -29,8 +32,12 @@
               <div class="actions">
                 <% menu_button t(:add_section, :scope => [:article, :edit]), :id => "add_section_button" do %>
                   <ul>
-                    <% Skyline::Renderer.renderables(:sections, a.object.class).each do |section| %>                    
-                      <li><%= link_to_remote(section.human_name, :url => new_skyline_section_path(:sectionable_type => section.name, :object_name => v.object_name_with_index, :renderable_scope => @renderable_scope.serialize), :method => :get) %></li>
+                    <% Skyline::Rendering::Renderer.renderables(:sections, a.object.class).each do |section| %>                    
+                      <li>
+                        <%= link_to_remote(section.human_name, 
+                              :url => new_skyline_section_path(:sectionable_type => section.name, :object_name => v.object_name_with_index, :renderable_scope => @renderable_scope.serialize), 
+                              :method => :get, 
+                              :data => "(new Hash({'after_section' : $('contentlist').retrieve('application.sections').getCurrentActiveId()})).toQueryString()") %></li>
                     <% end %>
                   </ul>              
                 <% end %>
@@ -106,6 +113,6 @@
 <script type="text/javascript" charset="utf-8">
   
   <% if Skyline::Configuration.enable_enforce_only_one_user_editing %>
-    new Application.Poller("/skyline/variants/<%= @variant.id %>/current_editor");
+    new Application.Poller("/<%= Skyline::Configuration.url_prefix %>/variants/<%= @variant.id %>/current_editor");
   <% end %>
 </script>