effective_regions 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1263b1785b74028263bd269c6b95e9f26511d591
-  data.tar.gz: b93fa090047b7886802717433b1a45360cca8875
+  metadata.gz: 0c2c1cb3c431ab51a22dd198cd4b72f8768937cf
+  data.tar.gz: 1fb2b99f024b3406fecbafd4e0a9901cefb044da
 SHA512:
-  metadata.gz: 54df70cae26e612b314fc31484ac227dd5b916a76e6f8e6770eee9a3092109e504b223f2f8a0b700571b45ff85002af96f70cb8a4809b1a417064fe1a93d5d0d
-  data.tar.gz: 5c1819a50d38f706fae8ece1643677bb493ea03def2e468eaaaac9e22965f85875c833fab6ab59b2122608c0a4c4b8541816993b2c623eee1f00db4a3402e1ce
+  metadata.gz: 835fa67a7173a4aef9970b8c81004ae719bc711a7f0c5bdc458783fa1355100f01b96d91d3da8a20da4a6fff19e44338b58e0aaf47ff4b3dfbc22a50cb794647
+  data.tar.gz: 2b29c1d3c256c04ee3abc043aa9b2e310146f19787c49c5a12f17459f65b4b6840824d5a52f21cfb5c9667f1c787211b8118f93c741e036bbd2712cb5becf147

data/app/assets/javascripts/ck_assets.js.coffee

@@ -0,0 +1,27 @@
+getCkEditorFuncNum = ->
+  reParam = new RegExp( '(?:[\?&]|&)' + 'CKEditorFuncNum' + '=([^&]+)', 'i' )
+  match = window.location.search.match(reParam)
+
+  if match && match.length > 0
+    match[1]
+
+$(document).on 'click', 'a[data-insert-ck-asset]', (event) ->
+  ckeditor = getCkEditorFuncNum()
+
+  if ckeditor && window.opener && window.opener.CKEDITOR
+    event.preventDefault()
+
+    attachment = $(event.currentTarget)
+
+    url = attachment.attr('href') || attachment.attr('src')
+    alt = attachment.attr('alt') || ''
+
+    window.opener.CKEDITOR.tools.callFunction(ckeditor, url, ->
+      dialog = this.getDialog()
+
+      if dialog && dialog.getName() == 'image2'
+        dialog.getContentElement('info', 'alt').setValue(alt)
+    )
+
+    window.close()
+

data/app/assets/stylesheets/ck_assets.scss

@@ -0,0 +1,3 @@
+body {
+  padding: 10px;
+}

data/app/controllers/effective/ck_assets_controller.rb

@@ -0,0 +1,15 @@
+module Effective
+  class CkAssetsController < ApplicationController
+    layout false
+
+    include Effective::CrudController
+
+    resource_scope -> { Effective::CkAsset.all.with_attached_files }
+
+    def permitted_params
+      params.require(:effective_ck_asset).permit!
+    end
+
+  end
+end
+

data/app/controllers/effective/regions_controller.rb

@@ -14,7 +14,7 @@ module Effective
     skip_log_page_views quiet: true, only: [:snippet] if defined?(EffectiveLogging)
 
     def edit
-      EffectiveRegions.authorized?(self, :edit, Effective::Region.new())
+      EffectiveRegions.authorize!(self, :edit, Effective::Region.new)
 
       cookies['effective_regions_editting'] = {:value => params[:exit].presence || request.referrer, :path => '/'}
 
@@ -76,7 +76,7 @@ module Effective
     end
 
     def snippet # This is a GET.  CKEDITOR passes us data, we need to render the non-editable content
-      EffectiveRegions.authorized?(self, :edit, Effective::Region.new())
+      EffectiveRegions.authorize!(self, :edit, Effective::Region.new)
 
       klass = "Effective::Snippets::#{region_params[:name].try(:classify)}".safe_constantize
 

data/app/models/effective/ck_asset.rb

@@ -0,0 +1,25 @@
+# This object just holds an asset file
+# There is a single `global` ck asset in which we use for the ckeditor uploads form
+
+module Effective
+  class CkAsset < ActiveRecord::Base
+    self.table_name = EffectiveRegions.ck_assets_table_name.to_s
+
+    # Only the global one
+    has_many_attached :files
+
+    # The instance ones will have just one file
+    has_one_attached :file
+
+    # Attributes
+    # global     :boolean
+
+    def self.global
+      CkAsset.where(global: true).first || CkAsset.create!(global: true)
+    end
+  end
+end
+
+
+
+

data/app/models/effective/snippets/current_date_time.rb

@@ -1,7 +1,10 @@
 module Effective
   module Snippets
     class CurrentDateTime < Snippet
-      attribute :format, String
+
+      def snippet_attributes
+        super + [:format]
+      end
 
       def snippet_tag
         :span

data/app/models/effective/snippets/current_user_info.rb

@@ -1,7 +1,10 @@
 module Effective
   module Snippets
     class CurrentUserInfo < Snippet
-      attribute :method, String
+
+      def snippet_attributes
+        super + [:method]
+      end
 
       def snippet_tag
         :span

data/app/models/effective/snippets/snippet.rb

@@ -1,18 +1,17 @@
-require 'virtus'
-
 module Effective
   module Snippets
     class Snippet
-      include Virtus.model
-
       # SO I have to add some restrictions on how snippets are built:
 
       # Each Snippet has to be a block (or inline) element with nested children.
       # It has to start with a root object
       # That root object has to do {snippet_data(snippet)}
+      #attr_accessor :id       # This will be snippet_12345
+      #attr_accessor :region   # The region Object
 
-      attribute :id, String # This will be snippet_12345
-      attribute :region, Effective::Region # The region Object
+      def snippet_attributes
+        [:id, :region]
+      end
 
       # This is going to return all snippet objects that are saved in any Effective::Regions
       def self.all(type = nil)
@@ -59,15 +58,20 @@ module Effective
       # And it will be assigned when the effective_region is rendered
 
       def initialize(atts = {})
+        snippet_attributes.each { |name| self.class.send(:attr_accessor, name) }
         (atts || {}).each { |k, v| self.send("#{k}=", v) if respond_to?("#{k}=") }
       end
 
       def id
-        super.presence || "snippet_#{object_id}"
+        @id || "snippet_#{object_id}"
+      end
+
+      def region
+        @region || Effective::Region.new
       end
 
       def data
-        self.attributes.reject { |k, v| [:region, :id].include?(k) }
+        (self.snippet_attributes - [:region, :id]).inject({}) { |h, name| h[name] = public_send(name); h}
       end
 
       def to_partial_path

data/app/views/effective/ck_assets/_form.html.haml

@@ -0,0 +1,7 @@
+= effective_form_with(model: ck_asset, url: effective_regions.ck_asset_path(ck_asset), remote: true) do |f|
+  = f.hidden_field :id
+
+  = f.file_field :files, label: 'Upload file', attachments_style: :ck_assets, click_submit: true
+
+  = f.save 'Save', style: 'display: none;'
+

data/app/views/effective/ck_assets/index.html.haml

@@ -0,0 +1,19 @@
+!!!
+%html
+  %head
+    %title Insert / Upload
+    %meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge,chrome=1'}
+    %meta{:charset => 'utf-8'}
+    %meta{:name => 'viewport', :content => 'width=device-width, initial-scale=1, maximum-scale=1'}
+
+    = javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js'
+    = javascript_include_tag 'application'
+    = stylesheet_link_tag 'application'
+
+    = javascript_include_tag 'ck_assets'
+    = stylesheet_link_tag 'ck_assets'
+    
+    = csrf_meta_tags
+
+  %body
+    = render 'effective/ck_assets/form', ck_asset: Effective::CkAsset.global

data/config/effective_regions.rb

@@ -1,5 +1,6 @@
 EffectiveRegions.setup do |config|
   config.regions_table_name = :regions
+  config.ck_assets_table_name = :ck_assets
 
   # Authorization Method
   #

data/config/routes.rb

