skylinecms 3.1.0 → 3.2.0

data/lib/skyline/plugins/plugin.rb

@@ -0,0 +1,89 @@
+class Skyline::Plugins::Plugin
+  
+  attr_reader :manager, :name, :path, :init_file, :load_file, :migration_path, :seed_path
+  
+  def initialize(path, manager)
+    @manager = manager
+    @path = Pathname.new(path)
+    @name = @path.basename.to_s
+    
+    files = { 
+      :init_file => "skyline/init.rb",
+      :load_file => "skyline/load.rb",
+      :migration_path => "db/migrate",
+      :seed_path => "db/fixtures" 
+    }
+    
+    files.each do |key, path|
+      
+      f = @path + path
+      instance_variable_set("@#{key}",f) if f.exist?
+    end
+  end
+  
+  # Initialize the plugin, this is usually done just once when the server starts
+  def init!
+    add_routes!
+    add_load_paths!
+    add_view_path!
+    add_public_path!
+    add_locales!
+
+    load(@init_file) if @init_file
+  end
+  
+  # Load the plugin, this will be done on every request in development
+  # only once in production mode.
+  def load!
+    load(@load_file) if @load_file
+  end
+    
+  protected
+  
+  def add_routes!
+    rp = self.path + "config/routes.rb"
+    return unless rp.exist?
+    self.manager.app.routes_reloader.paths.unshift(rp)
+  end
+  
+  def add_load_paths!
+    %w{app/models app/controllers app/helpers}.each do |p|
+      pn = self.path + p
+      $LOAD_PATH.unshift(pn) if File.directory?(pn)
+      ActiveSupport::Dependencies.autoload_paths << pn.to_s if pn.exist?
+    end
+    $LOAD_PATH.uniq!
+  end
+  
+  def add_view_path!
+    vp = (self.path + "app/views")
+    return unless vp.exist?
+    
+    ActiveSupport.on_load(:action_controller) do
+      prepend_view_path(vp)
+    end
+    ActiveSupport.on_load(:action_mailer) do
+      prepend_view_path(vp)
+    end    
+  end
+  
+  def add_public_path!
+    plugin_public_path = self.path + "public/#{self.name}"
+    return unless plugin_public_path.exist?
+      
+    public_path = self.manager.public_path + self.name
+    unless public_path.exist?
+      FileUtils.rm(public_path) if public_path.symlink?
+    
+      puts "=> Skyline [Plugin: #{self.name}]: Creating assets symlink to '#{public_path}'"
+      FileUtils.ln_s(plugin_public_path.relative_path_from(self.manager.public_path), public_path)
+    end    
+  end
+  
+  def add_locales!
+    plugin_locales = Dir[self.path + "config/locales/*.{yml,rb}"]
+    return unless plugin_locales.present?
+    self.manager.app.config.i18n.railties_load_path.concat(plugin_locales)
+  end
+  
+end

data/lib/skyline/rendering/helpers/renderer_helper.rb

@@ -144,7 +144,7 @@ module Skyline::Rendering
       # 
       # @deprecated Don't use the name of the object anymore,  use `renderer.object` instead.
       def method_missing(method, *params, &block)
-        return @_local_object if @_local_object_name == method
+        return @_local_object if @_local_object_name.to_s == method.to_s
         super
       end
     end

data/lib/skyline/rendering/renderer.rb

@@ -25,7 +25,7 @@ class Skyline::Rendering::Renderer
         if sub == :all
           @@renderables[type][:all] = renderables_to_class(type, @@renderables[type].values.flatten.uniq)
         else
-          sub = sub.name.downcase.underscore.to_sym if sub.kind_of?(Class)
+          sub = sub.name.underscore.to_sym if sub.kind_of?(Class)
           classes = @@renderables[type][sub] || @@renderables[type][:default]
           @@renderables[type][sub] = renderables_to_class(type, classes)
         end
@@ -83,7 +83,9 @@ class Skyline::Rendering::Renderer
                            :paths => ["app/templates", Skyline.root + "app/templates/skyline"],
                            :site => nil)
 
