skylinecms 3.0.7 → 3.0.8

data/config/locales/en-US.yml

@@ -1,9 +1,9 @@
 "en-US":
   date:
     formats:
-      default: "%d-%m-%Y"
-      long: "%e %B %Y"
-      short: "%e %B"
+      default: "%Y-%m-%d"
+      short: "%b %d"
+      long: "%B %d, %Y"
       short_with_day_of_week: "%a %e %b"
   
     day_names: [sunday, monday, tuesday, wednesday, thursday, friday, saturday]
@@ -307,7 +307,7 @@
     delete_variant: "Delete variant"
     new_variant: "New variant"
     copy_variant: "Copy variant"
-    lock: "lock"
+    lock: "Lock"
     unlock: "Unlock"
     rollback: "Rollback"
     login: "Log in"

data/db/migrate/20090526090049_add_pages_url_part.rb

@@ -1,8 +1,6 @@
 class AddPagesUrlPart < ActiveRecord::Migration
   def self.up
-    add_column :skyline_pages, :url_part, :string, :null => false
-    execute "UPDATE skyline_pages SET url_part = CONCAT('page-', position)"
-    execute "UPDATE skyline_pages SET url_part = NULL where page_id is NULL"
+    add_column :skyline_pages, :url_part, :string, :null => false, :default => ""
   end
 
   def self.down

data/db/migrate/20090610142139_add_skyline_tags_taggable_type.rb

@@ -1,6 +1,6 @@
 class AddSkylineTagsTaggableType < ActiveRecord::Migration
   def self.up
-    add_column :skyline_tags, :taggable_type, :string, :null => false
+    add_column :skyline_tags, :taggable_type, :string, :null => false, :default => ""
     add_index :skyline_tags, [:taggable_type, :tag]
     execute("UPDATE skyline_tags SET taggable_type='Skyline::MediaFile'")
   end

data/db/migrate/20090610143446_move_skyline_media_files_skyline_tags_to_skyline_associated_tags.rb

@@ -2,7 +2,7 @@ class MoveSkylineMediaFilesSkylineTagsToSkylineAssociatedTags < ActiveRecord::Mi
   def self.up
     rename_table :skyline_media_files_skyline_tags, :skyline_associated_tags
     rename_column :skyline_associated_tags, :media_file_id, :taggable_id
-    add_column :skyline_associated_tags, :taggable_type, :string, :null => false
+    add_column :skyline_associated_tags, :taggable_type, :string, :null => false, :default => ""
     execute "UPDATE skyline_associated_tags SET taggable_type='Skyline::MediaNode'"
   end
 

data/db/migrate/20090616091122_add_skyline_pages_persistent.rb

@@ -1,7 +1,6 @@
 class AddSkylinePagesPersistent < ActiveRecord::Migration
   def self.up
     add_column :skyline_pages, :persistent, :boolean, :null => false, :default => false
-    execute "UPDATE skyline_pages SET persistent=1 WHERE page_id IS NULL"
   end
 
   def self.down

data/db/migrate/20091008134448_article_position_no_default.rb

@@ -1,6 +1,7 @@
 class ArticlePositionNoDefault < ActiveRecord::Migration
   def self.up
-    execute "ALTER TABLE `skyline_articles` CHANGE `position` `position` INT( 11 ) NOT NULL"
+    # execute "ALTER TABLE `skyline_articles` CHANGE `position` `position` INT( 11 ) NOT NULL"
+    change_column_default(:skyline_articles, :position, nil)    
   end
 
   def self.down

data/doc/Bundler.md

@@ -0,0 +1,71 @@
+Setting up Bundler for a Rails 2.3 application
+==============================================
+
+Requirements
+------------
+
+* Ruby >= 1.8.6
+* Rubygems >= 1.3.5
+* Rails >= 2.3.4
+* Bundler 0.7.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
+    
+### Including extra Gemfiles?
+
+To make sure bundler handles all the required gems including the ones from plugins use
+the following code:
+
+    my_gemfile = File.join(File.dirname(__FILE__), 'vendor', 'plugins', 'my_plugin', 'Gemfile')
+    instance_eval(File.read(my_gemfile), my_gemfile)
+
+Create initializer for Bundler
+------------------------------
+
+Create file called `config/preinitializer.rb` and add the follwoing line:
+
+    require "#{File.dirname(__FILE__)}/../vendor/bundler_gems/environment"
+
+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
+          end
+        end
+      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

data/doc/INSTALL.md

@@ -1,64 +1,94 @@
 Skyline installation instructions
 =================================
 
