ckeditor 3.6.0.pre → 3.6.0

data/Gemfile

@@ -4,20 +4,31 @@ gemspec
 
 gem "rails", "3.0.9"
 
+platforms :mri_18 do
+  group :test do
+    gem 'ruby-debug'
+  end
+end
+
 platforms :ruby do
-  gem "mysql2", '0.2.11'
-    
+  gem "sqlite3"
+
+  group :development do
+    gem "unicorn", "~> 4.0.1"
+  end
+
   group :development, :test do
     gem "capybara", ">= 0.4.0"
-    gem "redgreen", "~> 1.2.2"
+    gem "mynyml-redgreen", "~> 0.7.1", :require => 'redgreen'
+  end
+
+  group :active_record do
     gem "paperclip", "~> 2.3.12"
-    
-    # To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-    # gem 'ruby-debug'
-    # gem 'ruby-debug19'
   end
-  
-  group :development do
-    gem "mongrel"
+
+  group :mongoid do
+    gem "mongoid"
+    gem "bson_ext"
+    gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
   end
 end

data/README.rdoc

@@ -12,7 +12,7 @@ the results users have when publishing it. It brings to the web common editing f
 * Extra plugins: attachment and embed.
 * Assets pagination (under construction)
 
-== Install (not currently available, under construction)
+== Install
 
   gem "ckeditor", "~> 3.6.0"
   
@@ -28,8 +28,8 @@ Now generate models for store uploading files:
 
 Available orms:
 * active_record
