rails_kindeditor 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b6cfb7130f199515719e293a4c199691661712a
-  data.tar.gz: 15881a605cca4945a17d87f11739bf6d8f513980
+  metadata.gz: 1ec1c8cf8e810c9bc12a13f6bd1efb3f10818a0c
+  data.tar.gz: aabd2dde91fca3a5469ad062831ee78ae3a431c2
 SHA512:
-  metadata.gz: 1a71b336bcb4280a0b2edab79132834fdfb7a7889150a1dd533d922e71fdb62fc2aed35251f96fb6c6338d2183ced82a96971722f5259797c4683144c9929ffd
-  data.tar.gz: c3dd5813fe30b5d2fdff83bd50dfd9c60567776ab49f872dba6c7ee66bcf4b4660788520ee388f0d6bf21b2e7660117c10692861720dc54793069d8ed2a75892
+  metadata.gz: b09e83fccbba0a9ebd3e1a3c97d6ae0e6ec9822719da688dcef792738b766492887de8ea909dcf31aae9f1221bcb0380ace3aae3d39e473e80973aaab913ce0c
+  data.tar.gz: 4029988064429d22be68bc02928d2e7dbbf520772eebb3c786d22d9ad46e5c261fcfa65924481249632470203f25025af365ed6ef4c2b7aad20fbcd8a41888b2

data/README.md

@@ -3,9 +3,6 @@
 Kindeditor is a WYSIWYG javascript editor, visit http://www.kindsoft.net for details.
 rails_kindeditor will helps your rails app integrate with kindeditor, includes images and files uploading.
 
-Deprecation: rails_kindeditor ~> v0.3.0 only support Rails3.1+!(include Rails3.1 and Rails3.2)
-             If you're using rails3.0.x, please check rails_kindeditor v0.2.8
-
 <img src="https://github.com/Macrow/rails_kindeditor/raw/master/screenshots/rails_kindeditor.png" alt="rails_indeditor">
 
 ## Installation and usage
@@ -13,7 +10,7 @@ Deprecation: rails_kindeditor ~> v0.3.0 only support Rails3.1+!(include Rails3.1
 ### Add this to your Gemfile
 
 ```ruby
-  gem 'rails_kindeditor', '~> 0.3.15'
+  gem 'rails_kindeditor', '~> 0.3.16'
 ```
 
 ### Run "bundle" command.
@@ -161,15 +158,12 @@ MIT License.
 Kindeditor是国产的所见即所得javascript富文本编辑器, 访问 http://www.kindsoft.net 获取更多信息.
 rails_kindeditor可以帮助你的rails程序集成kindeditor,包括了图片和附件上传功能，文件按照类型、日期进行存储。
 
-注意: rails_kindeditor ~> v0.3.0 仅支持Rails3.1+!当然，包括Rails3.1和Rails3.2.
-    如果你使用rails3.0.x，请使用rails_kindeditor v0.2.8
-
 ## 安装及使用
 
 ### 将下面代码加入Gemfile：
 
 ```ruby
-  gem 'rails_kindeditor', '~> 0.3.15'
+  gem 'rails_kindeditor', '~> 0.3.16'
 ```
 
 ### 运行"bundle"命令：

data/lib/rails_kindeditor/helper.rb

@@ -9,13 +9,11 @@ module RailsKindeditor
     end
     
     def kindeditor(name, method, options = {})
-      input_html = (options.delete(:input_html) || {})
-      hash = input_html.stringify_keys
-      instance_tag = ActionView::Base::InstanceTag.new(name, method, self, options.delete(:object))
-      instance_tag.send(:add_default_name_and_id, hash)      
+      # TODO: Refactory options: 1. kindeditor_option 2. html_option
+      input_html = (options.delete(:input_html) || {}).stringify_keys
       output_buffer = ActiveSupport::SafeBuffer.new
-      output_buffer << instance_tag.to_text_area_tag(input_html)
-      output_buffer << javascript_tag(js_replace(hash['id'], options))
+      output_buffer << build_text_area_tag(name, method, self, options, input_html)
+      output_buffer << javascript_tag(js_replace(input_html['id'], options))
     end
     
     private
@@ -41,11 +39,27 @@ module RailsKindeditor
       options.merge!(:uploadJson => '/kindeditor/upload')
       options.merge!(:fileManagerJson => '/kindeditor/filemanager')
       if options[:simple_mode] == true
-        options.delete(:simple_mode)
         options.merge!(:items => %w{fontname fontsize | forecolor hilitecolor bold italic underline removeformat | justifyleft justifycenter justifyright insertorderedlist insertunorderedlist | emoticons image link})
       end
+      options.delete(:simple_mode)
       options
-    end    
+    end
+    
+    def build_text_area_tag(name, method, template, options, input_html)
+      if Rails.version >= '4.0.0'
+        text_area_tag = ActionView::Helpers::Tags::TextArea.new(name, method, template, options)
+        text_area_tag.send(:add_default_name_and_id, input_html)
+        text_area_tag.render
+      elsif Rails.version >= '3.1.0'
+        text_area_tag = ActionView::Base::InstanceTag.new(name, method, template, options.delete(:object))
+        text_area_tag.send(:add_default_name_and_id, input_html)
+        text_area_tag.to_text_area_tag(input_html)
+      elsif Rails.version >= '3.0.0'
+        raise 'Please use rails_kindeditor v0.2.8 for Rails v3.0.x'
+      else
+        raise 'Please upgrade your Rails !'
+      end
+    end
   end
   
   module Builder

data/lib/rails_kindeditor/version.rb

@@ -1,4 +1,4 @@
 module RailsKindeditor
-  VERSION = "0.3.15"
+  VERSION = "0.3.16"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_kindeditor
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Macrow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave