rails_kindeditor 0.2.3 → 0.2.5

data/README.rdoc

@@ -37,6 +37,11 @@ Assign your textarea with id in your form:
 
 That's all.
 
+== Customize upload directory(optional)
+
+When you run "rails generate rails_kindeditor:install", installer will copy uploader files in you app/uploaders folder.
+Just modify "BASE_DIR" or "store_dir" in asset_uploader.rb.
+
 == Save upload file information into database(optional)
 
 rails_kindeditor can save upload file information into database.
@@ -108,6 +113,11 @@ MIT License. Copyright 2011
 
 完毕！
 
+== 自定义上传目录（可选）
+
+当你运行"rails generate rails_kindeditor:install"的时候，安装器会将uploader拷贝到app/uploaders文件夹。
+在asset_uploader.rb文件中修改"BASE_DIR"或者"store_dir"即可（可参考Carrierwave）。
+
 == 将上传文件信息记录入数据库（可选）
 
 rails_kindeditor 可以将上传文件信息记录入数据库，以便扩展应用.

data/app/controllers/kindeditor/assets_controller.rb

@@ -34,8 +34,8 @@ class Kindeditor::AssetsController < ApplicationController
   end
 
   def list
-    @root_path = Rails.public_path + "/uploads/"
-    @root_url = "/uploads/"
+    @root_path = Rails.public_path + "/#{Kindeditor::AssetUploader::BASE_DIR}/"
+    @root_url = "/#{Kindeditor::AssetUploader::BASE_DIR}/"
     @img_ext = Kindeditor::AssetUploader::EXT_NAMES[:image]
     @dir = params[:dir].strip || ""
     unless Kindeditor::AssetUploader::EXT_NAMES.keys.map(&:to_s).push("").include?(@dir)

data/app/uploaders/kindeditor/asset_uploader.rb

@@ -7,6 +7,8 @@ class Kindeditor::AssetUploader < CarrierWave::Uploader::Base
                :media => %w[swf flv mp3 wav wma wmv mid avi mpg asf rm rmvb],
                :file  => %w[doc docx xls xlsx ppt htm html txt zip rar gz bz2]}
 
+  BASE_DIR = "uploads"
+
   # Include RMagick or ImageScience support:
   # include CarrierWave::RMagick
   # include CarrierWave::ImageScience
@@ -19,9 +21,9 @@ class Kindeditor::AssetUploader < CarrierWave::Uploader::Base
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
     if Kindeditor::AssetUploader.save_upload_info?
-      "uploads/#{model.class.to_s.underscore}/#{model.created_at.strftime("%Y%m")}"
+      "#{BASE_DIR}/#{model.class.to_s.underscore.gsub(/(kindeditor\/)|(_uploader)/, '')}/#{model.created_at.strftime("%Y%m")}"
     else
-      "uploads/#{self.class.to_s.underscore.gsub(/(kindeditor\/)|(_uploader)/, '')}/#{Time.now.strftime("%Y%m")}"
+      "#{BASE_DIR}/#{self.class.to_s.underscore.gsub(/(kindeditor\/)|(_uploader)/, '')}/#{Time.now.strftime("%Y%m")}"
     end
   end
 

data/lib/generators/rails_kindeditor/install/USAGE

@@ -5,5 +5,6 @@ Example:
     rails generate rails_kindeditor:install
 
     This will create:
-        public/javascripts/kindeditor
+        public/kindeditor
+        app/uploaders/kindeditor
 

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

@@ -9,6 +9,7 @@ module RailsKindeditor
       else # Rails3.1+
         directory "kindeditor", "public/kindeditor"
       end
+      directory "uploaders", "app/uploaders"
     end
   end
 end

data/lib/generators/rails_kindeditor/install/templates/uploaders/kindeditor/asset_uploader.rb

