ckeditor 3.6.0 → 3.6.1

data/lib/ckeditor/orm/mongoid.rb

@@ -1,90 +1,39 @@
 require 'orm_adapter/adapters/mongoid'
+require 'ckeditor/orm/base'
 
 module Ckeditor
   module Orm
     module Mongoid
       module AssetBase
         def self.included(base)
-          base.send(:include, InstanceMethods)
           base.send(:include, ::Mongoid::Document)
           base.send(:include, ::Mongoid::Timestamps)
-          base.send(:include, ::Mongoid::Paperclip)
+          base.send(:include, Base::AssetBase::InstanceMethods)
+          base.send(:include, InstanceMethods)
           base.send(:extend, ClassMethods)
         end
+        
+        module InstanceMethods
+          def type
+            _type
+          end
+          
+          def as_json_methods
+            [:id, :type] + super
+          end
+        end
 
         module ClassMethods
           def self.extended(base)
             base.class_eval do
+              field :data_content_type, :type => String
+              field :data_file_size, :type => Integer
+              field :width, :type => Integer
+              field :height, :type => Integer
+              
               belongs_to :assetable, :polymorphic => true
-
-              before_validation :extract_content_type
-              before_create :read_dimensions, :parameterize_filename
-
-              delegate :url, :path, :styles, :size, :content_type, :to => :data
-            end
-          end
-        end
-
-        module InstanceMethods
-          def filename
-            data_file_name
-          end
-
-          def format_created_at
-            I18n.l(created_at, :format => "%d.%m.%Y")
-          end
-
-          def has_dimensions?
-            respond_to?(:width) && respond_to?(:height)
-          end
-
-          def image?
-            Ckeditor::IMAGE_TYPES.include?(data_content_type)
-          end
-
-          def geometry
-            @geometry ||= Paperclip::Geometry.from_file(data.to_file)
-            @geometry
-          end
-
-          def url_content
-            url
-          end
-
-          def url_thumb
-            url(:thumb)
-          end
-
-          def as_json(options = nil)
-            options = {
-              :methods => [:url_content, :url_thumb, :size, :filename, :format_created_at],
-              :root => "asset"
-            }.merge(options || {})
-
-            super options
-          end
-
-          protected
-
-          def parameterize_filename
-            unless data_file_name.blank?
-              filename = Ckeditor::Utils.parameterize_filename(data_file_name)
-              self.data.instance_write(:file_name, filename)
-            end
-          end
-
-          def read_dimensions
-            if image? && has_dimensions?
-              self.width = geometry.width
-              self.height = geometry.height
-            end
-          end
-
-          # Extract content_type from filename using mime/types gem
-          def extract_content_type
-            if data_content_type == "application/octet-stream" && !data_file_name.blank?
-              content_types = MIME::Types.type_for(data_file_name)
-              self.data_content_type = content_types.first.to_s unless content_types.empty?
+              
+              attr_accessible :data, :assetable_type, :assetable_id, :assetable
             end
           end
         end

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "3.6.0".freeze
+    GEM = "3.6.1".freeze
     EDITOR = "3.6.1".freeze
   end
 end

data/lib/generators/ckeditor/install_generator.rb

@@ -29,6 +29,7 @@ module Ckeditor
         filepath = Rails.root.join("tmp/#{filename}")
 
         if File.exist?(filepath)
+          FileUtils.mkdir_p(Rails.root.join("public/javascripts"))
           Ckeditor::Utils.extract(filepath, Rails.root.join('public', 'javascripts'))
           directory "ckeditor", "public/javascripts/ckeditor"
           FileUtils.rm_rf(filepath)

data/lib/generators/ckeditor/models_generator.rb

@@ -11,6 +11,9 @@ module Ckeditor
       # ORM configuration
       class_option :orm, :type => :string, :default => "active_record",
         :desc => "Backend processor for upload support"
+      
+      class_option :backend, :type => :string, :default => 'paperclip',
+        :desc => "Paperclip (by default) or carrierwave"
 
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates', 'models/'))
@@ -21,18 +24,22 @@ module Ckeditor
       end
 
       def create_models
