redactor-rails 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 197aed0bed73abd0306f05a7951eab03b601e7f2
-  data.tar.gz: 60e3476d5358fbea31c5509ffc1b0d3a9a98ce41
+  metadata.gz: 622d40678e93d8765958c9546e252fa4d614cf2b
+  data.tar.gz: 2266d92b29dc11a8406fd2c19e888af261d95faf
 SHA512:
-  metadata.gz: 8c0dcb5db44233fc959847ecbc22f752199f5786a4b0cfd22880284e8659792fd7093d47e2d456bf7d8d743118d8d622a78f0cb29e2819cb817c2549bf958d4f
-  data.tar.gz: b1d9940a45550ef33bc7c43a5ed1997dc93089f0efbabf95a4c759489f6ad6bdbd1316d3bb822f95f48ae826f02b437132816c7e8ea60ab72d09c45e07a6a1a7
+  metadata.gz: 65515703fee4a7f7e249eb2da7a29f53aaf6834957ec6caaab465fdf657ca8ca03ffcb186adc832c4139c6408d2d8e06cd538ffef7850c1107819e2f3e314c37
+  data.tar.gz: 4ad18b06bf4b483daeb5acc8eb739c476a48c493f83a495f81be60d6d89924cd49f9d4c41071fc026f61e0605770fc08ca4acc20ea3b22da1b104a4a8b109fd8

data/README.md

