ckeditor 3.6.0 → 3.6.1

data/test/generators/models_generator_test.rb

@@ -5,8 +5,8 @@ class ModelsGeneratorTest < Rails::Generators::TestCase
   destination File.expand_path("../../tmp", __FILE__)
   setup :prepare_destination
 
-  test "models and migration for active_record orm" do
-    run_generator %w(--orm=active_record)
+  test "models and migration for active_record orm via paperclip" do
+    run_generator %w(--orm=active_record --backend=paperclip)
 
     assert_file "app/models/ckeditor/asset.rb"
     assert_file "app/models/ckeditor/picture.rb"
@@ -19,13 +19,43 @@ class ModelsGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  test "models for mongoid orm" do
-    run_generator %w(--orm=mongoid)
+  test "models and migration for active_record orm via carrierwave" do
+    run_generator %w(--orm=active_record --backend=carrierwave)
 
     assert_file "app/models/ckeditor/asset.rb"
     assert_file "app/models/ckeditor/picture.rb"
     assert_file "app/models/ckeditor/attachment_file.rb"
+    
+    assert_file "app/uploaders/ckeditor_attachment_file_uploader.rb"
+    assert_file "app/uploaders/ckeditor_picture_uploader.rb"
 
+    assert_migration "db/migrate/create_ckeditor_assets.rb" do |migration|
+      assert_class_method :up, migration do |up|
+        assert_match /create_table/, up
+      end
+    end
+  end
+
+  test "models for mongoid orm via paperclip" do
+    run_generator %w(--orm=mongoid --backend=paperclip)
+
+    assert_file "app/models/ckeditor/asset.rb"
+    assert_file "app/models/ckeditor/picture.rb"
+    assert_file "app/models/ckeditor/attachment_file.rb"
+
+    assert_no_migration "db/migrate/create_ckeditor_assets.rb"
+  end
+  
+  test "models for mongoid orm via carrierwave" do
+    run_generator %w(--orm=mongoid --backend=carrierwave)
+  
+    assert_file "app/models/ckeditor/asset.rb"
+    assert_file "app/models/ckeditor/picture.rb"
+    assert_file "app/models/ckeditor/attachment_file.rb"
+    
+    assert_file "app/uploaders/ckeditor_attachment_file_uploader.rb"
+    assert_file "app/uploaders/ckeditor_picture_uploader.rb"
+  
     assert_no_migration "db/migrate/create_ckeditor_assets.rb"
   end
 end

data/test/models/attachment_file_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class AttachmentFileTest < ActiveSupport::TestCase
+  test "Set file content_type and size" do
+    @attachemnt = create_attachemnt
+    
+    assert_equal @attachemnt.data_content_type, "application/x-gzip"
+    # TODO: fix filename parameterization
+    if CKEDITOR_BACKEND == :paperclip
+      assert_equal @attachemnt.data_file_name, "rails_tar.gz"
+    else
+      assert_equal @attachemnt.data_file_name, "rails.tar.gz"
+    end
+    assert_equal @attachemnt.data_file_size, 6823
+  end
+end

data/test/models/picture_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class PictureTest < ActiveSupport::TestCase
+  test "Set file content_type and size" do
+    @picture = create_picture
+    
+    assert_equal @picture.data_content_type, "image/png"
+    assert_equal @picture.data_file_name, "rails.png"
+    assert_equal @picture.data_file_size, 6646
+    
+    if @picture.has_dimensions?
+      assert_equal @picture.width, 50
+      assert_equal @picture.height, 64
+    end
+  end
+end

data/test/support/helpers.rb

@@ -0,0 +1,30 @@
+require 'active_support/test_case'
+require 'action_dispatch/testing/test_process'
+
+class ActiveSupport::TestCase
+  include ActionDispatch::TestProcess
+  
+  def new_attachemnt(data = nil)
+    data ||= fixture_file_upload('files/rails.tar.gz', 'application/x-gzip')
+    
+    Ckeditor::AttachmentFile.new(:data => data)
+  end
+  
+  def create_attachemnt(data = nil)
+    attachemnt = new_attachemnt(data)
+    attachemnt.save!
+    attachemnt
+  end
+  
+  def new_picture(data = nil)
+    data ||= fixture_file_upload('files/rails.png', 'image/png')
+    
+    Ckeditor::Picture.new(:data => data)
+  end
+  
+  def create_picture(data = nil)
+    picture = new_picture(data)
+    picture.save!
+    picture
+  end
+end

data/test/support/raw_post.rb

@@ -0,0 +1,9 @@
+module RawPost
+  def raw_post(action, params, body, content_type = nil)
+    @request.env['RAW_POST_DATA'] = body
+    @request.env['CONTENT_TYPE'] = content_type
+    response = post(action, params)
+    @request.env.delete('RAW_POST_DATA')
+    response
+  end
+end

data/test/test_helper.rb

@@ -1,8 +1,10 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 CKEDITOR_ORM = (ENV["CKEDITOR_ORM"] || :active_record).to_sym
+CKEDITOR_BACKEND = (ENV["CKEDITOR_BACKEND"] || :paperclip).to_sym
 
 puts "\n==> Ckeditor.orm = #{CKEDITOR_ORM.inspect}. You can change orm in environment variable CKEDITOR_ORM"
+puts "\n==> Ckeditor.backend = #{CKEDITOR_BACKEND.inspect}. You can change backend in environment variable CKEDITOR_BACKEND"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"

data/test/tmp/app/models/ckeditor/asset.rb

@@ -1,7 +1,5 @@
-require 'mime/types'
-
 class Ckeditor::Asset
   include Ckeditor::Orm::Mongoid::AssetBase
-
-  attr_accessible :data, :assetable_type, :assetable_id, :assetable
+  include Mongoid::Paperclip
+  include Ckeditor::Backend::Paperclip
 end

data/test/tmp/app/models/ckeditor/attachment_file.rb

@@ -8,8 +8,8 @@ class Ckeditor::AttachmentFile < Ckeditor::Asset
 
   def url_thumb
     @url_thumb ||= begin
-                     extname = File.extname(filename).gsub(/^\./, '')
-                     "/javascripts/ckeditor/filebrowser/images/thumbs/#{extname}.gif"
-                   end
+      extname = File.extname(filename).gsub(/^\./, '')
+      "/javascripts/ckeditor/filebrowser/images/thumbs/#{extname}.gif"
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ckeditor
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 3
   - 6
-  - 0
-  version: 3.6.0
+  - 1
+  version: 3.6.1
 platform: ruby
 authors: 
 - Igor Galeta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-29 00:00:00 +03:00
+date: 2011-08-23 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,9 +72,12 @@ files:
 - lib/ckeditor/helpers/form_builder.rb
 - lib/ckeditor/helpers/controllers.rb
 - lib/ckeditor/helpers/form_helper.rb
+- lib/ckeditor/backend/carrierwave.rb
+- lib/ckeditor/backend/paperclip.rb
 - lib/ckeditor/hooks/simple_form.rb
 - lib/ckeditor/hooks/formtastic.rb
 - lib/ckeditor/http.rb
+- lib/ckeditor/orm/base.rb
 - lib/ckeditor/orm/active_record.rb
 - lib/ckeditor/orm/mongoid.rb
 - lib/ckeditor/version.rb
@@ -106,17 +109,27 @@ files:
 - lib/generators/ckeditor/templates/ckeditor/plugins/attachment/lang/uk.js
 - lib/generators/ckeditor/templates/ckeditor/plugins/attachment/lang/ru.js
 - lib/generators/ckeditor/templates/ckeditor/config.js
-- lib/generators/ckeditor/templates/models/mongoid/ckeditor/attachment_file.rb
-- lib/generators/ckeditor/templates/models/mongoid/ckeditor/asset.rb
-- lib/generators/ckeditor/templates/models/mongoid/ckeditor/picture.rb
-- lib/generators/ckeditor/templates/models/active_record/ckeditor/attachment_file.rb
-- lib/generators/ckeditor/templates/models/active_record/ckeditor/asset.rb
-- lib/generators/ckeditor/templates/models/active_record/ckeditor/picture.rb
-- lib/generators/ckeditor/templates/models/active_record/migration.rb
+- lib/generators/ckeditor/templates/models/mongoid/paperclip/ckeditor/attachment_file.rb
+- lib/generators/ckeditor/templates/models/mongoid/paperclip/ckeditor/asset.rb
+- lib/generators/ckeditor/templates/models/mongoid/paperclip/ckeditor/picture.rb
+- lib/generators/ckeditor/templates/models/mongoid/carrierwave/ckeditor/attachment_file.rb
+- lib/generators/ckeditor/templates/models/mongoid/carrierwave/ckeditor/asset.rb
+- lib/generators/ckeditor/templates/models/mongoid/carrierwave/ckeditor/picture.rb
+- lib/generators/ckeditor/templates/models/base/carrierwave/uploaders/ckeditor_picture_uploader.rb
+- lib/generators/ckeditor/templates/models/base/carrierwave/uploaders/ckeditor_attachment_file_uploader.rb
+- lib/generators/ckeditor/templates/models/active_record/paperclip/ckeditor/attachment_file.rb
+- lib/generators/ckeditor/templates/models/active_record/paperclip/ckeditor/asset.rb
+- lib/generators/ckeditor/templates/models/active_record/paperclip/ckeditor/picture.rb
+- lib/generators/ckeditor/templates/models/active_record/paperclip/migration.rb
+- lib/generators/ckeditor/templates/models/active_record/carrierwave/ckeditor/attachment_file.rb
+- lib/generators/ckeditor/templates/models/active_record/carrierwave/ckeditor/asset.rb
+- lib/generators/ckeditor/templates/models/active_record/carrierwave/ckeditor/picture.rb
+- lib/generators/ckeditor/templates/models/active_record/carrierwave/migration.rb
 - lib/generators/ckeditor/templates/ckeditor.rb
 - lib/ckeditor.rb
 - config/routes.rb
 - config/locales/uk.ckeditor.yml
