ckeditor 3.2.1 → 3.2.3

data/lib/generators/templates/ckeditor/swfupload/swfupload.queue.js

@@ -1,98 +1 @@
-/*
-	Queue Plug-in
-	
-	Features:
-		*Adds a cancelQueue() method for cancelling the entire queue.
-		*All queued files are uploaded when startUpload() is called.
-		*If false is returned from uploadComplete then the queue upload is stopped.
-		 If false is not returned (strict comparison) then the queue upload is continued.
-		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
-		 Set the event handler with the queue_complete_handler setting.
-		
-	*/
-
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-	SWFUpload.queue = {};
-	
-	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
-		return function () {
-			if (typeof(oldInitSettings) === "function") {
-				oldInitSettings.call(this);
-			}
-			
-			this.queueSettings = {};
-			
-			this.queueSettings.queue_cancelled_flag = false;
-			this.queueSettings.queue_upload_count = 0;
-			
-			this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
-			this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
-			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
-			this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
-			
-			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
-		};
-	})(SWFUpload.prototype.initSettings);
-
-	SWFUpload.prototype.startUpload = function (fileID) {
-		this.queueSettings.queue_cancelled_flag = false;
-		this.callFlash("StartUpload", [fileID]);
-	};
-
-	SWFUpload.prototype.cancelQueue = function () {
-		this.queueSettings.queue_cancelled_flag = true;
-		this.stopUpload();
-		
-		var stats = this.getStats();
-		while (stats.files_queued > 0) {
-			this.cancelUpload();
-			stats = this.getStats();
-		}
-	};
-	
-	SWFUpload.queue.uploadStartHandler = function (file) {
-		var returnValue;
-		if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
-			returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
-		}
-		
-		// To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
-		returnValue = (returnValue === false) ? false : true;
-		
-		this.queueSettings.queue_cancelled_flag = !returnValue;
-
-		return returnValue;
-	};
-	
-	SWFUpload.queue.uploadCompleteHandler = function (file) {
-		var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
-		var continueUpload;
-		
-		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
-			this.queueSettings.queue_upload_count++;
-		}
-
-		if (typeof(user_upload_complete_handler) === "function") {
-			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
-		} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
-			// If the file was stopped and re-queued don't restart the upload
-			continueUpload = false;
-		} else {
-			continueUpload = true;
-		}
-		
-		if (continueUpload) {
-			var stats = this.getStats();
-			if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
-				this.startUpload();
-			} else if (this.queueSettings.queue_cancelled_flag === false) {
-				this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
-				this.queueSettings.queue_upload_count = 0;
-			} else {
-				this.queueSettings.queue_cancelled_flag = false;
-				this.queueSettings.queue_upload_count = 0;
-			}
-		}
-	};
-}
+var SWFUpload;if(typeof(SWFUpload)==="function"){SWFUpload.queue={};SWFUpload.prototype.initSettings=(function(oldInitSettings){return function(){if(typeof(oldInitSettings)==="function"){oldInitSettings.call(this)}this.queueSettings={};this.queueSettings.queue_cancelled_flag=false;this.queueSettings.queue_upload_count=0;this.queueSettings.user_upload_complete_handler=this.settings.upload_complete_handler;this.queueSettings.user_upload_start_handler=this.settings.upload_start_handler;this.settings.upload_complete_handler=SWFUpload.queue.uploadCompleteHandler;this.settings.upload_start_handler=SWFUpload.queue.uploadStartHandler;this.settings.queue_complete_handler=this.settings.queue_complete_handler||null}})(SWFUpload.prototype.initSettings);SWFUpload.prototype.startUpload=function(fileID){this.queueSettings.queue_cancelled_flag=false;this.callFlash("StartUpload",[fileID])};SWFUpload.prototype.cancelQueue=function(){this.queueSettings.queue_cancelled_flag=true;this.stopUpload();var stats=this.getStats();while(stats.files_queued>0){this.cancelUpload();stats=this.getStats()}};SWFUpload.queue.uploadStartHandler=function(file){var returnValue;if(typeof(this.queueSettings.user_upload_start_handler)==="function"){returnValue=this.queueSettings.user_upload_start_handler.call(this,file)}returnValue=(returnValue===false)?false:true;this.queueSettings.queue_cancelled_flag=!returnValue;return returnValue};SWFUpload.queue.uploadCompleteHandler=function(file){var user_upload_complete_handler=this.queueSettings.user_upload_complete_handler;var continueUpload;if(file.filestatus===SWFUpload.FILE_STATUS.COMPLETE){this.queueSettings.queue_upload_count++}if(typeof(user_upload_complete_handler)==="function"){continueUpload=(user_upload_complete_handler.call(this,file)===false)?false:true}else if(file.filestatus===SWFUpload.FILE_STATUS.QUEUED){continueUpload=false}else{continueUpload=true}if(continueUpload){var stats=this.getStats();if(stats.files_queued>0&&this.queueSettings.queue_cancelled_flag===false){this.startUpload()}else if(this.queueSettings.queue_cancelled_flag===false){this.queueEvent("queue_complete_handler",[this.queueSettings.queue_upload_count]);this.queueSettings.queue_upload_count=0}else{this.queueSettings.queue_cancelled_flag=false;this.queueSettings.queue_upload_count=0}}}}

data/lib/generators/templates/models/attachment_fu/asset.rb

@@ -0,0 +1,32 @@
+class Ckeditor::Asset < ActiveRecord::Base
+  set_table_name "ckeditor_assets"
+  
+  belongs_to :user
+  belongs_to :assetable, :polymorphic => true
+  
+  scope :masters, where("parent_id IS NULL")
+  
+  def url(*args)
+    public_filename(*args)
+  end
+  
+  def format_created_at
+    I18n.l(self.created_at, :format=>"%d.%m.%Y %H:%M")
+  end
+  
+  def to_xml(options = {})
+    xml = options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
+
+    xml.tag!(self.read_attribute(:type).to_s.downcase) do
+      xml.filename{ xml.cdata!(self.filename) }
+      xml.size self.size
+      xml.path{ xml.cdata!(self.public_filename) }
+      
+      xml.thumbnails do
+        self.thumbnails.each do |t|
+          xml.tag!(t.thumbnail, self.public_filename(t.thumbnail))
+        end
+      end unless self.thumbnails.empty?
+    end
+  end
+end

data/lib/generators/templates/models/attachment_fu/attachment_file.rb

@@ -0,0 +1,24 @@
+class Ckeditor::AttachmentFile < Ckeditor::Asset
+  has_attachment :storage => :file_system, :path_prefix => 'public/assets/attachments',
+                 :max_size => 10.megabytes
+  
+  validates_as_attachment
+  
+  # Map file extensions to mime types.
+  # Thanks to bug in Flash 8 the content type is always set to application/octet-stream.
+  # From: http://blog.airbladesoftware.com/2007/8/8/uploading-files-with-swfupload
+  def swf_uploaded_data=(data)
+    data.content_type = MIME::Types.type_for(data.original_filename)
+    self.uploaded_data = data
+  end
+  
+  def full_filename(thumbnail = nil)
+    file_system_path = self.attachment_options[:path_prefix]
+    Rails.root.join(file_system_path, file_name_for(self.id))
+  end
+  
+  def file_name_for(asset = nil)
+    extension = filename.scan(/\.\w+$/)
+    return "#{asset}_#{filename}"
+  end
+end

data/lib/generators/templates/models/attachment_fu/migration.rb

@@ -0,0 +1,30 @@
+class CreateCkeditorAssets < ActiveRecord::Migration
+  def self.up
+    create_table :ckeditor_assets do |t|
+      t.integer  "parent_id"
+		  t.string   "content_type"
+		  t.string   "filename", :limit=>80
+		  t.string   "thumbnail", :limit=>20
+		  t.integer  "size"
+		  t.integer  "width"
+		  t.integer  "height"
+		  t.string   "type", :limit=>40
+		  t.integer  "user_id"
+		  t.integer  "assetable_id"
+		  t.string   "assetable_type", :limit=>40
+		  
+      t.timestamps
+    end
+    
+    add_index "ckeditor_assets", ["assetable_id", "assetable_type", "type"], :name => "ndx_type_assetable"
+		add_index "ckeditor_assets", ["assetable_id", "assetable_type"], :name => "fk_assets"
+		add_index "ckeditor_assets", ["parent_id", "type"], :name => "ndx_type_name"
+		add_index "ckeditor_assets", ["thumbnail", "parent_id"], :name => "assets_thumbnail_parent_id"
+		add_index "ckeditor_assets", ["user_id", "assetable_type", "assetable_id"], :name => "assets_user_type_assetable_id"
+		add_index :ckeditor_assets, :user_id, :name => "fk_user"
+  end
+
+  def self.down
+    drop_table :ckeditor_assets
+  end
+end

data/lib/generators/templates/models/attachment_fu/picture.rb

@@ -0,0 +1,25 @@
+class Ckeditor::Picture < Ckeditor::Asset
+  has_attachment :content_type => :image, 
+                 :storage => :file_system, :path_prefix => 'public/assets/pictures',
+                 :max_size => 2.megabytes,
+                 :size => 0.kilobytes..2000.kilobytes,
+                 :processor => 'Rmagick',
+                 :thumbnails => { :content => '575>', :thumb => '100x100!' }
+                 
+	validates_as_attachment
+  
+  def url_content
+	  public_filename(:content)
+	end
+	
+	def url_thumb
+	  public_filename(:thumb)
+	end
+	
+	def to_json(options = {})
+	  options[:methods] ||= []
+	  options[:methods] << :url_content
+	  options[:methods] << :url_thumb
+	  super options
+  end
+end

data/lib/generators/templates/models/paperclip/asset.rb

@@ -0,0 +1,86 @@
+class Ckeditor::Asset < ActiveRecord::Base
+  set_table_name "ckeditor_assets"
+  
+  belongs_to :user
+  belongs_to :assetable, :polymorphic => true
+  
+  before_validation :make_content_type
+  before_create :make_dimensions
+  
+  def url(*args)
+    data.url(*args)
+  end
+  alias :public_filename :url
+  
+  def filename
+    data_file_name
+  end
+  
+  def content_type
+    data_content_type
+  end
+  
+  def size
+    data_file_size
+  end
+  
+  def path
+    data.path
+  end
+  
+  def styles
+    data.styles
+  end
+  
+  def format_created_at
+    I18n.l(self.created_at, :format=>"%d.%m.%Y %H:%M")
+  end
+  
+  def to_xml(options = {})
+    builder = options[:builder] ||= Nokogiri::XML::Builder.new(options)
+
+    builder.send(self.type.to_s.downcase) do |xml|
+      xml.id_ self.id
+      xml.filename self.filename
+      xml.size self.size
+      xml.path self.url
+      
+      xml.styles do
+        self.styles.each do |style|
+          xml.send(style.first, self.url(style.first))
+        end
+      end unless self.styles.empty?
+    end
+    
+    builder.to_xml
+  end
+  
+  def has_dimensions?
+    self.respond_to?(:width) && self.respond_to?(:height)
+  end
+  
+  def image?
+    ["image/jpeg", "image/tiff", "image/png", "image/gif", "image/bmp"].include?(self.data_content_type)
+  end
+  
+  def geometry
+    @geometry ||= Paperclip::Geometry.from_file(data.to_file)
+    @geometry
+  end
+  
+  private
+    
+    def make_dimensions
+      if image? && has_dimensions?
+        self.width = geometry.width
+        self.height = geometry.height
+      end
+    end
+    
+    def make_content_type
+      if data_content_type == "application/octet-stream"
+        content_types = MIME::Types.type_for(filename)
+        self.data_content_type = content_types.first.to_s unless content_types.empty?
+      end
+    end
+end

data/lib/generators/templates/models/paperclip/attachment_file.rb

@@ -0,0 +1,40 @@
+class Ckeditor::AttachmentFile < Ckeditor::Asset
+  has_attached_file :data,
+                    :url => "/ckeditor_assets/attachments/:id/:filename",
+                    :path => ":rails_root/public/ckeditor_assets/attachments/:id/:filename"
+  
+  validates_attachment_size :data, :less_than=>100.megabytes
+  
+  def url(*args)
+    if [:thumb, :content].include?(args.first)
+      send("url_#{args.first}")
+    else
+      data.url(*args)
+    end
+  end
+  
+  def url_content
+	  data.url
+	end
+	
+	def url_thumb
+	  extname = File.extname(filename)
+    
+    case extname.to_s
+      when '.swf' then '/javascripts/ckeditor/images/swf.gif'
+      when '.pdf' then '/javascripts/ckeditor/images/pdf.gif'
+      when '.doc', '.txt' then '/javascripts/ckeditor/images/doc.gif'
+      when '.mp3' then '/javascripts/ckeditor/images/mp3.gif'
+      when '.rar', '.zip', '.tg' then '/javascripts/ckeditor/images/rar.gif'
+      when '.xls' then '/javascripts/ckeditor/images/xls.gif'
+      else '/javascripts/ckeditor/images/ckfnothumb.gif'
+    end
+	end
+	
+	def to_json(options = {})
+	  options[:methods] ||= []
+	  options[:methods] << :url_content
+	  options[:methods] << :url_thumb
+	  super options
+  end
+end

data/lib/generators/templates/models/paperclip/migration.rb

