locomotive_cms 0.0.2.9 → 0.0.3.1

data/lib/locomotive.rb

@@ -7,7 +7,10 @@ require 'locomotive/carrierwave'
 require 'locomotive/heroku'
 require 'locomotive/custom_fields'
 require 'locomotive/httparty'
+require 'locomotive/inherited_resources'
+require 'locomotive/admin_responder'
 
+require 'redcloth'
 require 'mongo_session_store/mongoid'
 
 module Locomotive

data/lib/locomotive/admin_responder.rb

@@ -0,0 +1,28 @@
+require 'responders'
+
+module Locomotive
+  class AdminResponder < ::ActionController::Responder
+    
+    include ::Responders::FlashResponder
+    
+    def api_behavior(error)
+      raise error unless resourceful?
+
+      # generate flash messages
+      set_flash_message!
+
+      if get?
+        display resource
+      elsif has_errors?
+        display({ :errors => resource.errors, :model => controller.send(:resource_instance_name), :alert => controller.flash[:alert] })
+      elsif post?
+        display resource, :status => :created, :location => resource_location
+      else
+        display({ :notice => controller.flash[:notice] })
+      end
+      
+      controller.flash.discard # reset flash messages !
+    end
+    
+  end
+end

data/lib/locomotive/inherited_resources.rb

@@ -0,0 +1,46 @@
+require 'inherited_resources'
+require 'inherited_resources/actions'
+require 'inherited_resources/responder'
+
+module InheritedResources
+  # redirect to edit_resource_url instead of resource_url
+  module Actions
+
+    def create(options={}, &block)
+      object = build_resource
+
+      if create_resource(object)
+        options[:location] ||= edit_resource_url rescue nil # change here
+      end
+
+      respond_with_dual_blocks(object, options, &block)
+    end
+    alias :create! :create
+
+    # PUT /resources/1
+    def update(options={}, &block)
+      object = resource
+
+      if update_resource(object, params[resource_instance_name])
+        options[:location] ||= edit_resource_url rescue nil # change here
+      end
+
+      respond_with_dual_blocks(object, options, &block)
+    end
+    alias :update! :update
+
+    # DELETE /resources/1
+    def destroy(options={}, &block)
+      object = resource
+      options[:location] ||= collection_url rescue nil
+
+      destroy_resource(object)
+        
+      options[:alert] = object.errors.full_messages.first # display the first error if present
+  
+      respond_with_dual_blocks(object, options, &block)
+    end
+    alias :destroy! :destroy
+    
+  end
+end

data/lib/locomotive/liquid/drops/page.rb

@@ -3,7 +3,7 @@ module Locomotive
     module Drops    
       class Page < Base
         
-        liquid_attributes << :title
+        liquid_attributes << :title << :slug
         
         def children
           @children ||= liquify(*@source.children)

data/lib/locomotive/liquid/filters/text.rb

@@ -4,7 +4,7 @@ module Locomotive
       module Text
     
         def textile(input)
-          RedCloth.new(input).to_html
+          ::RedCloth.new(input).to_html
         end
     
       end

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

@@ -15,8 +15,10 @@ module Locomotive
         def initialize(tag_name, markup, tokens)
           if markup =~ Syntax
             @site_or_page = $1 || 'page'
+            @options = {}
+            markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value }
           else
-            raise ::Liquid::SyntaxError.new("Syntax Error in 'nav' - Valid syntax: nav <page|site>")
+            raise ::Liquid::SyntaxError.new("Syntax Error in 'nav' - Valid syntax: nav <page|site> <options>")
           end
               
           super
@@ -27,8 +29,6 @@ module Locomotive
           
           source = context.registers[@site_or_page.to_sym]
           
-          # puts "[Nav] source = #{source.inspect}"
-          
           if source.respond_to?(:name) # site ?
             source = source.pages.first # start from home page
           else
@@ -46,9 +46,12 @@ module Locomotive
         def render_child_link(page)
           selected = @current_page._id == page._id ? ' on' : ''
           
