rails_kindeditor 0.2.1 → 0.2.2

data/app/controllers/kindeditor/assets_controller.rb

@@ -6,7 +6,7 @@ class Kindeditor::AssetsController < ApplicationController
     @imgFile = params[:imgFile]
     @dir = params[:dir]
     unless @imgFile.nil?
-      if save_upload_info? # save upload info into database
+      if Kindeditor::AssetUploader.save_upload_info? # save upload info into database
         begin
           @asset = "Kindeditor::#{@dir.camelize}".constantize.new(:asset => @imgFile)
           if @asset.save
@@ -14,8 +14,8 @@ class Kindeditor::AssetsController < ApplicationController
           else
             show_error(@asset.errors.full_messages)
           end
-        rescue
-          show_error("Internal Error!")
+        rescue Exception => e
+          show_error(e.to_s)
         end
       else # do not touch database
         begin
@@ -24,8 +24,8 @@ class Kindeditor::AssetsController < ApplicationController
           render :text => ({:error => 0, :url => uploader.url}.to_json)
         rescue CarrierWave::UploadError => e
           show_error(e.message)
-        rescue
-          show_error("Internal Error!")
+        rescue Exception => e
+          show_error(e.to_s)
         end
       end
     else
@@ -115,14 +115,4 @@ class Kindeditor::AssetsController < ApplicationController
     render :text => ({:error => 1, :message => msg}.to_json)
   end
   
-  def 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/app/uploaders/kindeditor/asset_uploader.rb

@@ -17,6 +17,13 @@ class Kindeditor::AssetUploader < CarrierWave::Uploader::Base
 
   # 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?
+      "uploads/#{model.class.to_s.underscore}/#{model.created_at.strftime("%Y%m")}"
+    else
+      "uploads/#{self.class.to_s.underscore.gsub(/(kindeditor\/)|(_uploader)/, '')}/#{Time.now.strftime("%Y%m")}"
+    end
+  end
 
   def cache_dir
     "#{Rails.root}/tmp/uploads"
@@ -63,6 +70,17 @@ class Kindeditor::AssetUploader < CarrierWave::Uploader::Base
     @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/app/uploaders/kindeditor/file_uploader.rb

@@ -2,10 +2,6 @@
 
 class Kindeditor::FileUploader < Kindeditor::AssetUploader
 
-  def store_dir
-    "uploads/file/#{Time.now.strftime("%Y%m")}"
-  end
-
   def extension_white_list
     EXT_NAMES[:file]
   end

data/app/uploaders/kindeditor/flash_uploader.rb

@@ -2,10 +2,6 @@
 
 class Kindeditor::FlashUploader < Kindeditor::AssetUploader
 
-  def store_dir
-    "uploads/flash/#{Time.now.strftime("%Y%m")}"
-  end
-
   def extension_white_list
     EXT_NAMES[:flash]
   end

data/app/uploaders/kindeditor/image_uploader.rb

@@ -2,10 +2,6 @@
 
 class Kindeditor::ImageUploader < Kindeditor::AssetUploader
 
-  def store_dir
-    "uploads/image/#{Time.now.strftime("%Y%m")}"
-  end
-
   def extension_white_list
     EXT_NAMES[:image]
   end

data/app/uploaders/kindeditor/media_uploader.rb

@@ -2,10 +2,6 @@
 
 class Kindeditor::MediaUploader < Kindeditor::AssetUploader
 
-  def store_dir
-    "uploads/media/#{Time.now.strftime("%Y%m")}"
-  end
-
   def extension_white_list
     EXT_NAMES[:media]
   end

data/lib/rails_kindeditor/version.rb

@@ -1,4 +1,4 @@
 module RailsKindeditor
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_kindeditor
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Macrow
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-02 00:00:00 Z
+date: 2011-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: carrierwave