rails_kindeditor 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1646a9cc4af470cf7ff498125e965fccf45c09a6
-  data.tar.gz: 1598b87d18c480a7808c4be83a5e1ca6f60b573b
+  metadata.gz: 9eeb13a10bad2a05a9ddf3cb1d5c2b4269056cf6
+  data.tar.gz: a00c51c53c5f5cc75ab8cde62492f5134c15535c
 SHA512:
-  metadata.gz: 478d1d2302dc65481cd4d09cbbc1772de6473b53f94c2072965d04c987f38d339b6a783268d172ccf9447cf29f36b0df341da2b1a440928ca947e259bb010be8
-  data.tar.gz: 608345c25a88ad695f677cb282b56faecb17b34fd34a1b9ea231090d957166877470a7faeb6c47304755c21a024963f4e39e758443100a3dd219aba5949ad4c7
+  metadata.gz: 9536a6323d3bd998be4ffd0b1c673ae0f8d830737b3529eabfc85ee4f926f1a0b49ad15e5a954b35d4b946c32ed042b1253d03e3821d9f45598b523920fae665
+  data.tar.gz: da032a5b3563971b0bbc80f39a8eb06af52ba830d40ffda2084d4f303cba21a6ffdbc63aa6369a89d51271279b0798d6ca31238dd9cdbe94bb56214fedca9f54

data/Gemfile

@@ -2,5 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
+gem 'jquery-rails'
 gem 'carrierwave'
 gem 'mini_magick'

data/README.md

@@ -10,8 +10,10 @@ rails_kindeditor will helps your rails app integrate with kindeditor, includes i
 ### Add this to your Gemfile
 
 ```ruby
+  gem 'jquery-rails'
   gem 'rails_kindeditor'
 ```
+notice: Rails 5.1 has dropped dependency on jQuery from the default,but rails_kindeditor need 'jquery-rails'.
 
 ### Run "bundle" command.
 
@@ -112,7 +114,7 @@ Warning: Kindeditor will be load when the others have been loaded.
   # or
   <%= form.input :content, :as => :kindeditor, :label => false, :input_html => { :width => 800, :height => 300 } %>
 ```
-  
+
 ### formtastic:
 
 ```ruby
@@ -139,7 +141,7 @@ You can get content like this:
 ## Upload options configuration
 
 When you run "rails generate rails_kindeditor:install", installer will copy configuration files in config/initializers folder.
-You can customize some option for uploading. 
+You can customize some option for uploading.
 
 ```ruby
   # Specify the subfolders in public directory.
@@ -195,7 +197,7 @@ rails_kindeditor can save upload file information into database.
 
 You can specify the owner for uploaded files, when the owner was destroying, all the uploaded files(belongs to the owner) will be destroyed automatically.
 
-####1. specify the owner_id for kindeditor
+###1. specify the owner_id for kindeditor
 
 ```ruby
    <%= form_for @article do |f| %>
@@ -209,7 +211,7 @@ You can specify the owner for uploaded files, when the owner was destroying, all
 Warnning: the @article must be created before this scene, the @article.id should not be empty.
 ```
 
-####2. add has_many_kindeditor_assets in your own model
+###2. add has_many_kindeditor_assets in your own model
 
 ```ruby
   class Article < ActiveRecord::Base
@@ -219,7 +221,7 @@ Warnning: the @article must be created before this scene, the @article.id should
   end
 ```
 
-####3. relationship
+###3. relationship
 
 ```ruby
   article = Article.first
@@ -250,8 +252,10 @@ rails_kindeditor可以帮助你的rails程序集成kindeditor,包括了图片和
 ### 将下面代码加入Gemfile：
 
 ```ruby
+  gem 'jquery-rails'
   gem 'rails_kindeditor'
 ```
+注意：Rails 5.1 已没有将jQuery作为默认设置,但rails_kindeditor需要'jquery-rails'.
 
 ### 运行"bundle"命令：
 