-    @assigns = options[:assigns].update(:_controller => options[:controller], 
+    # The controller is optional!!
+    @controller = options[:controller]
+    @assigns = options[:assigns].update(:_controller => @controller, 
                                         :_site => options[:site])
 
     @template_paths = options[:paths].collect{|p| (Rails.root + p).to_s if File.exist?(Rails.root + p)}.compact
@@ -114,23 +116,35 @@ class Skyline::Rendering::Renderer
 
       av = ActionView::Base.new(load_paths.map(&:to_s))
 
-      self.assigns.merge(options[:assigns]).each do |k, v|
-        av.assigns[k.to_sym] = v
-      end
-
-      av.assigns[:_template_assigns] = @template_assigns
-      av.assigns[:_renderer] = self
-      av.assigns[:_local_object_name] = object_config[:class_name].demodulize.underscore.to_sym
-      av.assigns[:_local_object] = object
+      assigns = (options[:assigns] || {}).merge(self.assigns)
+      assigns[:_template_assigns] = @template_assigns
+      assigns[:_renderer] = self
+      assigns[:_local_object_name] = object_config[:class_name].demodulize.underscore.to_sym
+      assigns[:_local_object] = object
+      
+      av.assign(assigns)
+      
       @_local_object = object   # for object function
       
+      if @controller
+        if @controller.respond_to?(:_routes)
+          (class << av; self; end).send(:include, @controller._routes.url_helpers)
+        end
+
+        if @controller.respond_to?(:_helpers)
+          (class << av; self; end).send(:include, @controller._helpers)
+        end
+      end
+          
       av.extend Skyline::Rendering::Helpers::RendererHelper
       av.extend Helpers
       
-      av.render(:file => "index", :locals => options[:locals])
+      av.render(:file => "index", :locals => options[:locals]).html_safe
     end
   end
   
+  
+  
   # Render a collection of objects (array), this gives
   # support for peek() and skip!() in the templates. A template
   # can decide too look n items forward and skip n items because the template
@@ -362,7 +376,7 @@ class Skyline::Rendering::Renderer
     end    
     @_current_colection = nil
     
-    output.join("\n")
+    output.join("\n").html_safe
   end  
   
     
@@ -384,7 +398,7 @@ class Skyline::Rendering::Renderer
 
     # Load all helpers
     Dir[Rails.root + "app/helpers/**/*_helper.rb"].each do |helper|
-      self.helper helper.sub(Rails.root + "app/helpers/","").sub(/_helper\.rb$/,"")
+      self.helper helper.sub(/^#{Regexp.escape((Rails.root + "app/helpers/").to_s)}/,"").sub(/_helper\.rb$/,"")
     end  
     
   end

data/lib/skyline/route_constraint.rb

@@ -0,0 +1,15 @@
+class Skyline::RouteConstraint
+  class << self
+    def matches?(request)
+      is_skyline_path = false
+      
+      # Exclude /[skyline_prefix]/*
+      is_skyline_path ||= (request.fullpath =~ /^\/?#{Regexp.escape(Skyline::Configuration.url_prefix)}/)
+      
+      # Also exclude /media/dirs
+      is_skyline_path ||= (request.fullpath =~ /^\/?media\/dirs/)
+      
+      !is_skyline_path
+    end
+  end
+end

data/lib/skyline/settings.rb

@@ -108,10 +108,6 @@ module Skyline::Settings
     
     protected
     
-    def page_cache
-       @_page_cache ||= {}
-    end
-    
     def create_proxy_method(name)
       (class << self; self; end).send(:define_method,name){ self[name] }
     end    
@@ -119,7 +115,7 @@ module Skyline::Settings
   
   # Set the data for this page, this works the same as .attributes= on 
   # regular ActiveRecord objects.
-  def data=data
+  def data=(data)
     data = HashWithIndifferentAccess.new(data)
     multi_parameter_attributes = [] 
     data.each do |k,v|
@@ -157,9 +153,15 @@ module Skyline::Settings
   end
   
   # Analogue to method_missing
-  def respond_to?(meth)
+  def respond_to?(meth, include_private=false)
+    s = super
+    return s if s
+    
+    # Failsafe for stack level errors of calling _page from within AR read_attribute
+    return false if meth == "_page"
+    
     base_method = meth.to_s.gsub(/(_before_type_cast)|(=)$/,"").to_sym
-    self[:page] && self.page && self.page.field_names.include?(base_method) || super
+    self[:page] && self.page && self.page.field_names.include?(base_method)
   end
 
   # The fields hash of the current settings-page

data/lib/skyline/taggable.rb

@@ -12,7 +12,7 @@
 #      has_many :associated_tags, :class_name => "Skyline::AssociatedTag", :as => "taggable"
 #      has_many :tags, :through => :associated_tags, :class_name => "Skyline::Tag"    
 #     
-#      named_scope :with_tags (tags)      (scope to return items that have at least one of the tags supplied; or all if no tags are passed)
+#      scope :with_tags (tags)      (scope to return items that have at least one of the tags supplied; or all if no tags are passed)
 #
 #      def raw_tags 
 #      def raw_tags=(str)
@@ -31,7 +31,7 @@ module Skyline::Taggable
     base.send :alias_method_chain, :clone, :associated_tags
     
     base.class_eval do
-      named_scope :with_tags, lambda {|tags|
+      scope :with_tags, lambda {|tags|
         if tags.any?
           {:conditions => ["(SELECT tag_id FROM skyline_associated_tags WHERE taggable_id=#{self.table_name}.id AND taggable_type=? AND tag_id IN (?) LIMIT 1)", self.name, tags],
            :include => :associated_tags}

data/lib/skyline/version.rb

@@ -5,7 +5,7 @@ module Skyline
   # @private
   module VERSION
     MAJOR = 3
-    MINOR = 1
+    MINOR = 2
     TINY = 0
     BUILD = 0
 
@@ -17,9 +17,9 @@ module Skyline
         if `git --git-dir=#{git_dir} describe --tags HEAD` =~ /^v\d+\.\d+\.\d+(\.\d+)?$/
           build = nil
         else
-          build = `git --git-dir=#{git_dir} show HEAD --format=format:"%ct" --quiet 2>&1`
-          if build =~ /\d+/
-            build = Time.at(build.to_i).strftime("%Y%m%d") 
+          build = `git --git-dir=#{git_dir} show HEAD --format=format:"%h" --quiet 2>&1`
+          if build =~ /[0-9a-f]+/
+            build = build.to_s
           else
             build = nil
           end

data/lib/skylinecms.rb

@@ -1,3 +1,5 @@
-# This file is here so config.gem and bundler work out of the box and don't complain
-# about a missing skylincms.rb file.
-require File.dirname(__FILE__) + "/skyline"
+require File.dirname(__FILE__) + "/skyline"
+
+require File.dirname(__FILE__) + '/skyline/engine' if defined?(::Rails) && ::Rails::VERSION::MAJOR == 3
+
+

data/lib/tasks/database.rake

@@ -8,7 +8,7 @@ namespace :skyline do
       ActiveRecord::Migrator.migrate(Skyline.root + "db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
       
       # Also seed plugins
-      Skyline::PluginsManager.plugins.each do |path, plugin|
+      Rails.application.config.skyline_plugins_manager.plugins.each do |path, plugin|
         next unless plugin.migration_path
         
         puts "\n\n[PLUGIN] [#{plugin.name}] ============================="
@@ -65,7 +65,7 @@ namespace :skyline do
       end
       
       # Also seed plugins
-      Skyline::PluginsManager.plugins.each do |path, plugin|
+      Rails.application.config.skyline_plugins_manager.plugins.each do |path, plugin|
         puts "\n\n[PLUGIN] [#{plugin.name}] ============================="
         Dir[plugin.seed_path + "*.rb"].each do |f|
           load f

data/public/skyline/javascripts/src/application.js

@@ -1,6 +1,7 @@
 // Place your application-specific JavaScript functions and classes here
 // This file is automatically included by javascript_include_tag :defaults
 
+//= require "rails"
 //= require "mootools_on_rails"
 
 var Application = {};
@@ -136,7 +137,7 @@ Application.Layout = (function(){
       
       // TODO: Currently hardcoded, should someday become something like $$('ul.sections')...
       if($('contentlist')){
-        new Application.Sections("contentlist",{ scrollParent : "contentEditPanel" });
+        new Application.Sections("contentlist",{ offsetParent : "contentEditPanel" });
       }
       
       // TODO: Currently hardcoded
@@ -251,7 +252,7 @@ Application.Layout = (function(){
   };  
   
   Layout.Media.initializeUploadPanel = function(dirPath){
-    var uPanel = $('contentInfoPanel')
+    var uPanel = $('contentInfoPanel');
     var fB = $('finishedbutton');
     fB.setStyle('display','none');
 
@@ -287,13 +288,13 @@ Application.Layout = (function(){
 
     upl.addEvent("start",function(){
       uPanel.retrieve("skyline.layout").parent.setup();
-    })
+    });
 
     $('cancelselect').addEvent('click', function() {
      upl.reset(); // remove all files
      uPanel.retrieve("skyline.layout").hide();
      return false;
-   })
+   });
   };
   
   

data/public/skyline/javascripts/src/rails.js

@@ -0,0 +1,165 @@
+/*
+---
+description: A MooTools driver for the Ruby on Rails 3 unobtrusive JavaScript API.
+
+license: MIT-style
+
+authors:
+- Kevin Valdek
+
+requires:
+  core/1.3: '*'
+
+provides:
+  - Rails 3 MooTools driver
+
+...
+*/
+
+(function($) {
+
+  window.rails = {
+    /**
+     * If el is passed as argument, events will only be applied to
+     * elements within el. Otherwise applied to document body.
+     */
+    applyEvents: function(el) {
+      var el = $(el || document.body);
+      var applyE = function(selector, action, callback) {
+        var name = action + ":relay(" + selector + ")";
+        el.addEvent(name, callback);
+      };
+
+      applyE('form[data-remote=true]', 'submit', rails.handleRemote);
+      applyE('a[data-remote=true], input[data-remote=true], button[data-remote=true]', 'click', rails.handleRemote);
+      applyE('a[data-method][data-remote!=true], button[data-method][data-remote!=true]', 'click', function(e) {
+        e.preventDefault();
+        if(rails.confirmed(this)) {
+          var form = new Element('form', {
+            method: 'post',
+            action: this.get('href') || this.get('data-url'),
+            styles: { display: 'none' }
+          }).inject(this, 'after');
+          
+          var methodInput = new Element('input', {
+            type: 'hidden',
+            name: '_method',
+            value: this.get('data-method')
+          });
+          
+          var csrfInput = new Element('input', {
+            type: 'hidden',
+            name: rails.csrf.param,
+            value: rails.csrf.token
+          });
+          
+          form.adopt(methodInput, csrfInput).submit();
+        }
+      });
+      var noMethodNorRemoteConfirm = ':not([data-method]):not([data-remote=true])[data-confirm]';
+      applyE('a' + noMethodNorRemoteConfirm + ',' + 'input' + noMethodNorRemoteConfirm, 'click', function() {
+        return rails.confirmed(this);
+      });
+    },
+
+    getCsrf: function(name) {
+      var meta = document.getElement('meta[name=csrf-' + name + ']');
+      return (meta ? meta.get('content') : null);
+    },
+
+    confirmed: function(el) {
+      var confirmMessage = el.get('data-confirm');
+      if(confirmMessage && !confirm(confirmMessage)) {
+        return false;
+      }
+      return true;
+    },
+
+    disable: function(el) {
+      var button = el.get('data-disable-with') ? el : el.getElement('[data-disable-with]');
+
+      if(button) {
+        var enableWith = button.get('value');
+        el.addEvent('ajax:complete', function() {
+          button.set({
+            value: enableWith,
+            disabled: false
+          });
+        });
+        button.set({
+          value: button.get('data-disable-with'),
+          disabled: true
+        });
+      }
+    },
+
+    handleRemote: function(e) {
+      e.preventDefault();
+
+      if(rails.confirmed(this)) {
+        this.request = new Request.Rails(this);
+        rails.disable(this);
+        this.request.send();
+      }
+    }
+  };
+
+  Request.Rails = new Class({
+
+    Extends: Request,
+
+    initialize: function(element, options) {
+      this.el = element;
+      this.parent(Object.merge({
+        method: this.el.get('method') || this.el.get('data-method') || 'get',
+        url: this.el.get('action') || this.el.get('href')
+      }, options));
+
+      this.addRailsEvents();
+    },
+
+    send: function(options) {
+      this.el.fireEvent('ajax:before');
+      if(this.el.get('tag') == 'form') {
+        this.options.data = this.el;
+      } else {
+        var d = {};
+        d[rails.csrf.param] = rails.csrf.token;
+        this.options.data = Object.merge(d, (this.options.data || {}));
+      }
+      this.parent(options);
+      this.el.fireEvent('ajax:after', this.xhr);
+    },
+
+    addRailsEvents: function() {
+      this.addEvent('request', function() {
+        this.el.fireEvent('ajax:loading', this.xhr);
+      });
+
+      this.addEvent('success', function() {
+        this.el.fireEvent('ajax:success', this.xhr);
+      });
+
+      this.addEvent('complete', function() {
+        this.el.fireEvent('ajax:complete', this.xhr);
+        this.el.fireEvent('ajax:loaded', this.xhr);
+      });
+
+      this.addEvent('failure', function() {
+        this.el.fireEvent('ajax:failure', this.xhr);
+      });
+    }
+
+  });
+
+})(document.id);
+
+window.addEvent('domready', function() {
+
+  rails.csrf = {
+    token: rails.getCsrf('token'),
+    param: rails.getCsrf('param')
+  };
+
+  rails.applyEvents();
+});