glebtv-ckeditor 4.4.7.4 → 4.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 024992675102131c25b02ba1f7c3227401ca064d
-  data.tar.gz: cd770c9149038aa403771c1d38b2101ab1caf61b
+  metadata.gz: 967cf72a5f9af7fb06496ce628df448c7b51ca19
+  data.tar.gz: 451401d91a449eda8aa22aa54e6025fabd7f10e4
 SHA512:
-  metadata.gz: a1ed5b2873da3958def6de3abbbc2f2a0d68f8dd1f4a7452384cf44fcd61cd992adb47ba3c15c0f405d496d2005419db01c0726bd526e292692740436373df69
-  data.tar.gz: 85a2a2f11e82f8b26a71db9d91dd410784b6adabed586daf825e0d77c80d0afc4e11475b06acef032c372d81686fc20d17d0755f733253a817abd00f39edd82f
+  metadata.gz: d6885c65b42dbcbb02f18ea60994357bfd756ef81946adb86ad76c35126624a3fcd39e5817a9dd522b53a900b1271c905e1dd42f732c0d98189178035550d367
+  data.tar.gz: 30938c904d109f67c8589115aa70c81b3388278a9b007b249169fce4d37db7ec899abfb176027b2b1fee4be1f462d822b3897b83bd836d9a1c940357d81007c0

data/Gemfile

@@ -2,3 +2,41 @@ source "http://rubygems.org"
 
 gemspec
 
