RubyGems - rails_kindeditor - Versions diffs - 0.0.1 → 0.0.2 - Mend

rails_kindeditor 0.0.1 → 0.0.2

Files changed (11) hide show

data/Gemfile +3 -0
data/README.rdoc +23 -7
data/app/uploaders/kindeditor/file_uploader.rb +19 -4
data/app/uploaders/kindeditor/image_uploader.rb +19 -4
data/lib/generators/rails_kindeditor/install/templates/kindeditor/kindeditor-init.js +1 -0
data/lib/rails_kindeditor/controller_additions.rb +23 -0
data/lib/rails_kindeditor/helper.rb +12 -0
data/lib/rails_kindeditor/version.rb +2 -1
data/lib/rails_kindeditor.rb +3 -9
data/rails_kindeditor.gemspec +2 -2
metadata +6 -4

data/Gemfile CHANGED Viewed

@@ -2,3 +2,6 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in rails_kindeditor.gemspec
 gemspec
+gem "carrierwave", "~> 0.5.4"

data/README.rdoc CHANGED Viewed

@@ -16,17 +16,33 @@ The generator will copy migration to your application. When you are done, rememb
   rake db:migrate
+Don't forget add this to your Gemfile
+  gem "carrierwave", "~> 0.5.4"
+  gem "rails_kindeditor"
 == Usage
-  Basically include this in the page you wish to use the editor in:
-  <%= include_kindeditor %>
+Basically include <%= include_kindeditor_if_needed %> under the <head> element of your in your layout file:
+  <%= include_kindeditor_if_needed %>
+In your controller, use include_kindeditor method to load kindeditor javascript:
+  include_kindeditor
+You can load kindeditor javascript only in some action if you needed:
+  include_kindeditor :only => [:new, :edit]
+  include_kindeditor :except => [:index, :show, :destroy, :create]
+Assign your textarea with id
+  :id => "kindeditor_id"
-  then use it like this:
-  <%= f.text_area :content, :id => "editor_id" %>
-  or <%= text_area_tag :content, :id => "editor_id" %>
-  or <textarea id="editor_id"></textarea>
+You can config kindeditor by rails_kindeditor-init.js file:
-  just assign the id to "editor_id".
+  public/javascripts/kindeditor/kindeditor-init.js
 == License

data/app/uploaders/kindeditor/file_uploader.rb CHANGED Viewed

@@ -16,9 +16,9 @@ class Kindeditor::FileUploader < CarrierWave::Uploader::Base
     "uploads/File/#{Time.now.strftime("%Y-%m")}"
   end
-  #def cache_dir
-  #  "#{Rails.root}/tmp/uploads"
-  #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
@@ -45,8 +45,23 @@ class Kindeditor::FileUploader < CarrierWave::Uploader::Base
   # 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_date.to_s(:db) + "-" + ActiveSupport::SecureRandom.hex
+    @name ||= Time.now.to_s(:number)
     "#{@name}#{File.extname(original_filename).downcase}" if original_filename
   end

data/app/uploaders/kindeditor/image_uploader.rb CHANGED Viewed

@@ -16,9 +16,9 @@ class Kindeditor::ImageUploader < CarrierWave::Uploader::Base
     "uploads/Image/#{Time.now.strftime("%Y-%m")}"
   end
-  #def cache_dir
-  #  "#{Rails.root}/tmp/uploads"
-  #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
@@ -45,8 +45,23 @@ class Kindeditor::ImageUploader < CarrierWave::Uploader::Base
   # 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_date.to_s(:db) + "-" + ActiveSupport::SecureRandom.hex
+    @name ||= Time.now.to_s(:number)
     "#{@name}#{File.extname(original_filename).downcase}" if original_filename
   end

data/lib/generators/rails_kindeditor/install/templates/kindeditor/kindeditor-init.js CHANGED Viewed

@@ -1,5 +1,6 @@
 KE.show({
   id : 'kindeditor_id',
+  width: "100%",
   allowFileManager: true,
 	imageUploadJson : '/kindeditor/upload',
 	fileManagerJson: '/kindeditor/filemanager'

data/lib/rails_kindeditor/controller_additions.rb ADDED Viewed

@@ -0,0 +1,23 @@
+module RailsKindeditor
+  module ControllerAdditions
+    module ClassMethods
+      def include_kindeditor(options = {})
+        proc = Proc.new do |c|
+          c.instance_variable_set(:@use_kindeditor, true)
+        end
+        before_filter(proc, options)
+      end
+    end
+    def self.included(base)
+      base.extend ClassMethods
+    end
+  end
+end
+if defined? ActionController
+  ActionController::Base.class_eval do
+    include RailsKindeditor::ControllerAdditions
+  end
+end

data/lib/rails_kindeditor/helper.rb ADDED Viewed

@@ -0,0 +1,12 @@
+module RailsKindeditor
+  module Helper
+    def include_kindeditor_if_needed
+      if @use_kindeditor
+        javascript_include_tag "kindeditor/kindeditor.js", "kindeditor/kindeditor-init.js"
+      end
+    end
+  end
+end
+ActionView::Base.send(:include, RailsKindeditor::Helper)

data/lib/rails_kindeditor/version.rb CHANGED Viewed

@@ -1,3 +1,4 @@
 module RailsKindeditor
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/rails_kindeditor.rb CHANGED Viewed

@@ -1,10 +1,4 @@
-module RailsKindeditor
-  require 'rails_kindeditor/engine'
-  module ActionView::Helpers::AssetTagHelper
-    def include_kindeditor
-      javascript_include_tag "kindeditor/kindeditor.js", "kindeditor/kindeditor-init.js"
-    end
-  end
-end
+require 'rails_kindeditor/engine'
+require 'rails_kindeditor/helper'
+require 'rails_kindeditor/controller_additions'

data/rails_kindeditor.gemspec CHANGED Viewed

@@ -12,13 +12,13 @@ Gem::Specification.new do |s|
   s.summary     = "kindeditor for rails3"
   s.description = "kindeditor for rails3, including image and file upload with carrierwave."
-  s.add_dependency "carrierwave"
   s.rubyforge_project = "rails_kindeditor"
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.add_dependency("carrierwave", "~> 0.5.4")
 end

metadata CHANGED Viewed

@@ -2,7 +2,7 @@
 name: rails_kindeditor
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Macrow
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-06-05 00:00:00 +08:00
+date: 2011-06-12 00:00:00 +08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -19,9 +19,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: "0"
+        version: 0.5.4
   type: :runtime
   version_requirements: *id001
 description: kindeditor for rails3, including image and file upload with carrierwave.
@@ -224,7 +224,9 @@ files:
 - lib/generators/rails_kindeditor/migration/migration_generator.rb
 - lib/generators/rails_kindeditor/migration/templates/migration/migration.rb
 - lib/rails_kindeditor.rb
+- lib/rails_kindeditor/controller_additions.rb
 - lib/rails_kindeditor/engine.rb
+- lib/rails_kindeditor/helper.rb
 - lib/rails_kindeditor/version.rb
 - rails_kindeditor.gemspec
 has_rdoc: true