skylinecms 3.2.0 → 3.3.0

data/lib/skyline/content/implementation.rb

@@ -1,6 +1,5 @@
 # @private
 class Skyline::Content::Implementation
-  extend ActiveSupport::Memoizable
   include Singleton
   
   # All the content_classes. This works fine when using in Rails
@@ -30,12 +29,14 @@ class Skyline::Content::Implementation
     
   # Does this implementations have a Settings class?
   def has_settings?
-    "Settings".constantize
-    true
-  rescue NameError
-    false
+    return @has_settings unless @has_settings === nil
+    @has_settings = begin
+      "Settings".constantize
+      true
+    rescue NameError
+      false
+    end
   end
-  memoize :has_settings?
   
   # The settings class for this implementation
   def settings

data/lib/skyline/content/meta_data/field.rb

@@ -99,7 +99,7 @@ module Skyline::Content
       
       # The method/column name this field writes to. This takes foreign_keys of belongs_to associations in account.
       def attribute_name
-        self.association? && self.reflection.macro == :belongs_to && self.reflection.primary_key_name || self.name
+        self.association? && self.reflection.macro == :belongs_to && self.reflection.foreign_key || self.name
       end
       
       # The type of the associated column, or if it's serialized

data/lib/skyline/content/stack.rb

@@ -2,7 +2,7 @@
 class Skyline::Content::Stack < Array
   
   def logger
-    RAILS_DEFAULT_LOGGER
+    Rails.logger
   end
 
   def initialize(implementation,types)

data/lib/skyline/content/versioning/version.rb

@@ -1,6 +1,6 @@
 # @private
 class Skyline::Content::Versioning::Version < ActiveRecord::Base
-  set_table_name "skyline_versions"
+  self.table_name = "skyline_versions"
   belongs_to :versionable, :polymorphic => true
   alias_attribute :current_version, :version
   alias_attribute :current_author, :author

data/lib/skyline/engine.rb

@@ -27,7 +27,7 @@ module Skyline
     end
     
     initializer "skyline.setup_plugins_manager" do |app|
-      app.config.skyline_plugins_manager = Skyline::Plugins::Manager.new(app)
+      app.config.skyline_plugins_manager = Skyline::Plugins::Manager.new(self, app)
       if app.config.cache_classes || !app.config.reload_plugins
         app.config.skyline_plugins_manager.load_all!
       end      

data/lib/skyline/has_many_referables_in.rb

@@ -34,7 +34,7 @@ module Skyline::HasManyReferablesIn
     base.send(:has_many, :image_refs, :class_name => "Skyline::ImageRef", :conditions => {:refering_type => base.name}, :foreign_key => :refering_id, :source_type => base.name, :dependent => :destroy)
     base.send(:has_many, :link_refs, :class_name => "Skyline::LinkRef", :conditions => {:refering_type => base.name}, :foreign_key => :refering_id, :source_type => base.name, :dependent => :destroy)
     
-    base.send :alias_method_chain, :clone, :referables    
+    base.send :alias_method_chain, :dup, :referables
   end
   
   module ClassMethods    
@@ -72,11 +72,11 @@ module Skyline::HasManyReferablesIn
   
   # Implementation of the clone interface
   # @private
-  def clone_with_referables
-    clone_without_referables.tap do |clone|      
+  def dup_with_referables
+    dup_without_referables.tap do |dup|
       if !self.referable_fields.nil?
         self.referable_fields.each do |field|         
-          clone.send("#{field}=".to_sym, self.send(field,true,{:nullify => true}))
+          dup.send("#{field}=".to_sym, self.send(field,true,{:nullify => true}))
         end
       end
     end

data/lib/skyline/plugins/manager.rb

@@ -16,10 +16,11 @@
 # @private
 class Skyline::Plugins::Manager
   
-  attr_reader :app
+  attr_reader :app, :engine
   
-  def initialize(app)
+  def initialize(engine, app)
     @app = app