-Create the file 'Gemfile' in the root of your application
----------------------------------------------------------
-Add the following contents:
+Choose your flavour
+-------------------
+
+**Install as a gem** The skylinecms gem is perfect if you want to have stable environment
+and don't care too much about cutting-edge new features. We release new versions fairly
+often.
+
+**Install the plugin** Use the plugin if you want to be on the latest development version
+with all the 'cool' new features. Especially if you use git, because we're hosting the
+source on github. It's of course entirely possible to use a stable tagged version as a
+plugin too.
+
+Create your rails app
+---------------------
+
+Create an empty rails app. Make sure you're usin MySQL for now,
+we didn't test with other databases yet.
+
+    rails my_app --database=mysql
+    cd my_app
+
+Installation as a gem
+---------------------
+
+Install the gems, and initialize Skyline. 
+
+    gem install skylinecms
+    skylincms init
+    
+Continue below.
+
+Installation as plugin
+-----------------------
+
+Download the Skyline source from [http://github.com/DigitPaint/skyline](http://github.com/DigitPaint/skyline).
+You can use it as a Git submodule or yust download the zip version and unpack it to
+`vendor/plugins/skyline`
+
+If you're using bundler, add the following to your `Gemfile`
 
-    #  To bundle all gems run:  gem bundle --build-options build_options.yml
     skyline_gemfile = File.join(File.dirname(__FILE__), 'vendor', 'plugins', 'skyline', 'Gemfile')
     instance_eval(File.read(skyline_gemfile), skyline_gemfile)
-    bundle_path "vendor/bundler_gems"
-    disable_system_gems
 
+Setup your database
+-------------------
 
-Create the file 'build_options.yml' in the root of your application
--------------------------------------------------------------------
-You only need this if your system needs specific build options
+Modify `config/database.yml` to match your database configuration and then run:
 
-    mysql:
-      mysql-config: /usr/bin/mysql_config
+    rake db:create
+    rake skyline:db:migrate
+    rake skyline:db:seed
+    
+Create your first user and grant him/her access
+-----------------------------------------------
 
+Open a Rails console by running `./script/console`
 
-Create the file config/preinitializer.rb
-----------------------------------------
+    u = Skyline::User.new(:email => 'admin@admin.com', :password => 'secret')
+    u.roles << Skyline::Role.first
+    u.save!
 
-    require "#{File.dirname(__FILE__)}/../vendor/bundler_gems/environment"
- 
+Make sure the user exists in the database.
 
-Add to config/environment.rb (just below the require boot line)
---------------------------------------------------------------------
+If you went the "gem route" you're done now just start the server with `./script/server`
+and browse to `http://localhost:3000/skyline` and log in with the just created user.
 
-    # Hijack rails initializer to load the bundler gem environment before loading the rails environment.
-    Rails::Initializer.module_eval do
-      alias load_environment_without_bundler load_environment
+Extra work when using the plugin
+--------------------------------
 
-      def load_environment
-        Bundler.require_env configuration.environment
-        load_environment_without_bundler
-      end
+### Create configuration file
+
+Create a Rails initializer in `config/initializers` (we call it `skyline_configuration.rb`) and
+add the following:
+
+    Skyline::Configuration.configure do |config|  
+      config.assets_path = File.join(Rails.root,"tmp/upload")
+      config.media_file_cache_path = File.join(Rails.root,"tmp/cache/media_files/cache")
+      config.rss_section_cache_path = File.join(Rails.root,"tmp/cache/rss_sections/cache")   
     end
 
+### Create template folder
 
-Add to .gitignore:
-------------------
-If you're using git.
+Create the template folder in your `app` directory.
 
-    bin
-    vendor/bundler_gems/doc
-    vendor/bundler_gems/environment.rb
-    vendor/bundler_gems/gems
-    vendor/bundler_gems/specifications
+    mkdir app/templates
 
+### Add default route for pages
 
-Add to config/deploy.rb:
-------------------------
+Open `config/routes.rb` and add the default Skyline route below all other routes:
 
-    task :bundle, :roles => [:app] do
-      run "mkdir -p #{deploy_to}/shared/bundler_gems/gems #{deploy_to}/shared/bundler_gems/specifications"
-      run "cd #{current_path}/vendor/bundler_gems; ln -fs #{deploy_to}/shared/bundler_gems/gems"
-      run "cd #{current_path}/vendor/bundler_gems; ln -fs #{deploy_to}/shared/bundler_gems/specifications"
-      run "cd #{current_path}; gem bundle --build-options build_options.yml"
-    end
-  
-    after "deploy", ....., "deploy:bundle"
+    map.connect '*url', :controller => "skyline/site/pages", :action => "show"  

data/doc/MIGRATION.md

@@ -1,6 +1,30 @@
 Skyline Version Migration
 =========================
 
+General update recipe
+---------------------
+
+After every Skyline update make sure that:
+
+* You have updated your `Gemfile`, or the `config.gem` specifications in your `environment.rb`.
+* Run `rake skyline:db:migrate` to update your Skyline tables.
+* Run `rake skyline:db:seed` to update roles/rights and other important data updates.
+* **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.7 -> Version 3.0.8
+------------------------------
+
+There are no pressing changes you need to make to your implementation. Keep in mind however
+that we deprecated some methods. The deprecated methods will be removed in version 3.1.0
+
+**page\_sections\_per_column** in templates. Use `sections_per_column` instead. The old method
+is still available as an alias.
+
+**setting and page\_from\_settings** in templates. These two helpers are deprecated
+in favour of `Settings.get` for `setting` and `Settings.get_page` for `page_from_setting`. The
+method signatures are identical was merly a restructuring.
+
 First OS release -> Version 3.0.7
 ---------------------------------
 

data/lib/skyline/cli/base.rb

@@ -5,7 +5,9 @@ require File.dirname(__FILE__) + '/../../skyline'
 require File.dirname(__FILE__) + '/../version'
 
 module Skyline
+  # @private
   module Cli
+    # @private
     class Base < Thor
       include Thor::Actions
       

data/lib/skyline/cli/init.rb

@@ -3,11 +3,12 @@ require 'fileutils'
 
 module Skyline
   module Cli
+    # @private
     class Init < Thor::Group
       include Thor::Actions
       
       def self.source_root
-        Skyline.root
+        Skyline.root.expand_path
       end
       
       def verify_rails_dir

data/lib/skyline/configuration.rb

@@ -43,7 +43,7 @@ class Skyline::Configuration < Configure
       config.media_file_cache_path = nil
       config.rss_section_cache_path = nil
     else
-      config.assets_path = File.join(Rails.root,"tmp/upload")
+      config.assets_path = File.join(Rails.root,"/tmp/upload")
       config.media_file_cache_path = File.join(Rails.root,"/tmp/media_files/cache")
       config.rss_section_cache_path = File.join(Rails.root,"/tmp/rss_sections/cache")
     end 

data/lib/skyline/content/exportable.rb

@@ -1,5 +1,5 @@
-# @private
 module Skyline::Content
+  # @private
   module Exportable
     
     # List of possible export formats for this class

data/lib/skyline/content/orderable.rb

@@ -1,6 +1,5 @@
-#
-# @private
 module Skyline::Content
+  # @private
   module Orderable
     
     def acts_as_orderable(options)
@@ -57,7 +56,8 @@ module Skyline::Content
         end
       end
     end
-              
+    
+    # @private          
     module InstanceMethods
       def set_initial_position
         unless self[self.class.position_column]

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

@@ -1,3 +1,4 @@
+# @private
 class Skyline::Content::Versioning::Version < ActiveRecord::Base
   set_table_name "skyline_versions"
   belongs_to :versionable, :polymorphic => true

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

@@ -1,5 +1,7 @@
 module Skyline::Content
+  # @private  
   module Versioning
+    # @private    
     module Versionable
       def self.included(obj)
         obj.send(:has_one, :skyline_version, :as => :versionable, :class_name => "Skyline::Content::Versioning::Version")

data/lib/skyline/referable.rb

@@ -25,6 +25,8 @@ module Skyline::Referable
     base.send(:cattr_accessor, :referable_fields)
     base.send(:has_many, :image_refs, :class_name => "Skyline::ImageRef", :foreign_key => :refering_id, :source_type => base.name, :dependent => :destroy)
     base.send(:has_many, :link_refs, :class_name => "Skyline::LinkRef", :foreign_key => :refering_id, :source_type => base.name, :dependent => :destroy)
+    
+    base.send :alias_method_chain, :clone, :referables    
   end
   
   module ClassMethods    
@@ -61,8 +63,8 @@ module Skyline::Referable
   
   # Implementation of the clone interface
   # @private
-  def clone
-    returning super do |clone|      
+  def clone_with_referables
+    returning clone_without_referables do |clone|      
       if !self.referable_fields.nil?
         self.referable_fields.each do |field|         
           clone.send("#{field}=".to_sym, self.send(field,true,{:nullify => true}))

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

@@ -2,15 +2,17 @@ module Skyline::Rendering::Helpers::BreadCrumbHelper
   
   # Helper to easily create breadcrumbs that are cut off in the middle.
   #
-  # @param bc [Array<Array>] :: An array of arrays with two elements: [[title,url],[title,url]...]
-  # @param options [Hash] :: Options
+  # @param bc [Array<Array>] An array of arrays with two elements: [[title,url],[title,url]...]
+  # @param options [Hash] Options
   #
   # @option options :max_length [Integer] () Limit the max length in chars. Returns an array with nil element where 
   #   something has been cut away.
+  # 
+  # @return [Array<Array>] Array of arrays with the first element the title and as second element the url.
   def bread_crumb(bc,options={})
     if bc.kind_of? Skyline::ArticleVersion
       page = bc
-      bc = bc.page.nesting.map{|p| [p.published_publication_data.navigation_title,p.url]}
+      bc = bc.page.nesting.map{|p| [p.published_publication_data.andand.navigation_title,p.url]}
       bc[-1][0] = page.data.navigation_title
     end
     

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

@@ -4,8 +4,8 @@ module Skyline::Rendering::Helpers::ColumnHelper
   #
   # @param page_version [ArticleVersion] The ArticleVersion to get section from to split
   #
-  # @return [Array<Array<Section>>]:: An array of columns each containing and array of sections.
-  def page_sections_per_column(page_version)
+  # @return [Array<Array<Section>>] An array of columns each containing and array of sections.
+  def sections_per_column(page_version)
     sections_per_col ||= []
     col = 0
     page_version.sections.each do |section|
@@ -18,5 +18,8 @@ module Skyline::Rendering::Helpers::ColumnHelper
     end
     sections_per_col
   end
+  
+  # @deprecated Will be removed in 3.1 for the more general sections_per_column
+  alias :page_sections_per_column :sections_per_column
     
 end

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

@@ -2,9 +2,26 @@
 module Skyline::Rendering
   module Helpers
     module RendererHelper
-      def assign(key, value = nil)
-        return @_template_assigns[key] if value.nil?
-        @_template_assigns[key] = value
+      
+      # Set global renderer assigns. These are accessible throughout all render/render_collection calls. They
+      # are especially usefull in scenarios where you want a sub-item render a piece of the page. You can assign it
+      # to `:content_for_sidebar` and in your page template you can read `assigns(:content_for_sidebar)` and place the content
+      # the content item rendered to the variable `:content_for_sidebar`
+      # 
+      # @param key [Symbol] The key to store or read
+      # @param value [Object] Anything you want to store, if empty and no block given this method just returns the stored value
+      # 
+      # @yield A block to capture, see also the `capture` documentation in Rails
+      # @yieldreturn [String] The result of doing a regular `capture`
+      # 
+      # @return The value stored with the key.
+      def assign(key, value = nil, &block)
+        return @_template_assigns[key] if value.nil? && !block_given?
+        if block_given?
+          @_template_assigns[key] = capture(&block)
+        else
+          @_template_assigns[key] = value
+        end
       end
 
       # Get's the current Renderer instance that is rendering the template we're in.

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

@@ -5,15 +5,11 @@ module Skyline::Rendering::Helpers::SettingsHelper
   # @param setting_identifier [Symbol] the symbol of the settings page
   # @param field [Symbol] the name of the setting
   # 
-  # @return Object the value of the setting or nil if not found
+  # @return [Object] the value of the setting or nil if not found
+  # 
+  # @deprecated Will be removed 3.1 in favour of {Skyline::Settings::KlassMethods#get}
   def setting(setting_identifier, field)
-    if s = ::Settings[setting_identifier] 
-      if s.respond_to?(field)
-        return s.send(field)
-      end
-    end
-    Rails.logger.warn "Couldn't find Setting[:#{setting_identifier}].#{field}"
-    nil
+    ::Settings.get(setting_identifier,field)
   end
   
   # a safe way to get a page from the settings  
@@ -21,11 +17,10 @@ module Skyline::Rendering::Helpers::SettingsHelper
   # @param setting_identifier [Symbol] the symbol of the settings page
   # @param field [Symbol] the name of the setting that references a page_id
   # 
-  # @return [Page,nil] The page if found, nil otherwise
+  # @return [Page, NilClass] The page if found, nil otherwise
+  # 
+  # @deprecated Will be removed 3.1 in favour of {Skyline::Settings::KlassMethods#get_page}  
   def page_from_setting(setting_identifier, field)
-    if page_id = setting(setting_identifier, field)
-      return Skyline::Page.find_by_id(page_id) if page_id.present?
-    end    
-    nil
-  end  
+    ::Settings.get_page(setting_identifier,field)
+  end
 end

data/lib/skyline/version.rb

@@ -1,13 +1,36 @@
 module Skyline
   # The defines the current Skyline version. 
-  # Edge will always be the next TINY number.
+  # 
   #
   # @private
   module VERSION
     MAJOR = 3
     MINOR = 0
-    TINY = 7
+    TINY = 8
+    BUILD = 0
+
+    # Some hackery to determine if we're on a development branch or not
+    # this sets BUILD to a timestamp 
+    begin
+      git_dir = File.dirname(__FILE__) + "/../../.git"
+      if File.exist?(git_dir)
+        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") 
+          else
+            build = nil
+          end
+        end
+      end
+    rescue RuntimeError => e
+    end
+    
+    # If no BUILD can be determined or we're on a version, it takes the last number
+    build = build || BUILD
  
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, TINY, build == 0 ? nil : build].compact.join('.')
   end
 end

