cdx 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 547667c51789bfcded17ead84db8d99d42d1eee1
-  data.tar.gz: 841323d0857e5f34187fec346b25c8e4a4c7237d
+  metadata.gz: 63d9635903d244298f5cf669827925fe464a589a
+  data.tar.gz: f0af518b0aa2f4d2d10b7ba5dbee82e6d00f183d
 SHA512:
-  metadata.gz: 7ca3ff7e0250da582028623d0e0026fd79cb0a5feb954c1a0c9fed6a21f2f0755a43e2ff085fb0173eda5e71b070d51522b774efec0a7dad0b27e90b92d63a75
-  data.tar.gz: c3a658c5992fe6000587611584382d42ad6c1ca8395ecc93e92dde884417a0d5e31451bfd78a64e1c695a6e10a53d6e0fea67d2163ad80e9982270beba77f8fc
+  metadata.gz: 9a500b1dec26eff9486b39cf615f17b1a7e495419307f18c39ee3bc906bc0f1766d6243cba6ea81d732cd8ba220572cfb886178436f7247e75ae99d62b6b7fe2
+  data.tar.gz: 1c5f36825c444d898d717d26317fe3e6e9af40cf9cc26b4d3be40aea5fe620d040a0781615612d48ec96ea7b57fa0059d0ca86b2c97b99bbabcdc0f1e17acf34

data/README.md

@@ -1,8 +1,9 @@
 # Cdx
 
