muck-contents 0.1.11 → 0.1.12

data/.gitignore

@@ -1,5 +1,29 @@
+**/*.pid
+log/*.log
+log/*.pid
+tmp
+.DS_Store
+public/cache/**/*
+public/system/**/*
+doc/**/*
+db/*.sqlite3
+.project
+.loadpath
+nbproject/
+.idea
+testjour.log
+*.so
+*.o
+Makefile
+mkmf.log
+*.bundle
+conftest
+content/
+.idea
 *.sw?
 .DS_Store
 coverage
 rdoc
 pkg
+pkg/*
+log/*

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Justin Ball
+Copyright (c) 2009 Tatemae
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -19,7 +19,7 @@ Many of the gems are found on github so before installing do:
 === Configure environment.rb
 Paste in the following:
   config.gem "collectiveidea-awesome_nested_set", :lib => 'awesome_nested_set'
-  config.gem "rgrove-sanitize", :lib => 'sanitize'
+  config.gem "sanitize"
   config.gem "mbleigh-acts-as-taggable-on", :source => "http://gems.github.com", :lib => "acts-as-taggable-on"
   config.gem "friendly_id"
   config.gem "babelphish"
@@ -99,7 +99,7 @@ Override the contents controller to change the the security model.  For example:
     # Override this method to change the available layouts. Note that the
     # layout will need to exist in your 'views/layouts' directory
     def setup_layouts
-      @content_layouts = 
+      @content_layouts = []
       @content_layouts << OpenStruct.new(:name => 'A Great Layout', :value => 'great_layout')
       @content_layouts << OpenStruct.new(:name => 'Default', :value => 'default')
     end
@@ -107,5 +107,4 @@ Override the contents controller to change the the security model.  For example:
   end
 
 
-
-Copyright (c) 2009 Justin Ball, released under the MIT license
+Copyright (c) 2009 Tatemae, released under the MIT license

data/Rakefile

@@ -56,9 +56,9 @@ begin
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "muck-contents"
     gemspec.summary = "Add content to your muck based project"
-    gemspec.email = "justinball@gmail.com"
-    gemspec.homepage = "http://github.com/jbasdf/muck_contents"
-    gemspec.authors = ["Justin Ball"]
+    gemspec.email = "justin@tatemae.com"
+    gemspec.homepage = "http://github.com/tatemae/muck_contents"
+    gemspec.authors = ["Justin Ball", "Joel Duffin"]
     gemspec.rubyforge_project = 'muck-contents'
     gemspec.add_dependency "muck-engine"
     gemspec.add_dependency "muck-users"
@@ -67,6 +67,8 @@ begin
     gemspec.add_dependency "sanitize"
     gemspec.add_dependency "acts-as-taggable-on"
     gemspec.add_dependency "friendly_id"
+    gemspec.add_dependency "uploader"
+    gemspec.add_dependency "tiny_mce"
   end
   Jeweler::GemcutterTasks.new
   Jeweler::RubyforgeTasks.new do |rubyforge|

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/app/controllers/muck/contents_controller.rb

@@ -1,6 +1,10 @@
 class Muck::ContentsController < ApplicationController
   unloadable
   
+  uses_tiny_mce(:options => GlobalConfig.advanced_mce_options.merge(:save_onsavecallback => 'save_page'),
+                :raw_options => GlobalConfig.raw_mce_options, 
+                :only => [:new, :create, :edit, :update])
+
   before_filter :login_required, :only => [:create, :edit, :update, :destroy]
   before_filter :setup_parent, :only => [:new, :create]
   before_filter :get_secure_content, :only => [:edit, :update, :destroy]
@@ -69,7 +73,9 @@ class Muck::ContentsController < ApplicationController
       format.html do
         redirect_back_or_default(@content.uri)
       end
-      format.json { render :json => { :success => true, :content => @content, :parent_id => @parent ? @parent.id : nil } }
+      # HACK there should be a way to force polymorphic_url to use an id instead of to_param
+      update_path = polymorphic_url([@parent, @content]).gsub(@content.to_param, "#{@content.id}") # force the id.  The slugs can cause problems during edit
+      format.json { render :json => { :success => true, :content => @content, :parent_id => @parent ? @parent.id : nil, :update_path => update_path, :preview_path => @content.uri, :type => 'create' } } 
     end
   rescue ActiveRecord::RecordInvalid => ex
     if @content
@@ -97,12 +103,22 @@ class Muck::ContentsController < ApplicationController
   
   def update
     @content.current_editor = current_user
-    @content.update_attributes(params[:content])
+    @content.update_attributes!(params[:content])
     respond_to do |format|
       format.html do
-        redirect_back_or_default(@content.uri)
+        redirect_to @content.uri
       end
-      format.json { render :json => { :success => true, :content => @content, :parent_id => @parent ? @parent.id : nil } }
+      format.json { render :json => { :success => true, :content => @content, :parent_id => @parent ? @parent.id : nil, :type => 'update' } }
+    end
+  rescue ActiveRecord::RecordInvalid => ex
+    @errors = @content.errors.full_messages.to_sentence
+    message = t('muck.contents.update_error', :errors => @errors)
+    respond_to do |format|
+      format.html do
+        flash[:error] = message
+        render :template => 'contents/edit'
+      end
+      format.json { render :json => { :success => false, :message => message, :errors => @errors } }
     end
   end
   

data/app/helpers/muck_contents_helper.rb

@@ -11,11 +11,20 @@ module MuckContentsHelper
   end
   
   # content uses friendly_id but we want the param in the form to use the number id
-  def get_content_form_url(content, parent)
+  def get_content_form_url(parent, content)
     if content.new_record?
-      contents_path(make_muck_parent_params(parent))
+      polymorphic_url([parent, content])
     else
-      content_path(content.id, make_muck_parent_params(parent))
+      # HACK there should be a way to force polymorphic_url to use an id instead of to_param
+      polymorphic_url([@parent, @content]).gsub(@content.to_param, "#{@content.id}") # force the id.  The slugs can cause problems during edit
+    end
+  end
+  
+  def show_preview(content)
+    if content.new_record?
+      %Q{<a style="display:none;" target="blank" id="preview" href="#">#{t('muck.contents.preview')}</a>}
+    else
+      %Q{<a id="preview" target="blank" href="#{content.uri}">#{t('muck.contents.preview')}</a>}
     end
   end
   

data/app/helpers/tinymce_helper.rb

@@ -0,0 +1,13 @@
+module TinymceHelper
+  
+  # Pass paths into the tiny mce image and file dialog via hidden fields
+  # auto_complete_pages_path is for the tinymce link dialog.  It will use that value to 
+  # retrieve a list of content pages to link to
+  def mce_fields(upload_path, auto_complete_pages_path)
+    '<input id="upload-path" type="hidden" value="' + upload_path + '">' + 
+    '<input id="pages-path" type="hidden" value="' + auto_complete_pages_path + '">' + 
+    '<input id="session-key" type="hidden" value="' + GlobalConfig.session_key + '">' + 
+    '<input id="session-id" type="hidden" value="' + request.session_options[:id] + '">'
+  end
+  
+end

data/app/views/contents/_form.html.erb

@@ -1,7 +1,21 @@
+<% 
+form_id = "#{content.dom_id}_content_form"
+mce_id = "#{content.dom_id}_content"
+message_container_id = "#{content.dom_id}_message_container"
+message_id = "#{content.dom_id}_message"
+-%>
+<div id="<%= message_container_id %>" class="help-box" style="display:none;">
+  <div id="flashMessage" class="message">
+    <div id="<%= message_id %>" class="notice message"></div>
+  </div>
+</div>
+
+<%= show_preview(@content) %>
+
 <div id="<%= "#{content.dom_id}" %>" class="content_editor">
-  <% custom_form_for(content, :url => get_content_form_url(content, @parent), :html => html.merge(:id => "#{content.dom_id}_content_form", :class => 'content_form') ) do |f| -%>
+  <% custom_form_for(content, :url => get_content_form_url(@parent, @content), :html => html.merge(:id => form_id, :class => 'content_form') ) do |f| -%>
     <%= f.text_field :title, {:class => 'title', :tip => t('muck.contents.title_help'), :label => t('muck.contents.title_label') } %>
-    <%= f.text_area :body_raw, {:label => t('muck.contents.content_label'), :class => 'mceEditor', :id => 'mce_content', :tip_key => 'mce_content', :tip => t('muck.contents.content_help') } %>
+    <%= f.text_area :body_raw, {:label => t('muck.contents.content_label'), :class => 'mceEditor', :id => mce_id, :tip_key => mce_id, :tip => t('muck.contents.content_help') } %>
     <%= capture(f, &block) %>
     <%= f.muck_select(:layout, :value, :name, t('muck.contents.choose_layout'), @content_layouts, {:tip => t('muck.contents.choose_layout_help')}) %>
     <div class="button form-row">
@@ -9,5 +23,47 @@
       <%= f.hidden_field :uri_path unless content.uri_path.blank? %>
       <%= f.hidden_field :custom_scope unless content.custom_scope.blank? %>
     </div>
+    <%= mce_fields(polymorphic_url([@parent, :uploads], :format => 'js'), contents_url(:format => 'js')) -%>
   <% end %>
-</div>
+</div>
+
+<% content_for :head do  -%>
+  <%= include_tiny_mce_if_needed %>
+  <%= javascript_include_tag 'tiny_mce_helper' %>
+<% end -%>
+
+<script language="javascript" type="text/javascript">
+function save_page() {
+	tinyMCE.triggerSave(true,true);
+	var form = jQuery('#<%= form_id %>');
+	jQuery('#errorExplanation').fadeOut();
+	jQuery.post(form.attr('action') + '.json', form.serialize(),
+	  function(data){
+			var json = eval('(' + data + ')');
+			if(json.success){
+				undirty();
+				if(json.type == 'create'){
+				  jQuery('#<%= form_id %>').attr('action', json.update_path);
+				  jQuery('#<%= form_id %>').append('<input id="hidden_put" type="hidden" value="put" name="_method"/>');
+				  jQuery('#preview').attr('href', json.preview_path);
+				  jQuery('#preview').show();
+				}
+			} else {
+			  show_message(json.message);
+			}
+	  });
+	return false;
+}
+function show_message(message){
+  <% if GlobalConfig.growl_enabled -%>
+	  jQuery.jGrowl.info(message);
+	<% else -%>
+	  jQuery('#<%=message_container_id%>').show();
+	  jQuery('#<%=message_id%>').fadeIn();
+	<% end -%>
+}
+function undirty(){
+	var ed = tinyMCE.get('<%=mce_id%>');
+	ed.isNotDirty = 1;
+}
+</script>

data/config/initializers/mce_options.rb

@@ -0,0 +1,78 @@
+content_css = ['/stylesheets/reset.css', '/stylesheets/ie.css', '/stylesheets/application.css', '/stylesheets/common.css', '/stylesheets/standard.css']
+if Rails.env.production?
+  content_css = ['/stylesheets/all.css']
+end
+GlobalConfig.advanced_mce_options = {
+  :theme => 'advanced',
+  :content_css => content_css,
+  :body_id => 'content',
+  :mode => "textareas",
+  :height => 650,
+  :width => 830,
+  :browsers => %w{msie gecko safari},
+  :theme_advanced_layout_manager => "SimpleLayout",
+  :theme_advanced_statusbar_location => "bottom",
+  :theme_advanced_toolbar_location => "top",
+  :theme_advanced_toolbar_align => "left",
+  :theme_advanced_resizing => true,
+  :relative_urls => false,
+  :convert_urls => false,
+  :cleanup => true,
+  :cleanup_on_startup => true,  
+  :convert_fonts_to_spans => true,
+  :theme_advanced_resize_horizontal => false,
+  :theme_advanced_buttons1 => %w{save cancel print preview separator
+                                search replace separator
+                                cut copy paste pastetext pasteword selectall undo redo separator
+                                bold italic underline strikethrough styleprops separator 
+                                justifyleft justifycenter justifyright indent outdent separator 
+                                bullist numlist separator 
+                                link unlink image file media anchor separator                                 
+                                help},
+  :theme_advanced_buttons2 => %w{formatselect fontselect fontsizeselect forecolor backcolor separator
+                                 tablecontrols separator
+                                 sub sup charmap separator
+                                 template visualaid fullscreen code},
+  :theme_advanced_buttons3 => [],
+  :plugins => %w{ paste media preview inlinepopups safari save searchreplace table style template fullscreen print autosave advimagetoo advlinktoo advfiletoo},
+  :editor_deselector => "mceNoEditor",
+  :editor_selector => 'mceEditor',
+  :remove_script_host => true,
+  :extended_valid_elements => "img[class|src|flashvars|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|obj|param|embed|scale|wmode|salign|style],embed[src|quality|scale|salign|wmode|bgcolor|width|height|name|align|type|pluginspage|flashvars],span[class|style],code[class],object[align<bottom?left?middle?right?top|archive|border|class|classid|codebase|codetype|data|declare|dir<ltr?rtl|height|hspace|id|lang|name|style|tabindex|title|type|usemap|vspace|width],iframe[id|class|title|style|align|frameborder|height|longdesc|marginheight|marginwidth|name|scrolling|src|width]",
+  :template_cdate_classes => "cdate creationdate",
+  :template_mdate_classes => "mdate modifieddate",
+  :template_selected_content_classes => "selcontent",
+  :template_cdate_format => "%m/%d/%Y : %H:%M:%S",
+  :template_mdate_format => "%m/%d/%Y : %H:%M:%S"
+  }
+   
+GlobalConfig.simple_mce_options = {
+  :theme => 'advanced',
+  :content_css => content_css,
+  :body_id => 'content',
+  :browsers => %w{msie gecko safari},
+  :cleanup_on_startup => true,
+  :convert_fonts_to_spans => true,
+  :theme_advanced_resizing => true, 
+  :theme_advanced_toolbar_location => "top",  
+  :theme_advanced_statusbar_location => "bottom", 
+  :editor_deselector => "mceNoEditor",
+  :theme_advanced_resize_horizontal => false,  
+  :theme_advanced_buttons1 => %w{bold italic underline separator bullist numlist separator link unlink},
+  :theme_advanced_buttons2 => [],
+  :theme_advanced_buttons3 => [],
+  :plugins => %w{inlinepopups safari}
+  }
+
+GlobalConfig.raw_mce_options = 'template_templates : [
+  {
+    title : "A page",
+    src : "/javascripts/tiny_mce/templates/bio.htm",
+    description : "Easily add a new biography for a team member."
+  },
+  {
+    title : "Country Page",
+    src : "/javascripts/tiny_mce/templates/country.htm",
+    description : "Add a new country page."
+  }
+]'

data/lib/action_controller/acts/muck_content_handler.rb

@@ -9,7 +9,6 @@ module ActionController
         def acts_as_muck_content_handler
           rescue_from ActionController::RoutingError, :with => :handle_content_request
           include ActionController::Acts::MuckContentHandler::InstanceMethods
-          
         end
       end
       

data/lib/active_record/acts/muck_content.rb

@@ -48,7 +48,9 @@ module ActiveRecord
           if options[:sanitize_content]
             before_save :sanitize_attributes
           end
-
+          
+          before_save :ensure_locale_is_string
+          
           # TODO add states - draft, published
           # maybe move content body_raw -> body_draft -> body
           # then you could be working on a revision without it being live
@@ -203,6 +205,9 @@ module ActiveRecord
           rescue => ex
             #TODO figure out a way to bubble up the error
             puts ex
+            # Translations failed, but update the default language
+            translation = translation_for(self.locale)
+            translation.update_attributes!(:title => self.title, :body => self.body)
           end
         end
         
@@ -254,6 +259,10 @@ module ActiveRecord
           end
         end
         
+        def ensure_locale_is_string
+          self.locale = self.locale.to_s
+        end
+        
         # Override this method to control sanitization levels.
         # Currently a user who is an admin will not have their content sanitized.  A user
         # in any role 'editor', 'manager', or 'contributor' will be given the 'RELAXED' settings

data/lib/muck_contents/tasks.rb

@@ -18,6 +18,7 @@ module MuckContents
             path = File.join(File.dirname(__FILE__), *%w[.. ..])
             system "rsync -ruv #{path}/db ."
             system "rsync -ruv #{path}/public ."
+            system "rsync -ruv #{path}/config/initializers ./config"
           end
         end
       end

data/lib/muck_contents.rb

@@ -4,6 +4,8 @@ ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckContentTranslati
 ActionController::Base.class_eval { include ActionController::Acts::MuckContentHandler }
 
 ActionController::Base.send :helper, MuckContentsHelper
+ActionController::Base.send :helper, TinymceHelper
+
 I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]
 
 module MuckContents

data/locales/en.yml

@@ -6,9 +6,11 @@ en:
       delete: Delete
       edit: Edit
       add: Add
+      preview: Preview
       delete_title: "Delete this page."
       edit_title: "Edit this page."
       create_error: "There was a problem adding your content"
+      update_error: "There was a problem updating your content"
       content_removed: "Content successfully removed"
       cant_delete_content: "You don't have permission to delete the specified content"
       manage_pages_title: "Manage site content"