+    @engine = engine
     init_all!
   end
   
@@ -47,7 +48,7 @@ class Skyline::Plugins::Manager
   # 
   # @return [Pathname] Rails.public_path + "skyline_plugins"
   def public_path
-    Pathname.new(self.app.paths.public.to_a.first) + "skyline_plugins"
+    Pathname.new(self.app.paths['public'].to_a.first) + "skyline_plugins"
   end
 
   # All known plugins

data/lib/skyline/plugins/plugin.rb

@@ -58,10 +58,18 @@ class Skyline::Plugins::Plugin
   def add_view_path!
     vp = (self.path + "app/views")
     return unless vp.exist?
+    engine_vp =  self.manager.engine.root + "app/views"
     
     ActiveSupport.on_load(:action_controller) do
-      prepend_view_path(vp)
+      current_view_paths = self.view_paths
+      append_view_path(vp)
+      plugin_path = self.view_paths.dup.pop
+
+      ep = self.view_paths.detect{|p| p.to_path == engine_vp.to_s}
+      i = self.view_paths.index(ep)
+      self.view_paths = current_view_paths.dup.insert(i, plugin_path)
     end
+
     ActiveSupport.on_load(:action_mailer) do
       prepend_view_path(vp)
     end    

data/lib/skyline/rendering/renderer.rb

@@ -62,7 +62,17 @@ class Skyline::Rendering::Renderer
     # Convert a renderable specified by string to a class
     def renderables_to_class(type, renderables, additional_map = {})
       map = {:sections => "Skyline::Sections"}.merge(additional_map)
-      renderables.map{|f| f.kind_of?(String) ? "#{[map[type], f.camelize].compact.join("::")}".constantize : f}
+      renderables.map do |f|
+        if f.kind_of?(String) 
+          if f =~ /\A::/
+            f.camelize.constantize
+          else
+            "#{[map[type], f.camelize].compact.join("::")}".constantize
+          end
+        else 
+          f
+        end
+      end
     end
     
   end
@@ -163,7 +173,7 @@ class Skyline::Rendering::Renderer
   # 
   # @return [String] The rendererd templates
   def render_collection(objects, options = {}, &block)
-    self.clone.send(:_render_collection, objects, options, &block)
+    self.dup.send(:_render_collection, objects, options, &block)
   end
   
   # The current object that's being rendered

data/lib/skyline/sections/interface.rb

@@ -24,7 +24,7 @@ module Skyline::Sections::Interface
  
   def self.included(base)
     base.class_eval do
-      set_table_name "skyline_sections_#{base.table_name}" if base.parents.include?(Skyline)
+      self.table_name = "skyline_sections_#{base.table_name}" if base.parents.include?(Skyline)
       has_one :section, :as => :sectionable, :class_name => "Skyline::Section"
     end
     base.send(:cattr_accessor, :default_interface)

data/lib/skyline/taggable.rb

@@ -28,7 +28,7 @@ module Skyline::Taggable
     base.send :has_many, :tags, :through => :associated_tags, :class_name => "Skyline::Tag"    
     base.send :cattr_accessor, :taggable_type
     
-    base.send :alias_method_chain, :clone, :associated_tags
+    base.send :alias_method_chain, :dup, :associated_tags
     
     base.class_eval do
       scope :with_tags, lambda {|tags|
@@ -60,9 +60,9 @@ module Skyline::Taggable
     self.class.available_tags
   end
   
-  def clone_with_associated_tags
-    clone_without_associated_tags.tap{|clone|      
-      clone.associated_tags = self.associated_tags.collect{|at| at.clone }
+  def dup_with_associated_tags
+    dup_without_associated_tags.tap{|dup|
+      dup.associated_tags = self.associated_tags.collect{|at| at.dup }
     }
   end  
   

data/lib/skyline/version.rb

@@ -5,7 +5,7 @@ module Skyline
   # @private
   module VERSION
     MAJOR = 3
-    MINOR = 2
+    MINOR = 3
     TINY = 0
     BUILD = 0
 
@@ -17,7 +17,7 @@ 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:"%h" --quiet 2>&1`
+          build = `git --git-dir=#{git_dir} show HEAD --format=format:"%h" 2>&1 -s`
           if build =~ /[0-9a-f]+/
             build = build.to_s
           else

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

@@ -4,7 +4,7 @@
 //= require "rails"
 //= require "mootools_on_rails"
 
-var Application = {};
+//= require "application_preinit"
 
 //= require "utils"
 //= require "draggable_files"

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

@@ -0,0 +1 @@
+var Application = {};

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

@@ -1,4 +1,4 @@
-//= require <uploader>
+//= require "uploader"
 
 /*
   Class: Application.LibraryUploader

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

@@ -1,12 +1,26 @@
-window.tinyMCEPreInit = {};
-tinyMCEPreInit.suffix  = "";
-tinyMCEPreInit.base = "/javascripts/skyline.editor";
-tinyMCEPreInit.query = "";
+//= require "tinymce_preinit.js"
 
 //= require "../vendor/tinymce/jscripts/tiny_mce/tiny_mce_src"
 //= require "../vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template"
 //= require "../vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin"
 
+//= require_self
+
+//= require "script_loader"
+//= require "theme"
+//= require "ui/separator"
+//= require "ui/toolbar"
+//= require "plugins/autoresize/editor_plugin"
+//= require "plugins/skylinewindows/editor_plugin"
+//= require "plugins/skylineimage/editor_plugin"
+//= require "plugins/skylineimage/dialog"
+//= require "plugins/skylinelink/editor_plugin"
+//= require "plugins/skylinelink/dialog"
+//= require "plugins/skylinecode/editor_plugin"
+//= require "plugins/skylinecode/dialog"
+//= require "plugins/skylinecontextmenu/editor_plugin"
+//= require "plugins/skylinetable/editor_plugin"
+
 var __FILE__ = Skyline.Utils.getJsLocation("skyline.editor.js");
 
 Skyline.Editor = new Class({
@@ -130,17 +144,3 @@ Skyline.Editor = new Class({
   }
 });
 
-//= require "script_loader"
-//= require "theme"
-//= require "ui/separator"
-//= require "ui/toolbar"
-//= require "plugins/autoresize/editor_plugin"
-//= require "plugins/skylinewindows/editor_plugin"
-//= require "plugins/skylineimage/editor_plugin"
-//= require "plugins/skylineimage/dialog"
-//= require "plugins/skylinelink/editor_plugin"
-//= require "plugins/skylinelink/dialog"
-//= require "plugins/skylinecode/editor_plugin"
-//= require "plugins/skylinecode/dialog"
-//= require "plugins/skylinecontextmenu/editor_plugin"
-//= require "plugins/skylinetable/editor_plugin"

data/public/skyline/javascripts/src/skyline.editor/src/tinymce_preinit.js

@@ -0,0 +1,4 @@
+window.tinyMCEPreInit = {};
+tinyMCEPreInit.suffix  = "";
+tinyMCEPreInit.base = "/javascripts/skyline.editor";
+tinyMCEPreInit.query = "";

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

@@ -1,18 +1,20 @@
-//= require <skyline>
-// 
-//= require <utils>
-//= require <events>
-//= require <drag>
-//= require <layout>
-//= require <tree>
-//= require <tag_selector>
-//= require <uploader>
-//= require <dialog>
-//= require <tabs>
-//= require <toggle>
-//= require <menubutton>
-//= require <sortable>
-//= require <hover_select>
-//= require <field_replicator>
-//= require <menu>
-//= require <table>
+//= require "skyline/src/skyline"
+//
+//= require "skyline/src/utils"
+//= require "events"
+//= require "drag"
+//= require "layout"
+//= require "tree"
+//= require "tag_selector"
+//= require "uploader"
+//= require "dialog"
+//= require "tabs"
+//= require "toggle"
+//= require "menubutton"
+//= require "sortable"
+//= require "hover_select"
+//= require "field_replicator"
+//= require "menu"
+//= require "table"
+
+//= require_self

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

@@ -1,5 +1,5 @@
-//= require <mootools-core>
-//= require <mootools-more>
+//= require "mootools-core"
+//= require "mootools-more"
 
 /*
   Namespace: Skyline

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

@@ -1,4 +1,4 @@
-//= require <Swiff.Uploader>
+//= require "Swiff.Uploader"
 /*
   Class: Skyline.Uploader
   An extended version of Swiff.Uploader. It has some extra event's and

data/skylinecms.gemspec

@@ -29,17 +29,19 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   
   s.add_dependency "thor"
-  s.add_dependency "rails", "3.0.9"
+  s.add_dependency "rails", "~> 3.2.2"
   s.add_dependency "polyglot", "0.3.2"
-  s.add_dependency "sprockets", "1.0.2"
+  s.add_dependency "sprockets", "2.1.2"
   s.add_dependency "mime-types", "1.16"
   s.add_dependency "rmagick", "2.13.1"
-  s.add_dependency "hpricot", "0.8.2"
+  s.add_dependency "hpricot", "0.8.6"
   s.add_dependency "guid", "0.1.1"
   s.add_dependency "will_paginate", "~> 3.0.0"
-  s.add_dependency "seed-fu", "~> 1.2.0"
-  s.add_dependency "mail", "~>2.2.0" 
+  s.add_dependency "seed-fu", "2.2.0"
+  s.add_dependency "mail", "~>2.4.1" 
   s.add_dependency "personify", "~> 1.1.0"
+  s.add_dependency 'factory_girl'
+  s.add_dependency 'shoulda'
 
 end
 

data/test/factories.rb

@@ -1,3 +1,5 @@
+require 'factory_girl'
+
 Factory.define :media_dir, :class => Skyline::MediaDir do |d|  
   d.name "test_dir"
 end

data/test/integration/media_browser_super_access_test.rb

@@ -37,15 +37,15 @@ class MediaBrowserSuperAccessTest < ActionController::IntegrationTest
     end 
      
     should "be able to create a MediaFile" do
-      @u.allow(:post, skyline_media_dir_files_path(@media_dir),{:Filename => "/files/test.gif", :Filedata => fixture_file_upload("/../../vendor/plugins/skyline/db/fixtures/files/test.gif", "image/gif")})
+      @u.allow(:post, skyline_media_dir_files_path(@media_dir),{:Filename => "/files/test.gif", :Filedata => fixture_file_upload(File.dirname(__FILE__) + "/../../db/fixtures/files/test.gif", "image/gif")})
     end
       
     should "be able to edit a MediaFile" do
-      @u.allow(:put,  skyline_media_dir_file_path(@media_dir,@media_file), {:Filename => "/files/test.gif", :mediafile => fixture_file_upload("/../../vendor/plugins/skyline/db/fixtures/files/test.gif", "image/gif")})
+      @u.allow(:put,  skyline_media_dir_file_path(@media_dir,@media_file), {:Filename => "/files/test.gif", :mediafile => fixture_file_upload(File.dirname(__FILE__) + "/../../db/fixtures/files/test.gif", "image/gif"), :format => :js})
     end    
       
     should "be able to delete a MediaFile" do
-      @u.allow(:delete, skyline_media_dir_file_path(@media_dir,@media_file))
+      @u.allow(:delete, skyline_media_dir_file_path(@media_dir,@media_file), :format => :js)
     end 
   end
   

data/test/integration/media_browser_user_access_test.rb

@@ -34,11 +34,11 @@ class MediaBrowserUserAccessTest < ActionController::IntegrationTest
     end 
      
      should "not be able to create a MediaFile" do
-       @u.deny(:post, skyline_media_dir_files_path(@media_dir),{:Filename => "/files/test.gif", :mediafile => fixture_file_upload("/../../vendor/plugins/skyline/db/fixtures/files/test.gif", "image/gif")})
+       @u.deny(:post, skyline_media_dir_files_path(@media_dir),{:Filename => "/files/test.gif", :mediafile => fixture_file_upload(File.dirname(__FILE__) + "/../../db/fixtures/files/test.gif", "image/gif")})
      end
       
     should "not be able to edit a MediaFile" do
-     @u.deny(:put,  skyline_media_dir_file_path(@media_dir,@media_file), {:Filename => "/files/test.gif", :mediafile => fixture_file_upload("/../../vendor/plugins/skyline/db/fixtures/files/test.gif", "image/gif")})
+     @u.deny(:put,  skyline_media_dir_file_path(@media_dir,@media_file), {:Filename => "/files/test.gif", :mediafile => fixture_file_upload(File.dirname(__FILE__) + "/../../db/fixtures/files/test.gif", "image/gif")})
     end
       
     should "not be able to delete a MediaFile" do

data/test/integration/user_preferences_test.rb

@@ -14,27 +14,27 @@ class UserPreferencesTest < ActionController::IntegrationTest
     end
     
     should "be stored in a cookie with value and sent on request" do
-      @u.cookies["skyline_up"] = CGI::escape(ActiveSupport::JSON.encode({"my_field" => "a.email@address.com"}))
+      @u.cookies["skyline_up"] = ActiveSupport::JSON.encode({"my_field" => "a.email@address.com"})
       @u.get "/skyline"
       @u.assert_equal('a.email@address.com', @user.user_preferences.get('my_field'))
     end
     
     should "be stored in a cookie with serialized hash and sent on request" do
       up_my_hash = {'a' => 1, 'b' => 2}
-      @u.cookies["skyline_up"] = CGI::escape(ActiveSupport::JSON.encode({"my_hash" => up_my_hash}))
+      @u.cookies["skyline_up"] = ActiveSupport::JSON.encode({"my_hash" => up_my_hash})
       @u.get "/skyline"
       @u.assert_equal(up_my_hash, @user.user_preferences.get('my_hash'))
     end
 
     should "be able to collect multiple values and send after request" do
-      @u.cookies["skyline_up"] = CGI::escape(ActiveSupport::JSON.encode({"my_field" => "a.email@address.com", "my_hash" => {'a' => 1, 'b' => 2}}))
+      @u.cookies["skyline_up"] = ActiveSupport::JSON.encode({"my_field" => "a.email@address.com", "my_hash" => {'a' => 1, 'b' => 2}})
       @u.get "/skyline"  
       @u.assert_equal({'a' => 1, 'b' => 2}, @user.user_preferences.get('my_hash'))
       @u.assert_equal('a.email@address.com', @user.user_preferences.get('my_field'))
     end
     
     should "have empty value in cookie after request" do
-      @u.cookies["skyline_up"] = CGI::escape(ActiveSupport::JSON.encode({"my_field" => "a.email@address.com"}))
+      @u.cookies["skyline_up"] = ActiveSupport::JSON.encode({"my_field" => "a.email@address.com"})
       @u.cookies["my_own_field"] = "Do not delete me"
       
       @u.get "/skyline"
@@ -60,7 +60,7 @@ class UserPreferencesTest < ActionController::IntegrationTest
     
     should "store delete value in cookie and handle correctly" do
       @u.assert @user.user_preferences.has_key?("a")
-      @u.cookies["skyline_up"] = CGI::escape(ActiveSupport::JSON.encode({"_delete" => ["a","b"]}))
+      @u.cookies["skyline_up"] = ActiveSupport::JSON.encode({"_delete" => ["a","b"]})
       
       @u.get "/skyline"