rich 0.0.8 → 1.0.0

data/app/controllers/rich/files_controller.rb

@@ -1,12 +1,27 @@
 module Rich
   class FilesController < ApplicationController
     
+    layout "rich/application"
+    
     def index
-      # list all files
-      @items = RichImage.order("created_at DESC").page params[:page]
+      @type = params[:type]
+      
+      if(params[:scoped] == 'true')
+        if(@type == "image")
+          @items = RichFile.images.order("created_at DESC").where("owner_type = ? AND owner_id = ?", params[:scope_type], params[:scope_id]).page params[:page]
+        else
+          @items = RichFile.files.order("created_at DESC").where("owner_type = ? AND owner_id = ?", params[:scope_type], params[:scope_id]).page params[:page]
+        end        
+      else
+        if(@type == "image")
+          @items = RichFile.images.order("created_at DESC").page params[:page]
+        else
+          @items = RichFile.files.order("created_at DESC").page params[:page]
+        end        
+      end
       
       # stub for new file
-      @rich_asset = RichImage.new
+      @rich_asset = RichFile.new
       
       respond_to do |format|
         format.js
@@ -16,24 +31,29 @@ module Rich
     end
     
     def show
-      # show is used to retrieve single images through XHR requests after an image has been uploaded
+      # show is used to retrieve single files through XHR requests after a file has been uploaded
       
       if(params[:id])
         # list all files
-        @file = RichImage.find(params[:id])
+        @file = RichFile.find(params[:id])
         render :layout => false
       else 
-        render :text => "Image not found"
+        render :text => "File not found"
       end
       
     end
     
     def create
-      @file = RichImage.new
+      @file = RichFile.new(:simplified_type => params[:simplified_type]) #make sure the type is set
+      
+      if(params[:scoped] == 'true')
+        @file.owner_type = params[:scope_type]
+        @file.owner_id = params[:scope_id].to_i
+      end
       
       # use the file from Rack Raw Upload
       if(params[:file])
-        @file.image = params[:file]
+        @file.rich_file = params[:file]
       end
       
       if @file.save
@@ -47,7 +67,7 @@ module Rich
     
     def destroy  
       if(params[:id])
-        image = RichImage.delete(params[:id])
+        rich_file = RichFile.delete(params[:id])
         @fileid = params[:id]
       end
     end

data/app/helpers/rich/files_helper.rb

@@ -1,4 +1,13 @@
 module Rich
   module FilesHelper
+    
+    def thumb_for_file(file)
+      if file.simplified_type == "image"
+        file.rich_file.url(:thumb)
+      else
+        asset_path "rich/document-thumb.png"
+      end
+    end
+    
   end
 end

data/app/inputs/rich_input.rb

