ckeditor 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e6854dce0b3eb7355ecf0fa909dd27b6ea5fa7c52b6d122ab6b262e63d63ba6
-  data.tar.gz: 98cf81374848b5b8d0f28fb48169097a347585139a51bb4630690c4d80e5625b
+  metadata.gz: b71ac2d1ebfd0eb53c8e24472f22e603c41c3ae8fc5958e44664211ee8e2b6ed
+  data.tar.gz: 8dd8a0c4681b5c76baf6a09d7c4a71426e7fedd9dd5c10e9623af7bd9d4a567d
 SHA512:
-  metadata.gz: a9fc827bcd8bea3e06f17514cfcf84b2b6e3e2d7667c4397f15839825c2e3afe87d8bb7a703e5d80f04557ab49f663883532191c8ac6e657f7d7aa60b3ba9209
-  data.tar.gz: 3fad2f11aabbc60b63d9995e3c6e4adea4bff67a1432deb6b55190b92dfb92608754806bc186776b46297013d374a7a9b021f829877f46e02974c778c7fd966f
+  metadata.gz: a609bce33d5a52dfab3d630681ffe9f84cf58f39a1fc219606030f9a618a416ba620f9958345afab23cb76e79958ca4c7c3e8aa5cf3a8c1f701d856491b2cf30
+  data.tar.gz: d2ebba5c7fe3716a65e4af6595da206f52bdee4913fb6ca961d3ae3dcfb5d838664b86067f1dbb265dbe889c4817a15a78624e93e9b2b9bdf5b63f5858830d87

data/Gemfile

@@ -4,17 +4,20 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 5.2.x'
+gem 'rails', '~> 5.2.4.6'
 
 platforms :ruby do
   gem 'sass'
   gem 'sqlite3', '~> 1.3.6'
+  gem 'sprockets', '~> 3.7.2'
 
   group :development, :test do
     gem 'capybara', '>= 0.4.0'
     gem 'jquery-rails', '~> 4.3.3'
     gem 'mynyml-redgreen', '~> 0.7.1', require: 'redgreen'
     gem 'rails-controller-testing'
+
+    gem 'rubocop-rails'
   end
 
   group :active_record do

data/README.md

@@ -274,26 +274,27 @@ can [:read, :create, :destroy], Ckeditor::Picture
 can [:read, :create, :destroy], Ckeditor::AttachmentFile
 ```
 
-### Pundit integration
+### Pundit or Action Policy Integration
 
+Setup Pundit and Action Policy similar.
 Just like CanCanCan, you can write this code in your config/initializers/ckeditor.rb file:
 
 ```ruby
 Ckeditor.setup do |config|
-  config.authorize_with :pundit
+  config.authorize_with :pundit # or :action_policy
 end
 ```
 
 Then, generate the policy files for model **Picture** and **AttachmentFile**
 
 ```