@@ -301,7 +305,7 @@ Precompiling assets不再自动从vendor/assets和lib/assets拷贝非JS/CSS文
   f.kindeditor :content, :simple_mode => true
   f.input :content, :as => :kindeditor, :input_html => { :simple_mode => true } # simple_form & formtastic  
 ```
-     
+
 完毕！
 
 ### 如何在Turbolinks5下使用
@@ -429,7 +433,7 @@ rails_kindeditor 可以将上传文件信息记录入数据库，以便扩展应
 
 你可以为上传的文件指定归属，比如一名用户，或者一篇文章，当用户或者文章被删除时，所有属于该用户或者该文章的上传文件将会被自动删除。
 
-####1. 为kindeditor指定owner_id
+###1. 为kindeditor指定owner_id
 
 ```ruby
    <%= form_for @article do |f| %>
@@ -443,7 +447,7 @@ rails_kindeditor 可以将上传文件信息记录入数据库，以便扩展应
 警告: @article应该事先被创建，@article.id不应该是空的。
 ```
 
-####2. 在你自己的模型里加入has_many_kindeditor_assets
+###2. 在你自己的模型里加入has_many_kindeditor_assets
 
 ```ruby
   class Article < ActiveRecord::Base
@@ -453,7 +457,7 @@ rails_kindeditor 可以将上传文件信息记录入数据库，以便扩展应
   end
 ```
 
-####3. 相互关系
+###3. 相互关系
 
 ```ruby
   article = Article.first
@@ -470,4 +474,4 @@ rails_kindeditor 可以将上传文件信息记录入数据库，以便扩展应
 
 ## License
 
-MIT License.
+MIT License.

data/app/controllers/kindeditor/assets_controller.rb

@@ -1,7 +1,7 @@
 #coding: utf-8
 require "find"
 class Kindeditor::AssetsController < ApplicationController
-  skip_before_filter :verify_authenticity_token
+  skip_before_action :verify_authenticity_token
   def create
     @imgFile, @dir = params[:imgFile], params[:dir]
     unless @imgFile.nil?
@@ -13,7 +13,7 @@ class Kindeditor::AssetsController < ApplicationController
           logger.warn '========= Warning: the owner have not been created, "delete uploaded files automatically" will not work. =========' if defined?(logger) && @asset.owner_id == 0
           @asset.asset_type = @dir
           if @asset.save
-            render :text => ({:error => 0, :url => @asset.asset.url}.to_json)
+            render :plain => ({:error => 0, :url => @asset.asset.url}.to_json)
           else
             show_error(@asset.errors.full_messages)
           end
@@ -24,7 +24,7 @@ class Kindeditor::AssetsController < ApplicationController
         begin
           uploader = "Kindeditor::#{@dir.camelize}Uploader".constantize.new
           uploader.store!(@imgFile)
-          render :text => ({:error => 0, :url => uploader.url}.to_json)
+          render :plain => ({:error => 0, :url => uploader.url}.to_json)
         rescue CarrierWave::UploadError => e
           show_error(e.message)
         rescue Exception => e
@@ -42,7 +42,7 @@ class Kindeditor::AssetsController < ApplicationController
     @img_ext = Kindeditor::AssetUploader::EXT_NAMES[:image]
     @dir = params[:dir].strip || ""
     unless Kindeditor::AssetUploader::EXT_NAMES.keys.map(&:to_s).push("").include?(@dir)
-      render :text => "Invalid Directory name."
+      render :plain => "Invalid Directory name."
       return
     end
     
@@ -71,15 +71,15 @@ class Kindeditor::AssetsController < ApplicationController
     end
     @order = %w(name size type).include?(params[:order].downcase) ? params[:order].downcase : "name"
     if !@current_path.match(/\.\./).nil?
-      render :text => "Access is not allowed."
+      render :plain => "Access is not allowed."
       return
     end
     if @current_path.match(/\/$/).nil?