@@ -3,7 +3,9 @@ if (Object.const_defined?("Formtastic") && Gem.loaded_specs["formtastic"].versio
   class RichInput < ::Formtastic::Inputs::TextInput  
     def to_html
 
-      editor_options = Rich.options(options[:config])
+      scope_type = object_name
+      scope_id = object.id
+      editor_options = Rich.options(options[:config], scope_type, scope_id)
 
       input_wrapping do
         label_html <<

data/app/inputs/rich_picker_input.rb

@@ -0,0 +1,28 @@
+if (Object.const_defined?("Formtastic") && Gem.loaded_specs["formtastic"].version.version[0,1] == "2")
+    
+    class RichPickerInput < ::Formtastic::Inputs::StringInput
+
+      def to_html 
+        scope_type = object_name
+        scope_id = object.id
+        editor_options = Rich.options(options[:config], scope_type, scope_id)
+        
+        local_input_options = {
+          :class => 'rich-picker',
+          :style => editor_options[:style]
+        }
+
+        input_wrapping do
+
+          label_html <<
+          builder.text_field(method, local_input_options.merge(input_html_options)) <<
+          " <a href='#{Rich.editor[:richBrowserUrl]}' class='button'>#{I18n.t('picker_browse')}</a>".html_safe <<
+          "</br></br><img class='rich-image-preview' src='#{@object.send(method)}' style='height: 100px' />".html_safe <<
+          "<script>$(function(){$('##{input_html_options[:id]}_input a').click(function(e){ e.preventDefault(); assetPicker.showFinder('##{input_html_options[:id]}', #{editor_options.to_json.html_safe})})})</script>".html_safe
+
+        end
+      end
+
+    end
+    
+end

data/app/models/rich/rich_file.rb

@@ -0,0 +1,75 @@
+require 'cgi'
+require 'mime/types'
+require 'kaminari'
+
+module Rich
+  class RichFile < ActiveRecord::Base
+    
+    scope :images, where("rich_rich_files.simplified_type = 'image'")
+    scope :files, where("rich_rich_files.simplified_type = 'file'")
+    
+    paginates_per 34
+    
+    has_attached_file :rich_file, :styles => Proc.new {|a| a.instance.set_styles }
+    
+    validates_attachment_presence :rich_file
+    validate :check_content_type
+    validates_attachment_size :rich_file, :less_than=>15.megabyte, :message => "must be smaller than 15MB"
+    
+    before_create :clean_file_name
+
+    after_create :cache_style_uris_and_save
+    before_update :cache_style_uris
+    
+    
+    def set_styles
+      if self.simplified_type=="image"
+        Rich.image_styles
+      else
+        {}
+      end
+    end
+    
+    private
+    
+    def cache_style_uris_and_save
+      cache_style_uris
+      self.save!
+    end
+    
+    def cache_style_uris
+      uris = {}
+      
+      rich_file.styles.each do |style|
+        uris[style[0]] = rich_file.url(style[0].to_sym, false)
+      end
+      
+      # manualy add the original size
+      uris["original"] = rich_file.url(:original, false)
+      
+      self.uri_cache = uris.to_json
+    end
+    
+    def clean_file_name      
+      extension = File.extname(rich_file_file_name).gsub(/^\.+/, '')
+      filename = rich_file_file_name.gsub(/\.#{extension}$/, '')
+      
+      filename = CGI::unescape(filename)
+      filename = CGI::unescape(filename)
+      
+      extension = extension.downcase
+      filename = filename.downcase.gsub(/[^a-z0-9]+/i, '-')
+      
+      self.rich_file.instance_write(:file_name, "#{filename}.#{extension}")
+    end
+    
+    def check_content_type
+      self.rich_file.instance_write(:content_type, MIME::Types.type_for(rich_file_file_name)[0].content_type)
+      
+      unless Rich.validate_mime_type(self.rich_file_content_type, self.simplified_type)
+        self.errors[:base] << "'#{self.rich_file_file_name}' is not the right type."
+      end
+    end
+    
+  end
+end

data/app/views/rails_admin/main/_form_rich_picker.html.haml

@@ -0,0 +1,9 @@
+= javascript_include_tag "rich/base.js"
+= form.send field.view_helper, field.method_name, field.html_attributes
+= link_to t('picker_browse').capitalize, Rich.editor[:richBrowserUrl], :class => "btn create"
+- unless field.value.to_s.html_safe == ''
+	%br
+	%br
+	%img{:src => field.value.html_safe, :style => 'height: 100px', :class => 'rich-image-preview'}
+= javascript_tag do
+	$(function(){$('##{form.dom_id(field)}_field a').click(function(e){ e.preventDefault(); assetPicker.showFinder('##{form.dom_id(field)}', #{Rich.options(field.config, field.scope_type, field.scope_id).to_json.html_safe})})})

data/app/views/rails_admin/main/_form_rich_text.html.haml

@@ -2,4 +2,4 @@
 
 = javascript_include_tag "rich/base.js"
 = javascript_tag do
-  $(function(){ $('##{form.dom_id(field)}').ckeditor(function() { }, #{Rich.options(field.config).to_json.html_safe} ); });
+  $(function(){ CKEDITOR.replace('#{form.dom_id(field)}', #{Rich.options(field.config, field.scope_type, field.scope_id).to_json.html_safe}); });

data/app/views/rich/files/_file.html.erb

@@ -0,0 +1,11 @@
+<li class="clickable">
+  <img  id="file<%= file.id %>"
+        src="<%= thumb_for_file(file) %>" 
+        data-uris="<%= file.uri_cache %>"
+        data-rich-asset-id="<%= file.id %>"
+				data-rich-asset-type="<%= file.simplified_type %>"
+				data-rich-asset-name="<%= file.rich_file_file_name %>"
+  />
+  <p><%= file.rich_file_file_name %></p>
+  <%= link_to "delete", "/rich/files/"+file.id.to_s, :method => :delete, :remote => true, :confirm => t(:delete_confirm), :class => "delete", :title => t(:delete) %>
+</li>

data/app/views/rich/files/destroy.js.erb

@@ -1 +1 @@
-$("#image<%= @fileid %>").parent().remove();
+$("#file<%= @fileid %>").parent().remove();

data/app/views/rich/files/index.html.erb

@@ -2,19 +2,24 @@
   
 	<div id="loading" style="display:none;"></div>
 
+  <div id="view-toggle">
+    <a href="#" id="view-grid" title="<%= t(:view_grid_tip) %>"><%= t(:view_grid) %></a>
+    <a href="#" id="view-list" title="<%= t(:view_list_tip) %>"><%= t(:view_list) %></a>
+  </div>
+
   <div id="insert-toggle">
-    <a href="#" id="insert-many" title="Insert many images (keep browser open)">Insert many</a>
-    <a href="#" id="insert-one" title="Insert one image">Insert one</a>  
+    <a href="#" id="insert-many" title="<%= t(:insert_many_tip) %>"><%= t(:insert_many) %></a>
+    <a href="#" id="insert-one" title="<%= t(:insert_one_tip) %>"><%= t(:insert_one) %></a>  
   </div>
 
   <ul id="styles" class="scopes">
-    <li class="label">Style</li>
+    <li class="label"><%= t(:available_styles) %></li>
   </ul>
   
 </header>
 
 <div id="legacy-form"><%= form_for(@rich_asset, :url => files_path) do |f| %>
-  <p><%= f.file_field :image%></p>
+  <p><%= f.file_field :rich_file%></p>
   <%= f.submit("Upload") %>
 <% end %>
 </div>
@@ -25,9 +30,9 @@
     <div id="upload" class="qq-upload-button placeholder">
       <div class="spinner"></div>
     </div>
-    <p>Upload an image</p>
+    <p><%= t(:upload_a_file) %></p>
   </li>
 
-	<%= render :partial => "image", :collection => @items, :as => :file %>
+	<%= render :partial => "file", :collection => @items, :as => :file %>
 
 </ul>

data/app/views/rich/files/index.js.erb

@@ -1 +1 @@
-<% if @items.count > 0 %>$("#items").append("<%= escape_javascript(render :partial => "image", :collection => @items, :as => :file) %>");<% end %>
+<% if @items.count > 0 %>$("#items").append("<%= escape_javascript(render :partial => "file", :collection => @items, :as => :file) %>");<% end %>

data/app/views/rich/files/show.html.erb

@@ -1 +1 @@
-<%= render :partial => 'image', :locals => {:file => @file} %>
+<%= render :partial => 'file', :locals => {:file => @file} %>

data/config/locales/en.yml

@@ -0,0 +1,14 @@
+en:
+  available_styles: "Styles"
+  upload_a_file: "Upload a file"
+  insert_one: "Insert one"
+  insert_one_tip: "Insert one"
+  insert_many: "Insert many"
+  insert_many_tip: "Insert many (keep browser open)"
+  view_grid: "View as grid"
+  view_grid_tip: "View as grid"
+  view_list: "View as list"
+  view_list_tip: "View as list"
+  delete: "Delete this file"
+  delete_confirm: "Are you sure you want to delete this file?"
+  picker_browse: "Select or upload"

data/config/locales/nl.yml

@@ -0,0 +1,14 @@
+nl:
+  available_styles: "Stijlen"
+  upload_a_file: "Uploaden"
+  insert_one: "Enkele invoegen"
+  insert_one_tip: "Enkele invoegen"
+  insert_many: "Meerdere invoegen"
+  insert_many_tip: "Meerdere invoegen (houd venster open)"
+  view_grid: "Bekijken als grid"
+  view_grid_tip: "Bekijken als grid"
+  view_list: "Bekijken als lijst"
+  view_list_tip: "Bekijken als lijst"
+  delete: "Verwijder dit bestand"
+  delete_confirm: "Dit bestand echt verwijderen?"
+  picker_browse: "Selecteer of upload"

data/db/migrate/20111201095829_refactor_image_to_file.rb

@@ -0,0 +1,12 @@
+class RefactorImageToFile < ActiveRecord::Migration
+  def change
+    rename_table :rich_rich_images, :rich_rich_files
+
+    rename_column :rich_rich_files, :image_file_name, :rich_file_file_name
+    rename_column :rich_rich_files, :image_content_type, :rich_file_content_type
+    rename_column :rich_rich_files, :image_file_size, :rich_file_file_size
+    rename_column :rich_rich_files, :image_updated_at, :rich_file_updated_at
+
+    add_column :rich_rich_files, :simplified_type, :string, :default => "file"
+  end
+end

data/lib/generators/rich/install/install_generator.rb

@@ -14,7 +14,7 @@ module Rich
       end
       
       def setup_route
-        route "mount Rich::Engine => '/rich'"
+        route "mount Rich::Engine => '/rich', :as => 'rich'"
       end
       
       def install_editor_styles

data/lib/generators/rich/install/templates/rich.rb.erb

@@ -26,7 +26,7 @@ if Object.const_defined?("Rich")
     # 
     # When you change these after uploading some files,
     # remember to do let Paperclip re-generate these by running
-    #   rake paperclip:refresh CLASS=Rich::RichImage
+    #   rake paperclip:refresh CLASS=Rich::RichFile
     config.image_styles = {
       :thumb => "100x100#"
     }
@@ -49,6 +49,29 @@ if Object.const_defined?("Rich")
     # the unprocessed file. Make sure this style exists.
     config.default_style = :thumb
 
+		# == Upload non-image files
+		#
+		# Setting this option to true will add a second Rich filebrowser icon to
+		# the editor toolbar. In this filebrowser you can upload non-image files.
+		# Inserting these files into your editor will result in a direct (A) link.
+		#
+		# Default:
+		# config.allow_document_uploads = false
+		
+		# == Set allowed filetypes for non-image files
+		#
+		# If you want, you can restrict the types of documents that users can upload.
+		# Default behavior is to allow any kind of file to be uploaded. You can set
+		# the accepted types by providing an array of mimetypes to check against.
+		# Note that for this to have any effect, you first need to enable document
+		# uploads using the setting above.
+		# 
+		# Default, allow any file to be uploaded:
+		# config.allowed_document_types = :all
+		#
+		# Example, only allow PDF uploads:
+		# config.allowed_document_types = ['application/pdf']
+		
 		# == Asset insertion
 		#
 		# Set this to true to keep the filebrowser open after inserting an asset.

data/lib/rich.rb

@@ -1,3 +1,8 @@
+if Object.const_defined?("RailsAdmin")
+  require "rich/rails_admin/config/fields/types/rich_picker"
+  require "rich/rails_admin/config/fields/types/rich_editor"
+end
+
 require "rich/engine"
 
 module Rich
@@ -6,7 +11,7 @@ module Rich
   mattr_accessor :image_styles
   @@image_styles = {
     :thumb => "100x100#"
-  }  
+  }
   
   mattr_accessor :allowed_styles
   @@allowed_styles = :all
@@ -20,26 +25,38 @@ module Rich
   mattr_accessor :insert_many
   @@insert_many = false
   
+  mattr_accessor :allow_document_uploads
+  @@allow_document_uploads = false
+  
+  mattr_accessor :allow_embeds
+  @@allow_embeds = false
+  
+  mattr_accessor :allowed_image_types
+  @@allowed_image_types = ['image/jpeg', 'image/png', 'image/gif', 'image/jpg']
+  
+  mattr_accessor :allowed_document_types
+  @@allowed_document_types = :all
+  
   # Configuration defaults (these map directly to ckeditor settings)
   mattr_accessor :editor
   @@editor = {
+    :height => 400,
     :stylesSet  =>  [],
-    :extraPlugins => 'stylesheetparser,richimage',
+    :extraPlugins => 'stylesheetparser,richfile,MediaEmbed',
     :removePlugins => 'scayt,menubutton,contextmenu,image,forms',
     :contentsCss => '/assets/rich/editor.css',
     :removeDialogTabs => 'link:advanced;link:target',
     :startupOutlineBlocks => true,
     :forcePasteAsPlainText => true,
     :format_tags => 'h3;p;pre',
-    :toolbar => [['Format','Styles'],['Bold', 'Italic', '-','NumberedList', 'BulletedList', 'Blockquote', '-', 'richImage', '-', 'Link', 'Unlink'],['Source', 'ShowBlocks']],
-    
+    :toolbar => [['Format','Styles'],['Bold', 'Italic', '-','NumberedList', 'BulletedList', 'Blockquote', '-', 'richImage', 'richFile','MediaEmbed', '-', 'Link', 'Unlink'],['Source', 'ShowBlocks']],
+    :language => I18n.default_locale,
     :richBrowserUrl => '/rich/files/',
-    
     :uiColor => '#f4f4f4'
   }
   # End configuration defaults
   
-  def self.options(overrides={})
+  def self.options(overrides={}, scope_type=nil, scope_id=nil)
     # merge in editor settings configured elsewhere
     
     if(self.allowed_styles == :all)
@@ -52,24 +69,70 @@ module Rich
     base = {
       :allowed_styles => self.allowed_styles,
       :default_style => self.default_style,
-      :insert_many => self.insert_many
+      :insert_many => self.insert_many,
+      :allow_document_uploads => self.allow_document_uploads,
+      :allow_embeds => self.allow_embeds
     }
     editor_options = self.editor.merge(base)
-       
+    
     # merge in local overrides
     editor_options.merge!(overrides) if overrides
     
-    puts editor_options.inspect
+    # update the language to the currently selected locale
+    editor_options[:language] = I18n.locale
+    
+    # remove the filebrowser if allow_document_uploads is false (the default)
+    unless editor_options[:allow_document_uploads]
+      editor_options[:toolbar][1].delete("richFile")
+    end
+    
+    unless editor_options[:allow_embeds]
+      editor_options[:toolbar][1].delete("MediaEmbed")
+    end
+    
+    # object scoping
+    if(editor_options[:scoped] == true)
+      if(scope_type != nil && scope_id != nil)
+        editor_options[:scope_type] = scope_type
+        editor_options[:scope_id] = scope_id
+      else
+        # cannot scope new objects
+        editor_options[:scoped] = false
+      end
+    end
     
     editor_options
 
   end
   
+  def self.validate_mime_type(mime, simplified_type)
+    # does the mimetype match the given simplified type?
+    puts "matching:" + mime + " TO " + simplified_type
+    
+    false # assume the worst
+    
+    if simplified_type == "image"
+      if allowed_image_types.include?(mime)
+        true
+      end
+    elsif simplified_type == "file"
+      if allowed_document_types == :all || allowed_document_types.include?(mime)
+        true
+      end
+    end
+    
+  end
+  
   def self.setup
     yield self
   end
   
   def self.insert
+    
+    
+    
+    
+    
     # manually inject into Formtastic 1. V2 is extended autmatically.
     if Object.const_defined?("Formtastic")
       if(Gem.loaded_specs["formtastic"].version.version[0,1] == "1")