glebtv-ckeditor 4.5.10.1 → 4.5.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aedbedce984ba1cd48756ae9beddab7319538b2b
-  data.tar.gz: da7f8b87b067a89cdeec278527a00a7ba3f81016
+  metadata.gz: d03c2e2c7f96737cad68a285e1f784078c30f5fc
+  data.tar.gz: 01caec07d8f358f80cacb4b59c84bd4b535de061
 SHA512:
-  metadata.gz: 86ab7febdff6c5d6d8889b3217fa4ba9173e89e85aff6d816f417b2cd129a28c3fb462b3acce6439b51b3582d42c6b18ef9e60031737ff319010b1e7aeb99352
-  data.tar.gz: 58448bd350ef02edd73b11f24396fd7a937d647de3a8d310a2c8d78110e944340084f60e8600619d2595072909eb87aafb7fc44c04db28b72d2f371204821cbd
+  metadata.gz: dbd6dd35ea3b3414de47799990a8a2e3ab6e77637f3ff53053f562287ca6fa08d8658b14c64fbdeba8fb60b69613dd9f48af31e651454bb808e18fb9c7b80044
+  data.tar.gz: 8a025d64952c1253662424990fc33f3eb0607739b104bdf718b34e5afdbcf3c0d8ab4d204a14e8e9512e216d5ac70d1198cae096eee161bdaa62fb8b6a06a1c4

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "4.2.4"
+gem "rails", "4.2.7.1"
 
 platforms :mri_18 do
   group :test do
@@ -15,13 +15,13 @@ platforms :ruby do
   gem "sqlite3"
 
   group :development do
-    gem "unicorn", "~> 4.0.1"
+    gem "unicorn"
   end
 
   group :development, :test do
-    gem 'jquery-rails', '~> 4.0.4'
-    gem "capybara", ">= 0.4.0"
-    gem "mynyml-redgreen", "~> 0.7.1", :require => 'redgreen'
+    gem 'jquery-rails'
+    gem "capybara"
+    gem "mynyml-redgreen", :require => 'redgreen'
   end
 
   group :active_record do

data/app/controllers/ckeditor/attachment_files_controller.rb

@@ -16,6 +16,7 @@ class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
   end
 
   def destroy
+    return false unless Ckeditor.can_delete
     @attachment.destroy
 
     respond_to do |format|

data/app/controllers/ckeditor/pictures_controller.rb

@@ -16,6 +16,8 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
   end
 
   def destroy
+    return false unless Ckeditor.can_delete
+
     @picture.destroy
 
     respond_to do |format|

data/app/views/ckeditor/shared/_asset.html.erb

@@ -1,4 +1,5 @@
 <%= content_tag(:div, :id => dom_id(asset), :class => "gal-item", :"data-url" => image_path(asset.url_content)) do %>
+  <% if Ckeditor.can_delete then %>
   <%= link_to image_tag('ckeditor/filebrowser/images/gal_del.png',
     :title => I18n.t('ckeditor.buttons.delete')),
           polymorphic_path(asset, :format => :json),
@@ -6,6 +7,7 @@
           :method => :delete, 
           :data => {:confirm => t('ckeditor.confirm_delete')},
           :class => "fileupload-cancel gal-del" %>
+  <% end %>
 	
 	<div class="fileupload-file gal-inner-holder">
 		<div class="img"><%= image_tag(asset.url_thumb, :title => asset.filename) %></div>

data/app/views/ckeditor/shared/_asset_tmpl.html.erb

@@ -1,5 +1,6 @@
 <script id="fileupload_tmpl" type="text/x-jquery-tmpl">
 <div id="asset_${id}" class="gal-item" data-url="${url_content}">
+  <% if Ckeditor.can_delete then %>
   <%= link_to image_tag('ckeditor/filebrowser/images/gal_del.png',
     :title => I18n.t('ckeditor.buttons.delete')), 
           "/ckeditor/${controller}/${id}.json", 
@@ -7,6 +8,7 @@
           :method => :delete, 
           :data => {:confirm => t('ckeditor.confirm_delete')},
           :class => "fileupload-cancel gal-del" %>
+  <% end %>
 	
 	<div class="fileupload-file gal-inner-holder">
 		<div class="img"><img src="${url_thumb}" title="${filename}"></div>

data/lib/ckeditor.rb

@@ -38,6 +38,9 @@ module Ckeditor
     request.env["warden"].try(:user) || respond_to?(:current_user) && current_user
   end
 
