ckeditor 3.5.3 → 3.5.4

data/README.rdoc

@@ -36,7 +36,7 @@ Check "config/initializers/ckeditor.rb" for more configuration options:
 
 You can pass version of ckeditor to download (http://ckeditor.com/download/releases):
 
-  rails generate ckeditor:base --version=3.5.2
+  rails generate ckeditor:base --version=3.5.4
 
 Generate ckeditor models for file upload support:
 For paperclip:

data/lib/ckeditor/engine.rb

@@ -1,3 +1,6 @@
+require 'rails'
+require 'ckeditor'
+
 module Ckeditor
   class Engine < ::Rails::Engine
     initializer "ckeditor_engine.add_middleware" do |app|

data/lib/ckeditor/middleware.rb

@@ -8,9 +8,9 @@ module Ckeditor
     end
    
     def call(env)
-      if env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/
+      if env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave)\s+Flash/
         params = ::Rack::Utils.parse_query(env['QUERY_STRING'])
-        env['HTTP_COOKIE'] = [ @session_key, ::Rack::Utils.escape(params[@session_key]) ].join('=').freeze unless params[@session_key].nil?
+        env['HTTP_COOKIE'] = [ @session_key, ::Rack::Utils.unescape(params[@session_key]) ].join('=').freeze unless params[@session_key].nil?
       end
       @app.call(env)
     end

data/lib/ckeditor/version.rb

@@ -2,7 +2,7 @@ module Ckeditor
   module Version
     MAJOR = 3
     MINOR = 5
-    RELEASE = 3
+    RELEASE = 4
 
     def self.dup
       "#{MAJOR}.#{MINOR}.#{RELEASE}"

data/lib/ckeditor/view_helper.rb

@@ -15,16 +15,16 @@ module Ckeditor
     #   <%= ckeditor_textarea("object", "field", :index => "2") %>
     # <% end %>
     #
-    def ckeditor_textarea(object, field, options = {})
+    def ckeditor_textarea(object_name, field, options = {})
       options = options.dup.symbolize_keys
       
-      var = options.delete(:object) if options.key?(:object)
-      var ||= @template.instance_variable_get("@#{object}")
+      object = options.delete(:object) if options.key?(:object)
+      object ||= @template.instance_variable_get("@#{object_name}")
       
-      value = var.send(field.to_sym) if var
-      value ||= options.delete(:value) || ""
-      
-      element_id = options.delete(:id) || ckeditor_element_id(object, field, options.delete(:index))
+      value = options.delete(:value) if options.key?(:value)
+      value ||= object.send(field)
+        
+      element_id = options.delete(:id) || ckeditor_element_id(object_name, field, options.delete(:index))
       width  = options.delete(:width) || '100%'
       height = options.delete(:height) || '100%'
       
@@ -50,7 +50,7 @@ module Ckeditor
       
       output_buffer = ActiveSupport::SafeBuffer.new
         
-      output_buffer << ActionView::Base::InstanceTag.new(object, field, self, var).to_text_area_tag(textarea_options.merge(options))
+      output_buffer << ActionView::Base::InstanceTag.new(object_name, field, self, object).to_text_area_tag(textarea_options.merge(options))
       
       output_buffer << javascript_tag("if (CKEDITOR.instances['#{element_id}']) { 
         CKEDITOR.remove(CKEDITOR.instances['#{element_id}']);}
@@ -71,8 +71,8 @@ module Ckeditor
     
     protected
       
-      def ckeditor_element_id(object, field, index = nil)
-        index.blank? ? "#{object}_#{field}_editor" : "#{object}_#{index}_#{field}_editor"
+      def ckeditor_element_id(object_name, field, index = nil)
+        [object_name, index, field, 'editor'].compact.join('_')
       end
       
       def ckeditor_applay_options(options={})

data/lib/generators/ckeditor/base/base_generator.rb

@@ -2,7 +2,7 @@ require 'rails/generators'
 
 module Ckeditor
   class BaseGenerator < Rails::Generators::Base
-    class_option :version, :type => :string, :default => '3.5.3',
+    class_option :version, :type => :string, :default => '3.6',
                  :desc => "Version of ckeditor which be install"
 
     def self.source_root

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ckeditor
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 3
   - 5
-  - 3
-  version: 3.5.3
+  - 4
+  version: 3.5.4
 platform: ruby
 authors: 
 - Igor Galeta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 +03:00
+date: 2011-05-25 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -132,16 +132,6 @@ files:
 - lib/generators/ckeditor/migration/templates/models/paperclip/migration.rb
 - lib/generators/ckeditor/migration/templates/models/paperclip/picture.rb
 - lib/tasks/ckeditor_tasks.rake