-[![Build Status](https://travis-ci.com/alexandre025/cdx.svg?token=in8sSsy4MxZn4XxNavha&branch=master)](https://travis-ci.com/alexandre025/cdx)
+[![Build Status](https://travis-ci.org/alexandre025/cdx.svg?branch=master)](https://travis-ci.org/alexandre025/cdx)
 [![Gem Version](https://badge.fury.io/rb/cdx.svg)](https://badge.fury.io/rb/cdx)
 [![Dependency Status](https://gemnasium.com/badges/github.com/alexandre025/cdx.svg)](https://gemnasium.com/github.com/alexandre025/cdx)
+[![Test Coverage](https://codeclimate.com/github/alexandre025/cdx/badges/coverage.svg)](https://codeclimate.com/github/alexandre025/cdx/coverage)
 
 Cdx is a rails 5.1.x engine which provide a ready to use admin panel with some components such as static pages, resource controller, multi-site, models translations, assets uploading, user management...
 
@@ -10,7 +11,7 @@ Cdx is a rails 5.1.x engine which provide a ready to use admin panel with some c
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'cdx', github: 'alexandre025/cdx'
+gem 'cdx', '0.0.4'
 ```
 
 And then execute:

data/app/assets/javascripts/cdx/admin/shared/theme.js

@@ -0,0 +1,15 @@
+Cdx.ready(function () {
+
+    $('.theme-selector').on('select2:select', function (e) {
+        var theme = e.params.data.id;
+
+        var $body = $('body');
+
+        $body.removeClass(function (index, className) {
+            return className.indexOf('skin-') >= 0 ? className : ''
+        });
+
+        $body.addClass('skin-'+theme);
+    });
+
+});

data/app/assets/stylesheets/cdx/admin/cdx.scss

@@ -8,6 +8,7 @@
 @import 'shared/file';
 @import 'shared/notifications';
 @import 'shared/select2';
+@import 'shared/radio_buttons';
 @import 'shared/translations';
 @import 'shared/nested_asset_form';
 

data/app/assets/stylesheets/cdx/admin/shared/radio_buttons.scss

@@ -0,0 +1 @@
+.form-horizontal .radio { margin-right: 15px; display: inline-block; }

data/app/controllers/cdx/admin/base_controller.rb

@@ -1,9 +1,11 @@
 module Cdx
   module Admin
     class BaseController < Cdx::ApplicationController
+      include Cdx::ControllerHelpers::Locale
+
       layout 'cdx/admin'
 
-      before_action :set_locale
+      helper_method :meta_title
 
       def authenticate_admin_user!
         if admin_user_signed_in?
@@ -13,16 +15,36 @@ module Cdx
         end
       end
 
-      private
+      def meta_title
+        if current_settings.meta_title
+          "#{current_settings.meta_title} | Admin"
+        else
+          "Admin#{current_settings.acronym}"
+        end
+      end
+
+      def current_ability
+        if try(:current_admin_user)
+          controller_name_segments = params[:controller].split('/')
+          controller_name_segments.pop
+          controller_namespace = controller_name_segments.join('/').camelize
 
-        def set_locale
-          I18n.locale = current_settings.default_locale || I18n.default_locale
+          @current_ability ||= Ability.new(current_admin_user, controller_namespace, Cdx::Site.current)
         end
+      end
+
+      private
 
         def flash_message(object, action, context)
           object_name    = object.class.name.demodulize.downcase
           flash[context] = t("admin.flash.#{object_name}.#{action}.#{context}", default: t("admin.flash.default.#{action}.#{context}", n: object_name.capitalize))
         end
+
+      protected
+
+        def action
+          action_name.to_sym
+        end
     end
   end
 end

data/app/controllers/cdx/admin/devise/confirmations_controller.rb

@@ -1,4 +1,8 @@
 class Cdx::Admin::Devise::ConfirmationsController < Devise::ConfirmationsController
+  include Cdx::ControllerHelpers::Locale
+
+  layout 'cdx/admin_login'
+
   helper Cdx::Admin::BaseHelper
 
   # GET /resource/confirmation/new

data/app/controllers/cdx/admin/devise/passwords_controller.rb

@@ -1,4 +1,8 @@
 class Cdx::Admin::Devise::PasswordsController < Devise::PasswordsController
+  include Cdx::ControllerHelpers::Locale
+
+  layout 'cdx/admin_login'
+
   helper Cdx::Admin::BaseHelper
 
   # GET /resource/password/new

data/app/controllers/cdx/admin/devise/sessions_controller.rb

@@ -1,4 +1,6 @@
 class Cdx::Admin::Devise::SessionsController < Devise::SessionsController
+  include Cdx::ControllerHelpers::Locale
+
   layout 'cdx/admin_login'
 
   helper Cdx::Admin::BaseHelper

data/app/controllers/cdx/admin/resource_controller.rb

@@ -5,6 +5,8 @@ module Cdx
 
       before_action :load_resource
 
+      before_action :authorize_admin
+
       helper_method :member_action?, :new_object_url, :edit_object_url, :object_url, :collection_url, :parent_collection_url, :parent_object_url, :edit_parent_object_url
 
       def index
@@ -70,16 +72,21 @@ module Cdx
         def load_resource
           if member_action? # Load member action
             @object ||= load_resource_instance
-            # instance_variable_set("@#{resource.object_name}", @object)
+            authorize! action, @object
+            instance_variable_set("@#{resource.object_name}", @object)
           else # Load collection
             @collection ||= collection
-            # instance_variable_set("@#{controller_name}", @collection)
+            instance_variable_set("@#{controller_name}", @collection)
           end
         end
 
         def collection
           return parent.send(controller_name) if parent_data.present?
-          model_class.where(nil)
+          if model_class.respond_to?(:accessible_by)
+            model_class.accessible_by(current_ability, action)
+          else
+            model_class.where(nil)
+          end
         end
 
         def resource
@@ -89,7 +96,7 @@ module Cdx
         end
 
         def load_resource_instance
-          if new_actions.include? action_name.to_sym
+          if new_actions.include? action
             build_resource
           elsif params[:id]
             find_resource
@@ -120,7 +127,7 @@ module Cdx
         def parent
           if parent_data.present?
             @parent ||= parent_data[:model_class].send(:find_by, parent_data[:find_by].to_s => params["#{resource.model_name}_id"])
-            # instance_variable_set("@#{resource.model_name}", @parent)
+            instance_variable_set("@#{resource.model_name}", @parent)
           else
             nil
           end
@@ -143,7 +150,7 @@ module Cdx
         end
 
         def member_action?
-          !collection_actions.include? action_name.to_sym
+          !collection_actions.include? action
         end
 
         def new_object_url(options = {})
@@ -198,6 +205,10 @@ module Cdx
         def location_after_save
           collection_url
         end
+
+        def authorize_admin
+          authorize! action, model_class
+        end
     end
   end
 end

data/app/controllers/cdx/admin/settings_controller.rb

@@ -5,6 +5,8 @@ module Cdx
 
       before_action :load_settings, only: [:edit, :update]
 
+      authorize_resource class: 'Cdx::Setting'
+
       def edit
       end
 

data/app/controllers/cdx/application_controller.rb

@@ -2,6 +2,17 @@ module Cdx
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
 
+    include Cdx::ControllerHelpers::Seo
     include Cdx::ControllerHelpers::Settings
+
+    def current_ability
+      if try(:current_user)
+        controller_name_segments = params[:controller].split('/')
+        controller_name_segments.pop
+        controller_namespace = controller_name_segments.join('/').camelize
+
+        @current_ability ||= Ability.new(current_user, controller_namespace, Cdx::Site.current)
+      end
+    end
   end
 end

data/app/controllers/cdx/static_controller.rb

@@ -0,0 +1,20 @@
+module Cdx
+  class StaticController < ApplicationController
+    before_action :load_object, only: :show
+
+    # We don't provide routes for this controller, you'll need to define your own routing logic.
+    def show
+      begin
+        render "cdx/static/custom/#{@object.template}"
+      rescue ActionView::MissingTemplate
+        render :show
+      end
+    end
+
+    private
+
+      def load_object
+        @object = Page.with_state(:published).friendly.find(params[:id])
+      end
+  end
+end

data/app/helpers/cdx/admin/base_helper.rb

@@ -8,7 +8,7 @@ module Cdx
       def theme_class
         if current_admin_user&.theme && !current_admin_user.theme.blank?
           "skin-#{current_admin_user.theme}"
-        elsif current_settings
+        elsif current_settings.default_theme
           "skin-#{current_settings.default_theme}"
         else
           'skin-yellow'

data/app/helpers/cdx/admin/form_helper.rb

@@ -17,7 +17,7 @@ module Cdx
       end
 
       def locales_options_tags
-        I18n.available_locales.map { |l| ["#{EmojiFlag.new(l)} (#{l})", l] }
+        Cdx.available_locales.map { |l| ["#{EmojiFlag.new(l)} (#{l})", l] }
       end
 
       def available_locales_options_tags

data/app/helpers/cdx/admin/resource_helper.rb

@@ -30,38 +30,48 @@ module Cdx
       end
 
       def link_to_new(options = {})
-        url             = options[:url] || new_object_url
-        options[:class] = 'btn-sm btn-info pull-right'
-        link_to url, options do
-          fa_icon(:plus) + ' ' + t('admin.actions.new')
+        if can? :new, @object.class
+          url = options[:url] || new_object_url
+          options[:class] = 'btn-sm btn-info pull-right'
+          link_to url, options do
+            fa_icon(:plus) + ' ' + t('admin.actions.new')
+          end
         end
       end
 
       def link_to_show(resource, options = {})
-        url             = options[:url] || object_url(resource)
-        options[:class] = 'btn-sm btn-success'
-        link_to fa_icon(:eye), url, options
+        if can? :show, resource
+          url             = options[:url] || object_url(resource)
+          options[:class] = 'btn-sm btn-success'
+          link_to fa_icon(:eye), url, options
+        end
       end
 
       def link_to_edit(resource, options = {})
-        url             = options[:url] || edit_object_url(resource)
-        options[:class] = 'btn-sm btn-info'
-        link_to fa_icon(:pencil), url, options
+        if can? :edit, resource
+          url             = options[:url] || edit_object_url(resource)
+          options[:class] = 'btn-sm btn-info'
+          link_to fa_icon(:pencil), url, options
+        end
       end
 
       def link_to_delete(resource, options = {})
-        url                      = options[:url] || object_url(resource)
-        options[:class]          = %w(btn-sm btn-danger)
-        options[:data]           ||= {}
-        options[:data][:method]  ||= :delete
-        options[:data][:confirm] ||= resource&.content_header_title ? t('admin.ujs_confirm.delete', o: resource.content_header_title) : t('admin.ujs_confirm.default')
-        link_to fa_icon(:trash), url, options
+        if can? :destroy, resource
+          url                      = options[:url] || object_url(resource)
+          options[:class]          = %w(btn-sm btn-danger)
+          options[:data]           ||= {}
+          options[:data][:method]  ||= :delete
+          options[:data][:confirm] ||= resource&.content_header_title ? t('admin.ujs_confirm.delete', o: resource.content_header_title) : t('admin.ujs_confirm.default')
+          link_to fa_icon(:trash), url, options
+        end
       end
 
       def link_to_return(options = {})
-        url             = options[:url] || collection_url
-        options[:class] = %w(btn btn-default)
-        link_to t('admin.actions.return'), url, options
+        if can? :index, @object.class
+          url             = options[:url] || collection_url
+          options[:class] = %w(btn btn-default)
+          link_to t('admin.actions.return'), url, options
+        end
       end
     end
   end

data/app/models/cdx/ability.rb

@@ -0,0 +1,40 @@
+module Cdx
+  class Ability
+    include CanCan::Ability
+
+    class_attribute :abilities
+    self.abilities = Set.new
+
+    def self.register_ability(ability)
+      abilities.add(ability)
+    end
+
+    def self.remove_ability(ability)
+      abilities.delete(ability)
+    end
+
+    def initialize(user, controller_namespace, current_site = Site.current)
+      clear_aliased_actions
+
+      if controller_namespace == 'Cdx::Admin'
+
+        if user.is_admin?
+          can :manage, :all
+        end
+
+      else
+
+      end
+
+      Ability.abilities.merge(abilities_to_register).each do |clazz|
+        merge clazz.new(user, controller_namespace, current_site)
+      end
+    end
+
+    private
+
+      def abilities_to_register
+        []
+      end
+  end
+end

data/app/models/cdx/application_record.rb

@@ -1,5 +1,7 @@
 module Cdx
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
+
+    extend Cdx::AttachmentMacros
   end
 end

data/app/models/cdx/asset/seo/og_image.rb

@@ -0,0 +1,11 @@
+module Cdx
+  class Asset::Seo::OgImage < Asset
+    has_attached_file :attachment,
+                      styles:  { thumb: '600x315^', regular: '1200x630^' },
+                      url:            '/cdx/seo/og_image/:id/:style/:basename.:extension',
+                      path:           ':rails_root/public/cdx/seo/og_image/:id/:style/:basename.:extension',
+                      convert_option: { all: '-strip -crop -gravity center -auto-orient' }
+
+    include Cdx::ImageAsset
+  end
+end

data/app/models/cdx/page.rb

@@ -2,6 +2,7 @@ module Cdx
   class Page < ApplicationRecord
     include Cdx::Resourceable
     include Cdx::Publishable
+    include Cdx::SeoSupport
 
     extend FriendlyId
 

data/app/models/cdx/seo.rb

@@ -0,0 +1,22 @@
+module Cdx
+  class Seo < ApplicationRecord
+    belongs_to :record, polymorphic: true, optional: true
+
+    # Assets
+    has_one_attached :og_image, 'Asset::Seo::OgImage'
+
+    store_accessor :meta, :meta_title, :meta_description, :meta_keywords, :meta_canonical
+    store_accessor :og, :og_title, :og_description, :og_keywords, :og_video
+
+    after_validation :normalize_blank_values
+
+    def normalize_blank_values
+      attributes['meta'].each do |column, value|
+        self['meta'][column].present? || (self['meta'][column] = nil)
+      end
+      attributes['og'].each do |column, value|
+        self['og'][column].present? || (self['og'][column] = nil)
+      end
+    end
+  end
+end

data/app/models/cdx/setting.rb

@@ -1,5 +1,11 @@
 module Cdx
   class Setting < ApplicationRecord
+    include Cdx::SeoSupport
+
+    # Constants
+
+    AVAILABLE_THEMES = %w(black-light black blue-light blue green-light green purple-light purple red-light red yellow-light yellow).freeze
+
     # Validators
 
     validates :acronym, :default_theme, :default_locale, presence: true
@@ -15,7 +21,7 @@ module Cdx
     end
 
     def self.current
-      Setting.first_or_create(acronym: 'CDX', default_theme: 'yellow', default_locale: 'en', available_locales: %w(en fr es))
+      Setting.first_or_create(acronym: 'CDX', default_theme: AVAILABLE_THEMES.last, default_locale: 'en', available_locales: Cdx.available_locales)
     end
   end
 end