ckeditor 3.6.0.pre → 3.6.0

data/test/generators/install_generator_test.rb

@@ -6,13 +6,20 @@ class InstallGeneratorTest < Rails::Generators::TestCase
   setup :prepare_destination
 
   test "Assert all files are properly created" do
-    run_generator
-    
-    assert_file "config/initializers/ckeditor.rb"
+    run_generator %w(--orm=active_record)
+
+    assert_file "config/initializers/ckeditor.rb", /require "ckeditor\/orm\/active_record"/
+
     assert_file "tmp/ckeditor_#{Ckeditor::Version::EDITOR}.tar.gz"
-    
+
     ["rails.js", "jquery.js", "fileuploader.js", "jquery.tmpl.js"].each do |file|
       assert_file "public/javascripts/ckeditor/filebrowser/javascripts/#{file}"
     end
   end
+
+  test "Assert configurator is valid for mongoid" do
+    run_generator %w(--orm=mongoid)
+
+    assert_file "config/initializers/ckeditor.rb", /require "ckeditor\/orm\/mongoid"/
+  end
 end

data/test/generators/models_generator_test.rb

@@ -7,15 +7,25 @@ class ModelsGeneratorTest < Rails::Generators::TestCase
 
   test "models and migration for active_record orm" do
     run_generator %w(--orm=active_record)
-    
+
     assert_file "app/models/ckeditor/asset.rb"
     assert_file "app/models/ckeditor/picture.rb"
     assert_file "app/models/ckeditor/attachment_file.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" do
+    run_generator %w(--orm=mongoid)
+
+    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
 end

data/test/orm/active_record.rb

@@ -0,0 +1 @@
+ActiveRecord::Migrator.migrate(File.expand_path("../../dummy/db/migrate/", __FILE__))

data/test/orm/mongoid.rb

@@ -0,0 +1,6 @@
+class ActiveSupport::TestCase
+  setup do
+    Post.delete_all
+    Ckeditor::Asset.delete_all
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,8 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
+CKEDITOR_ORM = (ENV["CKEDITOR_ORM"] || :active_record).to_sym
+
+puts "\n==> Ckeditor.orm = #{CKEDITOR_ORM.inspect}. You can change orm in environment variable CKEDITOR_ORM"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
@@ -16,8 +19,8 @@ require "capybara/rails"
 Capybara.default_driver   = :rack_test
 Capybara.default_selector = :css
 
-# Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+# Run specific orm operations
+require "orm/#{CKEDITOR_ORM}"
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

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

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

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

@@ -1,15 +1,15 @@
 class Ckeditor::AttachmentFile < Ckeditor::Asset
-  has_attached_file :data,
-                    :url => "/ckeditor_assets/attachments/:id/:filename",
-                    :path => ":rails_root/public/ckeditor_assets/attachments/:id/:filename"
-  
+  has_mongoid_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
   validates_attachment_presence :data
-	
-	def url_thumb
-	  @url_thumb ||= begin
-	    extname = File.extname(filename).gsub(/^\./, '')
-      "/javascripts/ckeditor/filebrowser/images/thumbs/#{extname}.gif"
-	  end
-	end
+
+  def url_thumb
+    @url_thumb ||= begin
+                     extname = File.extname(filename).gsub(/^\./, '')
+                     "/javascripts/ckeditor/filebrowser/images/thumbs/#{extname}.gif"
+                   end
+  end
 end

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

@@ -1,13 +1,13 @@
 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 => '800>', :thumb => '118x100#' }
-	
-	validates_attachment_size :data, :less_than => 2.megabytes
-	validates_attachment_presence :data
-	
-	def url_content
-	  url(:content)
-	end
+  has_mongoid_attached_file :data,
+                            :url  => "/ckeditor_assets/pictures/:id/:style_:basename.:extension",
+                            :path => ":rails_root/public/ckeditor_assets/pictures/:id/:style_:basename.:extension",
+                            :styles => { :content => '800>', :thumb => '118x100#' }
+
+  validates_attachment_size :data, :less_than => 2.megabytes
+  validates_attachment_presence :data
+
+  def url_content
+    url(:content)
+  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ckeditor
 version: !ruby/object:Gem::Version 
-  hash: 961915972
-  prerelease: 6
+  hash: 31
+  prerelease: 
   segments: 
   - 3
   - 6
   - 0
-  - pre
-  version: 3.6.0.pre
+  version: 3.6.0
 platform: ruby
 authors: 
 - Igor Galeta
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 +03:00
+date: 2011-07-29 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +76,7 @@ files:
 - lib/ckeditor/hooks/formtastic.rb
 - lib/ckeditor/http.rb
 - lib/ckeditor/orm/active_record.rb
