ckeditor 3.7.0.rc3 → 3.7.0

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "3.1.3"
+gem "rails", "3.2.3"
 
 platforms :mri_18 do
   group :test do
@@ -24,8 +24,9 @@ platforms :ruby do
   end
 
   group :active_record do
-    gem "paperclip"
+    gem "paperclip", "~> 3.0.3"
     gem "carrierwave"
+    gem "dragonfly"
     gem "mini_magick"
   end
 

data/README.rdoc

@@ -16,7 +16,7 @@ the results users have when publishing it. It brings to the web common editing f
 
 Rails 3.2:
 
-  gem "ckeditor", "3.7.0.rc3"
+  gem "ckeditor", "3.7.0"
 
 Rails <= 3.0:
 
@@ -64,6 +64,10 @@ Autoload ckeditor models folder (application.rb):
 
 == Usage
 
+Mount engine in your routes (config/routes.rb):
+
+  mount Ckeditor::Engine => "/ckeditor"
+
 Include ckeditor javascripts rails 3.2:
 
   //= require ckeditor/init
@@ -127,7 +131,7 @@ Jquery sample:
 
 === SimpleForm integration
 
-  <%= form.ckeditor :content, :label => false, :input_html => { :toolbar => 'Full' } %>
+  <%= form.input :content, :as => :ckeditor, :label => false, :input_html => { :toolbar => 'Full' } %>
 
 === Default scope
 

data/Rakefile

@@ -46,6 +46,13 @@ Rake::TestTask.new("test:models") do |t|
   t.verbose = false
 end
 