data/lib/skyline/wildcard_renderable_scope.rb

@@ -1,3 +1,4 @@
+# @private
 class Skyline::WildcardRenderableScope
   include Skyline::RenderableScopeInterface
 

data/lib/skyline.rb

@@ -1,3 +1,6 @@
+require 'pathname'
+require File.dirname(__FILE__) + "/skyline/version"
+
 # The Skyline contains all Skyline related (core) code and
 # defines some methods like the root (path) and version
 # of the Skyline core.
@@ -13,10 +16,10 @@ module Skyline
   
   # Shortcut for the current version
   #
-  # @return [String] The current version in the format x.x.x
+  # @return [String] The current version in the format x.x.x.x (the BUILD version is optional)
   def version
     Skyline::VERSION::STRING
   end
   module_function :version  
-end
-
+  
+end

data/rails/init.rb

@@ -14,7 +14,9 @@ ActiveSupport::Dependencies.load_once_paths << vendor_path
 
 # Setup public paths
 public_path = Pathname.new(Rails.public_path) + "skyline"
-if !public_path.exist? #&& !public_path.symlink?
+unless public_path.exist? 
+  FileUtils.rm(public_path) if public_path.symlink?
+  
   puts "=> Skyline: Creating assets symlink to '#{public_path}'"
   FileUtils.ln_s((Skyline.root + "public/skyline").relative_path_from(Pathname.new(Rails.public_path)),public_path)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: skylinecms
 version: !ruby/object:Gem::Version 
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors: 
 - DigitPaint
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 +01:00
+date: 2009-12-18 00:00:00 +01:00
 default_executable: skylinecms
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -170,7 +170,6 @@ files:
 - app/controllers/skyline/variant_current_editor_controller.rb
 - app/controllers/skyline/variants_controller.rb
 - app/helpers/skyline/application_helper.rb
