ckeditor 3.6.0 → 3.6.1

data/Gemfile

@@ -7,6 +7,7 @@ gem "rails", "3.0.9"
 platforms :mri_18 do
   group :test do
     gem 'ruby-debug'
+    gem 'SystemTimer'
   end
 end
 
@@ -23,12 +24,15 @@ platforms :ruby do
   end
 
   group :active_record do
-    gem "paperclip", "~> 2.3.12"
+    gem "paperclip"
+    gem "carrierwave"
+    gem "mini_magick"
   end
 
   group :mongoid do
     gem "mongoid"
     gem "bson_ext"
     gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
+    gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
   end
 end

data/README.rdoc

@@ -14,7 +14,13 @@ the results users have when publishing it. It brings to the web common editing f
 
 == Install
 
+  gem install ckeditor
+
+Or via bundler:
+
   gem "ckeditor", "~> 3.6.0"
+
+=== Download ckeditor
   
   rails generate ckeditor:install
 
@@ -22,31 +28,59 @@ You can pass version of ckeditor to download (http://ckeditor.com/download/relea
 
   rails generate ckeditor:install --version=3.5.4
 
-Now generate models for store uploading files:
+=== Now generate models for store uploading files
+
+==== ActiveRecord + paperclip
+
+For active_record orm is used paperclip gem (it's by default).
+
+  gem "paperclip"
+  
+  rails generate ckeditor:models --orm=active_record --backend=paperclip
+  
+==== ActiveRecord + carrierwave
+
+  gem "carrierwave"
+  gem "mini_magick"
+
+  rails generate ckeditor:models --orm=active_record --backend=carrierwave
+
+==== Mongoid + paperclip
+
+  gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
+  
+  rails generate ckeditor:models --orm=mongoid --backend=paperclip
+
+==== Mongoid + carrierwave
+
+  gem "carrierwave-mongoid", :require => 'carrierwave/mongoid'
+  gem "mini_magick"
+
+  rails generate ckeditor:models --orm=mongoid --backend=carrierwave
 
-  rails generate ckeditor:models --orm=active_record
 
 Available orms:
 * active_record
 * mongoid (Thanks Dmitry Lihachev https://github.com/lda)
 * mongo_mapper (under construction)
 
+
 Autoload ckeditor models folder (application.rb):
 
   config.autoload_paths += %W(#{config.root}/app/models/ckeditor)
 
-=== Dependencies
+== Usage
 
-For active_record orm is used paperclip gem (it's by default).
+Include ckeditor javascripts:
 
-  gem "paperclip"
-  
-For gem "carrierwave" shortly I will give an example.
+  <%= javascript_include_tag :ckeditor %>
 
-== Usage
+or (for rails 3.1):
 
-  <%= javascript_include_tag :ckeditor %>
+  <%= javascript_include_tag "/javascripts/ckeditor/ckeditor.js" %>
   
+Form helpers:
+
   cktext_area_tag("test_area", "Ckeditor is the best")
 
   cktext_area_tag("content", "Ckeditor", :input_html => {:cols => 10, :rows => 20}, :toolbar => 'Easy')
@@ -160,5 +194,6 @@ By default, both these methods call "ckeditor_filebrowser_scope" method:
 
   rake test
   rake test CKEDITOR_ORM=mongoid
+  rake test CKEDITOR_BACKEND=carrierwave
 
 This project rocks and uses MIT-LICENSE.

data/Rakefile

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

data/config/locales/pt-BR.ckeditor.yml

@@ -0,0 +1,8 @@
+"pt-BR":
+  ckeditor:
+    page_title: "Gerenciador de arquivos do CKEditor"
+    confirm_delete: "Apagar arquivo?"
+    buttons:
+      cancel: "Cancelar"
+      upload: "Enviar"
+      delete: "Apagar"

data/lib/ckeditor.rb

@@ -18,6 +18,11 @@ module Ckeditor
     autoload :SimpleFormBuilder, 'ckeditor/hooks/simple_form'
   end
   
+  module Backend
+    autoload :Paperclip, 'ckeditor/backend/paperclip'
+    autoload :CarrierWave, 'ckeditor/backend/carrierwave'
+  end
+  
   # Allowed image file types for upload. 
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :image_file_types
@@ -26,7 +31,7 @@ module Ckeditor
   # Allowed attachment file types for upload. 
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :attachment_file_types
-  @@attachment_file_types = ["doc", "docx", "rar", "zip", "xls", "swf"]
+  @@attachment_file_types = ["doc", "docx", "xls", "odt", "ods", "pdf", "rar", "zip", "tar", "tar.gz", "swf"]
   
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.

data/lib/ckeditor/backend/carrierwave.rb

@@ -0,0 +1,64 @@
+require 'mime/types'
+require 'mini_magick'
+
+module Ckeditor
+  module Backend
+    module CarrierWave
+      def self.included(base)
+        base.send(:include, InstanceMethods)
+        base.send(:extend, ClassMethods)
+      end
+      
+      module ClassMethods
+        def self.extended(base)
+          base.class_eval do
+            process :extract_content_type
+            process :set_size
+          end
+        end
+      end
+      
+      module InstanceMethods
+        # process :strip
+        def strip
+          manipulate! do |img|
+            img.strip
+            img = yield(img) if block_given?
+            img
+          end
+        end
+        
+        # process :quality => 85
+        def quality(percentage)
+          manipulate! do |img|
+            img.quality(percentage)
+            img = yield(img) if block_given?
+            img
+          end
+        end
+        
+        def extract_content_type
+          if file.content_type == 'application/octet-stream' || file.content_type.blank?
+            content_type = MIME::Types.type_for(original_filename).first
+          else
+            content_type = file.content_type
+          end
+          
+          model.data_content_type = content_type.to_s
+        end 
+        
+        def set_size
+          model.data_file_size = file.size
+        end
+        
+        def read_dimensions
+          if model.image? && model.has_dimensions?
+            magick = ::MiniMagick::Image.new(current_path)
+            model.width, model.height = magick[:width], magick[:height]
+          end
+        end
+        
+      end
+    end
+  end
+end

data/lib/ckeditor/backend/paperclip.rb

@@ -0,0 +1,53 @@
+require 'mime/types'
+
+module Ckeditor
+  module Backend
+    module Paperclip
+      def self.included(base)
+        base.send(:include, InstanceMethods)
+        base.send(:extend, ClassMethods)
+      end
+      
+      module ClassMethods
+        def self.extended(base)
+          base.class_eval do
+            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 geometry
+          @geometry ||= ::Paperclip::Geometry.from_file(data.to_file)
+        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?
+            end
+          end
+      end
+    end
+  end
+end

data/lib/ckeditor/http.rb

@@ -50,7 +50,7 @@ module Ckeditor
       end
      
       def fetch
-        self.write @request.raw_post
+        self.write(body)
         self.rewind
         self
       end
@@ -60,9 +60,17 @@ module Ckeditor
       end
      
       def content_type
-        types = MIME::Types.type_for(@request.content_type)
+        types = MIME::Types.type_for(original_filename)
         types.empty? ? @request.content_type : types.first.to_s
       end
+      
+      def body
+        if @request.raw_post.respond_to?(:force_encoding)
+          @request.raw_post.force_encoding("UTF-8")
+        else
+          @request.raw_post
+        end
+      end
     end
     
     # Convert nested Hash to HashWithIndifferentAccess and replace

data/lib/ckeditor/orm/active_record.rb

@@ -1,9 +1,11 @@
+require 'ckeditor/orm/base'
+
 module Ckeditor
   module Orm
     module ActiveRecord
       module AssetBase
         def self.included(base)
-          base.send(:include, InstanceMethods)
+          base.send(:include, Base::AssetBase::InstanceMethods)
           base.send(:extend, ClassMethods)
         end
         
@@ -13,78 +15,11 @@ module Ckeditor
               set_table_name "ckeditor_assets"
               
               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
+              attr_accessible :data, :assetable_type, :assetable_id, :assetable
             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?
-              end
-            end
-        end
       end
     end
   end

data/lib/ckeditor/orm/base.rb

@@ -0,0 +1,46 @@
+module Ckeditor
+  module Orm
+    module Base
+      module AssetBase
+        module InstanceMethods
+          def filename
+            data_file_name
+          end
+          
+          def has_dimensions?
+            respond_to?(:width) && respond_to?(:height)
+          end
+          
+          def image?
+            Ckeditor::IMAGE_TYPES.include?(data_content_type)
+          end
+
+          def format_created_at
+            self.created_at.strftime("%d.%m.%Y")
+          end
+
+          def url_content
+            url
+          end
+
+          def url_thumb
+            url(:thumb)
+          end
+          
+          def as_json_methods
+            [:url_content, :url_thumb, :size, :filename, :format_created_at]
+          end
+
+          def as_json(options = nil)
+            options = {
+              :methods => as_json_methods,
+              :root => "asset"
+            }.merge(options || {})
+
+            super options
+          end
+        end
+      end
+    end
+  end
+end