rails_kindeditor 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34a1caa64fbe3191d4baf1d8e46e0c534ae01515
-  data.tar.gz: 161088b41104740736b8de6c40e020651e046b34
+  metadata.gz: 3851f658444ef5cfa536213a825b41f3109b0948
+  data.tar.gz: 141f31b1dabbaa8419b7eb8dd5d6b9593acbf04d
 SHA512:
-  metadata.gz: 622feef63934646240973a3c750bb0591ab63763c5ddab7de72fb5c9c8a813c0877725d9904faefc94134c84d73a720f3c88e94ebf606f47f3fb7497c05028fe
-  data.tar.gz: e39d0698e0c0191d5ee179458db002be90a0e3c24d4f17cb01237908fed1922dfb12943061adb4bd8b22783a2c5f3ab483d66cd359e6fc3c927f2249943cb1cf
+  metadata.gz: 3b556f25d5d5bf6c6b89090e4c3693b3b7b51745aaac74f1b3a8934b8136fe5c18ba26c90707b34ffaa78ce5a94853695c7ab544277921717a2667c284a7e536
+  data.tar.gz: 18cd4eb2c47a4e5717482ad6f0d08a04adc3fcfdad4693f497fa0e1c5d02c16ad115b839be55c4324de5c3f7e322b1352ad31c07581177828a1ac4dcd5e66868

data/README.md

@@ -102,7 +102,7 @@ simple mode
 When you need to specify the owner_id：
 
 ```ruby
-f.kindeditor :content, owner_id: @article.id, data: {upload: kindeditor_upload_json_path(owner_id: @article.id), filemanager: kindeditor_file_manager_json_path}
+f.kindeditor :content, owner: @article
 ```
 
 ```coffeescript
@@ -224,7 +224,7 @@ You can specify the owner for uploaded files, when the owner was destroying, all
 ```ruby
    <%= form_for @article do |f| %>
      ...
-     <%= f.kindeditor :content, :owner_id => @article.id  %>
+     <%= f.kindeditor :content, :owner => @article  %>
      ...
    <% end %>
 ```
@@ -366,7 +366,7 @@ simple模式也需要手动设定
 需要指定owner_id的方法：
 
 ```ruby
-f.kindeditor :content, owner_id: @article.id, data: {upload: kindeditor_upload_json_path(owner_id: @article.id), filemanager: kindeditor_file_manager_json_path}
+f.kindeditor :content, owner: @article
 ```
 
 ```coffeescript
@@ -484,7 +484,7 @@ rails_kindeditor 可以将上传文件信息记录入数据库，以便扩展应
 ```ruby
    <%= form_for @article do |f| %>
      ...
-     <%= f.kindeditor :content, :owner_id => @article.id  %>
+     <%= f.kindeditor :content, :owner => @article  %>
      ...
    <% end %>
 ```

data/app/controllers/kindeditor/assets_controller.rb

@@ -9,7 +9,8 @@ class Kindeditor::AssetsController < ApplicationController
         begin
           @asset = "Kindeditor::#{@dir.camelize}".constantize.new(:asset => @imgFile)
           @asset.owner_id = params[:owner_id] ? params[:owner_id] : 0
-          logger.warn '========= Warning: the owner_id is 0, "delete uploaded files automatically" will not work. =========' if defined?(logger) && @asset.owner_id == 0
+          @asset.owner_type = params[:owner_type] ? params[:owner_type] : ''
+          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)

data/lib/generators/rails_kindeditor/migration/templates/migration/migration.rb

@@ -5,6 +5,7 @@ class CreateKindeditorAssets < ActiveRecord::Migration
       t.integer :file_size
       t.string :file_type
       t.integer :owner_id
+      t.string :owner_type
       t.string :asset_type # list by kindeditor: image, file, media, flash
       t.timestamps
     end

data/lib/rails_kindeditor/active_record.rb

@@ -3,11 +3,11 @@ if defined?(ActiveRecord)
     def self.has_many_kindeditor_assets(*args)
       options = args.extract_options!
       asset_name = args[0] ? args[0].to_s : 'assets'
-      has_many asset_name.to_sym, :class_name => 'Kindeditor::Asset', :foreign_key => 'owner_id', :dependent => options[:dependent]
+      has_many asset_name.to_sym, :class_name => 'Kindeditor::Asset', :as => :owner, :dependent => options[:dependent]
     
       class_name = self.name
       Kindeditor::Asset.class_eval do
-        belongs_to :owner, :class_name => class_name, :foreign_key => 'owner_id'
+        belongs_to :owner, :polymorphic => true
       end
     end
   end

data/lib/rails_kindeditor/helper.rb

@@ -12,14 +12,33 @@ module RailsKindeditor
       # TODO: Refactory options: 1. kindeditor_option 2. html_option
       input_html = (options.delete(:input_html) || {}).stringify_keys
       output_buffer = ActiveSupport::SafeBuffer.new
-      output_buffer << build_text_area_tag(name, method, self, options, input_html)
+      output_buffer << build_text_area_tag(name, method, self, merge_assets_info(options), input_html)
       output_buffer << javascript_tag(js_replace(input_html['id'], options))
     end
     
+    def merge_assets_info(options)
+      owner = options.delete(:owner)
+      if Kindeditor::AssetUploader.save_upload_info? && (!owner.nil?) && (!owner.id.nil?)
+        begin
+          owner_id = owner.id
+          owner_type = owner.class.name
+          options.reverse_merge!(owner_id: owner_id, owner_type: owner_type, data: {upload: kindeditor_upload_json_path(owner_id: owner_id, owner_type: owner_type), filemanager: kindeditor_file_manager_json_path})
+          return options
+        end
+      else
+        options.reverse_merge!(data: {upload: kindeditor_upload_json_path, filemanager: kindeditor_file_manager_json_path})
+      end
+    end
+    
     def kindeditor_upload_json_path(*args)
       options = args.extract_options!
       owner_id_query_string = options[:owner_id] ? "?owner_id=#{options[:owner_id]}" : ''
-      "#{main_app_root_url}kindeditor/upload#{owner_id_query_string}"
+      owner_type_query_string = options[:owner_type] ? "&owner_type=#{options[:owner_type]}" : ''
+      if owner_id_query_string == '' && owner_type_query_string == ''
+        "#{main_app_root_url}kindeditor/upload"
+      else
+        "#{main_app_root_url}kindeditor/upload#{owner_id_query_string}#{owner_type_query_string}"
+      end
     end
     
     def kindeditor_file_manager_json_path
@@ -62,8 +81,8 @@ module RailsKindeditor
       options.reverse_merge!(:width => '100%')
       options.reverse_merge!(:height => 300)
       options.reverse_merge!(:allowFileManager => true)
-      options.merge!(:uploadJson => kindeditor_upload_json_path(:owner_id => options.delete(:owner_id)))
-      options.merge!(:fileManagerJson => kindeditor_file_manager_json_path)
+      options.reverse_merge!(:uploadJson => kindeditor_upload_json_path(:owner_id => options.delete(:owner_id), :owner_type => options.delete(:owner_type)))
+      options.reverse_merge!(:fileManagerJson => kindeditor_file_manager_json_path)
       if options[:simple_mode] == true
         options.merge!(:items => %w{fontname fontsize | forecolor hilitecolor bold italic underline removeformat | justifyleft justifycenter justifyright insertorderedlist insertunorderedlist | emoticons image link})
       end

data/lib/rails_kindeditor/version.rb

@@ -1,4 +1,4 @@
 module RailsKindeditor
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_kindeditor
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Macrow