effective_regions 1.7.6 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: bf541eef8c3a489df97f8a3cb9e532a1256211d5608cbae9504b979cc1fc13ab
-  data.tar.gz: 3f79cb16aa0bd86ba62ac02fb3e04f209f4ec769f251621718d256664f5aa0ed
+SHA1:
+  metadata.gz: 1263b1785b74028263bd269c6b95e9f26511d591
+  data.tar.gz: b93fa090047b7886802717433b1a45360cca8875
 SHA512:
-  metadata.gz: f30d24e871fcdb8e377c58d5c15ac23f32de61146f96f65a16d17b956259ad2487c19edb32a0ac2194e8f8748c13914487e293a500513061c991376a6a6d4090
-  data.tar.gz: c367543c70c201d9ec73206ba251c98e2955f05a58099cf41fd53aca04bf1c0a2988629995067619e7e4142603d776beab3d6e4e2befac9f9ad07396b0878224
+  metadata.gz: 54df70cae26e612b314fc31484ac227dd5b916a76e6f8e6770eee9a3092109e504b223f2f8a0b700571b45ff85002af96f70cb8a4809b1a417064fe1a93d5d0d
+  data.tar.gz: 5c1819a50d38f706fae8ece1643677bb493ea03def2e468eaaaac9e22965f85875c833fab6ab59b2122608c0a4c4b8541816993b2c623eee1f00db4a3402e1ce

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.authorize!(self, :edit, Effective::Region.new)
+      EffectiveRegions.authorized?(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.authorize!(self, :edit, Effective::Region.new)
+      EffectiveRegions.authorized?(self, :edit, Effective::Region.new())
 
       klass = "Effective::Snippets::#{region_params[:name].try(:classify)}".safe_constantize
 

data/app/helpers/effective_regions_helper.rb

@@ -28,10 +28,8 @@ module EffectiveRegionsHelper
       }
 
       if defined?(EffectivePages) && defined?(EffectiveRoles)
-        if(menu = Effective::Menu.new()).respond_to?(:is_role_restricted?)
-          payload[:roles] = EffectiveRoles.roles_collection(menu, current_user)
-          payload[:pages] = ([['', '']] + Effective::Page.order(:title).map { |page| [page.title, page.id] })
-        end
+        payload[:roles] = EffectiveRoles.roles_collection(Effective::Menu.new(), current_user)
+        payload[:pages] = ([['', '']] + Effective::Page.order(:title).map { |page| [page.title, page.id] })
       end
 
       render(:partial => 'effective_regions/include_tags_javascript', :locals => {:payload => payload})

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

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

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

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

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

@@ -1,17 +1,18 @@
+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
 
-      def snippet_attributes
-        [:id, :region]
-      end
+      attribute :id, String # This will be snippet_12345
+      attribute :region, Effective::Region # The region Object
 
       # This is going to return all snippet objects that are saved in any Effective::Regions
       def self.all(type = nil)
@@ -58,20 +59,15 @@ 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
-        @id || "snippet_#{object_id}"
-      end
-
-      def region
-        @region || Effective::Region.new
+        super.presence || "snippet_#{object_id}"
       end
 
       def data
-        (self.snippet_attributes - [:region, :id]).inject({}) { |h, name| h[name] = public_send(name); h}
+        self.attributes.reject { |k, v| [:region, :id].include?(k) }
       end
 
       def to_partial_path

data/config/effective_regions.rb

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

data/config/routes.rb

@@ -6,8 +6,6 @@ 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

@@ -14,19 +14,10 @@ class CreateEffectiveRegions < ActiveRecord::Migration[4.2]
 
     add_index <%= @regions_table_name %>, [:regionable_type, :regionable_id]
     add_index <%= @regions_table_name %>, :regionable_id
-
-    create_table <%= @ck_assets_table_name %> do |t|
-      t.boolean :global, default: false
-
-      t.datetime :updated_at
-      t.datetime :created_at
-    end
-
   end
 
   def self.down
     drop_table <%= @regions_table_name %>
-    drop_table <%= @ck_assets_table_name %>
   end
 
 end

data/lib/effective_regions.rb

@@ -1,11 +1,10 @@
+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
 
@@ -14,20 +13,10 @@ module EffectiveRegions
   end
 
   def self.authorized?(controller, action, resource)
-    @_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
+    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)
     end
-  end
-
-  def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
+    true
   end
 
   # Returns a Snippet.new() for every class in the /app/effective/snippets/* directory

data/lib/effective_regions/engine.rb

@@ -23,9 +23,5 @@ 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.7.6'.freeze
+  VERSION = '1.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_regions
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ 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:
@@ -50,17 +64,13 @@ 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
@@ -69,8 +79,6 @@ 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
@@ -104,7 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Create editable content regions within your existing, ordinary ActionView::Base

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

@@ -1,27 +0,0 @@
-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

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

data/app/controllers/effective/ck_assets_controller.rb

@@ -1,15 +0,0 @@
-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/models/effective/ck_asset.rb

@@ -1,25 +0,0 @@
-# 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/views/effective/ck_assets/_form.html.haml

@@ -1,7 +0,0 @@
-= 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

@@ -1,19 +0,0 @@
-!!!
-%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