mokio 0.0.14 → 0.0.15

data/app/controllers/mokio/support_controller.rb

@@ -3,7 +3,9 @@ class Mokio::SupportController < Mokio::CommonController
   helper :application
 
   def index
-
+    respond_to do |format|
+      format.html
+    end
   end
 
 

data/app/helpers/mokio/backend/backend_helper.rb

@@ -1,6 +1,6 @@
 module Mokio
   module Backend
-    module BackendHelper  
+    module BackendHelper
       include Haml::Helpers
       #
       # Translate methods
@@ -55,7 +55,8 @@ module Mokio
       #     i.e.(can? : manage, Mokio::Menu)
       # * +plus_icon_class+ Icon css class for "+" button
       def sidebar_btn(type, icon_class, label="", add_btn = true, check_permissions = true, plus_icon_class = "icomoon-icon-plus")
-        table = type.to_s.demodulize.tableize #Mokio::Menu => menus
+
+        table = generate_tableize_name(type.to_s) #Mokio::Menu => menus or Mokio::MyModule::Menu => mymodule_menus
         model = table.singularize#Mokio::Menu => menu
 
         if label.empty?
@@ -98,6 +99,27 @@ module Mokio
         html.html_safe
       end
 
+      #
+      # Can user manage any site elements
+      #
+      def can_manage_site_elements?
+        (
+          (can? :manage, Mokio::StaticModule) ||
+          (can? :create, Mokio::StaticModule) ||
+          (can? :manage, Mokio::ModulePosition) ||
+          (can? :create, Mokio::ModulePosition) ||
+          (can? :manage, Mokio::ExternalScript) ||
+          (can? :create, Mokio::ExternalScript)
+        )
+      end
+      
+      #return table name for type
+      def generate_tableize_name(type)
+        type.gsub!("Mokio::","")
+        type.gsub!("::","_") if(type.include? "::")
+        type.tableize
+      end
+
     end
   end
-end
+end

data/app/helpers/mokio/backend/menu_helper.rb

@@ -3,10 +3,10 @@ module Mokio
     module MenuHelper
       include Haml::Helpers
       
-      #displays breadcrump to current menu element
-      def tree_menu_breadcrumps(menu)
+      #displays breadcrumb to current menu element
+      def tree_menu_breadcrumbs(menu)
         unless menu.nil?
-          @tree_nodes = menu.ancestors << menu
+          @tree_nodes = menu.ancestors.to_a << menu
           @tree_nodes.map do |m|
             if m.present? and m != menu
               link_to(m.name, edit_menu_path(m)) + " -> "
@@ -214,4 +214,4 @@ module Mokio
 
     end
   end
-end
+end

data/app/models/devise_custom_failure.rb

@@ -0,0 +1,5 @@
+class DeviseCustomFailure < Devise::FailureApp
+  def redirect_url
+    '/backend/users/sign_in'
+  end
+end

data/app/models/{ability.rb → mokio/ability.rb}

@@ -1,7 +1,7 @@
-class Ability
-  include CanCan::Ability
+module Mokio
+  class Ability
+    include CanCan::Ability
 
-  def initialize(user)
     # Define abilities for the passed in user here. For example:
     #
     #   user ||= User.new # guest user (not logged in)
@@ -28,31 +28,28 @@ class Ability
     #
     # See the wiki for details:
     # https://github.com/bryanrite/cancancan/wiki/Defining-Abilities
+    def initialize(user)
+      if user.has_role? :admin
+        can :manage, :all
+      end
+      if user.has_role? :content_editor
+        can :manage, [Mokio::Content]
+      end
+      if user.has_role? :menu_editor
+        can :manage, [Mokio::Menu]  
+      end
+      if user.has_role? :static_module_editor
+        can :manage, [Mokio::StaticModule]  
+      end
+      if user.has_role? :user_editor
+        can :manage, [Mokio::User]
+      end
+      if user.has_role? :reader
+        can :read, :all
+      end
 
-    if user.has_role? :admin
-      can :manage, :all
+      can :edit_password, Mokio::User
+      can :update_password, Mokio::User
     end
