inline_forms 2.0 → 2.1

data/bin/inline_forms

@@ -90,7 +90,7 @@ module InlineForms
       if dry_run?
         empty_directory(app_name)
       else
-        if ! run("rails _3.2.12_ new #{app_name} --skip-bundle --skip-gemfile --skip-test-unit")
+        if ! run("rails new #{app_name} --skip-bundle --skip-gemfile --skip-test-unit")
           say "Rails could not create the app '#{app_name}', maybe because it is a reserved word...", :red
           exit 1
         end
@@ -207,7 +207,7 @@ module InlineForms
         ROUTE
 
         say "- Mount Ckeditor::Engine to routes..."
-        insert_into_file "#{app_name}/config/routes.rb", 'mount Ckeditor::Engine => "/ckeditor"'
+        insert_into_file "#{app_name}/config/routes.rb", "\nmount Ckeditor::Engine => \"/ckeditor\"\n", :after => "routes.draw do\n"
 
         say "- Create User Controller..."
         create_file "#{app_name}/app/controllers/users_controller.rb", <<-USERS_CONTROLLER.strip_heredoc_with_indent
@@ -452,15 +452,10 @@ module InlineForms
         DEVISE_MAILER_STUFF
 
         say "- Setting autoload paths for ckeditor..."
-        insert_into_file "#{app_name}/config/application.rb", '  config.autoload_paths += %W(#{config.root}/app/models/ckeditor)\n', :after => "modules you want to be autoloadable.\n" unless dry_run?
+        insert_into_file "#{app_name}/config/application.rb", '  config.autoload_paths += %W(#{config.root}/app/models/ckeditor)' + "\n", :after => "modules you want to be autoloadable.\n" unless dry_run?
 
-        create_file "#{app_name}/config/initializers/ckeditor.rb" unless dry_run?
-        insert_into_file "#{app_name}/config/initializers/ckeditor.rb", <<-CKEDITOR_INITIALIZER_FOR_CANCAN.strip_heredoc_with_indent(2)
-        Ckeditor.setup do |config|
-          config.authorize_with :cancan
-        end
-
-        CKEDITOR_INITIALIZER_FOR_CANCAN
+        say "- Adding cancan authorization to ckeditor"
+        gsub_file "#{app_name}/config/initializers/ckeditor.rb", "# config.authorize_with :cancan", "config.authorize_with :cancan"
 
         say "- Capify..."
         run 'capify .'

data/lib/app/assets/javascripts/ckeditor/config.js

@@ -5,70 +5,69 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 CKEDITOR.editorConfig = function( config )
 {
-	// Define changes to default configuration here. For example:
-	// config.language = 'fr';
-	// config.uiColor = '#AADC6E';
+    // Define changes to default configuration here. For example:
+    // config.language = 'fr';
+    // config.uiColor = '#AADC6E';
 	
-  /* Filebrowser routes */
-  // The location of an external file browser, that should be launched when "Browse Server" button is pressed.
-  config.filebrowserBrowseUrl = "/ckeditor/attachment_files";
+    /* Filebrowser routes */
+    // The location of an external file browser, that should be launched when "Browse Server" button is pressed.
+    config.filebrowserBrowseUrl = "/ckeditor/attachment_files";
 
-  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Flash dialog.
-  config.filebrowserFlashBrowseUrl = "/ckeditor/attachment_files";
+    // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Flash dialog.
+    config.filebrowserFlashBrowseUrl = "/ckeditor/attachment_files";
 
-  // The location of a script that handles file uploads in the Flash dialog.
-  config.filebrowserFlashUploadUrl = "/ckeditor/attachment_files";
+    // The location of a script that handles file uploads in the Flash dialog.
+    config.filebrowserFlashUploadUrl = "/ckeditor/attachment_files";
   
-  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Link tab of Image dialog.
-  config.filebrowserImageBrowseLinkUrl = "/ckeditor/pictures";
+    // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Link tab of Image dialog.
+    config.filebrowserImageBrowseLinkUrl = "/ckeditor/pictures";
 
-  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Image dialog.
-  config.filebrowserImageBrowseUrl = "/ckeditor/pictures";
+    // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Image dialog.
+    config.filebrowserImageBrowseUrl = "/ckeditor/pictures";
 
-  // The location of a script that handles file uploads in the Image dialog.
-  config.filebrowserImageUploadUrl = "/ckeditor/pictures";
+    // The location of a script that handles file uploads in the Image dialog.
+    config.filebrowserImageUploadUrl = "/ckeditor/pictures";
   
-  // The location of a script that handles file uploads.
-  config.filebrowserUploadUrl = "/ckeditor/attachment_files";
+    // The location of a script that handles file uploads.
+    config.filebrowserUploadUrl = "/ckeditor/attachment_files";
   
-  // Rails CSRF token
-  config.filebrowserParams = function(){
-    var csrf_token = $('meta[name=csrf-token]').attr('content'),
+    // Rails CSRF token
+    config.filebrowserParams = function(){
+        var csrf_token = $('meta[name=csrf-token]').attr('content'),
         csrf_param = $('meta[name=csrf-param]').attr('content'),
         params = new Object();
     
-    if (csrf_param !== undefined && csrf_token !== undefined) {
-      params[csrf_param] = csrf_token;
-    }
+        if (csrf_param !== undefined && csrf_token !== undefined) {
+            params[csrf_param] = csrf_token;
+        }
     
-    return params;
-  };
+        return params;
+    };
   
-  /* Extra plugins */
-  // works only with en, ru, uk locales
-  config.extraPlugins = "embed,attachment";
+    /* Extra plugins */
+    // works only with en, ru, uk locales
+//    config.extraPlugins = "embed,attachment";
 
-    config.height = '400px';
-    config.width = '600px';
+    config.height = 400;
+    config.width = 600;
 
 
 
     config.language = 'nl';
 
-/* Toolbars */
-
-    config.toolbar = 'Minimal';
+    /* Toolbars */
 
     config.toolbarCanCollapse = false;
 
     config.toolbar_Minimal =
-        [
-            ['Format','-','Bold','Italic','-','NumberedList','BulletedList','-','Link'],
-            ['PasteFromWord','Source','Undo','Redo','RemoveFormat'],
-        ];
+    [
+    ['Format','-','Bold','Italic','-','NumberedList','BulletedList','-','Link'],
+    ['PasteFromWord','Source','Undo','Redo','RemoveFormat'],
+    ];
 
-   config.toolbar_None =
-     [ '-' ];
+    config.toolbar_None =
+    [ '-' ];
 
+    config.toolbar = 'Minimal';
 
 };

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "2.0"
+  VERSION = "2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '2.1'
   prerelease: 
 platform: ruby
 authors: