rich 0.0.4 → 0.0.6

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Rich is an opinionated implementation of CKEditor for Rails 3.1. It includes a stripped down toolbar, simplified dialogs and a custom file manager.
 
-Presently, Rich integrates with Formtastic 2.
+Presently, Rich integrates with Active Admin, Rails Admin and vanilla Formtastic (versions 1 and 2).
 
 == Goals
 
@@ -38,6 +38,8 @@ You're good to go.
 
 == Usage
 
+=== Vanilla Formtastic
+
 To use Rich, it's javascript file must be loaded. By default, this is already setup for you because Rails loads all Javascript files through the <tt>require_tree .</tt> command in application.js. If you've removed that line, manually load rich by requiring it.
 
   //= require rich
@@ -57,7 +59,7 @@ In your formtastic form, use <tt>:as => :rich</tt> to insert Rich. Like so:
    
 === Active Admin
 
-Since Active Admin actually uses Formtastic, you can use it with Rich out of the box. In your model configuration file, set up your form like this. Make sure you use a recent version of Active Admin, that supports Formtastic 2 (which Rich requires).
+Since Active Admin actually uses Formtastic, you can use it with Rich out of the box. In your model configuration file, set up your form like this. Make sure you add <tt>//= require rich</tt> to your <tt>app/assets/javascripts/active_admin.js</tt>.
 
   form do |f|
     f.inputs "Basic info" do
@@ -69,10 +71,28 @@ Since Active Admin actually uses Formtastic, you can use it with Rich out of the
 
 If you're annoyed by the fact that the Rich editor overlaps the field label (I was!), add the following to your <tt>/app/assets/stylesheets/active_admin.css.scss</tt>.
 
-  .cke_skin_kama {
+  #wrapper .cke_skin_kama {
   	margin-left: 20%;
   }
   
+=== Rails Admin
+
+Support for Rails Admin is very new and should be considered fragile. Per-editor configuration is not supported. However, you can globally customize your editors through the Rich initializer.
+
+To use Rich in your RA forms, first add the following lines to your <tt>/config/initializers/rails_admin.rb</tt>.
+
+  require 'rich/rails_admin'
+  RailsAdmin::Config::Fields::Types::register(Rich::RichRailsAdmin::RichEditor)
+  
+This will enable the <tt>rich_editor</tt> field type. You can use this field as follows:
+
+  config.model Post do
+    edit do
+      field :title
+      field :body, :rich_editor
+    end
+  end
+  
 == Screenshots
 
 This is the editor with default settings.

data/app/assets/javascripts/rich/application.js

@@ -31,19 +31,37 @@ function selectStyle(name) {
   })(window.location.search.substr(1).split('&'))
 })(jQuery);
 
+
+
+// Initialization
+
 $(function() {
+  
+  updateImageInsertToggle();
+  $('#insert-one, #insert-many').click(function(e){
+    insert_many_images = !insert_many_images;
+    updateImageInsertToggle();
+    
+    e.preventDefault();
+    return false;
+  })
+  
 	
-	// click an image to insert it in the editor
 	$('#images li img').live('click', function(e){
-		//var url = $(this).data('url');
-//		var url = $(this).attr('src');
 		var url = $(this).data('uris')[rich_current_style];
 		var id = $(this).data('rich-image-id');
 		
 		window.opener.CKEDITOR.tools.callFunction($.QueryString["CKEditorFuncNum"], url, id);
+
 		window.setTimeout(function(){
-			window.close();
-		},500);
+	    if(insert_many_images == false) {  			
+			  window.close();
+		  } else {
+		    window.focus();
+		  }
+			
+		},100); 
+		
 	});
 	
 	$('#styles li').click(function(e){
@@ -58,4 +76,43 @@ $(function() {
 	
 });
 
+// image insert toggle
+function  updateImageInsertToggle() {
+  if(insert_many_images == true) {
+    $('#insert-one').hide();
+    $('#insert-many').show();
+  } else {
+    $('#insert-one').show();
+    $('#insert-many').hide();
+  }
+}
 
+// seamless pagination
+var currentPage = 1;
+(function() {
+  loading = false;
+
+  function nearBottomOfPage() {
+    return $(window).scrollTop() > $(document).height() - $(window).height() - 100;
+  }
+
+  $(window).scroll(function(){
+    if (loading) {
+      return;
+    }
+
+    if(nearBottomOfPage()) {
+      loading=true;
+      currentPage++;
+      console.log(window.location.href);
+      $.ajax({
+        url: window.location.href + '&page=' + currentPage,
+        type: 'get',
+        dataType: 'script',
+        success: function() {
+          loading=false;
+        }
+      });
+    }
+  });
+}());

data/app/assets/javascripts/rich/base.js

@@ -48,4 +48,37 @@ CKEDITOR.plugins.add('richimage',
 			icon: '/assets/rich/images.png'
 		});
     }