-$ rails g ckeditor:pundit_policy
+$ rails g ckeditor:pundit_policy # or ckeditor:action_policy
 ```
 By this command, you will got two files:
 > app/policies/ckeditor/picture_policy.rb
 app/policies/ckeditor/attachment_file_policy.rb
 
-By default, only the user that logged in can access the models (with actions *index* and *create*) and only the owner of the asset can **destroy** the resource.
+By default, only the user that logged in can access the models.
 
 You can customize these two policy files as you like.
 

data/Rakefile

@@ -9,9 +9,10 @@ end
 
 require 'rake'
 require 'rdoc/task'
-
 require 'rake/testtask'
 
+require 'bundler/gem_tasks'
+
 task default: :test
 
 Rake::TestTask.new(:test) do |t|

data/app/views/ckeditor/attachment_files/index.html.erb

@@ -6,7 +6,7 @@
   </div>
 
   <div class="fileupload-list">
-    <%= render partial: 'ckeditor/shared/asset', collection: @attachments %>
+    <%= render partial: 'ckeditor/shared/asset', collection: @attachments.scoped %>
   </div>
 
   <% unless @attachments.last_page? %>

data/lib/ckeditor/helpers/controllers.rb

@@ -3,8 +3,6 @@
 module Ckeditor
   module Helpers
     module Controllers
-      extend ActiveSupport::Concern
-
       protected
 
       def ckeditor_current_user

data/lib/ckeditor/helpers/form_builder.rb

@@ -3,8 +3,6 @@
 module Ckeditor
   module Helpers
     module FormBuilder
-      extend ActiveSupport::Concern
-
       def cktext_area(method, options = {})
         @template.cktext_area(@object_name, method, objectify_options(options))
       end

data/lib/ckeditor/helpers/form_helper.rb

@@ -3,8 +3,6 @@
 module Ckeditor
   module Helpers
     module FormHelper
-      extend ActiveSupport::Concern
-
       def cktext_area(object_name, method, options = {})
         TextArea.new(self, options).render_instance_tag(object_name, method)
       end

data/lib/ckeditor/helpers/view_helper.rb

@@ -3,8 +3,6 @@
 module Ckeditor
   module Helpers
     module ViewHelper
-      extend ActiveSupport::Concern
-
       def cktext_area_tag(name, content = nil, options = {})
         TextArea.new(self, options).render_tag(name, content)
       end

data/lib/ckeditor/hooks/action_policy.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'action_policy'
+
+module Ckeditor
+  module Hooks
+    # This adapter is for the Action Policy[https://github.com/palkan/action_policy] authorization library.
+    # You can create another adapter for different authorization behavior, just be certain it
+    # responds to each of the public methods here.
+    class ActionPolicyAuthorization
+      include Ckeditor::Helpers::Controllers
+
+      # See the +authorize_with+ config method for where the initialization happens.
+      def initialize(controller)
+        @controller = controller
+      end
+
+      # This method is called in every controller action and should raise an exception
+      # when the authorization fails. The first argument is the name of the controller
+      # action as a symbol (:create, :destroy, etc.). The second argument is the actual model
+      # instance if it is available.
+      def authorize(_action, model_object = nil)
+        @controller.authorize!(model_object, context: {user: @controller.ckeditor_current_user})
+      end
+
+      # This method is called primarily from the view to determine whether the given user
+      # has access to perform the action on a given model. It should return true when authorized.
+      # This takes the same arguments as +authorize+. The difference is that this will
+      # return a boolean whereas +authorize+ will raise an exception when not authorized.
+      def authorized?(action, model_object = nil)
+        if action
+          @controller.allowed_to?(:"#{action}?",
+                                  model_object,
+                                  context: {user: @controller.ckeditor_current_user})
+        end
+      end
+    end
+  end
+end
+
+Ckeditor::AUTHORIZATION_ADAPTERS[:action_policy] = Ckeditor::Hooks::ActionPolicyAuthorization

data/lib/ckeditor/rails.rb

@@ -26,6 +26,7 @@ module Ckeditor
 
       require 'ckeditor/hooks/cancan' if Object.const_defined?('CanCan')
       require 'ckeditor/hooks/pundit' if Object.const_defined?('Pundit')
+      require 'ckeditor/hooks/action_policy' if Object.const_defined?('ActionPolicy')
     end
 
     rake_tasks do

data/lib/ckeditor/text_area.rb

@@ -42,7 +42,7 @@ module Ckeditor
     end
 
     def output_buffer
-      @output_buffer ||= ActiveSupport::SafeBuffer.new
+      @output_buffer ||= ActionView::OutputBuffer.new
     end
 
     def build_tag(object_name, method)

data/lib/ckeditor/version.rb

@@ -2,7 +2,7 @@
 
 module Ckeditor
   module Version
-    GEM = '5.1.0'
+    GEM = '5.1.1'
     EDITOR = '4.11.3'
   end
 end

data/lib/ckeditor.rb

@@ -21,6 +21,7 @@ module Ckeditor
     autoload :SimpleFormBuilder, 'ckeditor/hooks/simple_form'
     autoload :CanCanAuthorization, 'ckeditor/hooks/cancan'
     autoload :PunditAuthorization, 'ckeditor/hooks/pundit'
+    autoload :ActionPolicyAuthorization, 'ckeditor/hooks/action_policy'
   end
 
   module Backend

data/lib/generators/ckeditor/action_policy_generator.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+
+module Ckeditor
+  module Generators
+    class ActionPolicyGenerator < Rails::Generators::Base
+      desc 'Generates policy files for Action Policy'
+
+      def self.source_root
+        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end
+
+      # copy configuration
+      def copy_policy_files
+        [:picture, :attachment_file].each do |model_name|
+          template "action_policy/#{model_name}_policy.rb", "app/policies/ckeditor/#{model_name}_policy.rb"
+        end
+      end
+    end
+  end
+end

data/lib/generators/ckeditor/templates/action_policy/attachment_file_policy.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Ckeditor::AttachmentFilePolicy < ApplicationPolicy
+  # See https://actionpolicy.evilmartians.io/#/writing_policies
+  #
+
+  def index?
+    user.present?
+  end
+
+  def create?
+    user.present?
+  end
+
+  def destroy?
+    user.present?
+  end
+end

data/lib/generators/ckeditor/templates/action_policy/picture_policy.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Ckeditor::PicturePolicy < ApplicationPolicy
+  # See https://actionpolicy.evilmartians.io/#/writing_policies
+  #
+
+  def index?
+    user.present?
+  end
+
+  def create?
+    user.present?
+  end
+
+  def destroy?
+    user.present?
+  end
+end