@@ -1,9 +1,9 @@
-[![Gem Version](https://badge.fury.io/rb/redactor-rails.png)](http://badge.fury.io/rb/redactor-rails)
+
 # Rails 3.2 Integration for Redactor (Devise Edition)
 
 The redactor-rails gem integrates the [Redactor](http://redactorjs.com/) editor with the Rails 3.2 asset pipeline.
 
-This gem bundles Redactor version 9.1.4 which is the most recent version as of September 10, 2013. Check [Redactor's changelog](http://imperavi.com/redactor/log/) for further updates.
+This gem bundles Redactor version 10.0.4 which is the most recent version as of January 9, 2015. Check [Redactor's changelog](http://imperavi.com/redactor/log/) for further updates.
 
 ## Installation
 
@@ -94,6 +94,16 @@ Add to your `application.js`:
 
     //= require redactor-rails/langs/zh_tw
 
+#### Setting a max image size with carrierwave
+
+If you want to set a maximum image size used when a user uploads an image via carrierwave, open the uploader file and add add the following:
+
+    # app/uploaders/redactor_rails_picture_uploader.rb:33
+
+    process :resize_to_limit => [500, -1]
+
+The above example will set the image to have a maximum width of 500px.
+
 ### Using plugins
 
 This gem comes bundled with several Redactor plugins:
@@ -104,11 +114,11 @@ This gem comes bundled with several Redactor plugins:
 - FontSize
 - FontFamily
 - Text direction
- 
-Full details of these can be found at [Redactor Plugins](http://imperavi.com/redactor/docs/plugins/)
+
+Full details of these can be found at [Redactor Plugins](http://imperavi.com/redactor/plugins/)
 
 To include all the plugins just add to your `application.js`:
-      
+
         //= require redactor-rails/plugins
 
 and add to your `application.css`:
@@ -121,9 +131,18 @@ add for example:
       //= require redactor-rails/plugins/fontsize
       //= require redactor-rails/plugins/fontfamily
 
-After including the desired plugins they can be configured in the
-redactor config file as normal.
+After including the desired plugins they can be configured in the redactor config file as normal.
+
+To add it into the editor just add 'plugins' attributes to config.js file and specify which ones do you want to use:
 
+      $('.redactor').redactor(
+        { "plugins": ['fontsize',
+                    'fontcolor',
+                    'fontfamily',
+                    'fullscreen',
+                    'textdirection',
+                    'clips']
+        });
 
 ### Defining a Devise User Model
 
@@ -131,20 +150,20 @@ By default redactor-rails uses the `User` model.
 
 You may use a different model by:
 
-1. Run a migration to update the user_id column in the 
+1. Run a migration to update the user_id column in the
 2. Overriding the user class in an initializer.
 3. Overriding the authentication helpers in your controller.
 
     Create a new Migration: `rails g rename_user_id_to_new_user_id`
-    
+
     ```
     # db/migrate/...rename_user_id_to_new_user_id.rb
-    
+
     class RenameUserIdToNewUserId < ActiveRecord::Migration
       def up
         rename_column :redactor_assets, :user_id, :admin_user_id
       end
-    
+
       def down
         rename_column :redactor_assets, :admin_user_id, :user_id
       end
@@ -154,29 +173,29 @@ You may use a different model by:
     ```
     # config/initializers/redactor.rb
     # Overrides the user class
-    
+
     module RedactorRails
       def self.devise_user
         %s(admin_user) # name of your user class
       end
-      
+
       # You may override this to support legacy schema.
       # def self.devise_user_key
       #   "#{self.devise_user.to_s}_id".to_sym
       # end
     end
     ```
-    
+
     ```
     # app/controllers/application_controller.rb
-    
+
     class ApplicationController < ActionController::Base
       ...
-      
+
       def redactor_authenticate_user!
         authenticate_admin_user! # devise before_filter
       end
-    
+
       def redactor_current_user
         current_admin_user # devise user helper
       end
@@ -191,9 +210,14 @@ You may use a different model by:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+## Contributors
+
+[Sebastian Wilgosz](https://github.com/wilgoszpl)
+
 ## Special Thanks
 
 [wildjcrt (Jerry Lee)](https://github.com/wildjcrt/)
+
 ## Statement
 
 `redactor-rails` part of reference [galetahub/ckeditor](https://github.com/galetahub/ckeditor) project.
@@ -206,5 +230,5 @@ the `redactor-rails` project is MIT-LICENSE.
 
 You may use `Redactor` for non-commercial websites for free, however, we do not guarantee any technical support.
 
-Redactor has [3 different licenses](http://redactorjs.com/download/) for commercial use.
-For details please see [License Agreement](http://redactorjs.com/download/).
+Redactor has [3 different licenses](http://imperavi.com/redactor/download/) for commercial use.
+For details please see [License Agreement](http://imperavi.com/redactor/license/).

data/lib/generators/redactor/config_generator.rb

@@ -1,17 +1,17 @@
 require 'rails/generators'
+
 module Redactor
   module Generators
     class ConfigGenerator < ::Rails::Generators::Base
       desc "Generates redactor-rails config"
 
       def self.source_root
-	@source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+	      @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
 
 
       def create_config
-	template "config.js",
-	  File.join('app/assets/javascripts/redactor-rails', "config.js")
+	      template "config.js", File.join('app/assets/javascripts/redactor-rails', "config.js")
       end
     end
   end

data/lib/generators/redactor/templates/config.js

@@ -1,17 +1,22 @@
-$(document).ready(
-  function(){
+window.init_redactor = function(){
   var csrf_token = $('meta[name=csrf-token]').attr('content');
   var csrf_param = $('meta[name=csrf-param]').attr('content');
   var params;
   if (csrf_param !== undefined && csrf_token !== undefined) {
-    params = csrf_param + "=" + encodeURIComponent(csrf_token);
+      params = csrf_param + "=" + encodeURIComponent(csrf_token);
   }
-  $('.redactor').redactor(
-    { "imageUpload":"/redactor_rails/pictures?" + params,
-      "imageGetJson":"/redactor_rails/pictures",
-      "fileUpload":"/redactor_rails/documents?" + params,
-      "fileGetJson":"/redactor_rails/documents",
-      "path":"/assets/redactor-rails",
-      "css":"style.css"}
-  );
-});
+  $('.redactor').redactor({
+        // You can specify, which ones plugins you need.
+        // If you want to use plugins, you have add plugins to your
+        // application.js and application.css files and uncomment the line below:
+        // "plugins": ['fontsize', 'fontcolor', 'fontfamily', 'fullscreen', 'textdirection', 'clips'],
+        "imageUpload":"/redactor_rails/pictures?" + params,
+        "imageGetJson":"/redactor_rails/pictures",
+        "fileUpload":"/redactor_rails/documents?" + params,
+        "fileGetJson":"/redactor_rails/documents",
+        "path":"/assets/redactor-rails",
+        "css":"style.css"
+      });
+}
+
+$(document).on( 'ready page:load', window.init_redactor );

data/lib/redactor-rails/version.rb

@@ -1,3 +1,3 @@
 module RedactorRails
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/redactor-rails.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |gem|
   gem.email         = ["sammylintw@gmail.com"]
   gem.description   = "The redactor-rails gem integrates the Redactor editor"
   gem.summary       = ""
-  gem.homepage      = "https://github.com/SammyLin/redactor-rails"
-
+  gem.homepage      = "https://github.com/sammylin/redactor-rails"
+  gem.license       = 'MIT'
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/vendor/assets/javascripts/redactor-rails/config.js

@@ -13,5 +13,4 @@ window.init_redactor = function(){
   );
 }
 
-$(document).ready( window.init_redactor );
-$(window).bind('page:change', window.init_redactor);
+$(document).on( 'ready page:load', window.init_redactor );

data/vendor/assets/javascripts/redactor-rails/langs/ar.js

@@ -6,6 +6,7 @@ $.Redactor.opts.langs['ar'] = {
 	table: 'جدول',
 	link: 'رابط',
 	link_insert: 'أضف / حرر رابط',
+	link_edit: 'Edit link',
 	unlink: 'إزالة الرابط',
 	formatting: 'التنسيق',
 	paragraph: 'فقرة',
@@ -20,25 +21,25 @@ $.Redactor.opts.langs['ar'] = {
 	fontcolor: 'لون الخط',
 	backcolor: 'لون الخلفية',
 	unorderedlist: 'قائمة منقطة',
-	orderedlist: 'قائمة رقمية',	
+	orderedlist: 'قائمة رقمية',
 	outdent: 'أزل المسافة البادئة',
 	indent: 'أضف المسافة البادئة',
-	cancel: 'تراجع',	
+	cancel: 'تراجع',
 	insert: 'أدخل',
-	save: 'احفظ',	
+	save: 'احفظ',
 	_delete: 'أحذف',
-	insert_table: 'أدخل جدول',		
+	insert_table: 'أدخل جدول',
 	insert_row_above: 'أضف صف فوق',
 	insert_row_below: 'أضف صف تحت',
 	insert_column_left: 'أضف عمود يسارا',
-	insert_column_right: 'أضف عمود يمينا',									
-	delete_column: 'احذف العمود',									
-	delete_row: 'احذف الصف',									
+	insert_column_right: 'أضف عمود يمينا',
+	delete_column: 'احذف العمود',
+	delete_row: 'احذف الصف',
 	delete_table: 'احذف الجدول',
 	rows: 'الصفوف',
-	columns: 'الأعمدة',	
+	columns: 'الأعمدة',
 	add_head: 'أضف ترويسة',
-	delete_head: 'حذف ترويسة',	
+	delete_head: 'حذف ترويسة',
 	title: 'ترويسة',
 	image_position: 'الوضعية',
 	none: 'بدون',
@@ -49,19 +50,24 @@ $.Redactor.opts.langs['ar'] = {
 	mailto: 'بريد الكتروني',
 	web: 'رابط',
 	video_html_code: 'كود الفيديو',
-	file: 'أضف ملف جديد',	
+	file: 'أضف ملف جديد',
 	upload: 'رفع',
 	download: 'تحميل',
 	choose: 'اختار',
 	or_choose: 'أو اختار',
 	drop_file_here: 'اسحب الملف هنا',
-	align_left:	'محاذاة الى اليسار',	
+	align_left:	'محاذاة الى اليسار',
 	align_center: 'محاذاة الى الوسط',
 	align_right: 'محاذاة الى اليمين',
 	align_justify: 'محاذاة كاملة',
 	horizontalrule: 'أضف خط عمودي',
 	fullscreen: 'الشاشة الكاملة',
 	deleted: 'خط في الوسط',
-	anchor: 'مرساة'
+	anchor: 'مرساة',
+	link_new_tab: 'Open link in new tab',
+	underline: 'Underline',
+	alignment: 'Alignment',
+	filename: 'Name (optional)',
+	edit: 'Edit'
 };
 })( jQuery );

data/vendor/assets/javascripts/redactor-rails/langs/az.js

@@ -0,0 +1,72 @@
+(function ($) {
+$.Redactor.opts.langs['az'] = {
+	html: 'HTML',
+	video: 'Video əlavə...',
+	image: 'Şəkil əlavə...',
+	table: 'Cədvəl',
+	link: 'Link',
+	link_insert: 'Link əlavə...',
+	link_edit: 'Edit link',
+	unlink: 'Linki sil',
+	formatting: 'Format',
+	paragraph: 'Paraqraf',
+	quote: 'Sitat',
+	code: 'Kod',
+	header1: 'Başlıq 1',
+	header2: 'Başlıq 2',
+	header3: 'Başlıq 3',
+	header4: 'Başlıq 4',
+	bold:  'Qalın',
+	italic: 'Kursiv',
+	fontcolor: 'Yazı Rəngi',
+	backcolor: 'Fon rəngi',
+	unorderedlist: 'Sırasız List',
+	orderedlist: 'Sıralı List',
+	outdent: 'Abzası geri al',
+	indent: 'Abzas',
+	cancel: 'Ləğv et',
+	insert: 'Əlavə et',
+	save: 'Yadda saxla',
+	_delete: 'Sil',
+	insert_table: 'Cədvəl əlavə et...',
+	insert_row_above: 'Yuxarıya sətir əlavə et',
+	insert_row_below: 'Aşağıya sətir əlavə et',
+	insert_column_left: 'Sola sütun əlavə et',
+	insert_column_right: 'Sağa sütun əlavə et',
+	delete_column: 'Sütunu sil',
+	delete_row: 'Sətiri sil',
+	delete_table: 'Cədvəli sil',
+	rows: 'Sətirlər',
+	columns: 'Sütunlar',
+	add_head: 'Başlıq əlavə et',
+	delete_head: 'Başlığı sil',
+	title: 'Başlıq',
+	image_position: 'Mövqe',
+	none: 'Heç biri',
+	left: 'Sol',
+	right: 'Sağ',
+	image_web_link: 'Şəklin Veb Link',
+	text: 'Yazı',
+	mailto: 'E-poçt',
+	web: 'URL',
+	video_html_code: 'Video Embed Kodu',
+	file: 'Fayl əlavə et...',
+	upload: 'Yüklə',
+	download: 'Endir',
+	choose: 'Seç',
+	or_choose: 'Vəya seç',
+	drop_file_here: 'Faylı buraya at',
+	align_left:	'Yazıyı sola yanaşdır',
+	align_center: 'Yazıyı ortala',
+	align_right: 'Yazıyı sağa yanaşdır',
+	align_justify: 'Yazının kənarlarını düzləşdir',
+	horizontalrule: 'Üfuqi xətt əlavə et',
+	deleted: 'Silindi',
+	anchor: 'Anchor',
+	link_new_tab: 'Linki yeni tabda aç',
+	underline: 'Altıxətli',
+	alignment: 'Düzləndirmə',
+	filename: 'Name (optional)',
+	edit: 'Edit'
+};
+})( jQuery );

data/vendor/assets/javascripts/redactor-rails/langs/ba.js

@@ -6,6 +6,7 @@ $.Redactor.opts.langs['ba'] = {
 	table: 'Tabela',
 	link: 'Veza',
 	link_insert: 'Ubaci vezu ...',
+	link_edit: 'Edit link',
 	unlink: 'Ukloni vezu',
 	formatting: 'Stilovi',
 	paragraph: 'Paragraf',
@@ -20,7 +21,7 @@ $.Redactor.opts.langs['ba'] = {
 	fontcolor: 'Boja slova',
 	backcolor: 'Boja pozadine',
 	unorderedlist: 'Nesortirana lista',
-	orderedlist: 'Sortirana lista',	
+	orderedlist: 'Sortirana lista',
 	outdent: 'Izvuci',
 	indent: 'Uvuci',
 	redo: 'Korak naprijed',
@@ -65,6 +66,11 @@ $.Redactor.opts.langs['ba'] = {
 	horizontalrule: 'Ubaci horizontalnu liniju',
 	fullscreen: 'Prikaz preko čitavog ekrana',
 	deleted: 'Izbrisano',
-	anchor: 'Sidro'
+	anchor: 'Sidro',
+	link_new_tab: 'Open link in new tab',
+	underline: 'Underline',
+	alignment: 'Alignment',
+	filename: 'Name (optional)',
+	edit: 'Edit'
 };
-})( jQuery );
+})( jQuery );

data/vendor/assets/javascripts/redactor-rails/langs/bg.js

@@ -6,6 +6,7 @@ $.Redactor.opts.langs['bg'] = {
 	table: 'Таблица',
 	link: 'Връзка',
 	link_insert: 'Вкарай връзка ...',
+	link_edit: 'Edit link',
 	unlink: 'Премахни връзка',
 	formatting: 'Стилове',
 	paragraph: 'Параграф',
@@ -63,6 +64,11 @@ $.Redactor.opts.langs['bg'] = {
 	fullscreen: 'Цял екран',
 	deleted: 'Зачеркни',
 	none: 'Няма',
-	anchor: 'Връзка'
+	anchor: 'Котва',
+	link_new_tab: 'Отваряне в нов таб',
+	underline: 'Подчертай',
+	alignment: 'Подравняване',
+	filename: 'Name (optional)',
+	edit: 'Edit'
 };
-})( jQuery );
+})( jQuery );

data/vendor/assets/javascripts/redactor-rails/langs/by.js

@@ -6,6 +6,7 @@ $.Redactor.opts.langs['by'] = {
     table: 'Табліца',
     link: 'Спасылка',
     link_insert: 'Уставіць спасылку ...',
+    link_edit: 'Edit link',
     unlink: 'Выдаліць спасылку',
     formatting: 'Стылі',
     paragraph: 'Звычайны тэкст',
@@ -61,6 +62,11 @@ $.Redactor.opts.langs['by'] = {
     horizontalrule: 'Гарызантальная лінейка',
     fullscreen: 'Ва ўвесь экран',
     deleted: 'Закрэслены',
-    anchor: 'Anchor'
+    anchor: 'Anchor',
+	link_new_tab: 'Open link in new tab',
+	underline: 'Underline',
+	alignment: 'Alignment',
+	filename: 'Name (optional)',
+	edit: 'Edit'
 };
 })( jQuery );