+});
+
+var rich = rich || {};
+rich.AssetFinder = function(){
+	
+};
+
+rich.AssetFinder.prototype = {
+	
+	showFinder: function(id){
+		// open a popup
+		console.log(id);
+  },
+
+	setAsset: function(id, asset){
+		// callback from popup
+		console.log(id);
+  },
+	
+};
+
+// Rich Asset input
+var assetFinder = new rich.AssetFinder();
+$(function(){
+	$('.rich_asset').live('click', function(e){
+
+		if($(this).get(0).tagName=="INPUT") {
+			assetFinder.showFinder($(this).attr('id'));
+		}
+	});
+	
+	// on hover, show a thumbnail of the selected image?
+	
 });

data/app/assets/stylesheets/rich/application.css.scss

@@ -80,6 +80,31 @@ header {
 	@include box-shadow(0, 0, 4px, rgba(0,0,0,0.5))	
 }
 
+#insert-toggle {
+  float: right;
+  height: $headerHeight;
+  overflow: hidden;
+  margin: 0 $margin 0 5px;
+  padding-left: 25px;
+  background: image-url('rich/menu-dash.png') no-repeat left center;
+}
+
+#insert-many, #insert-one {
+  display: block;
+  width: 16px;
+  height: $headerHeight;
+  text-indent: -9999em;
+  background: no-repeat center;
+}
+
+#insert-many {
+  background-image: image-url('rich/insert-many.png');
+}
+
+#insert-one {
+  background-image: image-url('rich/insert-one.png');
+}
+
 #images {
 	list-style: none;
 	margin: 0 0 0 $margin;
