mokio 0.0.15 → 2.0.8

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

@@ -1,6 +1,6 @@
 module Mokio
-  module Concerns 
-    module Controllers 
+  module Concerns
+    module Controllers
       #
       # Concern for ApplicationController
       #
@@ -10,9 +10,9 @@ module Mokio
         included do
           # Prevent CSRF attacks by raising an exception.
           # For APIs, you may want to use :null_session instead.
-          protect_from_forgery with: :exception
+          protect_from_forgery prepend: true
 
-          before_filter :configure_permitted_parameters, if: :devise_controller?
+          before_action :configure_permitted_parameters, if: :devise_controller?
 
           rescue_from CanCan::AccessDenied do |exception|
             render :template =>'/mokio/errors/unauthorized', :alert => exception.message # backend_root_url
@@ -21,7 +21,7 @@ module Mokio
 
         protected
           #
-          # <b>before_filter</b> in ApplicationController using <b>gem devise</b>
+          # <b>before_action</b> in ApplicationController using <b>gem devise</b>
           #
           def configure_permitted_parameters
             devise_parameter_sanitizer.permit(:sign_up, keys: [:email, :password, :password_confirmation])

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

@@ -8,21 +8,21 @@ module Mokio
         extend ActiveSupport::Concern
 
         included do
-          protect_from_forgery
+          protect_from_forgery prepend: true
           layout "mokio/backend"
 
           before_action :authenticate_user!
-          after_filter :flash_to_headers    # json sending flash notices with ajax success see in main.js
+          after_action :flash_to_headers    # json sending flash notices with ajax success see in main.js
           attr_accessor :breadcrumbs_prefix
           attr_accessor :breadcrumbs_prefix_link
-          before_filter :set_breadcrumbs_prefix
-
+          before_action :set_breadcrumbs_prefix
+          before_action :prepare_locale
         end
 
         #
         # Sending flash messages in X-Flash-Messages header.
         # Decoding to UTF-8 with ajax success placed in main.js.
-        # <b>after_filter</b> in BaseController
+        # <b>after_action</b> in BaseController
         #
         def flash_to_headers
           if request.xhr?
@@ -41,13 +41,8 @@ module Mokio
         # Redirects back if back if available otherwise redirects to specified url, flash message is displayed
         #
         def redirect_back(format, url, message)
-          begin
-            format.html { redirect_to :back, notice: message }
-            format.json { head :no_content }
-          rescue ::ActionController::RedirectBackError
-            format.html { redirect_to url,   notice: message }
-            format.json { head :no_content }
-          end
+          format.html { redirect_to url, notice: message }
+          format.json { head :no_content }
         end
 
         def set_breadcrumbs_prefix
@@ -55,6 +50,11 @@ module Mokio
           @breadcrumbs_prefix_link = ""
         end
 
+        def prepare_locale
+          I18n.locale = session[:locale_cms] || Mokio.cms_locale
+          session[:locale_cms] = I18n.locale
+        end
+
         #
         # override current_ability to use Mokio's one
         #

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

@@ -56,6 +56,9 @@ module Mokio
 
         end
 
+        def ajax_collection
+          render json: []
+        end
         #
         # Index action renders <b>json</b> with parameters to jquery.datatables
         #
@@ -87,7 +90,6 @@ module Mokio
         #
         def create
           create_obj( @obj_class.new(obj_params) )
-
           respond_to do |format|
             if obj.save
               if !params[:save_and_new].blank?
@@ -148,7 +150,7 @@ module Mokio
         #     has_many :authors
         #
         #   amoeba do
-        #     include_field [:tags, :authors]
+        #     include_association [:tags, :authors]
         #   end
         #
         # If you use this method add to your controller resources in routes.rb:
@@ -182,8 +184,8 @@ module Mokio
           end
 
           respond_to do |format|
-            format.html { render :nothing => true }
-            format.js   { render :nothing => true }
+            format.html { head :ok }
+            format.js { head :ok }
           end
         end
 

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

@@ -3,12 +3,12 @@ module Mokio
     module Controllers
       #
       # Concern for DataFilesController
-      # 
+      #
       module DataFiles
         extend ActiveSupport::Concern
 
         included do
-          before_filter :data_file, only: [:edit, :update, :destroy]
+          before_action :data_file, only: [:edit, :update, :destroy]
 
           load_and_authorize_resource
         end
@@ -90,7 +90,7 @@ module Mokio
 
         private
           #
-          # before_filter finding datafile by id
+          # before_action finding datafile by id
           #
           def data_file #:doc:
             @data_file = Mokio::DataFile.find(params[:id])

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

@@ -1,4 +1,4 @@
-module Mokio 
+module Mokio
   module Concerns
     module Controllers
       #
