rails_kindeditor 0.3.8 → 0.3.9

data/README.md

@@ -28,12 +28,6 @@ Deprecation: rails_kindeditor ~> v0.3.0 only support Rails3.1+!(include Rails3.1
   rails generate rails_kindeditor:install
 ```
 
-### Include kindeditor javascripts for assets pipeline in your application.js:
-
-```ruby
-  //= require kindeditor
-```
-
 ### Usage:
 
 ```ruby
@@ -55,7 +49,7 @@ You can use kindeditor's initial parameters as usual, please visit http://www.ki
 
 additionally, rails_kindeditor provides one "simple_mode" parameter for render simple mode quickly.
 
-<img src="https://github.com/Macrow/rails_kindeditor/raw/master/screenshots/rails_kindeditor.png" alt="rails_indeditor">
+<img src="https://github.com/Macrow/rails_kindeditor/raw/master/screenshots/simple_mode.png" alt="simple mode">
 
 ```ruby
   kindeditor_tag :content, 'default content value', :simple_mode => true
@@ -103,8 +97,8 @@ You can customize some option for uploading.
   #     before    => after
   # eg: 1600x1600 => 800x800
   #     1600x800  => 800x400
-  #     400x400   => 800x800
-  # config.image_resize_to_fit = [800, 800]
+  #     400x400   => 400x400 # No Change
+  # config.image_resize_to_limit = [800, 800]
 ```
 
 ## Save upload file information into database(optional)
@@ -165,12 +159,6 @@ rails_kindeditor可以帮助你的rails程序集成kindeditor,包括了图片和
   rails generate rails_kindeditor:install
 ```
 
-### 在application.js里面为assets pipeline加入以下代码:
-
-```ruby
-  //= require kindeditor
-```
-
 ### 使用方法:
 
 ```ruby
@@ -188,7 +176,7 @@ rails_kindeditor可以帮助你的rails程序集成kindeditor,包括了图片和
        ...
      <% end -%>
 ```
-你可以向往常那样使用kindeditor自身的初始化参数，请访问 http://www.kindsoft.net/docs/option.html 查看更多参数。
+你可以像往常那样使用kindeditor自身的初始化参数，请访问 http://www.kindsoft.net/docs/option.html 查看更多参数。
 
 另外，rails_kindeditor还额外提供一个"simple_mode"参数，以便快捷使用简单模式的kindeditor。
 
@@ -235,8 +223,8 @@ rails_kindeditor可以帮助你的rails程序集成kindeditor,包括了图片和
   #     处理以前      => 处理以后
   # eg: 1600x1600 => 800x800
   #     1600x800  => 800x400
-  #     400x400   => 800x800
-  # config.image_resize_to_fit = [800, 800]
+  #     400x400   => 400x400 # 图片小于该限制尺寸则不作处理
+  # config.image_resize_to_limit = [800, 800]
 ```
 
 ## 将上传文件信息记录入数据库（可选）

data/app/controllers/kindeditor/assets_controller.rb

@@ -4,9 +4,9 @@ class Kindeditor::AssetsController < ApplicationController
   skip_before_filter :verify_authenticity_token
   def create
     @imgFile, @dir = params[:imgFile], params[:dir]
-    if !RailsKindeditor.image_resize_to_fit.nil? && @dir == 'image'
+    if !RailsKindeditor.image_resize_to_limit.nil? && @dir == 'image'
       Kindeditor::AssetUploader.send(:include, CarrierWave::MiniMagick)
-      Kindeditor::AssetUploader.send(:process, :resize_to_fit => RailsKindeditor.resize_to_fit)      
+      Kindeditor::AssetUploader.send(:process, :resize_to_limit => RailsKindeditor.resize_to_limit)
     end
     unless @imgFile.nil?
       if Kindeditor::AssetUploader.save_upload_info? # save upload info into database

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

@@ -11,5 +11,13 @@ 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"
+      else
+        copy_file "application.js", "app/assets/javascripts/application.js"
+      end
+    end
   end
 end

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

@@ -0,0 +1,17 @@
+// 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.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require kindeditor
+//= require_tree .
+

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

@@ -13,7 +13,7 @@ RailsKindeditor.setup do |config|
   # Porcess upload image size
   # eg: 1600x1600 => 800x800
   #     1600x800  => 800x400
-  #     400x400   => 800x800
-  # config.image_resize_to_fit = [800, 800]
+  #     400x400   => 400x400  # No Change
+  # config.image_resize_to_limit = [800, 800]
 
 end

data/lib/generators/rails_kindeditor/migration/templates/models/active_record/kindeditor/asset.rb

@@ -1,5 +1,5 @@
 class Kindeditor::Asset < ActiveRecord::Base
-  set_table_name 'kindeditor_assets'
+  self.table_name = 'kindeditor_assets'
   mount_uploader :asset, AssetUploader
   validates_presence_of :asset
   before_save :update_asset_attributes

data/lib/rails_kindeditor.rb

@@ -20,7 +20,7 @@ module RailsKindeditor
   mattr_accessor :upload_file_ext
   @@upload_file_ext = %w[doc docx xls xlsx ppt htm html txt zip rar gz bz2]
   
-  mattr_accessor :image_resize_to_fit
+  mattr_accessor :image_resize_to_limit
   
   def self.root_path
     @root_path ||= Pathname.new(File.dirname(File.expand_path('../', __FILE__)))
@@ -39,9 +39,9 @@ module RailsKindeditor
     dirs.join('/')
   end
   
-  def self.resize_to_fit
-    if !image_resize_to_fit.nil? && image_resize_to_fit.is_a?(Array)
-      [image_resize_to_fit[0], image_resize_to_fit[1]]
+  def self.resize_to_limit
+    if !image_resize_to_limit.nil? && image_resize_to_limit.is_a?(Array)
+      [image_resize_to_limit[0], image_resize_to_limit[1]]
     else
       [800, 800]
     end

data/lib/rails_kindeditor/version.rb

@@ -1,4 +1,4 @@
 module RailsKindeditor
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_kindeditor
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-28 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -64,6 +64,7 @@ files:
 - config/routes.rb
 - 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/rails_kindeditor.rb
 - lib/generators/rails_kindeditor/migration/USAGE
 - lib/generators/rails_kindeditor/migration/migration_generator.rb