skylinecms 3.0.8 → 3.1.0

data/db/fixtures/roles_and_rights.rb

@@ -6,6 +6,26 @@ def log(str)
   puts str if !Object.const_defined?(:SILENT_SEED) || SILENT_SEED == false
 end
 
+def stfu
+  return yield if !Object.const_defined?(:SILENT_SEED) || SILENT_SEED == false
+  
+  begin
+    orig_stderr = $stderr.clone
+    orig_stdout = $stdout.clone
+    $stderr.reopen File.new('/dev/null', 'w')
+    $stdout.reopen File.new('/dev/null', 'w')
+    retval = yield
+  rescue Exception => e
+    $stdout.reopen orig_stdout
+    $stderr.reopen orig_stderr
+    raise e
+  ensure
+    $stdout.reopen orig_stdout
+    $stderr.reopen orig_stderr
+  end
+  retval
+end
+
 # ==================================
 # = Definition of rights and roles =
 # ==================================
@@ -17,57 +37,62 @@ Skyline::Right.connection.execute("DELETE FROM skyline_rights_skyline_roles WHER
 
 log "\n== Creating roles"
 
-Skyline::Role.seed_many(:name,[
-  {:name => "super", :system => true}
-])
+stfu do
+  Skyline::Role.seed_many(:name,[
+    {:name => "super", :system => true}
+  ])
+end
 
 log "\n== Creating rights"
-Skyline::Right.seed_many(:name,[
-  {:name => "media_dir_create"},
-  {:name => "media_dir_update"},
-  {:name => "media_dir_delete"},
-  {:name => "media_file_create"},
-  {:name => "media_file_update"},
-  {:name => "media_file_delete"},
-  {:name => "media_file_show"},
+
+stfu do 
+  Skyline::Right.seed_many(:name,[
+    {:name => "media_dir_create"},
+    {:name => "media_dir_update"},
+    {:name => "media_dir_delete"},
+    {:name => "media_file_create"},
+    {:name => "media_file_update"},
+    {:name => "media_file_delete"},
+    {:name => "media_file_show"},
   
-  {:name => "page_index"},
-  {:name => "page_create"},
-  {:name => "page_show"},
-  {:name => "page_update"},
-  {:name => "page_lock"},
-  {:name => "page_variant_create"},
-  {:name => "page_variant_delete"},
+    {:name => "page_index"},
+    {:name => "page_create"},
+    {:name => "page_show"},
+    {:name => "page_update"},
+    {:name => "page_lock"},
+    {:name => "page_variant_create"},
+    {:name => "page_variant_delete"},
 
-  {:name => "page_fragment_index"},
-  {:name => "page_fragment_create"},
-  {:name => "page_fragment_show"},
-  {:name => "page_fragment_update"},
-  {:name => "page_fragment_lock"},
-  {:name => "page_fragment_variant_create"},
-  {:name => "page_fragment_variant_delete"},
+    {:name => "page_fragment_index"},
+    {:name => "page_fragment_create"},
+    {:name => "page_fragment_show"},
+    {:name => "page_fragment_update"},
+    {:name => "page_fragment_lock"},
+    {:name => "page_fragment_variant_create"},
+    {:name => "page_fragment_variant_delete"},
 
 
-  {:name => "article_index"},
-  {:name => "article_create"},
-  {:name => "article_show"},
-  {:name => "article_update"},
-  {:name => "article_lock"},
-  {:name => "article_variant_create"},
-  {:name => "article_variant_delete"},
+    {:name => "article_index"},
+    {:name => "article_create"},
+    {:name => "article_show"},
+    {:name => "article_update"},
+    {:name => "article_lock"},
+    {:name => "article_variant_create"},
+    {:name => "article_variant_delete"},
 
   
-  {:name => "variant_force_edit"},  # If a user has the "force_edit" right he can force to edit a certain page, even if someone else is editing it.
+    {:name => "variant_force_edit"},  # If a user has the "force_edit" right he can force to edit a certain page, even if someone else is editing it.
   
-  {:name => "settings_update"},
+    {:name => "settings_update"},
   
-  {:name => "user_create"},
-  {:name => "user_update"},
-  {:name => "user_show"},
-  {:name => "user_delete"},
+    {:name => "user_create"},
+    {:name => "user_update"},
+    {:name => "user_show"},
+    {:name => "user_delete"},
   
-  {:name => "tinymce_edit_html"} # Defines wether or not to show the "edit html" button in the toolbar
-])
+    {: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/migrate/20090302102548_add_media_nodes.rb

@@ -1,6 +1,6 @@
 class AddMediaNodes < ActiveRecord::Migration
   def self.up
-    create_table :media_nodes do |t|
+    create_table :skyline_media_nodes do |t|
       t.column :parent_id, :integer      
       t.column :type, :string      
       t.column :name, :string
@@ -12,6 +12,6 @@ class AddMediaNodes < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :media_nodes
+    drop_table :skyline_media_nodes    
   end
 end

data/db/migrate/20090309133933_add_description_to_media_nodes.rb

@@ -1,9 +1,9 @@
 class AddDescriptionToMediaNodes < ActiveRecord::Migration
   def self.up
-    add_column :media_nodes, :description, :text
+    add_column :skyline_media_nodes, :description, :text
   end
 
   def self.down
-    remove_column :media_nodes, :description
+    remove_column :skyline_media_nodes, :description
   end
 end

data/db/migrate/20090309134731_add_tags.rb

@@ -1,11 +1,11 @@
 class AddTags < ActiveRecord::Migration
   def self.up
-    create_table :tags do |t|
+    create_table :skyline_tags do |t|
       t.column :tag, :string
     end
   end
 
   def self.down
-    drop_table :tags
+    drop_table :skyline_tags
   end
 end

data/db/migrate/20090309135746_create_media_files_tags.rb

@@ -1,12 +1,12 @@
 class CreateMediaFilesTags < ActiveRecord::Migration
   def self.up
-    create_table :media_files_tags, :id => false do |t|
+    create_table :skyline_media_files_skyline_tags, :id => false do |t|
       t.column :media_file_id, :integer
       t.column :tag_id, :integer
     end
   end
 
   def self.down
-    drop_table :media_files_tags
+    drop_table :skyline_media_files_skyline_tags
   end
 end

data/db/migrate/20090319091342_create_media_caches.rb

@@ -1,6 +1,6 @@
 class CreateMediaCaches < ActiveRecord::Migration #:nodoc:
   def self.up
-    create_table :media_caches do |t|
+    create_table :skyline_media_cache do |t|
       t.column :url, :string
       t.column :object_type, :string
       t.column :object_id, :integer
@@ -8,6 +8,6 @@ class CreateMediaCaches < ActiveRecord::Migration #:nodoc:
   end
 
   def self.down
-    drop_table :media_caches
+    drop_table :skyline_media_cache
   end
 end

data/db/migrate/20090327083240_create_users.rb

@@ -1,6 +1,6 @@
 class CreateUsers < ActiveRecord::Migration
   def self.up
-    create_table :users do |t|
+    create_table :skyline_users do |t|
       t.column :name, :string      
       t.column :email, :string
       t.column :password, :string
@@ -11,6 +11,6 @@ class CreateUsers < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :users
+    drop_table :skyline_users
   end
 end

data/db/migrate/20090327084656_create_roles.rb

@@ -1,12 +1,12 @@
 class CreateRoles < ActiveRecord::Migration
   def self.up
-    create_table :roles do |t|
+    create_table :skyline_roles do |t|
       t.column :name, :string
       t.timestamps
     end
   end
 
   def self.down
-    drop_table :roles
+    drop_table :skyline_roles
   end
 end

data/db/migrate/20090327084719_create_rights.rb

@@ -1,12 +1,12 @@
 class CreateRights < ActiveRecord::Migration
   def self.up
-    create_table :rights do |t|
+    create_table :skyline_rights do |t|
       t.column :name, :string
       t.timestamps
     end
   end
 
   def self.down
-    drop_table :rights
+    drop_table :skyline_rights
   end
 end

data/db/migrate/20090327084739_create_grants.rb

@@ -1,12 +1,12 @@
 class CreateGrants < ActiveRecord::Migration
   def self.up
-    create_table :grants, :id => false do |t|
+    create_table :skyline_grants, :id => false do |t|
       t.column :user_id, :integer
       t.column :role_id, :integer
     end
   end
 
   def self.down
-    drop_table :grants
+    drop_table :skyline_grants
   end
 end

data/db/migrate/20090327090918_create_rights_roles.rb

@@ -1,12 +1,12 @@
 class CreateRightsRoles < ActiveRecord::Migration
   def self.up
-    create_table :rights_roles, :id => false do |t|
+    create_table :skyline_rights_skyline_roles, :id => false do |t|
       t.column :right_id, :integer
       t.column :role_id, :integer
     end
   end
 
   def self.down
-    drop_table :rights_roles
+    drop_table :skyline_rights_skyline_roles
   end
 end

data/db/migrate/20090408115155_create_ref_objects.rb

@@ -1,6 +1,6 @@
 class CreateRefObjects < ActiveRecord::Migration
   def self.up
-    create_table :ref_objects do |t|
+    create_table :skyline_ref_objects do |t|
       t.integer :id
       t.integer :referable_id
       t.string :referable_type
@@ -14,6 +14,6 @@ class CreateRefObjects < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :ref_objects
+    drop_table :skyline_ref_objects
   end
 end

data/db/migrate/20090504140044_create_test_sections.rb

@@ -1,6 +1,6 @@
 class CreateTestSections < ActiveRecord::Migration
   def self.up
-    create_table :test_sections do |t|
+    create_table :skyline_test_sections do |t|
       t.text :body_a
       t.text :body_b
 
@@ -9,6 +9,6 @@ class CreateTestSections < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :test_sections
+    drop_table :skyline_test_sections
   end
 end

data/db/migrate/20090506083107_add_refering_column_name_to_ref_objects.rb

@@ -1,9 +1,9 @@
 class AddReferingColumnNameToRefObjects < ActiveRecord::Migration
   def self.up
-    add_column :ref_objects, :refering_column_name, :string
+    add_column :skyline_ref_objects, :refering_column_name, :string
   end
 
   def self.down
-    remove_column :ref_objects, :refering_column_name
+    remove_column :skyline_ref_objects, :refering_column_name
   end
 end

data/db/migrate/20090706124019_add_skyline_media_node_title.rb

@@ -6,6 +6,6 @@ class AddSkylineMediaNodeTitle < ActiveRecord::Migration
 
   def self.down
     add_column :skyline_media_nodes, :hidden, :boolean,       :default => false
-    remove_column :media_nodes, :title
+    remove_column :skyline_media_nodes, :title
   end
 end

data/db/migrate/20090904121447_create_skyline_referable_uris.rb

@@ -1,20 +1,20 @@
 class CreateSkylineReferableUris < ActiveRecord::Migration
   class Skyline::LinkSectionLink < ActiveRecord::Base
     set_table_name "skyline_link_section_links"     
-    include Skyline::ContentItem
-    referable_content :linked    
+    include Skyline::BelongsToReferable
+    belongs_to_referable :linked    
   end
   
   class Skyline::Sections::MediaSection < ActiveRecord::Base
     set_table_name "skyline_sections_media_sections"     
-    include Skyline::ContentItem
-    referable_content :linked
+    include Skyline::BelongsToReferable
+    belongs_to_referable :linked
   end
   
   class Skyline::Sections::RedirectSection < ActiveRecord::Base
     set_table_name "skyline_sections_redirect_sections"     
-    include Skyline::ContentItem
-    referable_content :linked
+    include Skyline::BelongsToReferable
+    belongs_to_referable :linked
   end  
   
   class Skyline::ReferableUri < ActiveRecord::Base

data/db/migrate/20091221145204_add_skyline_media_section_link.rb

@@ -0,0 +1,11 @@
+class AddSkylineMediaSectionLink < ActiveRecord::Migration
+  def self.up
+    rename_column :skyline_sections_media_sections, :linked_id, :media_id
+    add_column :skyline_sections_media_sections, :link_id, :integer
+  end
+
+  def self.down
+    rename_column :skyline_sections_media_sections, :media_id, :linked_id
+    remove_column :skyline_sections_media_sections, :link_id
+  end
+end

data/db/migrate/20100109145958_add_associated_tags_index.rb

@@ -0,0 +1,9 @@
+class AddAssociatedTagsIndex < ActiveRecord::Migration
+  def self.up
+    add_index :skyline_associated_tags, [:taggable_type, :taggable_id, :tag_id], :name => "sat_ttt"
+  end
+
+  def self.down
+    remove_index :skyline_associated_tags, :name => "sat_ttt"
+  end
+end

data/db/migrate/20100115111440_create_skyline_user_preferences.rb

@@ -0,0 +1,14 @@
+class CreateSkylineUserPreferences < ActiveRecord::Migration
+  def self.up
+    create_table :skyline_user_preferences do |t|
+      t.integer :user_id
+      t.string :key
+      t.string :encoded_value
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :user_preferences
+  end
+end

data/db/migrate/20100120113953_remove_unused_articles_index.rb

@@ -0,0 +1,9 @@
+class RemoveUnusedArticlesIndex < ActiveRecord::Migration
+  def self.up
+    remove_index :skyline_articles, :name => "index_skyline_pages_on_page_id_and_in_navigation"
+  end
+
+  def self.down
+    # No backward, because this index is useless.
+  end
+end

data/db/migrate/20100409073447_change_referable_uri_to_text.rb

@@ -0,0 +1,9 @@
+class ChangeReferableUriToText < ActiveRecord::Migration
+  def self.up
+    change_column :skyline_referable_uris, :uri, :text
+  end
+
+  def self.down
+    change_column :skyline_referable_uris, :uri, :string
+  end
+end

data/doc/Bundler.md

@@ -1,22 +1,21 @@
-Setting up Bundler for a Rails 2.3 application
+Setting up Bundler 1.x for a Rails 2.3 application
 ==============================================
 
 Requirements
 ------------
 
-* Ruby >= 1.8.6
-* Rubygems >= 1.3.5
-* Rails >= 2.3.4
-* Bundler 0.7.0
+* Ruby >= 1.8.7
+* Rubygems >= 1.3.7
+* Rails >= 2.3.10
+* Bundler >= 1.0.0
 
 Setup bundler to provide all necessary gems
 -------------------------------------------
 
 Create the file `Gemfile` in your RAILS\_ROOT and add the following lines:
 
-    bundle_path "vendor/bundler_gems"
-    gem "rails"
-    disable_system_gems
+  source :rubygems
+  gem "rails"
     
 ### Including extra Gemfiles?
 
@@ -31,41 +30,47 @@ Create initializer for Bundler
 
 Create file called `config/preinitializer.rb` and add the follwoing line:
 
-    require "#{File.dirname(__FILE__)}/../vendor/bundler_gems/environment"
+    begin
+      require "rubygems"
+      require "bundler"
+    rescue LoadError
+      raise "Could not load the bundler gem. Install it with `gem install bundler`."
+    end
+
+    if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
+      raise RuntimeError, "Your bundler version is too old for Rails 2.3." +
+       "Run `gem install bundler` to upgrade."
+    end
+
+    begin
+      # Set up load paths for all bundled gems
+      ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
+      Bundler.setup
+    rescue Bundler::GemNotFound
+      raise RuntimeError, "Bundler couldn't find some gems." +
+        "Did you run `bundle install`?"
+    end
 
 Initialize Bundler before Rails boots
 -------------------------------------
 
 Add the following to `config/boot.rb`, just before the `Rails.boot!` statement.
 
-    # for bundler
     class Rails::Boot
       def run
         load_initializer
-        extend_environment
-        Rails::Initializer.run(:set_load_path)
-      end
-      def extend_environment
+
         Rails::Initializer.class_eval do
-          old_load = instance_method(:load_environment)
-          define_method(:load_environment) do
-            Bundler.require_env RAILS_ENV
-            old_load.bind(self).call
+          def load_gems
+            @bundler_loaded ||= Bundler.require :default, Rails.env
           end
         end
+
+        Rails::Initializer.run(:set_load_path)
       end
     end
 
 Bundle your gems
 ----------------
 
-    gem bundle
-
-Using git?
-----------
-If you're using git we advise you to put the following lines in your .gitignore
-
-    vendor/bundler_gems/doc
-    vendor/bundler_gems/environment.rb
-    vendor/bundler_gems/gems
-    vendor/bundler_gems/specifications
+    gem bundle

data/doc/MIGRATION.md

@@ -12,6 +12,54 @@ After every Skyline update make sure that:
 * **Plugin users only!** The assets (`RAILS_ROOT/public/skyline`) are from the new version. If they are symlinked, Skyline will 
   take care of them for you.
 
+Version 3.0.8 -> Version 3.1.0
+------------------------------
+
+**Important**: Read the changelog for Skyline 3.1.0!!
+
+The main change in Skyline 3.1.0 is that we switched to Bundler 1.x. This means that you have to change some of the initialization files.
+
+### Files to change ###
+
+**Gemfile**
+
+Remove the lines:
+
+    bundle_path "vendor/bundler_gems"
+    disable_system_gems
+
+**config/environment.rb**
+
+Update the Rails version:
+
+    RAILS_GEM_VERSION = '2.3.10' unless defined? RAILS_GEM_VERSION
+    
+**config/boot.rb**
+See the Bundler docuemntation (/doc/Bundler.md)
+
+**config/preinitializer.rb**
+See the Bundler docuemntation (/doc/Bundler.md)
+
+
+### Deprecations ###
+
+A couple of classes and methods have been deprecated/removed in Skyline 3.1. This is by no means a complete overview of things that changed
+so YMMV. No specific functionality has been removed, but the interfaces have changed a bit. See below for a list of deprecations.
+
+**Important** : Some functionality has been deprecated in Skyline 3.1 you can still use the deprecation-layer if you are updating from an older version.
+
+* [Deprecations] Deprecations for 3.0.8 aren't loaded automatically anymore: require skyline/lib/deprecated/version3_0_8 manually to enable them.
+* [Deprecations] Removed all of Solr search, it will be put in a plugin.
+* [Deprecations] Refactor Renderer and RenderableScope* to the Rendering module.
+* [Deprecations] Deprecate Skyline::Renderer in favour of Skyline::Rendering::Renderer 
+* [Deprecations] Deprecate Skyline::UrlValidation in favour of vendored UrlValidation
+* [Deprecations] Deprecate Skyline::Renderer::SettingsHelper#get and Skyline::Renderer::SettingsHelper#get_page
+* [Deprecations] Deprecate Skyline::FormBuilderWithErrors in favour of Skyline::FormBuilder
+* [Deprecations] Deprecate SectionItem in favour of Sections::Interface.
+* [Deprecations] Deprecate Referable in favour of HasManyReferablesIn.
+* [Deprecations] Deprecate ContentItem in favour of BelongsToReferable.
+
+
 Version 3.0.7 -> Version 3.0.8
 ------------------------------