-- app/helpers/skyline/browser/tabs/media_library/media_files_helper.rb
 - app/helpers/skyline/button_helper.rb
 - app/helpers/skyline/content_helper.rb
 - app/helpers/skyline/dialog_helper.rb
@@ -200,7 +199,6 @@ files:
 - app/helpers/skyline/ref_object_helper.rb
 - app/helpers/skyline/translation_helper.rb
 - app/helpers/skyline/tree_helper.rb
-- app/helpers/skyline/users_helper.rb
 - app/middleware/skyline/flash_session_cookie_middleware.rb
 - app/middleware/skyline/plugins_loader_middleware.rb
 - app/middleware/skyline/sprockets_middleware.rb
@@ -411,6 +409,7 @@ files:
 - db/migrate/20091013135821_allow_null_for_position_in_articles.rb
 - db/migrate/20091202130512_rename_users_destroyed_to_is_destroyed.rb
 - db/migrate/20091202152514_add_media_nodes_date.rb
+- doc/Bundler.md
 - doc/INSTALL.md
 - doc/MIGRATION.md
 - lib/skyline.rb

data/app/helpers/skyline/browser/tabs/media_library/media_files_helper.rb

@@ -1,6 +0,0 @@
-module Skyline::Browser::Tabs::MediaLibrary::MediaFilesHelper
-  def skyline_browser_tabs_media_library_media_dir_media_files_path_with_session_information(media_dir)
-    session_key = ActionController::Base.session_options[:session_key]
-    skyline_browser_tabs_media_library_media_dir_media_files_path(media_dir, session_key => cookies[session_key], request_forgery_protection_token => form_authenticity_token)
-  end
-end

data/app/helpers/skyline/users_helper.rb

@@ -1,2 +0,0 @@
-module Skyline::UsersHelper
-end