muck-contents 0.2.10 → 0.2.11

data/.gitignore

@@ -26,4 +26,5 @@ coverage
 rdoc
 pkg
 pkg/*
-log/*
+log/*
+global_config.yml

data/README.rdoc

@@ -19,6 +19,7 @@ Paste in the following:
   config.gem "sanitize"
   config.gem 'paperclip'
   config.gem 'tiny_mce'
+  config.gem 'fleakr'
   config.gem "uploader"
   config.gem "babelphish"
   config.gem 'muck-engine', :lib => 'muck_engine'
@@ -43,6 +44,7 @@ be sure to set content_css to any css files you want to have show up in your tin
   enable_auto_translations: true
   content_enable_solr: false
   content_css: ['/stylesheets/reset.css', '/stylesheets/styles.css']
+  flickr_api_key:  #get from www.flickr.com/services/api/misc.api_keys.html
 
 === Initializer
 Running rake muck:contents:sync will copy all the needed javascript, image and css files into your project.  It will also create an initializer called mce_options.rb.  That file
@@ -221,6 +223,8 @@ NOTE: you must define icon, thumb, small, medium and large as styles.  They can
   
   end
 
-
+== Testing
+This gem uses a full rails application in the test directory for testing and development.  By default there isn't a global_config.yml setup.  
+Use global_config.sample.yml to set one up.
 
 Copyright (c) 2009 Tatemae, released under the MIT license

data/Rakefile

@@ -69,6 +69,7 @@ begin
     gemspec.add_dependency "friendly_id"
     gemspec.add_dependency "uploader"
     gemspec.add_dependency "tiny_mce"
+    gemspec.add_dependency "fleakr"
   end
   Jeweler::GemcutterTasks.new
   Jeweler::RubyforgeTasks.new do |rubyforge|

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/app/controllers/muck/tiny_mce_controller.rb

@@ -28,6 +28,15 @@ class Muck::TinyMceController < ApplicationController
     end
   end
   
+  def tiny_mce_flickr
+    @body_tag = 'flickr'
+    Fleakr.api_key = GlobalConfig.flickr_api_key
+    @photos = Fleakr.search(params[:search]) unless params[:search].blank?
+    respond_to do |format|
+      format.html { render :template => 'tiny_mce/flickr'}
+    end
+  end
+  
   def images_for_content
     @parent = current_user if @parent.blank?
     @images = @parent.uploads.images.paginate(:page => @page, :per_page => @per_page, :order => 'created_at desc')

data/app/helpers/tinymce_helper.rb

@@ -8,19 +8,23 @@ module TinymceHelper
   #       tiny_mce_images_height height of image dialog. Default is 540
   def mce_fields(parent, options = {})
     parent_params = make_muck_parent_fields(parent) || {}
-    tiny_mce_files_path = tiny_mce_files_url(parent_params)
-    tiny_mce_images_path = tiny_mce_images_url(parent_params)
-    tiny_mce_links_path = tiny_mce_links_url(parent_params)
+    files_path = tiny_mce_files_url(parent_params)
+    images_path = tiny_mce_images_url(parent_params)
+    links_path = tiny_mce_links_url(parent_params)
+    flickr_path = tiny_mce_flickr_url(parent_params)
     
-    %Q{<input id="tiny_mce_files_path" type="hidden" value="#{tiny_mce_files_path}">
+    %Q{<input id="tiny_mce_files_path" type="hidden" value="#{files_path}">
     <input id="tiny_mce_files_width" type="hidden" value="#{options[:tiny_mce_files_width] || 675}">
     <input id="tiny_mce_files_height" type="hidden" value="#{options[:tiny_mce_files_height] || 540}">
-    <input id="tiny_mce_images_path" type="hidden" value="#{tiny_mce_images_path}">
+    <input id="tiny_mce_images_path" type="hidden" value="#{images_path}">
     <input id="tiny_mce_images_width" type="hidden" value="#{options[:tiny_mce_images_width] || 675}">
     <input id="tiny_mce_images_height" type="hidden" value="#{options[:tiny_mce_images_height] || 560}">
-    <input id="tiny_mce_links_path" type="hidden" value="#{tiny_mce_links_path}">
-    <input id="tiny_mce_links_width" type="hidden" value="#{options[:tiny_mce_images_width] || 480}">
-    <input id="tiny_mce_links_height" type="hidden" value="#{options[:tiny_mce_images_height] || 480}">}
+    <input id="tiny_mce_links_path" type="hidden" value="#{links_path}">
+    <input id="tiny_mce_links_width" type="hidden" value="#{options[:tiny_mce_links_width] || 480}">
+    <input id="tiny_mce_links_height" type="hidden" value="#{options[:tiny_mce_links_height] || 480}">
+    <input id="tiny_mce_flickr_path" type="hidden" value="#{flickr_path}">
+    <input id="tiny_mce_flickr_width" type="hidden" value="#{options[:tiny_mce_flickr_width] || 675}">
+    <input id="tiny_mce_flickr_height" type="hidden" value="#{options[:tiny_mce_flickr_height] || 675}">}
   end
   
   # Output a form capable of uploading files to the server.
@@ -56,4 +60,20 @@ module TinymceHelper
     render :partial => 'tiny_mce/tiny_mce_scripts', :locals => options
   end
   
+  # Adds fields for outputing messages related to the tiny mce editor.
+  # This method is used instead of tiny_mce_scripts if no customization of message fields
+  # is required.
+  # mce_id:   id of tiny mce editor 
+  # parent:   parent object for which to build tiny mce editor
+  def tiny_mce_messages_and_scripts_for(mce_id, parent)
+    form_id = "#{parent.dom_id}_content_form"
+    message_container_id = "#{parent.dom_id}_message_container"
+    message_id = "#{parent.dom_id}_message"
+    render :partial => 'tiny_mce/tiny_mce_messages_and_scripts_for', :locals => { :mce_id => mce_id,
+                                                                                  :form_id => form_id,
+                                                                                  :message_container_id => message_container_id,
+                                                                                  :message_id => message_id }
+  end
+
+
 end

data/app/views/tiny_mce/_flickr_photo.html.erb

@@ -0,0 +1,5 @@
+<li>
+  <a class="image-container" href="#">
+    <img src="<%= flickr_photo.id %>" alt="<%= flickr_photo.title %>" />
+  </a>
+</li>

data/app/views/tiny_mce/_tiny_mce_messages_and_scripts_for.html.erb

@@ -0,0 +1,6 @@
+<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>
+<%= tiny_mce_scripts(:form_id => form_id, :mce_id => mce_id, :message_container_id => message_container_id, :message_id => message_id) -%>

data/app/views/tiny_mce/flickr.html.erb

@@ -0,0 +1,35 @@
+<form name="insert_image" id="insert_image" onsubmit="ImageDialog.insert();return false;" action="#">
+   <div class="panel_wrapper">
+    <div id="dynamic_select_panel" class="panel current" style='overflow:auto'>
+      <fieldset>
+        <legend>Available Images - Click to Add</legend>
+        <ul id="flickr-list" class="image-list">
+          <%= render :partial => 'tiny_mce/flickr_photo', :collection => @photos -%>
+        </ul>
+      </fieldset>
+    </div>
+  </div>
+</div>
+
+<div class="mceActionPanel">
+  <div style="float: left">
+    <input type="button" id="insert" name="insert" value="{#insert}" onclick="ImageDialog.insert();" />
+  </div>
+
+  <div style="float: right">
+    <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+  </div>
+</div>
+</form>
+
+<% content_for :head do  -%>
+  <%= javascript_include_tag 'tiny_mce/plugins/muckflickr/js/functions.js' -%>
+<% end -%>
+<script language="javascript" type="text/javascript">
+jQuery(document).ready(function() { 
+  jQuery('.image-container').click(function() {
+    jQuery(this).toggleClass('highlight');
+    return false;
+  });
+});
+</script>

data/config/muck_contents_routes.rb

@@ -3,6 +3,7 @@ ActionController::Routing::Routes.draw do |map|
   map.tiny_mce_files '/tiny_mce_files', :controller => 'muck/tiny_mce', :action => 'tiny_mce_files'
   map.tiny_mce_images '/tiny_mce_images', :controller => 'muck/tiny_mce', :action => 'tiny_mce_images'
   map.tiny_mce_links '/tiny_mce_links', :controller => 'muck/tiny_mce', :action => 'tiny_mce_links'
+  map.tiny_mce_flickr '/tiny_mce_flickr', :controller => 'muck/tiny_mce', :action => 'tiny_mce_flickr'
   
   map.images_for_content '/images_for_content', :controller => 'muck/tiny_mce', :action => 'images_for_content'
   map.files_for_content '/files_for_content', :controller => 'muck/tiny_mce', :action => 'files_for_content'

data/muck-contents.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-contents}
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2009-11-20}
+  s.date = %q{2009-11-30}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -33,8 +33,11 @@ Gem::Specification.new do |s|
      "app/views/contents/new.html.erb",
      "app/views/contents/show.html.erb",
      "app/views/layouts/tiny_mce.html.erb",
+     "app/views/tiny_mce/_flickr_photo.html.erb",
+     "app/views/tiny_mce/_tiny_mce_messages_and_scripts_for.html.erb",
      "app/views/tiny_mce/_tiny_mce_scripts.html.erb",
      "app/views/tiny_mce/files.html.erb",
+     "app/views/tiny_mce/flickr.html.erb",
      "app/views/tiny_mce/images.html.erb",
      "app/views/tiny_mce/links.html.erb",
      "config/initializers/mce_options.rb",
@@ -1410,7 +1413,7 @@ Gem::Specification.new do |s|
      "test/rails_root/config/environments/development.rb",
      "test/rails_root/config/environments/production.rb",
      "test/rails_root/config/environments/test.rb",
-     "test/rails_root/config/global_config.yml",
+     "test/rails_root/config/global_config.sample.yml",
      "test/rails_root/config/initializers/inflections.rb",
      "test/rails_root/config/initializers/mce_options.rb",
      "test/rails_root/config/initializers/mime_types.rb",
@@ -1550,6 +1553,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/images/rails.png",
      "test/rails_root/public/images/spinner.gif",
      "test/rails_root/public/images/sprites.png",
+     "test/rails_root/public/images/tinymce/flickr.gif",
      "test/rails_root/public/images/tinymce/sample.gif",
      "test/rails_root/public/images/tinymce/upload.gif",
      "test/rails_root/public/javascripts/application.js",
@@ -2153,6 +2157,9 @@ Gem::Specification.new do |s|
      "test/rails_root/public/javascripts/tiny_mce/plugins/muckfile/editor_plugin_src.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/muckfile/js/functions.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/muckfile/langs/en_dlg.js",
+     "test/rails_root/public/javascripts/tiny_mce/plugins/muckflickr/editor_plugin.js",
+     "test/rails_root/public/javascripts/tiny_mce/plugins/muckflickr/editor_plugin_src.js",
+     "test/rails_root/public/javascripts/tiny_mce/plugins/muckflickr/js/functions.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/muckimage/editor_plugin.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/muckimage/editor_plugin_src.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/muckimage/image.htm",
@@ -3103,6 +3110,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<friendly_id>, [">= 0"])
       s.add_runtime_dependency(%q<uploader>, [">= 0"])
       s.add_runtime_dependency(%q<tiny_mce>, [">= 0"])
+      s.add_runtime_dependency(%q<fleakr>, [">= 0"])
     else
       s.add_dependency(%q<muck-engine>, [">= 0"])
       s.add_dependency(%q<muck-users>, [">= 0"])
@@ -3113,6 +3121,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<friendly_id>, [">= 0"])
       s.add_dependency(%q<uploader>, [">= 0"])
       s.add_dependency(%q<tiny_mce>, [">= 0"])
+      s.add_dependency(%q<fleakr>, [">= 0"])
     end
   else
     s.add_dependency(%q<muck-engine>, [">= 0"])
@@ -3124,5 +3133,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<friendly_id>, [">= 0"])
     s.add_dependency(%q<uploader>, [">= 0"])
     s.add_dependency(%q<tiny_mce>, [">= 0"])
+    s.add_dependency(%q<fleakr>, [">= 0"])
   end
 end

data/public/stylesheets/tinymce.css

@@ -18,6 +18,7 @@ input.submit{width:auto;margin:0;}
 .pagination a{border:1px solid #7DA807;color:#7DA807;margin-right:.3em;padding:.3em;}
 .pagination a:hover{background:#7DA807;border:1px solid #7DA807;color:#ffffff;}
 .pagination a.active{background:#1EA2C1;border:none;color:#ffffff;}
+.highlight img{border:solid 3px #ff0000;}
 /*file dialog*/
 ul.file-list{list-style:none;margin:0;padding:0;}
 ul.file-list li.selected a img{border:2px solid red;}