-    if user.has_role? :content_editor
-      can :manage, [Mokio::Content]
-    end
-    if user.has_role? :menu_editor
-      can :manage, [Mokio::Menu]  
-    end
-    if user.has_role? :static_module_editor
-      can :manage, [Mokio::StaticModule]  
-    end
-    if user.has_role? :user_editor
-      can :manage, [Mokio::User]
-    end
-    if user.has_role? :reader
-      can :read, :all
-    end
-
-    can :edit_password, Mokio::User
-    can :update_password, Mokio::User
-
-
-
   end
-end
-
+end

data/app/views/devise/sessions/new.html.haml

@@ -34,4 +34,4 @@
             %div
               =flash[:alert]
         %br
-        = link_to t("devise.link.forgot_password"), new_password_path(resource_name)
+        = link_to t("devise.link.forgot_password"), new_password_path(resource_name)

data/app/views/layouts/mokio/backend.html.haml

@@ -68,5 +68,7 @@
     = render :template => "mokio/site_helper/first_login"
     
     = javascript_include_tag 'backend'
-    = yield :js         
+    = yield :js
 
+    :javascript
+      CKEDITOR.config.entities = false;

data/app/views/mokio/common/index.html.slim

@@ -22,6 +22,7 @@
 - content_for :js do
   javascript:
     var obj_table = "#{@obj_class.to_s.demodulize.tableize}"
+    var obj_class = "#{@obj_path}"
   = javascript_include_tag "backend/datatable"
 
 /-if Mokio.solr_enabled == false

data/app/views/mokio/layout/_user_widget.html.slim

@@ -4,7 +4,7 @@
       span.icon16.icomoon-icon-user.white
       = current_user.email
     li#support
-      a href="#{support_path}"
+      a href="#{support_index_path}"
         span.icon16.entypo-icon-help
         = bts("support")
     li

data/app/views/mokio/layout/sidebar.html.slim

@@ -35,7 +35,7 @@
                 = sidebar_btn Mokio::Contact, "icomoon-icon-mail-3"
 
         /  SITE ELEMENTS
-        - if can? :create, Mokio::Content
+        - if can_manage_site_elements?
           li.site_elements_nav
             a href="#"
               span.icon16.icomoon-icon-puzzle

data/app/views/mokio/menus/_form.html.haml

@@ -23,14 +23,14 @@
 #url_box{:style => "display: #{!@menu.external_link.blank? ? 'block' : 'none'};"}
   = f.input :external_link, label: btc("external_link",'Menu'), disabled: !@menu.display_editable_field?('external_link')
   = f.input :follow, :as => :select, :collection => [[bt("follow",'Menu'), "true"], [bt("nofollow",'Menu'), "false"]],  :include_blank => false
-= f.input :parent_id, :collection => @menu.parent_tree.collect{|m| ["#{'-' * m.ancestry.count('/')}#{m.name}", m.id]}, include_blank: false, disabled: !@menu.display_editable_field?('parent_id')
+= f.input :parent_id, :collection => @menu.parent_tree.where.not(ancestry: nil).collect{|m| ["#{'-' * (m.depth - 1)} #{m.name}", m.id]}, include_blank: false, disabled: !@menu.display_editable_field?('parent_id')
 
 .row-fluid
   %label.form-label.span2
     = btc('path', Mokio::Menu)
   .span10
     #menu_breadcrumps
-      = tree_menu_breadcrumps(@menu.parent)
+      = tree_menu_breadcrumbs(@menu.parent)
 
 = f.input :target, :collection => [[bt("current_window_inside",Mokio::Menu), nil], [bt("new_window",Mokio::Menu), "_blank"]], include_blank: false, disabled: !@menu.display_editable_field?('target')
 

data/config/initializers/devise.rb

@@ -235,10 +235,11 @@ Devise.setup do |config|
   # If you want to use other strategies, that are not supported by Devise, or
   # change the failure app, you can configure them inside the config.warden block.
   #
-  # config.warden do |manager|
+  config.warden do |manager|
+     manager.failure_app = DeviseCustomFailure
   #   manager.intercept_401 = false
   #   manager.default_strategies(scope: :user).unshift :some_external_strategy
-  # end
+  end
 
   # ==> Mountable engine configurations
   # When using Devise inside an engine, let's call it `MyEngine`, and this engine

data/config/routes.rb