+gem "rails", "4.2.4"
+
+platforms :mri_18 do
+  group :test do
+    gem 'ruby-debug'
+    gem 'SystemTimer'
+  end
+end
+
+platforms :ruby do
+  gem "sqlite3"
+
+  group :development do
+    gem "unicorn", "~> 4.0.1"
+  end
+
+  group :development, :test do
+    gem 'jquery-rails', '~> 4.0.4'
+    gem "capybara", ">= 0.4.0"
+    gem "mynyml-redgreen", "~> 0.7.1", :require => 'redgreen'
+  end
+
+  group :active_record do
+    gem 'paperclip'
+    gem "carrierwave"
+    gem "dragonfly"
+    gem "mini_magick"
+    gem "refile", require: "refile/rails"
+    gem "refile-mini_magick"
+  end
+
+  group :mongoid do
+    gem 'mongoid', '~> 5.0.0'
+    gem "bson_ext"
+    gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
+    gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
+  end
+end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011 AIMBULANCE
+Copyright 2011-2015 Fodojo. http://www.fodojo.com/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,44 +1,45 @@
-# About this fork
-
-This fork adds nothing except plugins and default config file I need.
-All languages except en and ru are removed.
-
-Please use [original gem](https://github.com/galetahub/ckeditor) instead.
-
 # Ckeditor
 
-CKEditor is a ready-for-use HTML text editor designed to simplify web content creation. It's a WYSIWYG editor that brings common word processor features directly to your web pages. Enhance your website experience with our community maintained editor.
+[![Build Status](https://semaphoreci.com/api/v1/projects/9c3e4e36-9716-4362-aaa5-ef9644c72313/565007/badge.svg)](https://semaphoreci.com/igor-galeta/ckeditor)
+[![Code Climate](https://codeclimate.com/github/galetahub/ckeditor/badges/gpa.svg)](https://codeclimate.com/github/galetahub/ckeditor)
+
+CKEditor is a WYSIWYG text editor designed to simplify web content creation. It brings common word processing features directly to your web pages. Enhance your website experience with our community maintained editor.
 [ckeditor.com](http://ckeditor.com/)
 
 ## Features
 
-* Ckeditor version 4.3.2 (full)
+* Ckeditor version 4.5.6 (9 Dec 2015)
 * Rails 4 integration
 * Files browser
-* HTML5 files uploader
+* HTML5 file uploader
 * Hooks for formtastic and simple_form forms generators
 * Integrated with authorization framework CanCan and Pundit
 
 ## Installation
 
-For basic usage just include ckeditor gem:
+For basic usage just include the ckeditor gem:
 
 ```
-gem 'glebtv-ckeditor'
+gem 'ckeditor'
 ```
 
+or if you'd like to use the latest version from Github:
+
+```
+gem 'ckeditor', github: 'galetahub/ckeditor'
+```
 
-For files uploading support you need generage models for file storage.
-Currently supported next backends:
+For file upload support, you must generate the necessary file storage models.
+The currently supported backends are:
 
 * ActiveRecord (paperclip, carrierwave, dragonfly)
 * Mongoid (paperclip, carrierwave, dragonfly)
 
-### How generate models for store uploading files
+### How to generate models to store uploaded files
 
 #### ActiveRecord + paperclip
 
-For active_record orm is used paperclip gem (it's by default).
+To use the active_record orm with paperclip (i.e. the default settings):
 
 ```
 gem 'paperclip'
@@ -55,6 +56,25 @@ gem 'mini_magick'
 rails generate ckeditor:install --orm=active_record --backend=carrierwave
 ```
 
+#### ActiveRecord + refile
+
+```
+gem 'refile', require: "refile/rails"
+gem 'refile-mini_magick'
+
+rails generate ckeditor:install --orm=active_record --backend=refile
+```
+
+#### ActiveRecord + dragonfly
+
+Requires Dragonfly 1.0 or greater.
+
+```
+gem 'dragonfly'
+
+rails generate ckeditor:install --orm=active_record --backend=dragonfly
+```
+
 #### Mongoid + paperclip
 
 ```
@@ -74,14 +94,14 @@ rails generate ckeditor:install --orm=mongoid --backend=carrierwave
 
 #### Load generated models
 
-All ckeditor models will be generated into app/models/ckeditor folder.
-Autoload ckeditor models folder (application.rb):
+All ckeditor models will be generated in the app/models/ckeditor directory.
+Models are autoloaded in Rails 4. For earlier Rails versions, you need to add them to the autoload path (in application.rb):
 
 ```ruby
 config.autoload_paths += %W(#{config.root}/app/models/ckeditor)
 ```
 
-Mount engine in your routes (config/routes.rb):
+Mount the Ckeditor::Engine in your routes (config/routes.rb):
 
 ```ruby
 mount Ckeditor::Engine => '/ckeditor'
@@ -89,85 +109,85 @@ mount Ckeditor::Engine => '/ckeditor'
 
 ## Usage
 
-Include ckeditor javascripts rails 3.2 (application.js):
+### Load editor from gem vendor
+
+Include ckeditor javascripts in your `app/assets/javascripts/application.js`:
 
 ```
 //= require ckeditor/init
 ```
 
-Form helpers:
+### Load editor via CKEditor CDN
 
-```erb
-<%= form_for @page do |form| -%>
-  ...
-  <%= form.cktext_area :notes, :class => 'someclass', :ckeditor => {:language => 'uk'} %>
-  ...
-  <%= form.cktext_area :content, :value => 'Default value', :id => 'sometext' %>
-  ...
-  <%= cktext_area :page, :info, :cols => 40, :ckeditor => {:uiColor => '#AADC6E', :toolbar => 'mini'} %>
-  ...
-<% end -%>
-```
+Setup editor version to load (more info here http://cdn.ckeditor.com/)
 
-All ckeditor options [here](http://docs.ckeditor.com/#!/api/CKEDITOR.config)
+```ruby
+# in config/initializers/ckeditor.rb
+
+Ckeditor.setup do |config|
+  # //cdn.ckeditor.com/<version.number>/<distribution>/ckeditor.js
+  config.cdn_url = "//cdn.ckeditor.com/4.5.6/standard/ckeditor.js"
+end
+```
 
-In order to configure the ckeditor default options, create files:
+In view template include ckeditor CDN:
 
+```slim
+= javascript_include_tag Ckeditor.cdn_url
 ```
-app/assets/javascripts/ckeditor/config.js
 
-app/assets/javascripts/ckeditor/contents.css
+### Form helpers
+
+```slim
+= form_for @page do |form|
+  = form.cktext_area :notes, :class => 'someclass', :ckeditor => {:language => 'uk'}
+  = form.cktext_area :content, :value => 'Default value', :id => 'sometext'  
+  = cktext_area :page, :info, :cols => 40, :ckeditor => {:uiColor => '#AADC6E', :toolbar => 'mini'}
 ```
 
-### Usage with Rails 4 assets
+### Customize ckeditor
 
-In order to use rails 4 assets with digest in production environment you need some preparing.
+All ckeditor options can be found [here](http://docs.ckeditor.com/#!/api/CKEDITOR.config)
 
-First, you need to include in `application.js` **before** `ckeditor/init`
+In order to configure the ckeditor default options, create the following files:
 
 ```
-//= require ckeditor/override
+app/assets/javascripts/ckeditor/config.js
+
+app/assets/javascripts/ckeditor/contents.css
 ```
 
-It forces ckeditor core to respect digested assets.
+#### Custom toolbars example
 
-Next you need to check, that some non-core plugins and skins don't use core ckeditor functions
-to determine path to assets. Therefore we have to create a rake task thats copies the original assets and creates a non-digest version of it. Some example of such rake task is:
+Adding a custom toolbar:
 
-```ruby
-namespace :ckeditor do
-  desc 'Create nondigest versions of some ckeditor assets (e.g. moono skin png)'
-  task :create_nondigest_assets do
-    fingerprint = /\-[0-9a-f]{32}\./
-    for file in Dir['public/assets/ckeditor/contents-*.css', 'public/assets/ckeditor/skins/moono/*.png']
-      next unless file =~ fingerprint
-      nondigest = file.sub fingerprint, '.' # contents-0d8ffa186a00f5063461bc0ba0d96087.css => contents.css
-      FileUtils.cp file, nondigest, verbose: true
-    end
-  end
-end
+```javascript
+# in app/assets/javascripts/ckeditor/config.js
 
-# auto run ckeditor:create_nondigest_assets after assets:precompile
-Rake::Task['assets:precompile'].enhance do
-  Rake::Task['ckeditor:create_nondigest_assets'].invoke
-end
+CKEDITOR.editorConfig = function (config) {
+  // ... other configuration ...
+
+  config.toolbar_mini = [
+    ["Bold",  "Italic",  "Underline",  "Strike",  "-",  "Subscript",  "Superscript"],
+  ];
+  config.toolbar = "simple";
+
+  // ... rest of the original config.js  ...
+}
 ```
-This also works on heroku. Even after restarting dynos running on a cedar stack, the assets will remain.
 
-You can include this rake task in a capistrano task (if you are deploying via capistrano):
+When overriding the default `config.js` file, you must set all configuration options yourself as the bundled `config.js` will not be loaded. To see the default configuration, run `bundle open ckeditor`, copy `app/assets/javascripts/ckeditor/config.js` into your project and customize it to your needs.
+
+### Deployment (only if you use ckeditor from gem vendor)
+
+For Rails 4, add the following to `config/initializers/assets.rb`:
 
 ```ruby
-desc 'copy ckeditor nondigest assets'
-task :copy_nondigest_assets, roles: :app do
-  run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} ckeditor:create_nondigest_assets"
-end
-after 'deploy:assets:precompile', 'copy_nondigest_assets'
+Rails.application.config.assets.precompile += %w( ckeditor/* )
 ```
 
-Periodically check your error monitoring tool, if you see some part of ckeditor try to load
-unexisting non-digest asset - if so just add it in the ckeditor rake task.
-
-Also you can use gem [non-stupid-digest-assets](https://rubygems.org/gems/non-stupid-digest-assets), which do the same work.
+As of version 4.1.0, non-digested assets of Ckeditor will simply be copied after digested assets were compiled.
+For older versions, use gem [non-stupid-digest-assets](https://rubygems.org/gems/non-stupid-digest-assets), to copy non digest assets.
 
 To reduce the asset precompilation time, you can limit plugins and/or languages to those you need:
 
@@ -180,6 +200,24 @@ Ckeditor.setup do |config|
 end
 ```
 
+Note that you have to list your plugins, including all their dependencies.
+
+### Include customized CKEDITOR_BASEPATH setting
+
+Add your app/assets/javascripts/ckeditor/basepath.js.erb like
+
+```erb
+<%
+  base_path = ''
+  if ENV['PROJECT'] =~ /editor/i
+    base_path << "/#{Rails.root.basename.to_s}/"
+  end
+  base_path << Rails.application.config.assets.prefix
+  base_path << '/ckeditor/'
+%>
+var CKEDITOR_BASEPATH = '<%= base_path %>';
+```
+
 ### AJAX
 
 jQuery sample:
@@ -198,20 +236,20 @@ jQuery sample:
 
 ### Formtastic integration
 
-```erb
-<%= form.input :content, :as => :ckeditor %>
-<%= form.input :content, :as => :ckeditor, :input_html => { :ckeditor => { :height => 400 } } %>
+```slim
+= form.input :content, :as => :ckeditor
+= form.input :content, :as => :ckeditor, :input_html => { :ckeditor => { :height => 400 } }
 ```
 
 ### SimpleForm integration
 
-```erb
-<%= form.input :content, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Full'} } %>
+```slim
+= form.input :content, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Full'} }
 ```
 
 ### CanCan integration
 
-To use cancan with Ckeditor, add this to an initializer.
+To use cancan with Ckeditor, add this to an initializer:
 
 ```ruby
 # in config/initializers/ckeditor.rb
@@ -222,7 +260,7 @@ end
 ```
 
 At this point, all authorization will fail and no one will be able to access the filebrowser pages.
-To grant access, add this to Ability#initialize
+To grant access, add this to Ability#initialize:
 
 ```ruby
 # Always performed
@@ -235,7 +273,7 @@ can [:read, :create, :destroy], Ckeditor::AttachmentFile
 
 ### Pundit integration
 
-Just like CanCan, you can write this code in your config/initializers/ckeditor.rb file
+Just like CanCan, you can write this code in your config/initializers/ckeditor.rb file:
 
 ```ruby
 Ckeditor.setup do |config|
@@ -243,7 +281,7 @@ Ckeditor.setup do |config|
 end
 ```
 
-And then, generate the policy files for model **Picture** and **AttachmentFile**
+Then, generate the policy files for model **Picture** and **AttachmentFile**
 
 ```
 $ rails g ckeditor:pundit_policy
@@ -252,9 +290,9 @@ By this command, you will got two files:
 > app/policies/ckeditor/picture_policy.rb
 app/policies/ckeditor/attachment_file_policy.rb
 
-By default, only the user that logged in can access the models(with action *index* and *create*), and only the owner of the asset can **destroy** the resource.
+By default, only the user that logged in can access the models (with actions *index* and *create*) and only the owner of the asset can **destroy** the resource.
 
-You can simply customize these two policy files as you like.
+You can customize these two policy files as you like.
 
 ## I18n
 
@@ -273,9 +311,11 @@ en:
 ## Tests
 
 ```bash
-$> rake test
-$> rake test CKEDITOR_ORM=mongoid
+$> rake test CKEDITOR_BACKEND=paperclip
 $> rake test CKEDITOR_BACKEND=carrierwave
+$> rake test CKEDITOR_BACKEND=refile
+$> rake test CKEDITOR_BACKEND=dragonfly
+$> rake test CKEDITOR_ORM=mongoid
 
 $> rake test:controllers
 $> rake test:generators
@@ -283,4 +323,4 @@ $> rake test:integration
 $> rake test:models
 ```
 
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses the MIT-LICENSE.

data/Rakefile

@@ -6,10 +6,9 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require "bundler/gem_tasks"
-
 require 'rake'
 require 'rdoc/task'
+require "bundler/gem_tasks"
 
 require 'rake/testtask'
 
@@ -64,26 +63,3 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-desc "prepare ckeditor CSS"
-task :process_css do
-  path = File.expand_path("../vendor/assets/javascripts/ckeditor/skins/moono", __FILE__).to_s
-  
-  Dir.glob("#{path}/*.css").each do |f|
-    puts f
-    cmd = "sass-convert -F css -T scss #{f} #{f}.scss"
-    unless system(cmd)
-      puts cmd
-      raise 'sass convert error'
-    end    
-    File.delete(f)
-  end
-  Dir.glob("#{path}/*.scss").each do |f|
-    puts f
-    text = File.read(f)
-    text = text.gsub(/ url\((.*)\)/, ' image-url("ckeditor/skins/moono/\1")')
-    File.write(f, text)
-    #File.write(f.gsub('.scss', '.css.scss'), text)
-    #File.delete(f)
-  end
-end

data/app/assets/javascripts/ckeditor/application.js

@@ -1,4 +1,3 @@
-//= require ckeditor/filebrowser/javascripts/jquery.min.js
 //= require ckeditor/filebrowser/javascripts/jquery.tmpl.min.js
 //= require ckeditor/filebrowser/javascripts/fileuploader.js
 //= require ckeditor/filebrowser/javascripts/jquery.endless-scroll.js