+          icon = @options[:icon] ? '<span></span>' : ''
+          label = %{#{icon if @options[:icon] != 'after' }#{page.title}#{icon if @options[:icon] == 'after' }}
+          
           %{
             <li id="#{page.slug.dasherize}" class="link#{selected}">
-              <a href="/#{page.fullpath}">#{page.title}</a>
+              <a href="/#{page.fullpath}">#{label}</a>
             </li>
           }.strip
         end

data/public/javascripts/admin/application.js

@@ -80,6 +80,9 @@ $(document).ready(function() {
 	});
 	$('.formtastic li.error input').eq(0).focus();
 	
+	// save form in AJAX
+	$('form.save-with-shortcut').saveWithShortcut();
+	
 	// editable title (page, ...etc)
 	$('#content h2 a.editable').each(function() {
 		var target = $('#' + $(this).attr('rel')), 

data/public/javascripts/admin/pages.js

@@ -26,7 +26,7 @@ $(document).ready(function() {
 			params += '&_method=put';
 			
 			$.post($(this).attr('data_url'), params, function(data) {
-				$.growl('success', data.message);
+				$.growl('success', data.notice);
 			}, 'json');
 		} 
 	});

data/public/javascripts/admin/plugins/shortcut.js

@@ -0,0 +1,55 @@
+// Save -> Command S (need a form)
+jQuery.fn.saveWithShortcut = function() {
+	
+	var resetFormErrors = function(form) {
+		jQuery('div.form-errors').remove();
+		jQuery('div.formError').remove();
+		jQuery('p.inline-errors').remove();
+		form.find('li.error').removeClass('error');
+	}
+	
+	var updateFromCodeMirror = function() {
+		if (typeof CodeMirror == undefined)
+			return;		
+		jQuery.each(CodeMirrorEditors, function() { 
+			this.el.val(this.editor.getCode());
+		});
+	}
+	
+	var save = function(form) {
+		$.post(form.attr('action'), form.serializeArray(), function(data) {
+			onSaveCallback(form, data)
+		}, 'json');
+	};
+	
+	var onSaveCallback = function(form, data) {
+		resetFormErrors(form);
+	
+		if (data.alert != undefined) {	
+			$.growl('error', data.alert);
+			for (var field in data.errors) {
+				var error = data.errors[field];
+				var node = form.find('li:has(#' + data.model + '_' + field + ')');
+				node.addClass('error');
+				node.append("<p class='inline-errors'>" + error + "</p>");
+			}
+			form.find('li.error input').eq(0).focus();
+		} else {
+			$.growl('success', data.notice);
+		}
+	};
+	
+	return this.each(function() {
+		var form = jQuery(this);
+		
+		jQuery(document).bind('keypress.shortcut', function(event) {
+			if (!(event.which == 115 && (event.ctrlKey || event.metaKey))) return true;
+			updateFromCodeMirror();
+			save(form);
+			event.preventDefault();
+			return false;
+		});
+
+	});
+	
+};

data/public/stylesheets/admin/application.css

@@ -7,7 +7,7 @@ div.notice {
 	height: 90px;
 }
 
-div.notice.error {
+div.notice.error, div.notice.alert {
 	background-image: url(/images/admin/form/growl-error.png);
 }
 

data/public/stylesheets/admin/buttons.css

@@ -37,31 +37,26 @@
 }
 
 .button.small {
-	background: transparent url(/images/admin/buttons/action-left.png) no-repeat left -40px;
+	background: #ebedf4;
+	outline: none;
+	-moz-border-radius : 10px;
+	-webkit-border-radius: 10px;
 	color: #787a89;
 	height: 20px;
 	font-size: 0.7em;
-	padding: 0px 0px 0px 12px;
+	padding: 0px 12px 0px 12px;
 	color: #8B8D9A !important;
 	text-decoration: none;
-}
-
-.button.small span {
-	background-image: url(/images/admin/buttons/action-right.png);
-	text-shadow: 1px 1px 1px #fff;
-	padding: 0px 12px 10px 0px;
-	top: 0px;
 	color: #8B8D9A;
+	text-shadow: 1px 1px 1px #fff;
 }
 
 .button.small.add {
-	padding-left: 24px;
-	background-position: 0 0;
 }
 
-.button.remove, .button.remove span {
+.button.remove {
 	color: #ff092c !important;
 	font-size: 1.1em;
 }
 
-.button.remove:hover span { text-decoration: underline; }
+.button.remove:hover { text-decoration: underline; }

data/public/stylesheets/admin/formtastic_changes.css

@@ -13,7 +13,6 @@ form.formtastic legend {
 	margin: 0;
 	float: left;
 	white-space: normal;
-	*margin-left: -7px;
 	position: relative;
 }
 
@@ -289,7 +288,7 @@ form.formtastic fieldset.editable-list ol li.added input {
 	color: #17171D;
 	font-size: 0.9em;
 	font-weight: bold;
-	cursor: normal;
+	cursor: pointer;
 }
 
 form.formtastic fieldset.editable-list ol li.added input:hover {

data/public/stylesheets/admin/layout.css

@@ -105,32 +105,44 @@ body {
 
 #content #local-actions-bar {
 	position: absolute;
-	top: 15px;
+	top: 13px;
 	right: 15px;
 }
 
 #content #local-actions-bar a {
-	display: block;
-	float: left;
-	height: 20px;
+	position: relative;
+	padding: 2px 10px 3px 31px;
 	color: #8b8d9a;
 	text-decoration: none;
 	font-size: 0.7em;
-	padding-left: 24px;
 	margin-left: 10px;
-	background: transparent url(/images/admin/buttons/action-left.png) no-repeat 0 0;
+	background-color: #ebedf4;
 	outline: none;
+	-moz-border-radius : 10px;
+	-webkit-border-radius: 10px;
 }
 
-#content #local-actions-bar a:hover span { text-decoration: underline; }
+#content #local-actions-bar a em {
+	position: absolute;
+	display: block;	
+	top: 5px;
+	left: 10px;
+	height: 16px;
+	width: 16px;
+	background: transparent url(/images/admin/icons/actions.png) no-repeat 0 0;
+}
 
-#content #local-actions-bar a span {
-	display: inline-block;	
-	height: 13px;
-	background: transparent url(/images/admin/buttons/action-right.png) no-repeat right 0;
-	padding: 1px 10px 8px 2px;
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+	#content #local-actions-bar a em { top: 4px; }
 }
 
+#content #local-actions-bar a.show em { background-position: 0 0; }
+#content #local-actions-bar a.edit em { background-position: 0 -16px; top: 2px; left: 12px; }
+#content #local-actions-bar a.download em { background-position: 0 -32px; }
+#content #local-actions-bar a.new em { background-position: 0 -48px; left: 13px; }
+
+#content #local-actions-bar a:hover { text-decoration: none; color: #333; }
+
 /* ___ footer ___ */
 
 #footer {

data/public/stylesheets/admin/menu.css

@@ -48,12 +48,12 @@ body.contents ul#menu li.contents a em { background-position: 0 -12px; }
 body.settings ul#menu li.contents { background-position: 0 -80px; }
 body.settings ul#menu li.contents a { background-position: 0 -80px; }
 
-ul#menu li.assets { background: url(/images/admin/menu/left.png) no-repeat 0 -40px; padding-left: 35px; }
-ul#menu li.assets a em { background: transparent url(/images/admin/menu/icons/settings.png) no-repeat 0 0; height: 14px; }
+ul#menu li.assets { background: url(/images/admin/menu/left.png) no-repeat 0 -40px; padding-left: 40px; }
+ul#menu li.assets a em { background: transparent url(/images/admin/menu/icons/assets.png) no-repeat 0 0; height: 20px; width: 20px; float: left; top: 0px; }
 body.contents ul#menu li.assets { background-position: 0 0px; }
 body.assets ul#menu li.assets { background-position: 0 -80px; }
 body.assets ul#menu li.assets a { background-position: right -80px; color: white; text-shadow: none; }
-body.assets ul#menu li.assets a em { background-position: 0 -15px; }
+body.assets ul#menu li.assets a em { background-position: 0 -20px; }
 
 ul#menu li.assets { background: url(/images/admin/menu/left.png) no-repeat 0 -40px; padding-left: 35px; }
 ul#menu li.assets a { background: url(/images/admin/menu/right.png) no-repeat right 0px;  }

data/spec/factories.rb

@@ -45,7 +45,7 @@ Factory.define :layout do |l|
     </head>
     <body>
       <div id="sidebar">\{\{ content_for_left_sidebar \}\}</div>
-      <div id="main">\{\{ content_for_layout \}\}</div>
+      <div id="main">\{\{ content_for_layout | textile \}\}</div>
     </body>
   </html>}
 end