@@ -206,10 +206,7 @@ Mokio::Engine.routes.draw do
         end
       end
 
-
-      namespace :support do
-        get '/', to: :index
-      end
+      resources :support, only: :index
 
 end
 

data/lib/mokio/concerns/common/controller_functions.rb

@@ -66,11 +66,18 @@ module Mokio
           parameters
         end
 
+          def generate_path
+            path = @obj_class.name
+            path = path.gsub("Mokio::","") if path.include? "Mokio::"
+            path = path.tableize.gsub("/","_")
+            path
+          end
+
           #
           # Returns obj index url
           #
           def obj_index_url #:doc:
-            send("#{self.controller_name.demodulize}_url") # call your_controller index path 
+            send("#{generate_path}_url") # call your_controller index path
           end
 
           #
@@ -89,7 +96,7 @@ module Mokio
           # Returns obj new url
           #
           def obj_new_url(obj) #:doc:
-            send("new_#{self.controller_name.demodulize.singularize}_path", obj) # call your_controller edit path for obj
+            send("new_#{generate_path.singularize}_path", obj) # call your_controller edit path for obj
           end
       end
     end

data/lib/mokio/concerns/common/controller_object.rb

@@ -1,6 +1,6 @@
 module Mokio
-  module Concerns 
-    module Common 
+  module Concerns
+    module Common
       #
       # Most important logic for CommonController
       #
@@ -16,7 +16,7 @@ module Mokio
 
         private
           #
-          # Returns inherited conroller singularized name 
+          # Returns inherited conroller singularized name
           #
           def obj_name #:doc:
             self.controller_name.singularize
@@ -68,13 +68,22 @@ module Mokio
             create_obj( @obj_class.respond_to?(:friendly) ? @obj_class.friendly.find(params[:id]) : @obj_class.find(params[:id]) )
           end
 
-          
+
           #
           # Setting constant parsed from controller name to @obj_class variable.
           # Our controllers are named to match model name. <b>before_filter</b> in CommonController
           #
           def set_obj_class #:doc:
-            @obj_class = "Mokio::#{self.class.name.demodulize.gsub("Controller", "").classify}".constantize
+
+            class_name = (self.class.name.include? "Mokio::") ? self.class.name.gsub("Mokio::", "") : self.class.name
+            #check is class in Mokio module
+            @obj_class = "Mokio::#{class_name.gsub("Controller", "").classify}".constantize rescue nil
+            #if there is no class in Mokio module check outside
+            if @obj_class.nil?
+                @obj_class = "#{class_name.gsub("Controller", "").classify}".constantize rescue nil
+            end
+            #used for path to update_active action in datatable.js.coffee.erb
+            @obj_path = ((@obj_class.to_s.include? "Mokio::") ? @obj_class.to_s.gsub("Mokio::","") : @obj_class.to_s).tableize
           end
 
           #

data/lib/mokio/concerns/controllers/application.rb

@@ -24,7 +24,7 @@ module Mokio
           # <b>before_filter</b> in ApplicationController using <b>gem devise</b>
           #
           def configure_permitted_parameters
-            devise_parameter_sanitizer.for(:sign_up) {|u| u.permit(:email, :password, :password_confirmation, roles: [])}
+            devise_parameter_sanitizer.permit(:sign_up, keys: [:email, :password, :password_confirmation])
           end
 
           #
@@ -73,4 +73,4 @@ module Mokio
       end
     end
   end
-end
+end

data/lib/mokio/concerns/controllers/base.rb

@@ -54,6 +54,13 @@ module Mokio
           @breadcrumbs_prefix = ""
           @breadcrumbs_prefix_link = ""
         end
+
+        #
+        # override current_ability to use Mokio's one
+        #
+        def current_ability
+          @current_ability ||= Mokio::Ability.new(current_user)
+        end
       end
     end
   end

data/lib/mokio/concerns/controllers/common.rb

@@ -1,7 +1,7 @@
 module Mokio
   module Concerns
     module Controllers
-      # 
+      #
       # Concern for CommonController. Many important controller logic is placed here.
       #
       # Most of Mokio's controllers are inherited by this controller. The main logic is to not repeat same part of code with changing only variables.
@@ -12,10 +12,10 @@ module Mokio
       # == CommonController provides:
       #
       # * +index+ method with json sending data.
