locomotive_cms 1.0.0.beta → 1.0.0.beta.2

data/app/models/extensions/page/redirect.rb

@@ -0,0 +1,25 @@
+module Models
+  module Extensions
+    module Page
+      module Redirect
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          field :redirect, :type => Boolean, :default => false
+
+          field :redirect_url, :type => String
+
+          validates_presence_of :redirect_url, :if => :redirect
+
+          validates_format_of   :redirect_url, :with => Locomotive::Regexps::URL, :allow_blank => true
+
+        end
+
+      end
+    end
+  end
+end
+
+

data/app/models/page.rb

@@ -8,6 +8,7 @@ class Page
   include Models::Extensions::Page::Parse
   include Models::Extensions::Page::Render
   include Models::Extensions::Page::Templatized
+  include Models::Extensions::Page::Redirect
 
   ## fields ##
   field :title

data/app/views/admin/pages/_form.html.haml

@@ -11,7 +11,7 @@
 
   = f.input :slug, :required => false, :hint => @page.slug.blank? ? ' ' : @page.url, :input_html => { :data_url => get_path_admin_pages_url, :disabled => @page.index? || @page.not_found? }, :wrapper_html => { :style => "#{'display: none' if @page.templatized?}" }
 
-  = f.custom_input :templatized, :css => 'toggle' do
+  = f.custom_input :templatized, :css => 'toggle', :style => "#{'display: none' if @page.redirect?}" do
     = f.check_box :templatized
 
   = f.input :content_type_id, :as => :select, :collection => current_site.content_types.all.to_a, :include_blank => false, :wrapper_html => { :style => "#{'display: none' unless @page.templatized?}" }
@@ -19,7 +19,12 @@
   = f.custom_input :published, :css => 'toggle' do
     = f.check_box :published
 
-  = f.input :cache_strategy, :as => :select, :collection => options_for_page_cache_strategy, :include_blank => false
+  = f.custom_input :redirect, :css => 'toggle', :style => "#{'display: none' if @page.templatized?}" do
+    = f.check_box :redirect
+
+  = f.input :cache_strategy, :as => :select, :collection => options_for_page_cache_strategy, :include_blank => false, :wrapper_html => { :style => "#{'display: none' if @page.redirect?}" }
+
+  = f.input :redirect_url, :required => true, :wrapper_html => { :style => "#{'display: none' unless @page.redirect?}" }
 
 = render 'editable_elements', :page => @page
 

data/config/assets.yml

@@ -82,6 +82,7 @@ stylesheets:
     - public/stylesheets/admin/buttons.css
     - public/stylesheets/admin/formtastic.css
     - public/stylesheets/admin/formtastic_changes.css
+    - public/stylesheets/admin/assets.css
     - public/stylesheets/admin/application.css
     - public/stylesheets/admin/safari.css
   fancybox:

data/lib/locomotive/import/pages.rb

@@ -15,10 +15,21 @@ module Locomotive
 
           self.add_page(fullpath)
         end
+
+        # make sure all the pages were processed (redirection pages without template for instance)
+        self.pages.each { |fullpath, attributes| self.add_page_without_template(fullpath.to_s) }
       end
 
       protected
 
+      def add_page_without_template(fullpath)
+        page = context[:done][fullpath]
+
+        return page if page # already added, so skip it
+
+        self._save_page!(fullpath, nil)
+      end
+
       def add_page(fullpath)
         page = context[:done][fullpath]
 
@@ -30,6 +41,10 @@ module Locomotive
 
         self.build_parent_template(template)
 