+- lib/ckeditor/orm/mongoid.rb
 - lib/ckeditor/version.rb
 - lib/generators/ckeditor/models_generator.rb
 - lib/generators/ckeditor/install_generator.rb
@@ -106,10 +106,13 @@ 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/active_record/attachment_file.rb
-- lib/generators/ckeditor/templates/models/active_record/asset.rb
+- 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/active_record/picture.rb
 - lib/generators/ckeditor/templates/ckeditor.rb
 - lib/ckeditor.rb
 - config/routes.rb
@@ -143,9 +146,6 @@ files:
 - test/dummy/app/views/posts/index.html.erb
 - test/dummy/app/helpers/posts_helper.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/ckeditor/attachment_file.rb
-- test/dummy/app/models/ckeditor/asset.rb
-- test/dummy/app/models/ckeditor/picture.rb
 - test/dummy/app/models/post.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/posts_controller.rb
@@ -157,6 +157,7 @@ files:
 - test/dummy/test/fixtures/files/rails.png
 - test/dummy/test/fixtures/files/rails.tar.gz
 - test/dummy/script/rails
+- test/dummy/config/mongoid.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
@@ -175,13 +176,15 @@ files:
 - test/dummy/db/migrate/20110623120047_create_posts.rb
 - test/dummy/db/migrate/20110705195648_create_ckeditor_assets.rb
 - test/dummy/db/schema.rb
+- test/dummy/db/test.sqlite3
 - test/dummy/config.ru
 - test/tmp/app/models/ckeditor/attachment_file.rb
 - test/tmp/app/models/ckeditor/asset.rb
 - test/tmp/app/models/ckeditor/picture.rb
-- test/tmp/db/migrate/20110711170413_create_ckeditor_assets.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
+- test/orm/active_record.rb
+- test/orm/mongoid.rb
 - test/controllers/pictures_controller_test.rb
 - test/controllers/attachment_files_controller_test.rb
 - test/ckeditor_test.rb
@@ -207,14 +210,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: ckeditor
@@ -246,9 +247,6 @@ test_files:
 - test/dummy/app/views/posts/index.html.erb
 - test/dummy/app/helpers/posts_helper.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/ckeditor/attachment_file.rb
-- test/dummy/app/models/ckeditor/asset.rb
-- test/dummy/app/models/ckeditor/picture.rb
 - test/dummy/app/models/post.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/posts_controller.rb
@@ -260,6 +258,7 @@ test_files:
 - test/dummy/test/fixtures/files/rails.png
 - test/dummy/test/fixtures/files/rails.tar.gz
 - test/dummy/script/rails
+- test/dummy/config/mongoid.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
@@ -278,13 +277,15 @@ test_files:
 - test/dummy/db/migrate/20110623120047_create_posts.rb
 - test/dummy/db/migrate/20110705195648_create_ckeditor_assets.rb
 - test/dummy/db/schema.rb
+- test/dummy/db/test.sqlite3
 - test/dummy/config.ru
 - test/tmp/app/models/ckeditor/attachment_file.rb
 - test/tmp/app/models/ckeditor/asset.rb
 - test/tmp/app/models/ckeditor/picture.rb
-- test/tmp/db/migrate/20110711170413_create_ckeditor_assets.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
+- test/orm/active_record.rb
+- test/orm/mongoid.rb
 - test/controllers/pictures_controller_test.rb
 - test/controllers/attachment_files_controller_test.rb
 - test/ckeditor_test.rb

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

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

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

@@ -1,15 +0,0 @@
-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
-  validates_attachment_presence :data
-	
-	def url_thumb
-	  @url_thumb ||= begin
-	    extname = File.extname(filename).gsub(/^\./, '')
-      "/javascripts/ckeditor/filebrowser/images/thumbs/#{extname}.gif"
-	  end
-	end
-end

data/test/dummy/app/models/ckeditor/picture.rb

@@ -1,13 +0,0 @@
-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 => '800>', :thumb => '118x100#' }
-	
-	validates_attachment_size :data, :less_than => 2.megabytes
-	validates_attachment_presence :data
-	
-	def url_content
-	  url(:content)
-	end
-end

data/test/tmp/db/migrate/20110711170413_create_ckeditor_assets.rb

@@ -1,26 +0,0 @@
-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 => 30
-		  
-      # 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_ckeditor_assetable_type"
-		add_index "ckeditor_assets", ["assetable_type", "assetable_id"], :name => "idx_ckeditor_assetable"
-  end
-
-  def self.down
-    drop_table :ckeditor_assets
-  end
-end