data/test/rails_root/config/environment.rb

@@ -25,6 +25,7 @@ Rails::Initializer.run do |config|
   config.gem "sanitize"
   config.gem 'paperclip'
   config.gem 'tiny_mce'
+  config.gem 'fleakr'
   config.gem "uploader"
   config.gem "babelphish"
   config.gem 'muck-engine', :lib => 'muck_engine'

data/test/rails_root/config/{global_config.yml → global_config.sample.yml}

@@ -58,6 +58,7 @@ default: &DEFAULT
   enable_auto_translations: true
   content_enable_solr: false
   content_css: ['/stylesheets/reset.css', '/stylesheets/styles.css']
+  flickr_api_key:  #get from www.flickr.com/services/api/misc.api_keys.html
   
 production:
   <<: *DEFAULT

data/test/rails_root/config/initializers/mce_options.rb

@@ -23,7 +23,7 @@ GlobalConfig.advanced_mce_options = {
                                 bold italic underline strikethrough separator 
                                 justifyleft justifycenter justifyright indent outdent separator 
                                 bullist numlist separator 
-                                link unlink image file media anchor separator  
+                                link unlink image flickr file media anchor separator  
                                 template visualaid separator
                                 fullscreen code},
   :theme_advanced_buttons2 => %w{styleprops styleselect separator
@@ -33,7 +33,7 @@ GlobalConfig.advanced_mce_options = {
                                  sub sup charmap },
   :theme_advanced_buttons3 => %w{}, #bramus_cssextras_classes bramus_cssextras_ids
   #:theme_advanced_buttons3 => %w{cleanup code insertdate inserttime removeformat insertlayer},
-  :plugins => %w{ paste media preview inlinepopups safari save searchreplace table style template fullscreen print autosave muckimage mucklink},
+  :plugins => %w{ paste media preview inlinepopups safari save searchreplace table style template fullscreen print autosave muckimage mucklink muckflickr},
   # codehighlighting
   # spellchecker,pagebreak,layer,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,
   # contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template

data/test/rails_root/public/javascripts/tiny_mce/plugins/muckflickr/editor_plugin.js

@@ -0,0 +1,42 @@
+/**
+ * @author Tatamae
+ * @copyright Copyright © 2009, Tatemae.
+ */
+(function() {
+	tinymce.create('tinymce.plugins.muckFlickr', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('muckFlickr', function() {
+				var e = ed.selection.getNode();
+				// Internal file object like a flash placeholder
+				if (ed.dom.getAttrib(e, 'class').indexOf('mceItem') != -1)
+					return;
+				ed.windowManager.open({
+					file : jQuery('#tiny_mce_flickr_path').val(),
+					width : parseInt(jQuery('#tiny_mce_flickr_width').val()) + parseInt(ed.getLang('muckflickr.delta_width', 0)),
+					height : parseInt(jQuery('#tiny_mce_flickr_height').val()) + parseInt(ed.getLang('muckflickr.delta_height', 0)),
+					inline : 1
+				}, {
+					search_string : ed.selection.getContent({format : 'text'}),
+					plugin_url : url
+				});
+			});
+			// Register button
+			ed.addButton('flickr', {
+				title : 'Flickr',
+				cmd : 'muckFlickr',
+				image : '/images/tinymce/flickr.gif'
+			});
+		},
+		getInfo : function() {
+			return {
+				longname : 'Flickr in muck',
+				author : 'Tatemae',
+				authorurl : 'http://Tatemae.com',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+	// Register plugin
+	tinymce.PluginManager.add('muckflickr', tinymce.plugins.muckFlickr);
+})();

data/test/rails_root/public/javascripts/tiny_mce/plugins/muckflickr/editor_plugin_src.js

@@ -0,0 +1,41 @@
+/**
+ * @author Tatamae
+ * @copyright Copyright © 2009, Tatemae.
+ */
+(function() {
+	tinymce.create('tinymce.plugins.muckFlickr', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('muckFlickr', function() {
+				var e = ed.selection.getNode();
+				// Internal file object like a flash placeholder
+				if (ed.dom.getAttrib(e, 'class').indexOf('mceItem') != -1)
+					return;
+				ed.windowManager.open({
+					file : jQuery('#tiny_mce_flickr_path').val() + '?search=' + ed.selection.getContent({format : 'text'}),
+					width : parseInt(jQuery('#tiny_mce_flickr_width').val()) + parseInt(ed.getLang('muckflickr.delta_width', 0)),
+					height : parseInt(jQuery('#tiny_mce_flickr_height').val()) + parseInt(ed.getLang('muckflickr.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+			// Register button
+			ed.addButton('flickr', {
+				title : 'Flickr',
+				cmd : 'muckFlickr',
+				image : '/images/tinymce/flickr.gif'
+			});
+		},
+		getInfo : function() {
+			return {
+				longname : 'Flickr in muck',
+				author : 'Tatemae',
+				authorurl : 'http://Tatemae.com',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+	// Register plugin
+	tinymce.PluginManager.add('muckflickr', tinymce.plugins.muckFlickr);
+})();

data/test/rails_root/public/javascripts/tiny_mce/plugins/muckflickr/js/functions.js

@@ -0,0 +1,19 @@
+tinyMCEPopup.requireLangPack();
+
+var MuckFlickrDialog = {
+	init : function() {
+		var selected_text = tinyMCEPopup.editor.selection.getContent({format : 'text'});
+	},
+	insert : function() {
+        selected_text = tinyMCEPopup.editor.selection.getContent({format : 'text'})
+        if(selected_text.length > 3){
+            return_text =  selected_text + document.getElementById("result_html_id").value;
+        }else{
+            return_text =  document.getElementById("result_html_id").value;
+        }
+		tinyMCEPopup.editor.execCommand('mceInsertContent', false, return_text);
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.onInit.add(MuckFlickrDialog.init, MuckFlickrDialog);

data/test/rails_root/public/stylesheets/tinymce.css

@@ -18,6 +18,7 @@ input.submit{width:auto;margin:0;}
 .pagination a{border:1px solid #7DA807;color:#7DA807;margin-right:.3em;padding:.3em;}
 .pagination a:hover{background:#7DA807;border:1px solid #7DA807;color:#ffffff;}
 .pagination a.active{background:#1EA2C1;border:none;color:#ffffff;}
+.highlight img{border:solid 3px #ff0000;}
 /*file dialog*/
 ul.file-list{list-style:none;margin:0;padding:0;}
 ul.file-list li.selected a img{border:2px solid red;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-contents
 version: !ruby/object:Gem::Version 
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 -07:00
+date: 2009-11-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: fleakr
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: justin@tatemae.com
 executables: []
@@ -130,8 +140,11 @@ files:
 - app/views/contents/new.html.erb
 - app/views/contents/show.html.erb
 - app/views/layouts/tiny_mce.html.erb
+- app/views/tiny_mce/_flickr_photo.html.erb
+- app/views/tiny_mce/_tiny_mce_messages_and_scripts_for.html.erb
 - app/views/tiny_mce/_tiny_mce_scripts.html.erb
 - app/views/tiny_mce/files.html.erb
+- app/views/tiny_mce/flickr.html.erb
 - app/views/tiny_mce/images.html.erb
 - app/views/tiny_mce/links.html.erb
 - config/initializers/mce_options.rb
@@ -1507,7 +1520,7 @@ files:
 - test/rails_root/config/environments/development.rb
 - test/rails_root/config/environments/production.rb
 - test/rails_root/config/environments/test.rb
-- test/rails_root/config/global_config.yml
+- test/rails_root/config/global_config.sample.yml
 - test/rails_root/config/initializers/inflections.rb
 - test/rails_root/config/initializers/mce_options.rb
 - test/rails_root/config/initializers/mime_types.rb
@@ -1647,6 +1660,7 @@ files:
 - test/rails_root/public/images/rails.png
 - test/rails_root/public/images/spinner.gif
 - test/rails_root/public/images/sprites.png
+- test/rails_root/public/images/tinymce/flickr.gif
 - test/rails_root/public/images/tinymce/sample.gif
 - test/rails_root/public/images/tinymce/upload.gif
 - test/rails_root/public/javascripts/application.js
@@ -2250,6 +2264,9 @@ files:
 - test/rails_root/public/javascripts/tiny_mce/plugins/muckfile/editor_plugin_src.js
 - test/rails_root/public/javascripts/tiny_mce/plugins/muckfile/js/functions.js
 - test/rails_root/public/javascripts/tiny_mce/plugins/muckfile/langs/en_dlg.js
+- test/rails_root/public/javascripts/tiny_mce/plugins/muckflickr/editor_plugin.js
+- test/rails_root/public/javascripts/tiny_mce/plugins/muckflickr/editor_plugin_src.js
+- test/rails_root/public/javascripts/tiny_mce/plugins/muckflickr/js/functions.js
 - test/rails_root/public/javascripts/tiny_mce/plugins/muckimage/editor_plugin.js
 - test/rails_root/public/javascripts/tiny_mce/plugins/muckimage/editor_plugin_src.js
 - test/rails_root/public/javascripts/tiny_mce/plugins/muckimage/image.htm