+        self._save_page!(fullpath, template)
+      end
+
+      def _save_page!(fullpath, template)
         parent = self.find_parent(fullpath)
 
         attributes = {
@@ -42,20 +57,22 @@ module Locomotive
 
         # templatized ?
         if content_type_slug = attributes.delete(:content_type)
-          fullpath.gsub!(/\/template$/, '/content_type_template')
           attributes.merge!({
             :templatized  => true,
             :content_type => site.content_types.where(:slug => content_type_slug).first
           })
         end
 
-        page = site.pages.where(:fullpath => fullpath).first || site.pages.build
+        # redirection page ?
+        attributes[:redirect] = true if attributes[:redirect_url].present?
+
+        page = site.pages.where(:fullpath => self.sanitize_fullpath(fullpath)).first || site.pages.build
 
         page.attributes = attributes
 
         page.save!
 
-        self.log "adding #{page.fullpath} / #{page.position}"
+        self.log "adding #{page.fullpath} (#{template.blank? ? 'without' : 'with'} template) / #{page.position}"
 
         site.reload
 
@@ -162,6 +179,10 @@ module Locomotive
         pages
       end
 
+      def sanitize_fullpath(fullpath)
+        fullpath.gsub(/\/template$/, '/content_type_template')
+      end
+
     end
   end
 end

data/lib/locomotive/liquid/tags/extends.rb

@@ -19,7 +19,9 @@ module Locomotive
         def parse_parent_template
           if @template_name == 'parent'
             if @context[:cached_parent]
-              @context[:parent_page] = @context[:cached_parent]
+              @context[:parent_page] = @context[:cached_parent] #.clone # parent must not be modified
+
+              @context[:cached_parent].instance_variable_set(:@template, nil) # force to reload the template
               @context[:cached_parent] = nil
             else
               @context[:parent_page] = @context[:page].parent
@@ -31,7 +33,12 @@ module Locomotive
 
           raise PageNotFound.new("Page with fullpath '#{@template_name}' was not found") if @context[:parent_page].nil?
 
-          @context[:parent_page].template
+          # be sure to work with a copy of the parent template otherwise there will be conflicts
+          parent_template = @context[:parent_page].template.clone
+
+          @context[:parent_page].instance_variable_set(:@template, parent_template)
+
+          parent_template
         end
 
       end

data/lib/locomotive/misc_form_builder.rb

@@ -22,7 +22,7 @@ module Locomotive
       html += inline_hints_for(name, options) || ''
       html += self.errors_on(name) || ''
 
-      template.content_tag(:li, template.find_and_preserve(html), :class => "#{options[:css]} #{'error' unless @object.errors[name].empty?}")
+      template.content_tag(:li, template.find_and_preserve(html), :style => "#{options[:style]}", :class => "#{options[:css]} #{'error' unless @object.errors[name].empty?}")
     end
 
     def inline_errors_on(method, options = nil)

data/lib/locomotive/regexps.rb

@@ -5,5 +5,7 @@ module Locomotive
 
     DOMAIN              = /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
 
+    URL                 = /((http|https|ftp):\/)?\/\S*/
+
   end
 end

data/lib/locomotive/render.rb

@@ -9,10 +9,12 @@ module Locomotive
 
       def render_locomotive_page
         if request.fullpath =~ /^\/admin\//
-          render :template => "/admin/errors/404", :layout => '/admin/layouts/box', :status => 404
+          render :template => "/admin/errors/404", :layout => '/admin/layouts/box', :status => :not_found
         else
           @page = locomotive_page
 
+          redirect_to(@page.redirect_url) and return if @page.present? && @page.redirect?
+
           render_no_page_error and return if @page.nil?
 
           output = @page.render(locomotive_context)
@@ -50,7 +52,7 @@ module Locomotive
           end
         end
 
-        page || current_site.pages.not_found.published.first
+        page || not_found_page
       end
 
       def locomotive_context
@@ -91,13 +93,21 @@ module Locomotive
           end
         end
 
-        render :text => output, :layout => false, :status => :ok
+        render :text => output, :layout => false, :status => page_status
+      end
+
+      def not_found_page
+        current_site.pages.not_found.published.first
       end
 
       def editing_page?
         self.params[:editing] == true && current_admin
       end
 
+      def page_status
+        @page == not_found_page ? :not_found : :ok
+      end
+
     end
 
   end

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = "1.0.0.beta"
+  VERSION = "1.0.0.beta.2"
 end

data/public/javascripts/admin/pages.js

@@ -26,7 +26,8 @@ $(document).ready(function() {
       params += '&_method=put';
 
       $.post($(this).attr('data_url'), params, function(data) {
-        $.growl('success', data.notice);
+        var error = typeof(data.error) != 'undefined';
+        $.growl((error ? 'error' : 'success'), (error ? data.error : data.notice));
       }, 'json');
     }
   });
@@ -35,15 +36,31 @@ $(document).ready(function() {
 
   $.subscribe('toggle.page_templatized.checked', function(event, data) {
     $('#page_slug_input').hide();
+    $('#page_redirect').parent('li').hide();
     $('#page_content_type_id_input').show();
   }, []);
 
   $.subscribe('toggle.page_templatized.unchecked', function(event, data) {
     $('#page_slug_input').show();
+    $('#page_redirect').parent('li').show();
     $('#page_slug').val(makeSlug($('#page_title').val())).addClass('touched');
     $('#page_content_type_id_input').hide();
   }, []);
 
+  // redirect feature
+
+  $.subscribe('toggle.page_redirect.checked', function(event, data) {
+    $('#page_templatized').parent('li').hide();
+    $('#page_cache_strategy_input').hide();
+    $('#page_redirect_url_input').show();
+  }, []);
+
+ $.subscribe('toggle.page_redirect.unchecked', function(event, data) {
+    $('#page_templatized').parent('li').show();
+    $('#page_cache_strategy_input').show();
+    $('#page_redirect_url_input').hide();
+  }, []);
+
   // automatic slug from page title
   $('#page_title').keypress(function() {
     var input = $(this);

data/public/stylesheets/admin/application.css

@@ -1,5 +1,3 @@
-@import url(/stylesheets/admin/assets.css);
-
 /* ___ application messages ___ */
 
 div.notice {

data/public/stylesheets/admin/formtastic_changes.css

@@ -171,6 +171,8 @@ form.formtastic div.actions a {
   top: 4px;
 }
 
+form.formtastic div.actions a.remove { color: #ff092c !important; }
+
 form.formtastic div.actions p a:hover { text-decoration: underline; }
 
 form.formtastic div.actions .last p { text-align: right; }

data/public/stylesheets/admin/inline_editor.css

@@ -89,7 +89,7 @@
   left: 7px;
 }
 
-#page-toolbar ul li.sep { float: left; margin: 0 15px 0 10px; }
+#page-toolbar ul li.sep { float: left; margin: 0 15px 0 10px; width: auto !important; background: none !important; }
 
 #page-toolbar ul li.sep span {
   display: block;

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: locomotive_cms
 version: !ruby/object:Gem::Version 
-  hash: 31098193
+  hash: 62196359
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
   - beta
-  version: 1.0.0.beta
+  - 2
+  version: 1.0.0.beta.2
 platform: ruby
 authors: 
 - Didier Lafforgue
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 +01:00
+date: 2011-01-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -446,6 +447,7 @@ files:
 - app/models/extensions/asset/vignette.rb
 - app/models/extensions/page/editable_elements.rb
 - app/models/extensions/page/parse.rb
+- app/models/extensions/page/redirect.rb
 - app/models/extensions/page/render.rb
 - app/models/extensions/page/templatized.rb
 - app/models/extensions/page/tree.rb