+- config/locales/pt-BR.ckeditor.yml
 - config/locales/en.ckeditor.yml
 - config/locales/ru.ckeditor.yml
 - MIT-LICENSE
@@ -127,6 +140,8 @@ files:
 - test/integration/navigation_test.rb
 - test/generators/models_generator_test.rb
 - test/generators/install_generator_test.rb
+- test/models/attachment_file_test.rb
+- test/models/picture_test.rb
 - test/dummy/public/stylesheets/scaffold.css
 - test/dummy/public/500.html
 - test/dummy/public/404.html
@@ -137,7 +152,43 @@ files:
 - test/dummy/public/javascripts/prototype.js
 - test/dummy/public/javascripts/controls.js
 - test/dummy/public/javascripts/rails.js
+- test/dummy/public/uploads/tmp/20110823-1245-5487-7226/rails.tar.gz
+- test/dummy/public/uploads/tmp/20110823-1245-5487-1597/rails.tar.gz
+- test/dummy/public/uploads/tmp/20110823-1231-4694-7541/rails.png
+- test/dummy/public/uploads/tmp/20110823-1245-5487-0966/rails.png
+- test/dummy/public/uploads/tmp/20110823-1245-5487-5787/rails.tar.gz
+- test/dummy/public/uploads/tmp/20110823-1245-5487-5790/rails.png
+- test/dummy/public/uploads/tmp/20110823-1245-5487-6435/rails.png
+- test/dummy/public/uploads/tmp/20110823-1232-4702-5501/rails.png
+- test/dummy/public/uploads/tmp/20110823-1245-5487-9279/rails.png
+- test/dummy/public/uploads/tmp/20110823-1245-5487-3892/rails.tar.gz
+- test/dummy/public/uploads/tmp/20110823-1245-5487-7290/rails.tar.gz
+- test/dummy/public/uploads/tmp/20110823-1245-5487-6978/rails.png
 - test/dummy/public/422.html
+- test/dummy/public/ckeditor_assets/pictures/4e53723dde2f151212000002/content_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53723dde2f151212000002/original_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53723dde2f151212000002/thumb_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537334de2f15123b000002/content_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537334de2f15123b000002/original_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537334de2f15123b000002/thumb_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537868de2f151651000007/content_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537868de2f151651000007/original_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537868de2f151651000007/thumb_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53783ade2f1515b7000007/content_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53783ade2f1515b7000007/rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53783ade2f1515b7000007/thumb_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537637de2f1514e9000007/content_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537637de2f1514e9000007/original_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537637de2f1514e9000007/thumb_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53768ade2f15152c000007/content_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53768ade2f15152c000007/original_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53768ade2f15152c000007/thumb_rails.png
+- test/dummy/public/ckeditor_assets/attachments/4e537333de2f15123b000001/rails_tar.gz
+- test/dummy/public/ckeditor_assets/attachments/4e53766ade2f15152c000001/rails_tar.gz
+- test/dummy/public/ckeditor_assets/attachments/4e53723cde2f151212000001/rails_tar.gz
+- test/dummy/public/ckeditor_assets/attachments/4e537621de2f1514e9000001/rails_tar.gz
+- test/dummy/public/ckeditor_assets/attachments/4e53781ede2f1515b7000001/rails.tar.gz
+- test/dummy/public/ckeditor_assets/attachments/4e537849de2f151651000001/rails_tar.gz
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/posts/new.html.erb
 - test/dummy/app/views/posts/edit.html.erb