+  mattr_accessor :can_delete
+  @@can_delete = true
+
   # Allowed image file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :image_file_types
@@ -120,7 +123,10 @@ module Ckeditor
     @@assets ||= if Ckeditor.cdn_enabled?
       ["ckeditor/config.js"]
     else
-      Utils.select_assets("ckeditor", "vendor/assets/javascripts") << "ckeditor/init.js"
+      assets = Utils.select_assets("ckeditor", "vendor/assets/javascripts")
+      assets << "ckeditor/init.js"
+      assets << 'ckeditor/filebrowser/images/gal_del.png'
+      assets
     end
   end
 
@@ -235,4 +241,4 @@ require 'ckeditor/version'
 
 if Object.const_defined?("RailsAdmin")
   require "ckeditor/rails_admin/field"
-end
+end

data/lib/ckeditor/backend/paperclip.rb

@@ -9,7 +9,7 @@ module Ckeditor
       module ClassMethods
         def self.extended(base)
           base.class_eval do
-            before_validation :extract_content_type
+            # before_validation :extract_content_type
             before_create :read_dimensions, :parameterize_filename
 
             delegate :url, :path, :styles, :size, :content_type, :to => :data

data/lib/ckeditor/version.rb

@@ -1,6 +1,6 @@
 module Ckeditor
   module Version
-    GEM = "4.5.10.1".freeze
+    GEM = "4.5.10.2".freeze
     EDITOR = "4.5.10".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-ckeditor
 version: !ruby/object:Gem::Version
-  version: 4.5.10.1
+  version: 4.5.10.2
 platform: ruby
 authors:
 - glebtv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
@@ -568,61 +568,61 @@ signing_key:
 specification_version: 4
 summary: Rails gem for easy integration ckeditor in your application
 test_files:
-- test/generators/install_generator_test.rb
+- test/integration/navigation_test.rb
 - test/support/helpers.rb
-- test/support/integration_case.rb
 - test/support/raw_post.rb
+- test/support/integration_case.rb
 - test/support/routes.txt
+- test/test_helper.rb
+- test/functional/posts_controller_test.rb
 - test/controllers/attachment_files_controller_test.rb
 - test/controllers/pictures_controller_test.rb
-- test/functional/posts_controller_test.rb
-- test/orm/mongoid.rb
 - test/orm/active_record.rb
-- test/dummy/config.ru
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/script/rails
-- test/dummy/test/fixtures/files/rails.png
-- test/dummy/test/fixtures/files/rails.tar.gz
+- test/orm/mongoid.rb
+- test/models/ckeditor_test.rb
+- test/models/picture_test.rb
+- test/models/attachment_file_test.rb
+- test/models/utils_test.rb
+- test/dummy/Rakefile
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/stylesheets/scaffold.css
+- test/dummy/app/controllers/posts_controller.rb
+- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/posts/edit.html.erb
-- test/dummy/app/views/posts/new.html.erb
-- test/dummy/app/views/posts/show.html.erb
 - test/dummy/app/views/posts/_form.html.erb
+- test/dummy/app/views/posts/show.html.erb
+- test/dummy/app/views/posts/edit.html.erb
 - test/dummy/app/views/posts/index.html.erb
-- test/dummy/app/assets/stylesheets/scaffold.css
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/helpers/posts_helper.rb
+- test/dummy/app/views/posts/new.html.erb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/posts_controller.rb
+- test/dummy/app/helpers/posts_helper.rb
 - test/dummy/app/models/post.rb
-- test/dummy/db/migrate/20110623120047_create_posts.rb
-- test/dummy/Rakefile
+- test/dummy/script/rails
 - test/dummy/config/locales/en.yml
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/secrets.yml
+- test/dummy/config/database.yml
+- test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/ckeditor.rb
 - test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/ckeditor.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/boot.rb
 - test/dummy/config/mongoid.yml
-- test/dummy/config/database.yml
-- test/dummy/config/application.rb
+- test/dummy/config/routes.rb
 - test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/models/utils_test.rb
-- test/models/picture_test.rb
-- test/models/attachment_file_test.rb
-- test/models/ckeditor_test.rb
-- test/test_helper.rb
-- test/integration/navigation_test.rb
+- test/dummy/config.ru
+- test/dummy/public/500.html
+- test/dummy/public/422.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/404.html
+- test/dummy/test/fixtures/files/rails.png
+- test/dummy/test/fixtures/files/rails.tar.gz
+- test/dummy/db/migrate/20110623120047_create_posts.rb
+- test/generators/install_generator_test.rb