@@ -0,0 +1,88 @@
+# encoding: utf-8
+
+class Kindeditor::AssetUploader < CarrierWave::Uploader::Base
+  
+  EXT_NAMES = {:image => %w[gif jpg jpeg png bmp],
+               :flash => %w[swf flv],
+               :media => %w[swf flv mp3 wav wma wmv mid avi mpg asf rm rmvb],
+               :file  => %w[doc docx xls xlsx ppt htm html txt zip rar gz bz2]}
+
+  BASE_DIR = "uploads"
+
+  # Include RMagick or ImageScience support:
+  # include CarrierWave::RMagick
+  # include CarrierWave::ImageScience
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    if Kindeditor::AssetUploader.save_upload_info?
+      "#{BASE_DIR}/#{model.class.to_s.underscore}/#{model.created_at.strftime("%Y%m")}"
+    else
+      "#{BASE_DIR}/#{self.class.to_s.underscore.gsub(/(kindeditor\/)|(_uploader)/, '')}/#{Time.now.strftime("%Y%m")}"
+    end
+  end
+
+  def cache_dir
+    "#{Rails.root}/tmp/uploads"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process :scale => [50, 50]
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  before :store, :remember_cache_id
+  after :store, :delete_tmp_dir
+
+  # store! nil's the cache_id after it finishes so we need to remember it for deletition
+  def remember_cache_id(new_file)
+    @cache_id_was = cache_id
+  end
+
+  def delete_tmp_dir(new_file)
+    # make sure we don't delete other things accidentally by checking the name pattern
+    if @cache_id_was.present? && @cache_id_was =~ /\A[\d]{8}\-[\d]{4}\-[\d]+\-[\d]{4}\z/
+      FileUtils.rm_rf(File.join(cache_dir, @cache_id_was))
+    end
+  end
+
+  def filename
+    @name ||= Time.now.to_s(:number)
+    "#{@name}#{File.extname(original_filename).downcase}" if original_filename
+  end
+  
+  def self.save_upload_info?
+    begin
+      %w(asset file flash image media).each do |s|
+        "Kindeditor::#{s.camelize}".constantize
+      end
+      return true
+    rescue
+      return false
+    end
+  end
+
+end
+

data/lib/generators/rails_kindeditor/install/templates/uploaders/kindeditor/file_uploader.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+class Kindeditor::FileUploader < Kindeditor::AssetUploader
+
+  def extension_white_list
+    EXT_NAMES[:file]
+  end
+
+end
+

data/lib/generators/rails_kindeditor/install/templates/uploaders/kindeditor/flash_uploader.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+class Kindeditor::FlashUploader < Kindeditor::AssetUploader
+
+  def extension_white_list
+    EXT_NAMES[:flash]
+  end
+
+end
+

data/lib/generators/rails_kindeditor/install/templates/uploaders/kindeditor/image_uploader.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+class Kindeditor::ImageUploader < Kindeditor::AssetUploader
+
+  def extension_white_list
+    EXT_NAMES[:image]
+  end
+
+end
+

data/lib/generators/rails_kindeditor/install/templates/uploaders/kindeditor/media_uploader.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+class Kindeditor::MediaUploader < Kindeditor::AssetUploader
+
+  def extension_white_list
+    EXT_NAMES[:media]
+  end
+
+end
+

data/lib/generators/rails_kindeditor/migration/USAGE

@@ -1,13 +1,14 @@
 Description:
-    Copy model , migration and uploader to your application.
+    Copy model, migration and uploader to your application.
 
 Example:
     rails generate rails_kindeditor:migration
 
     This will create:
-        app/models/asset.rb
-        app/models/image.rb
-        app/models/file.rb
-        app/uploaders/image_uploader.rb
-        app/uploaders/file_uploader.rb
+        app/models/kindeditor/asset.rb
+        app/models/kindeditor/file.rb
+        app/models/kindeditor/flash.rb
+        app/models/kindeditor/image.rb
+        app/models/kindeditor/media.rb
+        db/migrate/xxxxxxxxx_create_kindeditor_assets.rb
 

data/lib/rails_kindeditor/version.rb

@@ -1,4 +1,4 @@
 module RailsKindeditor
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_kindeditor
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-06 00:00:00.000000000Z
+date: 2011-11-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70222082057080 !ruby/object:Gem::Requirement
+  requirement: &70206492049000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70222082057080
+  version_requirements: *70206492049000
 description: Kindeditor(4.x) for Rails3, including image and file upload with carrierwave.
 email: Macrow_wh@163.com
 executables: []
@@ -226,6 +226,11 @@ files:
 - lib/generators/rails_kindeditor/install/templates/kindeditor/themes/default/default.css
 - lib/generators/rails_kindeditor/install/templates/kindeditor/themes/default/default.png
 - lib/generators/rails_kindeditor/install/templates/kindeditor/themes/simple/simple.css
+- lib/generators/rails_kindeditor/install/templates/uploaders/kindeditor/asset_uploader.rb
+- lib/generators/rails_kindeditor/install/templates/uploaders/kindeditor/file_uploader.rb
+- lib/generators/rails_kindeditor/install/templates/uploaders/kindeditor/flash_uploader.rb
+- lib/generators/rails_kindeditor/install/templates/uploaders/kindeditor/image_uploader.rb
+- lib/generators/rails_kindeditor/install/templates/uploaders/kindeditor/media_uploader.rb
 - lib/generators/rails_kindeditor/migration/USAGE
 - lib/generators/rails_kindeditor/migration/migration_generator.rb
 - lib/generators/rails_kindeditor/migration/templates/migration/migration.rb