-      render :text => "Parameter is not valid."
+      render :plain => "Parameter is not valid."
       return
     end
     if !File.exist?(@current_path) || !File.directory?(@current_path)
-      render :text => "Directory does not exist."
+      render :plain => "Directory does not exist."
       return
     end
     @file_list = []
@@ -116,12 +116,12 @@ class Kindeditor::AssetsController < ApplicationController
     @result[:current_url] = @current_url
     @result[:total_count] = @file_list.count
     @result[:file_list] = @file_list
-    render :text => @result.to_json
+    render :plain => @result.to_json
   end
   
   private
   def show_error(msg)
-    render :text => ({:error => 1, :message => msg}.to_json)
+    render :plain => ({:error => 1, :message => msg}.to_json)
   end
   
 end

data/lib/generators/rails_kindeditor/install/install_generator.rb

@@ -11,13 +11,22 @@ module RailsKindeditor
         template "rails_kindeditor.rb", "config/initializers/rails_kindeditor.rb"
       end
     end
-    
+
     def insert_or_copy_js_files
       if File.exist?('app/assets/javascripts/application.js')
-        insert_into_file "app/assets/javascripts/application.js", "//= require kindeditor\n", :after => "jquery_ujs\n"
+        insert_into_file "app/assets/javascripts/application.js", "//= require jquery\n//= require jquery_ujs\n//= require kindeditor\n", :before => "//= require_tree ."
       else
         copy_file "application.js", "app/assets/javascripts/application.js"
       end
     end
+
+    def copy_load_kindeditor_coffeescript
+      if ::Rails.version < "3.1.0"
+        warn "Warning: rails_kindeditor ~> v0.3.0 only support Rails3.1+!"
+        warn "If you're using rails3.0.x, please check rails_kindeditor v0.2.8"
+      else
+        template "load_kindeditor.coffee", "app/assets/javascripts/load_kindeditor.coffee"
+      end
+    end
   end
-end
+end

data/lib/generators/rails_kindeditor/install/templates/application.js

@@ -1,17 +1,18 @@
 // This is a manifest file that'll be compiled into application.js, which will include all the files
 // listed below.
 //
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
+// vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
 //
+//= require rails-ujs
+//= require turbolinks
 //= require jquery
 //= require jquery_ujs
 //= require kindeditor
 //= require_tree .
-

data/lib/generators/rails_kindeditor/install/templates/load_kindeditor.coffee

@@ -0,0 +1,6 @@
+$(document).on 'turbolinks:before-cache', ->
+  KindEditor.remove('.rails_kindeditor')
+
+$(document).on 'turbolinks:load', ->
+  $('.rails_kindeditor').each ->
+    KindEditor.create "##{$(this).attr('id')}", "allowFileManager": true, "uploadJson": $(this).data('upload'), "fileManagerJson": $(this).data('filemanager'), "width": '100%', "height": '300'

data/lib/rails_kindeditor/version.rb

@@ -1,4 +1,3 @@
 module RailsKindeditor
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end
-

data/rails_kindeditor.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
+  s.add_dependency("jquery-rails")
   s.add_dependency("carrierwave")
   s.add_dependency("mini_magick")
-end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rails_kindeditor
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Macrow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +74,7 @@ files:
 - lib/generators/rails_kindeditor/install/USAGE
 - lib/generators/rails_kindeditor/install/install_generator.rb
 - lib/generators/rails_kindeditor/install/templates/application.js
+- lib/generators/rails_kindeditor/install/templates/load_kindeditor.coffee
 - lib/generators/rails_kindeditor/install/templates/rails_kindeditor.rb
 - lib/generators/rails_kindeditor/migration/USAGE
 - lib/generators/rails_kindeditor/migration/migration_generator.rb
@@ -304,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rails_kindeditor
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Kindeditor for Ruby on Rails