@@ -0,0 +1,31 @@
+class CreateCkeditorAssets < ActiveRecord::Migration
+  def self.up
+    create_table :ckeditor_assets do |t|
+      t.string  :data_file_name, :null => false
+      t.string  :data_content_type
+      t.integer :data_file_size
+      
+      t.integer :assetable_id
+		  t.string  :assetable_type, :limit => 30
+      t.string  :type, :limit => 25
+      t.string  :guid, :limit => 10
+		  
+		  t.integer :locale, :limit => 1, :default => 0
+		  t.integer :user_id
+		  
+      # Uncomment	it to save images dimensions, if your need it
+#		  t.integer :width
+#		  t.integer :height
+		  
+      t.timestamps
+    end
+    
+    add_index "ckeditor_assets", ["assetable_type", "type", "assetable_id"], :name => "idx_assetable_type"
+		add_index "ckeditor_assets", ["assetable_type", "assetable_id"], :name => "fk_assetable"
+		add_index "ckeditor_assets", ["user_id"], :name => "fk_user"
+  end
+
+  def self.down
+    drop_table :ckeditor_assets
+  end
+end

data/lib/generators/templates/models/paperclip/picture.rb

@@ -0,0 +1,23 @@
+class Ckeditor::Picture < Ckeditor::Asset
+  has_attached_file :data,
+                    :url  => "/ckeditor_assets/pictures/:id/:style_:basename.:extension",
+                    :path => ":rails_root/public/ckeditor_assets/pictures/:id/:style_:basename.:extension",
+	                  :styles => { :content => '575>', :thumb => '80x80#' }
+	
+	validates_attachment_size :data, :less_than=>2.megabytes
+	
+	def url_content
+	  url(:content)
+	end
+	
+	def url_thumb
+	  url(:thumb)
+	end
+	
+	def to_json(options = {})
+	  options[:methods] ||= []
+	  options[:methods] << :url_content
+	  options[:methods] << :url_thumb
+	  super options
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 2
-  - 1
-  version: 3.2.1
+  - 3
+  version: 3.2.3
 platform: ruby
 authors: 
 - Igor Galeta
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +03:00
+date: 2010-05-18 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -25,17 +25,14 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
-- TODO
+- README.rdoc
 files: 
 - CHANGELOG
-- README.textile
+- README.rdoc
 - Rakefile
-- TODO
 - app/controllers/ckeditor_controller.rb
 - app/helpers/ckeditor_helper.rb
-- app/views/ckeditor/_file.html.erb
-- app/views/ckeditor/_image.html.erb
+- app/views/ckeditor/_asset.html.erb
 - app/views/ckeditor/_swfupload.html.erb
 - app/views/ckeditor/files.html.erb
 - app/views/ckeditor/images.html.erb
@@ -43,12 +40,15 @@ files:
 - config/routes.rb
 - lib/ckeditor.rb
 - lib/ckeditor/engine.rb
-- lib/ckeditor/file_storage.rb
 - lib/ckeditor/form_builder.rb
+- lib/ckeditor/formtastic.rb
+- lib/ckeditor/middleware.rb
 - lib/ckeditor/utils.rb
 - lib/ckeditor/version.rb
 - lib/ckeditor/view_helper.rb
-- lib/generators/ckeditor_generator.rb
+- lib/generators/USAGE
+- lib/generators/ckeditor_core_generator.rb
+- lib/generators/ckeditor_models_generator.rb
 - lib/generators/templates/ckeditor.rb
 - lib/generators/templates/ckeditor.yml
 - lib/generators/templates/ckeditor/CHANGES.html
@@ -650,6 +650,14 @@ files:
 - lib/generators/templates/ckeditor/swfupload/swfupload.swf
 - lib/generators/templates/ckeditor/swfupload/swfupload.swfobject.js
 - lib/generators/templates/ckeditor/themes/default/theme.js
+- lib/generators/templates/models/attachment_fu/asset.rb
+- lib/generators/templates/models/attachment_fu/attachment_file.rb
+- lib/generators/templates/models/attachment_fu/migration.rb
+- lib/generators/templates/models/attachment_fu/picture.rb
+- lib/generators/templates/models/paperclip/asset.rb
+- lib/generators/templates/models/paperclip/attachment_file.rb
+- lib/generators/templates/models/paperclip/migration.rb
+- lib/generators/templates/models/paperclip/picture.rb
 - lib/tasks/ckeditor_tasks.rake
 has_rdoc: true
 homepage: http://github.com/galetahub/rails-ckeditor
@@ -686,9 +694,9 @@ test_files:
 - examples/migrations/paperclip/create_assets.rb
 - examples/s3/attachment_file.rb
 - examples/s3/picture.rb
-- examples/models/attachment_fu/attachment_file.rb
 - examples/models/attachment_fu/asset.rb
+- examples/models/attachment_fu/attachment_file.rb
 - examples/models/attachment_fu/picture.rb
-- examples/models/paperclip/attachment_file.rb
 - examples/models/paperclip/asset.rb
+- examples/models/paperclip/attachment_file.rb
 - examples/models/paperclip/picture.rb