-        template "#{generator_dir}/ckeditor/asset.rb",
-                 File.join('app/models', ckeditor_dir, "asset.rb")
-
-        template "#{generator_dir}/ckeditor/picture.rb",
-                 File.join('app/models', ckeditor_dir, "picture.rb")
-
-        template "#{generator_dir}/ckeditor/attachment_file.rb",
-                 File.join('app/models', ckeditor_dir, "attachment_file.rb")
+        [:asset, :picture, :attachment_file].each do |filename|
+          template "#{generator_dir}/ckeditor/#{filename}.rb",
+                   File.join('app/models', ckeditor_dir, "#{filename}.rb")
+        end
+        
+        if backend == "carrierwave"
+          template "#{uploaders_dir}/uploaders/ckeditor_attachment_file_uploader.rb",
+                   File.join("app/uploaders", "ckeditor_attachment_file_uploader.rb")
+          
+          template "#{uploaders_dir}/uploaders/ckeditor_picture_uploader.rb",
+                   File.join("app/uploaders", "ckeditor_picture_uploader.rb")
+        end
       end
 
       def create_migration
-        if options[:orm] == "active_record"
+        if ["active_record"].include?(orm)
           migration_template "#{generator_dir}/migration.rb", File.join('db/migrate', "create_ckeditor_assets.rb")
         end
       end
@@ -44,8 +51,20 @@ module Ckeditor
         end
 
         def generator_dir
+          @generator_dir ||= [orm, backend].join('/')
+        end
+        
+        def uploaders_dir
+          @uploaders_dir ||= ['base', 'carrierwave'].join('/')
+        end
+        
+        def orm
           options[:orm] || "active_record"
         end
+        
+        def backend
+          options[:backend] || "paperclip"
+        end
     end
   end
 end

data/lib/generators/ckeditor/templates/ckeditor.rb

@@ -7,13 +7,12 @@ if Object.const_defined?("Ckeditor")
     # available as additional gems.
     require "ckeditor/orm/<%= options[:orm] %>"
 
-
     # Allowed image file types for upload.
     # Set to nil or [] (empty array) for all file types
     # config.image_file_types = ["jpg", "jpeg", "png", "gif", "tiff"]
 
     # Allowed attachment file types for upload.
     # Set to nil or [] (empty array) for all file types
-    # config.attachment_file_types = ["doc", "docx", "rar", "zip", "xls", "swf"]
+    # config.attachment_file_types = ["doc", "docx", "xls", "odt", "ods", "pdf", "rar", "zip", "tar", "swf"]
   end
 end

data/lib/generators/ckeditor/templates/ckeditor/filebrowser/javascripts/application.js