data/spec/lib/locomotive/liquid/tags/nav_spec.rb

@@ -28,13 +28,22 @@ describe Locomotive::Liquid::Tags::Nav do
       output.should == '<ul id="nav"><li id="sub-child-1" class="link on"><a href="/child_2/sub_child_1">Child #2.1</a></li><li id="sub-child-2" class="link"><a href="/child_2/sub_child_2">Child #2.2</a></li></ul>'
     end
     
+    it 'adds an icon before the link' do
+      render_nav('site', {}, 'icon: true').should match /<li id="child-1" class="link"><a href="\/child_1"><span><\/span>Child #1<\/a>/
+      render_nav('site', {}, 'icon: before').should match /<li id="child-1" class="link"><a href="\/child_1"><span><\/span>Child #1<\/a>/
+    end
+    
+    it 'adds an icon after the link' do
+      render_nav('site', {}, 'icon: after').should match /<li id="child-1" class="link"><a href="\/child_1">Child #1<span><\/span><\/a><\/li>/
+    end    
+    
   end
   
-  def render_nav(source = 'site', registers = {})
+  def render_nav(source = 'site', registers = {}, template_option = '')
     registers = { :site => @site, :page => @home }.merge(registers)
     liquid_context = ::Liquid::Context.new({}, registers)
     