@@ -36,7 +36,7 @@ module Mokio
         def update
           @content_ids = params[:menu][:content_ids]
           @av_mod_ids = params[:menu][:available_module_ids]
-          super  
+          super
         end
 
         #
@@ -66,7 +66,7 @@ module Mokio
           if Mokio::Menu.update(@change.keys, @change.values)
             flash[:notice] = t("menus.sort_true")
           else
-            flash[:error]  = t("menus.sort_false") 
+            flash[:error]  = t("menus.sort_false")
           end
 
           render :nothing => true
@@ -89,16 +89,15 @@ module Mokio
           #
           # Method to initialize menu's dual select boxes
           #
-          def init_dual_select #:doc:
-            @dual_select_str = ""
+            def init_dual_select #:doc:
+            @dual_select_arr = []
 
             Mokio::ModulePosition.all.each do |mp|
-              @dual_select_str += " dualSelectInit('_#{mp.id}', false);"
+              @dual_select_arr << mp.id
             end
           end
-
           #
-          # Transforms structure like: menu_id1 => parent_id1, menu_id2 => parent_id2 into 
+          # Transforms structure like: menu_id1 => parent_id1, menu_id2 => parent_id2 into
           # structure like: menu_id => {:parent_id => parent_id, :seq => seq_number}
           #
            def transform(menu_tree_param, change) #:doc:
@@ -109,13 +108,13 @@ module Mokio
             menu_tree_param.each do |menu_id, parent_id|
               menu = menus.select{|m| m.id == menu_id.to_i}.first
               # parent_id = menu.lang_id if parent_id == 'null'
-               
+
               if parent_id == "null"
                 parent_id = menu.ancestor_ids.select{|ar| root_ids.include?(ar)}.first
               end
 
               seq[parent_id] = seq[parent_id].nil? ? 1 : seq[parent_id].to_i + 1
-              change[menu_id] = {:parent_id => parent_id, :seq => seq[parent_id]} 
+              change[menu_id] = {:parent_id => parent_id, :seq => seq[parent_id]}
             end
 
             change
@@ -165,13 +164,12 @@ module Mokio
               @menu.save
             end
           end
-          
+
           #
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def menu_params #:doc:
-            params[:menu].permit(extended_parameters,mokio_gems_parameters, :name, :subtitle, :seq, :target, :external_link, :css_class, :css_body_class, :main_pic, :follow, :parent_id, :active, :visible, :description, :lang_id, :fake, :content_ids => [],:available_module_ids => [],
-              :meta_attributes => Mokio::Meta.meta_attributes)
+            params[:menu].permit(extended_parameters,mokio_gems_parameters, :name, :subtitle, :seq, :target, :external_link, :css_class, :css_body_class, :main_pic, :follow, :parent_id, :active, :visible, :description, :lang_id, :fake, :content_ids => [],:available_module_ids => [])
           end
       end
     end

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

@@ -55,8 +55,7 @@ module Mokio
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def mov_gallery_params #:doc:
-            params.require(:mov_gallery).permit(mokio_gems_parameters,:title, :subtitle, :type, :active, :home_page ,:intro, :content, :display_from, :display_to, :lang_id, :main_pic, :tag_list, :menu_ids => [], :data_file => [],
-              :meta_attributes => Mokio::Meta.meta_attributes)
+            params.require(:mov_gallery).permit(mokio_gems_parameters,:title, :subtitle, :type, :active, :home_page ,:intro, :content, :display_from, :display_to, :lang_id, :main_pic, :tag_list, :menu_ids => [], :data_file => [])
           end
       end
     end

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

@@ -11,7 +11,7 @@ module Mokio
         extend ActiveSupport::Concern
 
         included do
