rails_kindeditor_video 0.5.1 → 0.5.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0c358f4733fbc8d6f8244fbf1aa105e327a4cfa2
4
- data.tar.gz: ac7f8055dbe87cea46d9d147bf0370897c6346cc
3
+ metadata.gz: cd2843c7ec236fa0e9c38e27f5dcc8098123caa3
4
+ data.tar.gz: 639c87b85e75eb0dab5a6092575a4023d49875a7
5
5
  SHA512:
6
- metadata.gz: c97156d7bf8bb810bd2ff007ea550d2eb421f166674e4dcae6fdc2fbf730fd3f43420f0a38519f0fa3d1b82887885a0397be0713f974eca848202f87f38950bc
7
- data.tar.gz: 8f5c8abd204ba5386d94d5d8126e29c0552fea17a4e3596238c1cfd899dceb7919a1a13b2d17b8f849536868f6209b72c9207ca724eac1e9992d077ca7eeb135
6
+ metadata.gz: 1c52447d6f19cc0e7b1f59d1c8ab3fb89945d7c204d00e169fde42c2059a703cd50d9011a3c83ce8afb29f049d109dc676c9ca8b67913dc437c4966e0e1209ea
7
+ data.tar.gz: 67bd6a9c0f2212234a81ce86b7022bae5378b3b62f30f34e7ccd129664926cea8d74445d15a9ccf4836a5b35f224ae79b60e213ab634b5c71581b35fbc3bbd2c
@@ -13,7 +13,7 @@ class Kindeditor::AssetsController < ApplicationController
13
13
  logger.warn '========= Warning: the owner have not been created, "delete uploaded files automatically" will not work. =========' if defined?(logger) && @asset.owner_id == 0
14
14
  @asset.asset_type = @dir
15
15
  if @asset.save
16
- render :plain => ({:error => 0, :url => @asset.asset.url}.to_json)
16
+ render :text => ({:error => 0, :url => @asset.asset.url}.to_json)
17
17
  else
18
18
  show_error(@asset.errors.full_messages)
19
19
  end
@@ -24,7 +24,7 @@ class Kindeditor::AssetsController < ApplicationController
24
24
  begin
25
25
  uploader = "Kindeditor::#{@dir.camelize}Uploader".constantize.new
26
26
  uploader.store!(@imgFile)
27
- render :plain => ({:error => 0, :url => uploader.url}.to_json)
27
+ render :text => ({:error => 0, :url => uploader.url}.to_json)
28
28
  rescue CarrierWave::UploadError => e
29
29
  show_error(e.message)
30
30
  rescue Exception => e
@@ -42,7 +42,7 @@ class Kindeditor::AssetsController < ApplicationController
42
42
  @img_ext = Kindeditor::AssetUploader::EXT_NAMES[:image]
43
43
  @dir = params[:dir].strip || ""
44
44
  unless Kindeditor::AssetUploader::EXT_NAMES.keys.map(&:to_s).push("").include?(@dir)
45
- render :plain => "Invalid Directory name."
45
+ render :text => "Invalid Directory name."
46
46
  return
47
47
  end
48
48
 
@@ -71,15 +71,15 @@ class Kindeditor::AssetsController < ApplicationController
71
71
  end
72
72
  @order = %w(name size type).include?(params[:order].downcase) ? params[:order].downcase : "name"
73
73
  if !@current_path.match(/\.\./).nil?
74
- render :plain => "Access is not allowed."
74
+ render :text => "Access is not allowed."
75
75
  return
76
76
  end
77
77
  if @current_path.match(/\/$/).nil?
78
- render :plain => "Parameter is not valid."
78
+ render :text => "Parameter is not valid."
79
79
  return
80
80
  end
81
81
  if !File.exist?(@current_path) || !File.directory?(@current_path)
82
- render :plain => "Directory does not exist."
82
+ render :text => "Directory does not exist."
83
83
  return
84
84
  end
85
85
  @file_list = []
@@ -116,12 +116,12 @@ class Kindeditor::AssetsController < ApplicationController
116
116
  @result[:current_url] = @current_url
117
117
  @result[:total_count] = @file_list.count
118
118
  @result[:file_list] = @file_list
119
- render :plain => @result.to_json
119
+ render :text => @result.to_json
120
120
  end
121
121
 
122
122
  private
123
123
  def show_error(msg)
124
- render :plain => ({:error => 1, :message => msg}.to_json)
124
+ render :text => ({:error => 1, :message => msg}.to_json)
125
125
  end
126
126
 
127
127
  end
@@ -1,4 +1,4 @@
1
1
  module RailsKindeditor
2
- VERSION = "0.5.1"
2
+ VERSION = "0.5.2"
3
3
  end
4
4
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rails_kindeditor_video
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.1
4
+ version: 0.5.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Macrow