+* mongoid (Thanks Dmitry Lihachev https://github.com/lda)
 * mongo_mapper (under construction)
-* mongoid (under construction)
 
 Autoload ckeditor models folder (application.rb):
 
@@ -159,5 +159,6 @@ By default, both these methods call "ckeditor_filebrowser_scope" method:
 == Tests
 
   rake test
+  rake test CKEDITOR_ORM=mongoid
 
 This project rocks and uses MIT-LICENSE.

data/lib/ckeditor/orm/mongoid.rb

@@ -0,0 +1,94 @@
+require 'orm_adapter/adapters/mongoid'
+
+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(:extend, ClassMethods)
+        end
+
+        module ClassMethods
+          def self.extended(base)
+            base.class_eval do
+              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?
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ckeditor/version.rb

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

data/lib/generators/ckeditor/install_generator.rb

@@ -6,54 +6,57 @@ module Ckeditor
     class InstallGenerator < Rails::Generators::Base
       class_option :version, :type => :string, :default => Ckeditor::Version::EDITOR,
                    :desc => "Version of ckeditor which be install"
-      
+
+      class_option :orm, :type => :string, :default => 'active_record',
+                   :desc => "Backend processor for upload support"
+
       desc "Download and install ckeditor"
-      
+
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-      end  
-      
+      end
+
       # copy configuration
       def copy_initializer
         template "ckeditor.rb", "config/initializers/ckeditor.rb"
       end
-      
+
       # copy ckeditor files
       def install_ckeditor
         say_status("fetching #{filename}", "", :green)
         get(download_url, "tmp/#{filename}")
-        
+
         filepath = Rails.root.join("tmp/#{filename}")
-        
+
         if File.exist?(filepath)
           Ckeditor::Utils.extract(filepath, Rails.root.join('public', 'javascripts'))
           directory "ckeditor", "public/javascripts/ckeditor"
           FileUtils.rm_rf(filepath)
         end
       end
-      
+
       def download_javascripts
         js_dir = "public/javascripts/ckeditor/filebrowser/javascripts"
-        
+
         say_status("fetching rails.js", "", :green)
         get "https://github.com/rails/jquery-ujs/raw/master/src/rails.js", "#{js_dir}/rails.js"
-        
+
         say_status("fetching fileuploader.js", "", :green)
         get "https://raw.github.com/galetahub/file-uploader/master/client/fileuploader.js", "#{js_dir}/fileuploader.js"
-        
+
         say_status("fetching jquery-1.6.1.min.js", "", :green)
         get "http://code.jquery.com/jquery-1.6.1.min.js", "#{js_dir}/jquery.js"
-        
+
         say_status("fetching jquery.tmpl.min.js", "", :green)
         get "https://raw.github.com/jquery/jquery-tmpl/master/jquery.tmpl.min.js", "#{js_dir}/jquery.tmpl.js"
       end
-      
+
       protected
-      
+
         def download_url
           "http://download.cksource.com/CKEditor/CKEditor/CKEditor%20#{options[:version]}/#{filename}"
         end
-        
+
         def filename
           "ckeditor_#{options[:version]}.tar.gz"
         end

data/lib/generators/ckeditor/models_generator.rb

@@ -5,13 +5,13 @@ module Ckeditor
   module Generators
     class ModelsGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
-      
+
       desc "Generates migration for Asset (Picture, AttachmentFile) models"
-      
+
       # ORM configuration
       class_option :orm, :type => :string, :default => "active_record",
         :desc => "Backend processor for upload support"
-                            
+
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates', 'models/'))
       end
@@ -19,30 +19,30 @@ module Ckeditor
       def self.next_migration_number(dirname)
         Time.now.strftime("%Y%m%d%H%M%S")
       end
-      
+
       def create_models
-        template "#{generator_dir}/asset.rb",
+        template "#{generator_dir}/ckeditor/asset.rb",
                  File.join('app/models', ckeditor_dir, "asset.rb")
-        
-        template "#{generator_dir}/picture.rb",
+
+        template "#{generator_dir}/ckeditor/picture.rb",
                  File.join('app/models', ckeditor_dir, "picture.rb")
-        
-        template "#{generator_dir}/attachment_file.rb",
+
+        template "#{generator_dir}/ckeditor/attachment_file.rb",
                  File.join('app/models', ckeditor_dir, "attachment_file.rb")
       end
-      
+
       def create_migration
         if options[:orm] == "active_record"
           migration_template "#{generator_dir}/migration.rb", File.join('db/migrate', "create_ckeditor_assets.rb")
         end
       end
-      
+
       protected
-        
+
         def ckeditor_dir
           'ckeditor'
         end
-        
+
         def generator_dir
           options[:orm] || "active_record"
         end

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

@@ -5,13 +5,14 @@ if Object.const_defined?("Ckeditor")
     # Load and configure the ORM. Supports :active_record (default), :mongo_mapper and
     # :mongoid (bson_ext recommended) by default. Other ORMs may be
     # available as additional gems.
-    require 'ckeditor/orm/active_record'
-    
-    # Allowed image file types for upload. 
+    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. 
+    # 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"]
   end

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

@@ -0,0 +1,7 @@
+require 'mime/types'
+
+class Ckeditor::Asset
+  include Ckeditor::Orm::Mongoid::AssetBase
+
+  attr_accessible :data, :assetable_type, :assetable_id, :assetable
+end

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

@@ -0,0 +1,15 @@
+class Ckeditor::AttachmentFile < Ckeditor::Asset
+  has_mongoid_attached_file :data,
+                            :url => "/ckeditor_assets/attachments/:id/:filename",
+                            :path => ":rails_root/public/ckeditor_assets/attachments/:id/:filename"
+
+  validates_attachment_size :data, :less_than => 100.megabytes
+  validates_attachment_presence :data
+
+  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/ckeditor/picture.rb

@@ -0,0 +1,13 @@
+class Ckeditor::Picture < Ckeditor::Asset
+  has_mongoid_attached_file :data,
+                            :url  => "/ckeditor_assets/pictures/:id/:style_:basename.:extension",
+                            :path => ":rails_root/public/ckeditor_assets/pictures/:id/:style_:basename.:extension",
+                            :styles => { :content => '800>', :thumb => '118x100#' }
+
+  validates_attachment_size :data, :less_than => 2.megabytes
+  validates_attachment_presence :data
+
+  def url_content
+    url(:content)
+  end
+end

data/test/dummy/app/models/post.rb

@@ -1,3 +1,17 @@
-class Post < ActiveRecord::Base
-  validates_presence_of :title, :info, :content
+case CKEDITOR_ORM
+
+when :active_record
+  class Post < ActiveRecord::Base
+    validates_presence_of :title, :info, :content
+  end
+
+when :mongoid
+  class Post
+    include Mongoid::Document
+    field :title
+    field :info
+    field :content
+    validates_presence_of :title, :info, :content
+  end
+
 end

data/test/dummy/config/application.rb

@@ -6,9 +6,9 @@ require "action_controller/railtie"
 require "action_view/railtie"
 require "action_mailer/railtie"
 
-Bundler.require
+Bundler.require :default, CKEDITOR_ORM
+
 require "ckeditor"
-require "paperclip"
 
 module Dummy
   class Application < Rails::Application
@@ -17,7 +17,7 @@ module Dummy
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W(#{config.root}/app/models/ckeditor)
+    config.autoload_paths += %W(#{config.root}/../../lib/generators/ckeditor/templates/models/#{CKEDITOR_ORM})
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.

data/test/dummy/config/boot.rb

@@ -1,10 +1,9 @@
-require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
-
-if File.exist?(gemfile)
-  ENV['BUNDLE_GEMFILE'] = gemfile
+begin
+  require File.expand_path("../../../../.bundle/environment", __FILE__)
+rescue LoadError
+  require 'rubygems'
   require 'bundler'
-  Bundler.setup
+  Bundler.setup :default, :test, CKEDITOR_ORM
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy/config/database.yml

@@ -1,34 +1,14 @@
-# And be sure to use new-style password hashing:
-# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: ckeditor_dummy
-  pool: 5
-  username: root
-  password:
-  socket: /var/run/mysqld/mysqld.sock
+  adapter: sqlite3
+  database: db/development.sqlite3
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: ckeditor_dummy_test
-  pool: 5
-  username: root
-  password:
-  socket: /var/run/mysqld/mysqld.sock
+  adapter: sqlite3
+  database: db/test.sqlite3
 
 production:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: true
-  database: ckeditor_dummy
-  pool: 5
-  username: root
-  password: 
-  socket: /var/run/mysqld/mysqld.sock
+  adapter: sqlite3
+  database: db/production.sqlite3