-    output = Liquid::Template.parse("{% nav #{source} %}").render(liquid_context)
+    output = Liquid::Template.parse("{% nav #{source} #{template_option} %}").render(liquid_context)
     output.gsub(/\n\s{0,}/, '')
   end
     

data/spec/models/membership_spec.rb

@@ -26,29 +26,30 @@ describe Membership do
     before(:each) do      
       @membership = Factory.build(:membership, :site => Factory.build(:site))
       @account = Factory.build(:account)
+      @account.stubs(:save).returns(true)
       Account.stubs(:where).returns([@account])
       Account.stubs(:find).returns(@account)
     end
     
     it 'should tell error' do
-      @membership.action_to_take.should == :error
+      @membership.process!.should == :error
     end
     
     it 'should tell we need to create a new account' do
       Account.stubs(:where).returns([])
       @membership.email = 'homer@simpson'
-      @membership.action_to_take.should == :create_account
+      @membership.process!.should == :create_account
     end
     
     it 'should tell nothing to do' do
       @membership.email = 'bart@simpson.net'
       @membership.site.stubs(:memberships).returns([@membership, @membership])
-      @membership.action_to_take.should == :nothing
+      @membership.process!.should == :nothing
     end
     
     it 'should tell membership has to be saved' do
       @membership.email = 'bart@simpson.net'
-      @membership.action_to_take.should == :save_it
+      @membership.process!.should == :save_it
     end
   end
   

data/spec/models/page_spec.rb

@@ -81,24 +81,26 @@ describe Page do
     
   end
   
-  describe 'delete' do
+  describe '#deleting' do
     
     before(:each) do 
       @page = Factory.build(:page)
     end
     
-    it 'should delete index page' do
+    it 'does not delete the index page' do
       @page.stubs(:index?).returns(true)
       lambda {
-        @page.destroy
-      }.should raise_error(Exception, 'You can not remove index or 404 pages')
+        @page.destroy.should be_false
+        @page.errors.first == 'You can not remove index or 404 pages'
+      }.should_not change(Page, :count)
     end
     
-    it 'should delete 404 page' do
+    it 'does not delete the 404 page' do
       @page.stubs(:not_found?).returns(true)
       lambda {
-        @page.destroy
-      }.should raise_error(Exception, 'You can not remove index or 404 pages')
+        @page.destroy.should be_false
+        @page.errors.first == 'You can not remove index or 404 pages'
+      }.should_not change(Page, :count)
     end
     
   end
@@ -323,7 +325,7 @@ describe Page do
     </head>
     <body>
       <div id="sidebar">A sidebar...</div>
-      <div id="main">Hello world !</div>
+      <div id="main"><p>Hello world !</p></div>
     </body>
   </html>}
       end