@@ -212,7 +237,7 @@ header {
 ul.scopes {
 	
 	list-style: none;
-	margin: 0 ($margin/4*3);
+	margin: 0 0 0 ($margin/4*3);
 	padding: 0;
 	float: right;
 	

data/app/controllers/rich/files_controller.rb

@@ -1,12 +1,9 @@
-require 'mime/types'
-
 module Rich
   class FilesController < ApplicationController
     
     def index
-      # filter for allowed styles, default to all available
       
-      #logger.debug("#{Rich.allowed_styles.inspect}")
+      @insert_many_images = Rich.insert_many_images
       
       if (Rich.allowed_styles == :all)
         @styles = Rich.image_styles.keys
@@ -18,10 +15,16 @@ module Rich
       @default_style = Rich.default_style
       
       # list all files
-      @images = RichImage.all(:order => "created_at DESC")
+      @images = RichImage.order("created_at DESC").page params[:page]
       
       # stub for new file
       @rich_image = RichImage.new
+      
+      respond_to do |format|
+        format.js
+        format.html
+      end
+      
     end
     
     def show
@@ -38,62 +41,20 @@ module Rich
     end
     
     def create
-      #render :json => { :success => false, :error => "File is too large..." }
-      #render :json => { :success => true, :rich_id => 1 }
-
       @file = RichImage.new
       
-      
-
-      
       # use the file from Rack Raw Upload
       if(params[:file])
-        # Rack Raw Upload always passes octet/stream, so we need to figure it out ourselves.
-        params[:file].content_type = MIME::Types.type_for(params[:file].original_filename)
-        
         @file.image = params[:file]
       end
       
-      logger.debug("DIT IS HEM >> #{params[:file].inspect}")
-      
       if @file.save
         render :json => { :success => true, :rich_id => @file.id }
       else
         render :json => { :success => false, 
                           :error => "Could not upload your file:\n- "+@file.errors.to_a[-1].to_s,
                           :params => params.inspect }
-                          
-                          # :error => "Could not upload your file:\n"+@file.errors.map {
-                          #                             |k,v|
-                          #                             "- "+v+"\n"
-                          #                           }.to_s,
-                          #                           
-                          
       end
-      
-      # if @article.save
-      #       if is_qq
-      #         render :json => { "success" => true }
-      #       else
-      #         # as before, likely:
-      #         # redirect_to(articles_path, :notice => "Article was successfully created.")
-      #       end
-      #     else
-      #       if is_qq
-      #         render :json => { "error" => @article.errors }
-      #       else
-      #         # as before, likely:
-      #         # render :action => :new
-      #       end
-      #     end
-      
-      # @rich_image = RichImage.new(params[:rich_image])
-      #       if @rich_image.save
-      #         flash[:notice] = "Successfully created image."
-      #         redirect_to :action => 'index'
-      #       else
-      #         redirect_to :action => 'index'
-      #       end
     end
     
     def destroy  

data/app/inputs/rich_asset_input.rb

@@ -0,0 +1,20 @@
+
+if Object.const_defined?("Formtastic")
+  if(Gem.loaded_specs["formtastic"].version.version[0,1] == "2")
+
+    class RichAssetInput < ::Formtastic::Inputs::StringInput  
+  
+      # todo:
+      # differentiate between rich_asset and rich_asset_url
+      # where the former links an object and the latter returns a url string
+      # ?
+  
+      def input_html_options
+        options = super
+        options[:class] = [options[:class], "rich_asset"].compact.join(' ')
+        options
+      end
+    end
+    
+  end
+end

data/app/inputs/rich_input.rb

@@ -1,15 +1,25 @@
-class RichInput < ::Formtastic::Inputs::TextInput  
-  def to_html
-    editor_options = Rich.editor.merge(options[:editor] || {})
-    editor_options[:width]  = options[:width] || '76%'
-    editor_options[:height] = options[:height] || '400px'
-    
-    input_wrapping do
-      label_html <<
-      builder.text_area(method, input_html_options) <<
-      #javascript_tag("$(function(){$('##{dom_id}').ckeditor(function() { }, #{editor_options.to_json} );});")
-      # doing this might be insecure?
-      "<script>$(function(){$('##{dom_id}').ckeditor(function() { }, #{editor_options.to_json} );});</script>".html_safe
+
+if Object.const_defined?("Formtastic")
+  if(Gem.loaded_specs["formtastic"].version.version[0,1] == "2")
+
+
+    class RichInput < ::Formtastic::Inputs::TextInput  
+      def to_html
+        editor_options = Rich.editor.merge(options[:editor] || {})
+        editor_options[:width]  = options[:width] || '76%'
+        editor_options[:height] = options[:height] || '400px'
+
+        input_wrapping do
+          label_html <<
+          builder.text_area(method, input_html_options) <<
+          #javascript_tag("$(function(){$('##{dom_id}').ckeditor(function() { }, #{editor_options.to_json} );});")
+          # doing this might be insecure?
+          "<script>$(function(){$('##{dom_id}').ckeditor(function() { }, #{editor_options.to_json} );});</script>".html_safe
+        end
+      end
     end
+    
+
   end
-end
+end
+

data/app/models/rich/rich_image.rb

@@ -1,77 +1,68 @@
 require 'cgi'
+require 'mime/types'
 
 module Rich
   class RichImage < ActiveRecord::Base
     
-    #has_attached_file :image, :styles => { :thumb => "100x100#", :large => "1000x1000"}
+    paginates_per 27
+    
     has_attached_file :image
     
     validates_attachment_presence :image
-    validates_attachment_content_type :image, :content_type=>['image/jpeg', 'image/png', 'image/gif', 'image/jpg'], :message => "is not an image"
+    validate :check_content_type    
     validates_attachment_size :image, :less_than=>15.megabyte, :message => "must be smaller than 15MB"
     
     after_initialize :init_styles
-    
-    before_create :transliterate_file_name
+    before_create :clean_file_name
 
-    def style_uris
-     uris = {}
-  
-      image.styles.each do |style|
-        uris[style[0]] = image.url(style[0].to_sym)
-      end
-      
-      # manualy add the original size
-      uris["original"] = image.url(:original)
-      
-      uris.to_json
-    end
+    after_create :cache_style_uris_and_save
+    before_update :cache_style_uris
 
     def init_styles
       self.class.has_attached_file :image,
         :styles => hash = Rich.image_styles
     end
     
-    def transliterate(str)
-      # Based on permalink_fu by Rick Olsen
-
-      # Escape str by transliterating to UTF-8 with Iconv
-      s = Iconv.iconv('ascii//ignore//translit', 'utf-8', str).to_s
-
-      # Downcase string
-      s.downcase!
-
-      # Remove apostrophes so isn't changes to isnt
-      s.gsub!(/'/, '')
-
-      # Replace any non-letter or non-number character with a space
-      s.gsub!(/[^A-Za-z0-9]+/, ' ')
-
-      # Remove spaces from beginning and end of string
-      s.strip!
-
-      # Replace groups of spaces with single hyphen
-      s.gsub!(/\ +/, '-')
-
-      return s
-    end
+    private 
     
+    def cache_style_uris_and_save
+      cache_style_uris
+      self.save!
+    end
     
-    private 
+    def cache_style_uris
+      uris = {}
+      
+      image.styles.each do |style|
+        uris[style[0]] = image.url(style[0].to_sym)
+      end
+      
+      # manualy add the original size
+      uris["original"] = image.url(:original)
+      
+      self.uri_cache = uris.to_json
+    end
     
-    def transliterate_file_name
+    def clean_file_name
       extension = File.extname(image_file_name).gsub(/^\.+/, '')
       filename = image_file_name.gsub(/\.#{extension}$/, '')
       
       filename = CGI::unescape(filename)
       filename = CGI::unescape(filename)
       
-      # TODO: remove %20 stuff from filename
-      # CGI::unescape("%27Stop%21%27+said+Fred")
+      extension = extension.downcase
+      filename = filename.downcase.gsub(/[^a-z0-9]+/i, '-')
       
-      self.image.instance_write(:file_name, "#{self.transliterate(filename)}.#{self.transliterate(extension)}")
+      self.image.instance_write(:file_name, "#{filename}.#{extension}")
+    end
+    
+    def check_content_type
+      self.image.instance_write(:content_type, MIME::Types.type_for(image_file_name)[0])
+      logger.debug(image_content_type)
+      unless ['image/jpeg', 'image/png', 'image/gif', 'image/jpg'].include?(image_content_type)
+        self.errors[:base] << "'#{self.image_file_name}' is not an image."
+      end
     end
     
-        
   end
 end