-          before_filter :edited_photo, only: [:get_thumb, :update_thumb, :remove_thumb, :crop_thumb, :rotate_thumb,
+          before_action :edited_photo, only: [:get_thumb, :update_thumb, :remove_thumb, :crop_thumb, :rotate_thumb,
                                               :get_photo, :rotate_photo, :crop_photo]
         end
 
@@ -50,8 +50,8 @@ module Mokio
             # split with "\n" can create "empty" string with '\r', when parsing textarea parameter
             # we don't want to have them in loop
             #
-            urls.reject! {|u| u == "\r"} 
-                                         
+            urls.reject! {|u| u == "\r"}
+
             if urls
               urls.each do |url|
                 url = url.gsub(/,/, '')
@@ -66,7 +66,7 @@ module Mokio
                   #
                   if Faraday.head(url).status == 200
                     photo = create_external_photo url
-                    
+
                     if photo.save # !!!
                       @photos << photo
                       notice += "#{t("photos.created", title: photo.name)}\n"
@@ -90,7 +90,7 @@ module Mokio
             #
             # we can have both error and notice messages so only those cases
             #
-            flash[:error]  = error  unless error == t("photos.photos_from_external_links_error") 
+            flash[:error]  = error  unless error == t("photos.photos_from_external_links_error")
             flash[:notice] = notice unless notice.blank?
 
             respond_to do |format|
@@ -104,7 +104,7 @@ module Mokio
           def destroy
             @id = params[:id]
             @photo = photo_model.friendly.find(@id)
-            
+
             if @photo.destroy
               flash[:notice] = t("photos.deleted", title: @photo.name)
             else
@@ -166,13 +166,13 @@ module Mokio
             # when MiniMagick.open failed, continue action with only error message for user, this prevent redirect to 500 in this case
             #
             rescue Errno::ENOENT
-              flash[:error] = t("photos.not_crop", name: @edited_photo.name) 
+              flash[:error] = t("photos.not_crop", name: @edited_photo.name)
               logger.error exception_msg(image_path)
             end
 
             respond_to do |format|
               format.js {render :template => "mokio/photos/crop_thumb"}
-            end 
+            end
           end
 
           #
@@ -224,7 +224,7 @@ module Mokio
           #
           def remove_thumb
             @edited_photo.remove_thumb = true
-            
+
             if @edited_photo.save!
               flash[:notice] = t("photos.thumb_deleted", name: @edited_photo.name)
               @edited_photo.touch
@@ -313,7 +313,7 @@ module Mokio
             # Never trust parameters from the scary internet, only allow the white list through.
             #
             def photo_params #:doc:
-              params.require(:photo).permit(:name, :subtitle, :intro, :external_link, :thumb, :active, :content_id,:base_content_id, :data_file, :remote_data_file_url, :seq)
+              params.require(:photo).permit(:name, :subtitle, :intro, :external_link, :thumb, :active, :content_id,:data_file, :remote_data_file_url, :seq)
             end
 
             #

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

@@ -1,5 +1,5 @@
 module Mokio
-  module Concerns 
+  module Concerns
     module Controllers
       #
       # Concern for PicGalleriesController
@@ -54,8 +54,7 @@ module Mokio
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def pic_gallery_params #:doc:
-            params.require(:pic_gallery).permit(mokio_gems_parameters,:title, :subtitle, :type, :active,:home_page, :intro, :content, :display_from, :display_to, :lang_id, :main_pic, :tag_list, :menu_ids => [], :data_file => [],
-              :meta_attributes => Mokio::Meta.meta_attributes)
+            params.require(:pic_gallery).permit(mokio_gems_parameters,:title, :subtitle, :type, :active,:home_page, :intro, :content, :display_from, :display_to, :lang_id, :main_pic, :tag_list, :menu_ids => [], :data_file => [])
           end
       end
     end

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

@@ -8,7 +8,7 @@ module Mokio
         extend ActiveSupport::Concern
 
         include Mokio::Concerns::Common::Translations
-        
+
         included do
         end
 
@@ -35,7 +35,7 @@ module Mokio
               if !params[:save_and_new].blank?
                 format.html { redirect_to obj_new_url(@obj_class.new), notice: CommonTranslation.updated(obj) }
                 format.json { head :no_content }
-              else 
+              else
                 format.html { redirect_to obj_index_url, notice: CommonTranslation.updated(obj) }
                 format.json { render action: 'index', status: :created, location: obj }
               end
@@ -50,7 +50,7 @@ module Mokio
         # Editing password for user
         #
         def edit_password
-
+          set_obj
           # Request Referer for redirect user in the place where it was before the change password
           session[:return_to] = request.referer
           @password_only = true
@@ -60,6 +60,7 @@ module Mokio
         # Updating password for user
         #
         def update_password
+          set_obj
           @user.only_password = true
           respond_to do |format|
             if @user.update(user_params)

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

@@ -8,8 +8,8 @@ module Mokio
         extend ActiveSupport::Concern
 
         included do
-          before_filter :set_edited_gallery, :only => [:create, :update, :find]
-          before_filter :set_edited_movie, :only => [:edit, :update, :preview_movie]
+          before_action :set_edited_gallery, :only => [:create, :update, :find]
+          before_action :set_edited_movie, :only => [:edit, :update, :preview_movie]
         end
 
         #
@@ -29,14 +29,14 @@ module Mokio
           end
 
           @youtube.thumb = @youtube.thumb.file
-        
+
           if @youtube.save
             flash[:notice] = t("youtubes.created", title: @youtube.name).html_safe
           else
             flash[:error]  = t("youtubes.created", title: @youtube.name).html_safe
           end
 
-          redirect_to edit_content_path(@edited_gallery) 
+          redirect_to edit_content_path(@edited_gallery)
         end
 
         #
@@ -76,7 +76,7 @@ module Mokio
 
         #
         # Searches for a movie on Youtube, Vimeo or Dailymotion based on given URL.
-        # Renders preview.html.haml 
+        # Renders preview.html.haml
         #
         def find
           @youtube = Mokio::Youtube.new
@@ -102,7 +102,7 @@ module Mokio
         end
 
         #
-        # Opens a window with a movie based on the movie URL 
+        # Opens a window with a movie based on the movie URL
         #
         def preview_movie
           @video = Mokio::Youtube.find_movie(@edited_movie.movie_url)
@@ -114,7 +114,7 @@ module Mokio
         private
           #
           # Never trust parameters from the scary internet, only allow the white list through.
-          #   
+          #
           def youtube_params #:doc:
             params.require(:youtube).permit(:name, :intro, :external_link, :active, :content_id, :movie_url, :id, :thumb, :subtitle, :thumb_external_url)
           end

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

@@ -11,17 +11,17 @@ module Mokio
           belongs_to :static_module
           belongs_to :module_position
 
-          scope :not_selected_for_menu, -> (menu_id = -1) { 
+          scope :not_selected_for_menu, -> (menu_id = -1) {
               ids = Mokio::SelectedModule.where(:menu_id => menu_id).pluck(:available_module_id)
               joins("join mokio_static_modules on mokio_available_modules.static_module_id = mokio_static_modules.id").
-              where('mokio_available_modules.id not in (?) and always_displayed = 0', ids.empty? ? '-1' : ids)
+              where('mokio_available_modules.id not in (?) and always_displayed = false', ids.empty? ? '-1' : ids)
           }
           scope :always_displayed, -> {joins("join mokio_static_modules on mokio_available_modules.static_module_id = mokio_static_modules.id").where('mokio_static_modules.always_displayed = ?', true)}
           scope :for_lang, -> (lang_id = 0) {joins("join mokio_static_modules on mokio_available_modules.static_module_id = mokio_static_modules.id").where('mokio_static_modules.lang_id = ? or mokio_static_modules.lang_id is null', lang_id)}
 
           # acts_as_list :column => :seq, :scope => :module_position
           #
-          # scope :selected_for_menu, -> (menu_id = -1) { 
+          # scope :selected_for_menu, -> (menu_id = -1) {
           #     ids = SelectedModule.where(:menu_id => menu_id).pluck(:available_module_id)
           #     joins("join static_modules on available_modules.static_module_id = static_modules.id").
           #     where('available_modules.id in (?) or always_displayed = 1', ids.empty? ? '-1' : ids)

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

@@ -14,13 +14,12 @@ module Mokio
         DATE_ATTRIBUTES = %w(display_from display_to updated_at created_at)
 
         included do
-          attr_accessor :empty_meta
 
           scope :active,        -> { where(active: true) }
           scope :order_default, -> { order("seq asc")    }
 
           before_destroy :deletable
-          before_save :complete_meta
+
 
           validate  :some_editable , on: :update
 
@@ -46,13 +45,6 @@ module Mokio
           def has_gmap_enabled?
             Mokio.backend_gmap_enabled.include?(self.name)
           end
-
-          #
-          # Returns boolean value depends on included model names in Mokio.backend_meta_enabled
-          #
-          def has_meta_enabled?
-            Mokio.backend_meta_enabled.include?(self.name)
-          end
         end
 
         #
@@ -118,26 +110,6 @@ module Mokio
         def cloneable?
           true
         end
-
-        #
-        # Method for autocomplete meta tags
-        #
-        def complete_meta
-          if self.class.has_meta_enabled?
-            self.empty_meta = true if self.meta.present? && (self.meta.g_title.blank? || self.meta.f_title.blank? || self.meta.g_application_name.blank?)
-
-            application_name = Rails.application.class.to_s.split("::").first
-            self.meta.g_title            = self.title       if self.meta.present? && self.meta.g_title.blank?
-            self.meta.f_title            = self.title       if self.meta.present? && self.meta.f_title.blank?
-            self.meta.g_application_name = application_name if self.meta.present? && self.meta.g_application_name.blank?
-
-            if self.respond_to?(:intro) && self.intro.present?
-              intro = ActionController::Base.helpers.strip_tags(self.intro).truncate(160).gsub!(/\s+/, ' ')
-              self.meta.g_desc = intro if self.meta.present? && self.meta.g_desc.blank?
-              self.meta.f_desc = intro if self.meta.present? && self.meta.f_desc.blank?
-            end
-          end
-        end
       end
     end
   end