-      # Its using common/index view and place date into jquery.datatable plugin (you can see in backend/datatable.js.coffee.erb file). 
+      # Its using common/index view and place date into jquery.datatable plugin (you can see in backend/datatable.js.coffee.erb file).
       # We send json as CommonsDatatable object (app/datatables/commons_datatable.rb)
       # Columns displayed in table are specified in used model inside method called columns_for_table.
-      # 
+      #
       # * +new+ method with building meta/gmap if they are enabled in used model
       # Its using common/new view and need partial '_form' with specifed form elements. Main form uses simple_form.
       #
@@ -23,7 +23,7 @@ module Mokio
       # Its using common/edit and need same partial as in 'new' action.
       #
       # * +create+ method
-      # Simple creating and saving object to database if passed validation. 
+      # Simple creating and saving object to database if passed validation.
       #
       # * +update+ method
       # Simple updating object in database
@@ -49,7 +49,11 @@ module Mokio
           include Mokio::Concerns::Common::ControllerObject
           include Mokio::Concerns::Common::ControllerFunctions
 
-          load_and_authorize_resource
+          before_action :authorize_actions
+          def authorize_actions
+            authorize!(params[:action].to_sym, @obj_class)
+          end
+
         end
 
         #

data/lib/mokio/concerns/controllers/dashboard.rb

@@ -25,9 +25,9 @@ module Mokio
           #
           # menu without displayed content
           #
-          @menu_with_invisible_content = (Mokio::Menu.includes(:contents).where('mokio_contents.id is not NULL').references(:contents)).select{|menu| menu.invisible_content}
-          @empty_menu = Mokio::Menu.includes(:contents).where(:mokio_content_links => {:menu_id => nil}, :external_link => nil, :fake => false)
-          @empty_menu = @empty_menu.concat(@menu_with_invisible_content)
+          @menu_with_invisible_content = (Mokio::Menu.includes(:contents).where('mokio_contents.id is not NULL').references(:contents)).select{|menu| menu.invisible_content}.pluck :id
+          @empty_menu = Mokio::Menu.includes(:contents).where(:mokio_content_links => {:menu_id => nil}, :external_link => nil, :fake => false).pluck :id
+          @empty_menu = Mokio::Menu.where id: @empty_menu + @menu_with_invisible_content
           @empty_menu = @empty_menu.first(Mokio.dashboard_size.to_i)
           @more_empty_menu = @empty_menu.size
 
@@ -38,4 +38,4 @@ module Mokio
       end
     end
   end
-end
+end

data/lib/mokio/concerns/models/common.rb

@@ -29,7 +29,7 @@ module Mokio
           #
           if Mokio.solr_enabled
             exceptions = Mokio::SolrConfig.all_exceptions # Classes which are excluded from indexing or have own searchable method
-            
+
             unless exceptions.include? self.name.demodulize.downcase.to_sym
               searchable do # Columns where Sunspot knows which data use to index
                 text :title, :boost => 5
@@ -37,7 +37,7 @@ module Mokio
               end
             end
           end
-        end 
+        end
 
         module ClassMethods
           #
@@ -60,12 +60,12 @@ module Mokio
         #
         def active_view
           "<div class=\"activebutton\">
-            <input type=\"checkbox\" 
-              #{"checked=\"checked\"" if self.active} 
+            <input type=\"checkbox\"
+              #{"checked=\"checked\"" if self.active}
               class=\"activebtn switch-small\"
               data-on=\"success\"
               data-off=\"danger\"
-              data-on-label=\"<i class='icomoon-icon-checkmark white'></i>\" 
+              data-on-label=\"<i class='icomoon-icon-checkmark white'></i>\"
               data-off-label=\"<i class='icomoon-icon-cancel-3 white'></i>\"
             >
           </div>"
@@ -103,7 +103,7 @@ module Mokio
         def some_editable
           if !self.editable && !self.changed.nil?
             (self.changed.to_set - self.always_editable_fields.to_set).each do |field|
-              errors.add(field.to_sym, "#{I18n.t('activerecord.errors.editable.not_permitted')}") 
+              errors.add(field.to_sym, "#{I18n.t('activerecord.errors.editable.not_permitted')}")
             end
           end
         end