@@ -181,6 +232,8 @@ files:
 - test/tmp/app/models/ckeditor/attachment_file.rb
 - test/tmp/app/models/ckeditor/asset.rb
 - test/tmp/app/models/ckeditor/picture.rb
+- test/support/raw_post.rb
+- test/support/helpers.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
 - test/orm/active_record.rb
@@ -228,6 +281,8 @@ test_files:
 - test/integration/navigation_test.rb
 - test/generators/models_generator_test.rb
 - test/generators/install_generator_test.rb
+- test/models/attachment_file_test.rb
+- test/models/picture_test.rb
 - test/dummy/public/stylesheets/scaffold.css
 - test/dummy/public/500.html
 - test/dummy/public/404.html
@@ -238,7 +293,43 @@ test_files:
 - test/dummy/public/javascripts/prototype.js
 - test/dummy/public/javascripts/controls.js
 - test/dummy/public/javascripts/rails.js
+- test/dummy/public/uploads/tmp/20110823-1245-5487-7226/rails.tar.gz
+- test/dummy/public/uploads/tmp/20110823-1245-5487-1597/rails.tar.gz
+- test/dummy/public/uploads/tmp/20110823-1231-4694-7541/rails.png
+- test/dummy/public/uploads/tmp/20110823-1245-5487-0966/rails.png
+- test/dummy/public/uploads/tmp/20110823-1245-5487-5787/rails.tar.gz
+- test/dummy/public/uploads/tmp/20110823-1245-5487-5790/rails.png
+- test/dummy/public/uploads/tmp/20110823-1245-5487-6435/rails.png
+- test/dummy/public/uploads/tmp/20110823-1232-4702-5501/rails.png
+- test/dummy/public/uploads/tmp/20110823-1245-5487-9279/rails.png
+- test/dummy/public/uploads/tmp/20110823-1245-5487-3892/rails.tar.gz
+- test/dummy/public/uploads/tmp/20110823-1245-5487-7290/rails.tar.gz
+- test/dummy/public/uploads/tmp/20110823-1245-5487-6978/rails.png
 - test/dummy/public/422.html
+- test/dummy/public/ckeditor_assets/pictures/4e53723dde2f151212000002/content_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53723dde2f151212000002/original_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53723dde2f151212000002/thumb_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537334de2f15123b000002/content_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537334de2f15123b000002/original_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537334de2f15123b000002/thumb_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537868de2f151651000007/content_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537868de2f151651000007/original_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537868de2f151651000007/thumb_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53783ade2f1515b7000007/content_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53783ade2f1515b7000007/rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53783ade2f1515b7000007/thumb_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537637de2f1514e9000007/content_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537637de2f1514e9000007/original_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e537637de2f1514e9000007/thumb_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53768ade2f15152c000007/content_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53768ade2f15152c000007/original_rails.png
+- test/dummy/public/ckeditor_assets/pictures/4e53768ade2f15152c000007/thumb_rails.png
+- test/dummy/public/ckeditor_assets/attachments/4e537333de2f15123b000001/rails_tar.gz
+- test/dummy/public/ckeditor_assets/attachments/4e53766ade2f15152c000001/rails_tar.gz
+- test/dummy/public/ckeditor_assets/attachments/4e53723cde2f151212000001/rails_tar.gz
+- test/dummy/public/ckeditor_assets/attachments/4e537621de2f1514e9000001/rails_tar.gz
+- test/dummy/public/ckeditor_assets/attachments/4e53781ede2f1515b7000001/rails.tar.gz
+- test/dummy/public/ckeditor_assets/attachments/4e537849de2f151651000001/rails_tar.gz
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/posts/new.html.erb
 - test/dummy/app/views/posts/edit.html.erb
@@ -282,6 +373,8 @@ test_files:
 - test/tmp/app/models/ckeditor/attachment_file.rb
 - test/tmp/app/models/ckeditor/asset.rb
 - test/tmp/app/models/ckeditor/picture.rb
+- test/support/raw_post.rb
+- test/support/helpers.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
 - test/orm/active_record.rb

data/lib/generators/ckeditor/templates/models/mongoid/ckeditor/asset.rb

@@ -1,7 +0,0 @@
-require 'mime/types'
-
-class Ckeditor::Asset
-  include Ckeditor::Orm::Mongoid::AssetBase
-
-  attr_accessible :data, :assetable_type, :assetable_id, :assetable
-end