@@ -163,7 +163,7 @@ qq.extend(qq.FileUploaderInput.prototype, {
         qq.FileUploaderBasic.prototype._onComplete.apply(this, arguments);
 
         var item = this._getItemByFileId(id);
-        var asset = result.asset;
+        var asset = result.asset ? result.asset : result;
         
         if (asset && asset.id){
             qq.addClass(item, this._classes.success);

data/lib/generators/ckeditor/templates/models/active_record/carrierwave/ckeditor/asset.rb

@@ -0,0 +1,7 @@
+class Ckeditor::Asset < ActiveRecord::Base
+  include Ckeditor::Orm::ActiveRecord::AssetBase
+              
+  delegate :url, :current_path, :size, :content_type, :filename, :to => :data
+  
+  validates_presence_of :data
+end

data/lib/generators/ckeditor/templates/models/active_record/carrierwave/ckeditor/attachment_file.rb

@@ -0,0 +1,10 @@
+class Ckeditor::AttachmentFile < Ckeditor::Asset
+  mount_uploader :data, CkeditorAttachmentFileUploader, :mount_on => :data_file_name
+	
+	def url_thumb
+	  @url_thumb ||= begin
+	    extname = File.extname(filename).gsub(/^\./, '')
+      "/javascripts/ckeditor/filebrowser/images/thumbs/#{extname}.gif"
+	  end
+	end
+end

data/lib/generators/ckeditor/templates/models/active_record/carrierwave/ckeditor/picture.rb

@@ -0,0 +1,7 @@
+class Ckeditor::Picture < Ckeditor::Asset
+  mount_uploader :data, CkeditorPictureUploader, :mount_on => :data_file_name
+	
+	def url_content
+	  url(:content)
+	end
+end

data/lib/generators/ckeditor/templates/models/active_record/{ckeditor → paperclip/ckeditor}/asset.rb

@@ -1,7 +1,4 @@
-require 'mime/types'
-
 class Ckeditor::Asset < ActiveRecord::Base
   include Ckeditor::Orm::ActiveRecord::AssetBase
-  
-  attr_accessible :data, :assetable_type, :assetable_id, :assetable
+  include Ckeditor::Backend::Paperclip
 end

data/lib/generators/ckeditor/templates/models/active_record/paperclip/migration.rb

@@ -0,0 +1,26 @@
+class CreateCkeditorAssets < ActiveRecord::Migration
+  def self.up
+    create_table :ckeditor_assets do |t|
+      t.string  :data_file_name, :null => false
+      t.string  :data_content_type
+      t.integer :data_file_size
+      
+      t.integer :assetable_id
+		  t.string  :assetable_type, :limit => 30
+      t.string  :type, :limit => 30
+		  
+      # Uncomment	it to save images dimensions, if your need it
+#		  t.integer :width
+#		  t.integer :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

data/lib/generators/ckeditor/templates/models/base/carrierwave/uploaders/ckeditor_attachment_file_uploader.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+class CkeditorAttachmentFileUploader < CarrierWave::Uploader::Base
+  include Ckeditor::Backend::CarrierWave
+  
+  # Include RMagick or ImageScience support:
+  # include CarrierWave::RMagick
+  # include CarrierWave::MiniMagick
+  # include CarrierWave::ImageScience
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "ckeditor_assets/attachments/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+    Ckeditor.attachment_file_types
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+end

data/lib/generators/ckeditor/templates/models/base/carrierwave/uploaders/ckeditor_picture_uploader.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+class CkeditorPictureUploader < CarrierWave::Uploader::Base
+  include Ckeditor::Backend::CarrierWave
+
+  # Include RMagick or ImageScience support:
+  # include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
+  # include CarrierWave::ImageScience
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "ckeditor_assets/pictures/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+  
+  process :read_dimensions
+
+  # Create different versions of your uploaded files:
+  version :thumb do
+    process :resize_to_fill => [118, 100]
+  end
+
+  version :content do
+    process :resize_to_fit => [800, 800]
+  end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+    Ckeditor.image_file_types
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+end

data/lib/generators/ckeditor/templates/models/mongoid/carrierwave/ckeditor/asset.rb

@@ -0,0 +1,7 @@
+class Ckeditor::Asset
+  include Ckeditor::Orm::Mongoid::AssetBase
+              
+  delegate :url, :current_path, :size, :content_type, :filename, :to => :data
+  
+  validates_presence_of :data
+end

data/lib/generators/ckeditor/templates/models/mongoid/carrierwave/ckeditor/attachment_file.rb

@@ -0,0 +1,10 @@
+class Ckeditor::AttachmentFile < Ckeditor::Asset
+  mount_uploader :data, CkeditorAttachmentFileUploader, :mount_on => :data_file_name
+	
+	def url_thumb
+	  @url_thumb ||= begin
+	    extname = File.extname(filename).gsub(/^\./, '')
+      "/javascripts/ckeditor/filebrowser/images/thumbs/#{extname}.gif"
+	  end
+	end
+end

data/lib/generators/ckeditor/templates/models/mongoid/carrierwave/ckeditor/picture.rb

@@ -0,0 +1,7 @@
+class Ckeditor::Picture < Ckeditor::Asset
+  mount_uploader :data, CkeditorPictureUploader, :mount_on => :data_file_name
+	
+	def url_content
+	  url(:content)
+	end
+end

data/lib/generators/ckeditor/templates/models/mongoid/paperclip/ckeditor/asset.rb

@@ -0,0 +1,5 @@
+class Ckeditor::Asset
+  include Ckeditor::Orm::Mongoid::AssetBase
+  include Mongoid::Paperclip
+  include Ckeditor::Backend::Paperclip
+end

data/lib/generators/ckeditor/templates/models/mongoid/{ckeditor → paperclip/ckeditor}/attachment_file.rb

@@ -8,8 +8,8 @@ class Ckeditor::AttachmentFile < Ckeditor::Asset
 
   def url_thumb
     @url_thumb ||= begin
-                     extname = File.extname(filename).gsub(/^\./, '')
-                     "/javascripts/ckeditor/filebrowser/images/thumbs/#{extname}.gif"
-                   end
+      extname = File.extname(filename).gsub(/^\./, '')
+      "/javascripts/ckeditor/filebrowser/images/thumbs/#{extname}.gif"
+    end
   end
 end

data/test/controllers/attachment_files_controller_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class AttachmentFilesControllerTest < ActionController::TestCase
   tests Ckeditor::AttachmentFilesController
+  include RawPost
   
   def setup
     @attachment = fixture_file_upload('files/rails.tar.gz', 'application/x-gzip')
@@ -34,6 +35,14 @@ class AttachmentFilesControllerTest < ActionController::TestCase
     assert_equal 200, @response.status
   end
   
+  test "create action via html5 upload" do
+    assert_difference 'Ckeditor::AttachmentFile.count' do
+      raw_post :create, { :qqfile => @attachment.original_filename }, @attachment.read
+    end
+    
+    assert_equal 200, @response.status
+  end
+  
   test "invalid params for create action" do
     assert_no_difference 'Ckeditor::AttachmentFile.count' do
       post :create, :qqfile => nil