-- examples/migrations/attachment_fu/create_assets.rb
-- examples/migrations/paperclip/create_assets.rb
-- examples/models/attachment_fu/asset.rb
-- examples/models/attachment_fu/attachment_file.rb
-- examples/models/attachment_fu/picture.rb
-- examples/models/paperclip/asset.rb
-- examples/models/paperclip/attachment_file.rb
-- examples/models/paperclip/picture.rb
-- examples/s3/attachment_file.rb
-- examples/s3/picture.rb
 has_rdoc: true
 homepage: http://github.com/galetahub/rails-ckeditor
 licenses: []
@@ -176,14 +166,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rails plugin for integration ckeditor 3.x
-test_files: 
-- examples/migrations/attachment_fu/create_assets.rb
-- examples/migrations/paperclip/create_assets.rb
-- examples/models/attachment_fu/asset.rb
-- examples/models/attachment_fu/attachment_file.rb
-- examples/models/attachment_fu/picture.rb
-- examples/models/paperclip/asset.rb
-- examples/models/paperclip/attachment_file.rb
-- examples/models/paperclip/picture.rb
-- examples/s3/attachment_file.rb
-- examples/s3/picture.rb
+test_files: []
+

data/examples/migrations/attachment_fu/create_assets.rb

@@ -1,30 +0,0 @@
-class CreateAssets < ActiveRecord::Migration
-  def self.up
-    create_table :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 "assets", ["assetable_id", "assetable_type", "type"], :name => "ndx_type_assetable"
-		add_index "assets", ["assetable_id", "assetable_type"], :name => "fk_assets"
-		add_index "assets", ["parent_id", "type"], :name => "ndx_type_name"
-		add_index "assets", ["thumbnail", "parent_id"], :name => "assets_thumbnail_parent_id"
-		add_index "assets", ["user_id", "assetable_type", "assetable_id"], :name => "assets_user_type_assetable_id"
-		add_index :assets, :user_id, :name=>"fk_user"
-  end
-
-  def self.down
-    drop_table :assets
-  end
-end

data/examples/migrations/paperclip/create_assets.rb

@@ -1,25 +0,0 @@
-class CreateAssets < ActiveRecord::Migration
-  def self.up
-    create_table :assets do |t|
-      t.string  :data_file_name
-      t.string  :data_content_type
-      t.integer :data_file_size
-      
-      t.integer :assetable_id
-		  t.string  :assetable_type, :limit=>25
-      t.string  :type, :limit=>25
-		  
-		  t.integer :user_id
-		  
-      t.timestamps
-    end
-    
-    add_index "assets", ["assetable_id", "assetable_type", "type"], :name => "ndx_type_assetable"
-		add_index "assets", ["assetable_id", "assetable_type"], :name => "fk_assets"
-		add_index "assets", ["user_id"], :name => "fk_user"
-  end
-
-  def self.down
-    drop_table :assets
-  end
-end

data/examples/models/attachment_fu/asset.rb

@@ -1,45 +0,0 @@
-class Asset < ActiveRecord::Base
-
-  # === List of columns ===
-  #   id             : integer 
-  #   parent_id      : integer 
-  #   content_type   : string 
-  #   filename       : string 
-  #   thumbnail      : string 
-  #   size           : integer 
-  #   width          : integer 
-  #   height         : integer 
-  #   type           : string 
-  #   user_id        : integer 
-  #   assetable_id   : integer 
-  #   assetable_type : string 
-  #   created_at     : datetime 
-  #   updated_at     : datetime 
-  # =======================
-
-  belongs_to :assetable, :polymorphic => true
-  
-  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/examples/models/attachment_fu/attachment_file.rb