+Rake::TestTask.new("test:functional") do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/functional/*_test.rb'
+  t.verbose = false
+end
+
 task :default => :test
 
 RDoc::Task.new do |rdoc|

data/config/locales/pl.ckeditor.yml

@@ -0,0 +1,8 @@
+pl:
+  ckeditor:
+    page_title: "CKEditor Menadżer Plików"
+    confirm_delete: "Usunąć plik?"
+    buttons:
+      cancel: "Anuluj"
+      upload: "Wyślij"
+      delete: "Skasuj"

data/lib/ckeditor.rb

@@ -21,6 +21,7 @@ module Ckeditor
   module Backend
     autoload :Paperclip, 'ckeditor/backend/paperclip'
     autoload :CarrierWave, 'ckeditor/backend/carrierwave'
+    autoload :Dragonfly, 'ckeditor/backend/dragonfly'
   end
   
   # Allowed image file types for upload. 
@@ -37,6 +38,10 @@ module Ckeditor
   mattr_accessor :relative_path
   @@relative_path = '/assets/ckeditor'
   
+  # Ckeditor assets for precompilation
+  mattr_accessor :assets
+  @@assets = nil
+  
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
   def self.setup
@@ -48,12 +53,14 @@ module Ckeditor
   end
   
   def self.assets
-    Dir[root_path.join('vendor/assets/javascripts/ckeditor/**', '*.{js,css}')].inject([]) do |list, path|
-      unless path.include?("/ckeditor/filebrowser/")
-        list << Pathname.new(path).relative_path_from(root_path.join('vendor/assets/javascripts'))
+    @@assets ||= begin
+      Dir[root_path.join('vendor/assets/javascripts/ckeditor/**', '*.{js,css}')].inject([]) do |list, path|
+        unless path.include?("/ckeditor/filebrowser/")
+          list << Pathname.new(path).relative_path_from(root_path.join('vendor/assets/javascripts'))
+        end
+        
+        list
       end
-      
-      list
     end
   end
   

data/lib/ckeditor/backend/dragonfly.rb

@@ -0,0 +1,45 @@
+module Ckeditor
+  module Backend
+    module Dragonfly
+      def self.included(base)
+        base.send(:include, InstanceMethods)
+        base.send(:extend, ClassMethods)
+      end
+      
+      module ClassMethods
+        def attachment_file_types
+          @attachment_file_types ||= Ckeditor.attachment_file_types.map(&:to_sym).tap do |formats|
+            # This is not ideal but Dragonfly doesn't return double
+            # extensions. Having said that, the other backends
+            # currently don't use attachment_file_types at all.
+            [ :bz2, :gz, :lzma, :xz ].each do |f|
+              formats << f if formats.include?("tar.#{f}".to_sym)
+            end
+          end
+        end
+
+        def image_file_types
+          @image_file_types ||= Ckeditor.image_file_types.map(&:to_sym)
+        end
+      end
+      
+      module InstanceMethods
+        delegate :url, :path, :size, :image?, :width, :height, :to => :data
+
+        alias_attribute :data_file_name, :data_name
+        alias_attribute :data_content_type, :data_mime_type
+        alias_attribute :data_file_size, :data_size
+
+        private
+
+        def url_thumb_options
+          if data.basename.present?
+            { :basename => "thumb_#{data.basename}" }
+          else
+            {}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ckeditor/backend/paperclip.rb

@@ -21,7 +21,10 @@ module Ckeditor
       
       module InstanceMethods
         def geometry
-          @geometry ||= ::Paperclip::Geometry.from_file(data.to_file)
+          @geometry ||= begin
+            file = data.respond_to?(:queued_for_write) ? data.queued_for_write[:original] : data.to_file
+            ::Paperclip::Geometry.from_file(file)
+          end
         end
                 
         protected

data/lib/ckeditor/engine.rb

@@ -24,12 +24,13 @@ module Ckeditor
     end
     
     initializer "ckeditor.hooks" do
-      if Object.const_defined?("Formtastic")
+      # Don't load the hook for Formtastic < 2.0.0 that (it crashes), apparently, didn't define a Formtastic::Inputs.
+      if Object.const_defined?("Formtastic") && Formtastic.const_defined?("Inputs")
         require "ckeditor/hooks/formtastic"
       end
       
       if Object.const_defined?("SimpleForm")
-        ::SimpleForm::FormBuilder.send :include, Ckeditor::Hooks::SimpleFormBuilder
+        require "ckeditor/hooks/simple_form"
       end
     end
   end

data/lib/ckeditor/helpers/form_helper.rb

@@ -8,16 +8,18 @@ module Ckeditor
       
       def cktext_area(object_name, method, options = {})
         options = { :language => I18n.locale.to_s }.merge(options)
-        input_html = (options.delete(:input_html) || {})
-        hash = input_html.stringify_keys
+        input_html = (options.delete(:input_html) || {}).stringify_keys
+        js_content_for_section = options.delete(:js_content_for)
         
         instance_tag = ActionView::Base::InstanceTag.new(object_name, method, self, options.delete(:object))
-        instance_tag.send(:add_default_name_and_id, hash)
+        instance_tag.send(:add_default_name_and_id, input_html)
         
         output_buffer = ActiveSupport::SafeBuffer.new
         output_buffer << instance_tag.to_text_area_tag(input_html)
-        output_buffer << javascript_tag(Utils.js_replace(hash['id'], options))
         
+        js = Utils.js_replace(input_html['id'], options)
+        
+        output_buffer << (js_content_for_section ? content_for(js_content_for_section, js) : javascript_tag(js))
         output_buffer
       end
     end

data/lib/ckeditor/helpers/view_helper.rb

@@ -7,11 +7,14 @@ module Ckeditor
         element_id = sanitize_to_id(name)
         options = { :language => I18n.locale.to_s }.merge(options)
         input_html = { :id => element_id }.merge( options.delete(:input_html) || {} )
+        js_content_for_section = options.delete(:js_content_for)
         
         output_buffer = ActiveSupport::SafeBuffer.new
         output_buffer << text_area_tag(name, content, input_html)
-        output_buffer << javascript_tag(Utils.js_replace(element_id, options))
         
+        js = Utils.js_replace(element_id, options)
+        
+        output_buffer << (js_content_for_section ? content_for(js_content_for_section, js) : javascript_tag(js))
         output_buffer
       end
     end

data/lib/ckeditor/hooks/simple_form.rb

@@ -1,28 +1,17 @@
-module Ckeditor
-  module Hooks
-    module SimpleFormBuilder
-      class CkeditorInput < ::SimpleForm::Inputs::Base
-        def input
-          @builder.send(:cktext_area, attribute_name, input_html_options)
-        end
-      end
-      
-      def self.included(base)
-        base.send(:include, InstanceMethods)
-      end
-    
-      module InstanceMethods
-        def ckeditor(attribute_name, options={}, &block)
-          column     = find_attribute_column(attribute_name)
-          input_type = default_input_type(attribute_name, column, options)
-
-          if block_given?
-            SimpleForm::Inputs::BlockInput.new(self, attribute_name, column, input_type, options, &block).render
-          else
-            CkeditorInput.new(self, attribute_name, column, input_type, options).render
-          end
-        end
-      end
+module Ckeditor::Hooks::SimpleForm
+  class CkeditorInput < ::SimpleForm::Inputs::Base
+    def input
+      @builder.cktext_area(attribute_name, input_html_options)
     end
   end
 end
+::SimpleForm::FormBuilder.map_type :ckeditor, :to => Ckeditor::Hooks::SimpleForm::CkeditorInput
+
+# TODO: remove this after a while, SimpleForm::FormBuilder#ckeditor is deprecated.
+class SimpleForm::FormBuilder
+  def ckeditor(attribute_name, options={}, &block)
+    warn "[DEPRECATION] calling f.ckeditor(:#{attribute_name}, ...) is deprecated, call f.input(:#{attribute_name}, :as => :ckeditor, #{options.to_s[1..-1]}) #{Kernel.caller.first}"
+    options[:as] = :ckeditor
+    self.input(attribute_name, options, &block)
+  end
+end

data/lib/ckeditor/utils.rb

@@ -1,6 +1,18 @@
 # encoding: utf-8
+require 'active_support/json/encoding'
+
 module Ckeditor
   module Utils
+    class JavascriptCode < String
+      def to_json(options = nil)
+        self
+      end
+      
+      def as_json(options = nil)
+        ActiveSupport::JSON::Variable.new(to_s).freeze
+      end
+    end
+
     class << self
       def escape_single_quotes(str)
         str.gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
@@ -14,16 +26,12 @@ module Ckeditor
       end
       
       def js_replace(dom_id, options = {})
-        js_options = applay_options(options)
-        js = ["if (CKEDITOR.instances['#{dom_id}']) {CKEDITOR.remove(CKEDITOR.instances['#{dom_id}']);}"]
-        
-        if js_options.blank?
-          js << "CKEDITOR.replace('#{dom_id}');"
-        else
-          js << "CKEDITOR.replace('#{dom_id}', { #{js_options} });"
-        end
+        js_options = ActiveSupport::JSON.encode(options)
         
-        js.join
+        js = ["if (CKEDITOR.instances['#{dom_id}']) {CKEDITOR.remove(CKEDITOR.instances['#{dom_id}']);}"]
+        js << "CKEDITOR.replace('#{dom_id}', #{js_options});"
+
+        "$(document).ready(function(){ #{js.join} });".html_safe
       end
       
       def js_fileuploader(uploader_type, options = {})
@@ -31,40 +39,19 @@ module Ckeditor
         
         case uploader_type.to_s.downcase
           when "image" then
-            options[:action] = "^EDITOR.config.filebrowserImageUploadUrl"
+            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserImageUploadUrl")
             options[:allowedExtensions] = Ckeditor.image_file_types
           when "flash" then
-            options[:action] = "^EDITOR.config.filebrowserFlashUploadUrl"
+            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserFlashUploadUrl")
             options[:allowedExtensions] = ["swf"]
           else
-            options[:action] = "^EDITOR.config.filebrowserUploadUrl"
+            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserUploadUrl")
             options[:allowedExtensions] = Ckeditor.attachment_file_types
         end
         
-        js_options = applay_options(options)
-        
-        "$(document).ready(function(){ new qq.FileUploaderInput({ #{js_options} }); });".html_safe
-      end
-      
-      def applay_options(options)
-        str = []
-        
-        options.each do |key, value|
-          item = case value
-            when String then
-              value.split(//).first == '^' ? value.slice(1..-1) : "'#{value}'"
-            when Hash then 
-              "{ #{applay_options(value)} }"
-            when Array then 
-              arr = value.collect { |v| "'#{v}'" }
-              "[ #{arr.join(',')} ]"
-            else value
-          end
-          
-          str << %Q{"#{key}": #{item}}
-        end
+        js_options = ActiveSupport::JSON.encode(options)
         
-        str.sort.join(',')
+        "$(document).ready(function(){ new qq.FileUploaderInput(#{js_options}); });".html_safe
       end
       
       def filethumb(filename)

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "3.7.0.rc3".freeze
-    EDITOR = "3.6.2".freeze
+    GEM = "3.7.0".freeze
+    EDITOR = "3.6.3".freeze
   end
 end

data/lib/generators/ckeditor/install_generator.rb

@@ -13,7 +13,7 @@ module Ckeditor
         :desc => "Backend processor for upload support"
       
       class_option :backend, :type => :string, :default => 'paperclip',
-        :desc => "Paperclip (by default) or carrierwave"
+        :desc => "paperclip (default), carrierwave, or dragonfly"
       
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
@@ -26,6 +26,10 @@ module Ckeditor
       # copy configuration
       def copy_initializer
         template "ckeditor.rb", "config/initializers/ckeditor.rb"
+
+        if backend == "dragonfly"
+          template File.join("base", "dragonfly", "initializer.rb"), "config/initializers/ckeditor_dragonfly.rb"
+        end
       end
       
       def mount_engine

data/lib/generators/ckeditor/templates/active_record/carrierwave/migration.rb

@@ -10,8 +10,8 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.string  :type, :limit => 30
 		  
       # Uncomment	it to save images dimensions, if your need it
-#		  t.integer :width
-#		  t.integer :height
+		  t.integer :width
+		  t.integer :height
 		  
       t.timestamps
     end

data/lib/generators/ckeditor/templates/active_record/dragonfly/ckeditor/asset.rb

@@ -0,0 +1,7 @@
+class Ckeditor::Asset < ActiveRecord::Base
+  include Ckeditor::Orm::ActiveRecord::AssetBase
+  include Ckeditor::Backend::Dragonfly
+
+  ckeditor_file_accessor :data
+  validates_presence_of :data
+end

data/lib/generators/ckeditor/templates/active_record/dragonfly/ckeditor/attachment_file.rb

@@ -0,0 +1,7 @@
+class Ckeditor::AttachmentFile < Ckeditor::Asset
+  validates_property :format, :of => :data, :in => attachment_file_types unless attachment_file_types.empty?
+
+  def url_thumb
+    Ckeditor::Utils.filethumb(filename)
+  end
+end

data/lib/generators/ckeditor/templates/active_record/dragonfly/ckeditor/picture.rb

@@ -0,0 +1,12 @@
+class Ckeditor::Picture < Ckeditor::Asset
+  validates_property :format, :of => :data, :in => image_file_types unless image_file_types.empty?
+  validates_property :image?, :of => :data, :as => true, :message => :invalid
+
+  def url_content
+    data.thumb("800x800>").url
+  end
+
+  def url_thumb
+    data.thumb("118x100#").url(url_thumb_options)
+  end
+end

data/lib/generators/ckeditor/templates/active_record/dragonfly/migration.rb

@@ -0,0 +1,27 @@
+class CreateCkeditorAssets < ActiveRecord::Migration
+  def self.up
+    create_table :ckeditor_assets do |t|
+      t.string  :data_uid, :null => false
+      t.string  :data_name, :null => false
+      t.string  :data_mime_type
+      t.integer :data_size
+
+      t.integer :assetable_id
+      t.string  :assetable_type, :limit => 30
+      t.string  :type, :limit => 30
+
+      # Uncomment these to save image dimensions, if your need them.
+      t.integer :data_width
+      t.integer :data_height
+
+      t.timestamps
+    end
+
+    add_index "ckeditor_assets", ["assetable_type", "type", "assetable_id"], :name => "idx_ckeditor_assetable_type"
+    add_index "ckeditor_assets", ["assetable_type", "assetable_id"], :name => "idx_ckeditor_assetable"
+  end
+
+  def self.down
+    drop_table :ckeditor_assets
+  end
+end