@@ -6,6 +6,8 @@ EffectiveRegions::Engine.routes.draw do
   scope :module => 'effective' do
     scope '/effective' do
       get 'snippet/:id' => 'regions#snippet', :as => :snippet # Get a Snippet based on passed values
+      
+      resources :ck_assets, only: [:index, :update] # Ckeditor IFrame
     end
 
     scope '/edit' do  # Changing this, means changing the effective_ckeditor routes

data/db/migrate/01_create_effective_regions.rb.erb

@@ -12,6 +12,13 @@ class CreateEffectiveRegions < ActiveRecord::Migration[4.2]
       t.datetime :created_at
     end
 
+    create_table <%= @ck_assets_table_name %> do |t|
+      t.boolean :global, default: false
+
+      t.datetime :updated_at
+      t.datetime :created_at
+    end
+
     add_index <%= @regions_table_name %>, [:regionable_type, :regionable_id]
     add_index <%= @regions_table_name %>, :regionable_id
   end

data/lib/effective_regions.rb

@@ -1,10 +1,11 @@
-require 'virtus'
 require 'effective_ckeditor'
 require 'effective_regions/engine'
 require 'effective_regions/version'
 
 module EffectiveRegions
   mattr_accessor :regions_table_name
+  mattr_accessor :ck_assets_table_name
+
   mattr_accessor :authorization_method
   mattr_accessor :before_save_method
 
@@ -13,10 +14,20 @@ module EffectiveRegions
   end
 
   def self.authorized?(controller, action, resource)
-    if authorization_method.respond_to?(:call) || authorization_method.kind_of?(Symbol)
-      raise Effective::AccessDenied.new() unless (controller || self).instance_exec(controller, action, resource, &authorization_method)
+    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
+
+    return !!authorization_method unless authorization_method.respond_to?(:call)
+    controller = controller.controller if controller.respond_to?(:controller)
+
+    begin
+      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
+    rescue *@_exceptions
+      false
     end
-    true
+  end
+
+  def self.authorize!(controller, action, resource)
+    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
   end
 
   # Returns a Snippet.new() for every class in the /app/effective/snippets/* directory

data/lib/effective_regions/engine.rb

@@ -23,5 +23,9 @@ module EffectiveRegions
       eval File.read("#{config.root}/config/effective_regions.rb")
     end
 
+    initializer "effective_regions.append_precompiled_assets" do |app|
+      Rails.application.config.assets.precompile += ['ck_assets.js', 'ck_assets.css']
+    end
+
   end
 end

data/lib/effective_regions/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRegions
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.8.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_regions
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Code and Effect
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: virtus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Create editable content regions within your existing, ordinary ActionView::Base
   views, and update content with an actually-good full-screen WYSIWYG editor.
 email:
@@ -64,13 +50,17 @@ files:
 - README.md
 - Rakefile
 - app/assets/images/effective/templates/image_and_title.png
+- app/assets/javascripts/ck_assets.js.coffee
 - app/assets/javascripts/effective/snippets/current_date_time.js.coffee
 - app/assets/javascripts/effective/snippets/current_user_info.js.coffee
+- app/assets/stylesheets/ck_assets.scss
+- app/controllers/effective/ck_assets_controller.rb
 - app/controllers/effective/regions_controller.rb
 - app/helpers/effective_regions_controller_helper.rb
 - app/helpers/effective_regions_helper.rb
 - app/models/concerns/acts_as_regionable.rb
 - app/models/effective/access_denied.rb
+- app/models/effective/ck_asset.rb
 - app/models/effective/region.rb
 - app/models/effective/snippets/current_date_time.rb
 - app/models/effective/snippets/current_user_info.rb
@@ -79,6 +69,8 @@ files:
 - app/models/effective/templates/template.rb
 - app/models/effective/templates/three_column.rb
 - app/models/effective/templates/two_column.rb
+- app/views/effective/ck_assets/_form.html.haml
+- app/views/effective/ck_assets/index.html.haml
 - app/views/effective/snippets/_current_date_time.html.haml
 - app/views/effective/snippets/_current_user_info.html.haml
 - app/views/effective/templates/_image_and_title.html.haml