@@ -1,46 +0,0 @@
-class AttachmentFile < Asset
-
-  # === List of columns ===
-  #   id             : integer 
-  #   parent_id      : integer 
-  #   content_type   : string 
-  #   filename       : string 
-  #   thumbnail      : string 
-  #   size           : integer 
-  #   width          : integer 
-  #   height         : integer 
-  #   type           : string 
-  #   user_id        : integer 
-  #   assetable_id   : integer 
-  #   assetable_type : string 
-  #   created_at     : datetime 
-  #   updated_at     : datetime 
-  # =======================
-
-  belongs_to :user
-  
-  has_attachment :storage => :file_system, :path_prefix => 'public/attachments/files',
-                 :max_size => 10.megabytes
-  
-  validates_as_attachment
-  
-  named_scope :masters, :conditions => {:parent_id => nil}
-  
-  # 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]
-    File.join(RAILS_ROOT, 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/examples/models/attachment_fu/picture.rb

@@ -1,46 +0,0 @@
-class Picture < Asset
-
-  # === List of columns ===
-  #   id             : integer 
-  #   parent_id      : integer 
-  #   content_type   : string 
-  #   filename       : string 
-  #   thumbnail      : string 
-  #   size           : integer 
-  #   width          : integer 
-  #   height         : integer 
-  #   type           : string 
-  #   user_id        : integer 
-  #   assetable_id   : integer 
-  #   assetable_type : string 
-  #   created_at     : datetime 
-  #   updated_at     : datetime 
-  # =======================
-
-  belongs_to :user
-  has_attachment :content_type => :image, 
-                 :storage => :file_system, :path_prefix => 'public/attachments/pictures',
-                 :max_size => 2.megabytes,
-                 :size => 0.kilobytes..2000.kilobytes,
-                 :processor => 'Rmagick',
-                 :thumbnails => { :content => '575>', :thumb => '100x100!' }
-                 
-	validates_as_attachment
-	
-  named_scope :masters, :conditions=>"parent_id IS NULL", :order=>'filename'
-  
-  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/examples/models/paperclip/asset.rb

@@ -1,65 +0,0 @@
-class Asset < ActiveRecord::Base
-
-  # === List of columns ===
-  #   id                : integer 
-  #   data_file_name    : string 
-  #   data_content_type : string 
-  #   data_file_size    : integer 
-  #   assetable_id      : integer 
-  #   assetable_type    : string 
-  #   type              : string 
-  #   locale            : integer 
-  #   user_id           : integer 
-  #   created_at        : datetime 
-  #   updated_at        : datetime 
-  # =======================
-
-  
-  belongs_to :user
-  belongs_to :assetable, :polymorphic => true
-  
-  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 = {})
-    xml = options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
-
-    xml.tag!(self.type.to_s.downcase) do
-      xml.filename{ xml.cdata!(self.filename) }
-      xml.size self.size
-      xml.path{ xml.cdata!(self.url) }
-      
-      xml.styles do
-        self.styles.each do |style|
-          xml.tag!(style.first, self.url(style.first))
-        end
-      end unless self.styles.empty?
-    end
-  end
-end

data/examples/models/paperclip/attachment_file.rb

@@ -1,22 +0,0 @@
-class AttachmentFile < Asset
-
-  # === List of columns ===
-  #   id                : integer 
-  #   data_file_name    : string 
-  #   data_content_type : string 
-  #   data_file_size    : integer 
-  #   assetable_id      : integer 
-  #   assetable_type    : string 
-  #   type              : string 
-  #   locale            : integer 
-  #   user_id           : integer 
-  #   created_at        : datetime 
-  #   updated_at        : datetime 
-  # =======================
-
-  has_attached_file :data,
-                    :url => "/assets/attachments/:id/:filename",
-                    :path => ":rails_root/public/assets/attachments/:id/:filename"
-  
-  validates_attachment_size :data, :less_than=>10.megabytes
-end

data/examples/models/paperclip/picture.rb

@@ -1,39 +0,0 @@
-class Picture < Asset
-
-  # === List of columns ===
-  #   id                : integer 
-  #   data_file_name    : string 
-  #   data_content_type : string 
-  #   data_file_size    : integer 
-  #   assetable_id      : integer 
-  #   assetable_type    : string 
-  #   type              : string 
-  #   locale            : integer 
-  #   user_id           : integer 
-  #   created_at        : datetime 
-  #   updated_at        : datetime 
-  # =======================
-
-  
-  has_attached_file :data,
-                    :url  => "/assets/pictures/:id/:style_:basename.:extension",
-                    :path => ":rails_root/public/assets/pictures/:id/:style_:basename.:extension",
-	                  :styles => { :content => '575>', :thumb => '100x100' }
-	
-	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

data/examples/s3/attachment_file.rb

@@ -1,23 +0,0 @@
-class AttachmentFile < Asset
- 
-  # === List of columns ===
-  # id : integer
-  # data_file_name : string
-  # data_content_type : string
-  # data_file_size : integer
-  # assetable_id : integer
-  # assetable_type : string
-  # type : string
-  # locale : integer
-  # user_id : integer
-  # created_at : datetime
-  # updated_at : datetime
-  # =======================
- 
-  has_attached_file :data,
-                    :s3_credentials => "#{Rails.root}/config/s3.yml", :bucket => "yourbucket",
-                    :storage => :s3,
-                    :path => "#{APP_NAME}/files/:id/:filename"
-  
-  validates_attachment_size :data, :less_than => 10.megabytes
-end

data/examples/s3/picture.rb

@@ -1,41 +0,0 @@
-class Picture < Asset
- 
-  # === List of columns ===
-  # id : integer
-  # data_file_name : string
-  # data_content_type : string
-  # data_file_size : integer
-  # assetable_id : integer
-  # assetable_type : string
-  # type : string
-  # locale : integer
-  # user_id : integer
-  # created_at : datetime
-  # updated_at : datetime
-  # =======================
- 
- 
- 
-  has_attached_file :data,
-  :s3_credentials => "#{Rails.root}/config/s3.yml", :bucket => "yourbucket",
-  :storage => :s3,
-  :path => "#{APP_NAME}/images/:id/:style_:basename.:extension",
-  :styles => { :content => '575>', :thumb => '100x100' }
- 
-  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