cms9 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39671969df29f084dc50386b34c30986abd7cf40
-  data.tar.gz: a5d9ee92ba34f3ddc4b35bf41b815eafad32da36
+  metadata.gz: dbd78b3f88753a938d70f3ab5d0617cfcb0e59d7
+  data.tar.gz: 38b5b8cdba433909a0e9b9c2efb6ff857829cf4f
 SHA512:
-  metadata.gz: ca9af03a530830533930fd948b812300654a9cbadf72334685808353d8e1c1bb19fab4534a9525c4a85b147f7e9d48e06e22ce7cd7ab32da6b5e5bc0b99bd804
-  data.tar.gz: 11a5d8d5e2dfcdbba45f4468f598f1bffb26c8559595a38b43947ca07043d627a55c19d30fd51c68fddbef66a18e8b8583ab7a7721c293e6424895588303527c
+  metadata.gz: cd416f3a1b773d461e2efbf1d8f0247ab7c625fe63839d29db5f599b4c31d7a5c8a8ea6aaf04827a39494deadffc2ff17ded7134cafa271d07ec98b683cabeba
+  data.tar.gz: c9d98c9c389007741aaa70d38d8fe1e076858a342dfb44dd69e20e272b7a47fd6679da108728231e5ad53d15af650152c5999c3d8fb5a6fd2fafae8a21fd2302

data/README.md

@@ -2,6 +2,8 @@
 
 # Cms9
 
+[![Gem Version](https://badge.fury.io/rb/cms9.svg)](https://badge.fury.io/rb/cms9)
+
 Small CMS Admin module for developers.
 
 [Demo Application](https://github.com/klikaba/cms9-demo) running on Cms9.

data/app/controllers/cms9/application_controller.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # Main applicaiton contoller
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
     helper_method :current_user, :user_logout
@@ -10,25 +11,22 @@ module Cms9
       parent = ::ApplicationController.new
       parent.request = request
 
-      if parent.respond_to?(current_user_ident)
-        parent.send(current_user_ident)
-      end
+      parent.send(current_user_ident) if parent.respond_to?(current_user_ident)
     end
 
     def user_logout
-      logout_ident = Cms9.configuration.destroy_user_session || :destroy_user_session
+      config = Cms9.configuration.destroy_user_session
+      logout_ident = config || :destroy_user_session
       parent = ::ApplicationController.new
       parent.request = request
 
-      if parent.respond_to?(logout_ident)
-        parent.send(logout_ident)
-      end
+      parent.send(logout_ident) if parent.respond_to?(logout_ident)
     end
 
     def authorize
-      unless current_user.try(:cms9_admin?)
-        raise 'Implement cms9_admin? method in current_user context. See https://github.com/klikaba/cms9'
-      end
+      message = 'Implement cms9_admin? method in current_user context.
+                 See https://github.com/klikaba/cms9'
+      raise message unless current_user.try(:cms9_admin?)
     end
   end
 end

data/app/controllers/cms9/fields_controller.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # fields controller
   class FieldsController < Cms9::ApplicationController
   end
 end

data/app/controllers/cms9/post_definitions_controller.rb

@@ -1,7 +1,10 @@
 module Cms9
+  # post definition controller
   class PostDefinitionsController < Cms9::ApplicationController
     def index
-      @posts = PostDefinition.order('created_at desc').page(params[:page]).per(20)
+      @posts = PostDefinition.order('created_at desc')
+                             .page(params[:page])
+                             .per(20)
     end
 
     def new
@@ -12,74 +15,82 @@ module Cms9
       @post = PostDefinition.find(params[:id])
     end
 
+    # rubocop:disable all
     def create
       @post = PostDefinition.new(post_definition_params)
-
       @post.user_id = current_user.id
 
       if PostDefinition.where(name: @post[:name]).blank?
-
         if @post.save
-          @field = PostField.new({
-            'name': 'Title',
-            'field_type': 'text',
-            'required': true,
-            'post_definition_id': @post.id,
-            'user_id': current_user.id
-          })
+          @field = PostField.new(name: 'Title', field_type: 'text',
+                                 required: true, post_definition_id: @post.id,
+                                 user_id: current_user.id)
           if @field.save
-            Cms9Events.new.create_event('post_definition', @post.id, params[:action], current_user, nil)
-
+            create_post_event
             redirect_to edit_post_definition_path(@post.id)
           end
         else
           render :new
         end
-
       else
-        @post.errors.add(:name, " Post Type already exist")
+        @post.errors.add(:name, ' Post Type already exist')
         render :new
       end
-
     end
 
     def update
       @post = PostDefinition.find(params[:id])
       @post.user_id = current_user.id
+      post_definition_name = params[:post_definition][:name]
 
-      field = PostDefinition.where(name: params[:post_definition][:name].downcase)
-
-      if field.blank? || @post.name == params[:post_definition][:name]
+      field = PostDefinition.where(name: post_definition_name.downcase)
 
+      if field.blank? || @post.name == post_definition_name
         if @post.update(post_definition_params)
-          Cms9Events.new.create_event('post_definition', @post.id, params[:action], current_user, nil)
-
+          create_post_event
           redirect_to edit_post_definition_path(@post.id)
         else
           render :edit
         end
-
       else
-        @post.errors.add(:name, " Post Type already exist")
+        @post.errors.add(:name, ' Post Type already exist')
         render :edit
       end
     end
 
     def destroy
       @post_def = PostDefinition.find(params[:id])
-      @post_def.destroy
-
-      Cms9Events.new.create_event('post_definition', @post_def.id, params[:action], current_user, @post_def.name)
-
       @posts = Post.where(post_definition_id: params[:id])
+      @posts.each do |post|
+        Cms9Events.new.create_event('post', post[:id], params[:action],
+                                    current_user, post_name(post))
+      end
       @posts.destroy_all
-
+      @post_def.destroy
+      create_post_def_event(@post_def.name)
       redirect_to post_definitions_path
     end
 
     private
-      def post_definition_params
-        params.require(:post_definition).permit(:name)
-      end
+
+    def post_name(post)
+      Field.where(post_field_id: post.post_definition
+                                      .post_fields[0].id,
+                  post_id: post.id)[0]['value']
+    end
+
+    def create_post_def_event(name)
+      Cms9Events.new.create_event('post_definition', @post_def.id,
+                                  params[:action], current_user, name)
+    end
+
+    def create_post_event
+      Cms9Events.new.create_event('post_definition', @post.id,
+                                  params[:action], current_user, nil)
+    end
+
+    def post_definition_params
+      params.require(:post_definition).permit(:name)
+    end
   end
 end

data/app/controllers/cms9/post_fields_controller.rb

@@ -1,40 +1,42 @@
 module Cms9
+  # post fields controller
   class PostFieldsController < Cms9::ApplicationController
     def new
       @field = PostField.new
       @field.post_definition_id = params[:post_definition_id]
     end
 
+    # rubocop:disable all
     def create
       @field = PostField.new(post_field_params)
       @field.user_id = current_user.id
 
-      if PostField.where(name: @field[:name], post_definition_id: @field[:post_definition_id]).blank?
-        if @field[:field_type] == 'select_single' || @field[:field_type] == 'select_multiple'
+      if PostField.where(name: @field[:name],
+                         post_definition_id: @field[:post_definition_id]).blank?
+        if %w(select_single select_multiple).include?(@field[:field_type])
           @field.metadata = ''
           values = params[:multi_values]
 
           values.each_with_index do |value, index|
-            if value != ''
-              if index == 0
-                @field.metadata = value
-              elsif
-                @field.metadata = @field.metadata + ',' + value
-              end
+            if value != '' && index.zero?
+              @field.metadata = value
+            elsif !index.zero?
+              @field.metadata = @field.metadata + ',' + value
             end
           end
-        elsif @field[:field_type] != 'select_single' && @field[:field_type] != 'select_multiple' && @field[:field_type] != 'image'
+        elsif !%w(select_single select_multiple image)
+              .include?(@field[:field_type])
           @field.metadata = nil
         end
 
         if @field.save
-          Cms9Events.new.create_event('post_definition', @field[:post_definition_id], 'update', current_user, nil)
+          create_post_field_event
           redirect_to edit_post_definition_path(id: @field.post_definition_id)
         else
           render :new
         end
       else
-        @field.errors.add(:name, "of field already exist")
+        @field.errors.add(:name, 'of field already exist')
         render :new
       end
     end
@@ -42,51 +44,28 @@ module Cms9
     def edit
       @field = PostField.find(params[:id])
       @post_name = params[:post]
-
-      if PostField.all_types.index(params[:type]) != nil
-        @field.field_type = params[:type]
-      end
-
-      if params[:field_name] != nil
-        @field.name = params[:field_name]
-      end
+      @field.field_type = params[:type] unless PostField.all_types
+                                                        .index(params[:type])
+                                                        .nil?
+      @field.name = params[:field_name] unless params[:field_name].nil?
     end
 
     def update
       @field = PostField.find(params[:id])
       @field.user_id = current_user.id
-      
-      field = PostField.where(name: post_field_params[:name], post_definition_id: @field[:post_definition_id])
+      field = PostField.where(name: post_field_params[:name],
+                              post_definition_id: @field[:post_definition_id])
 
       if field.blank? || field.pluck(:id)[0].to_s == params[:id]
-        if @field[:field_type] == 'select_single' || @field[:field_type] == 'select_multiple'
-          @field.metadata = ''
-          values = params[:multi_values]
-
-          values.each_with_index do |value, index|
-            if value != ''
-              if index == 0
-                @field.metadata = value
-              elsif
-                @field.metadata = @field.metadata + ',' + value
-              end
-            end
-          end
-
-          params[:post_field][:metadata] = @field.metadata
-
-        elsif @field[:field_type] != 'select_single' && @field[:field_type] != 'select_multiple' && @field[:field_type] != 'image'
-          @field.metadata = nil
-        end
-
+        check_selectors
         if @field.update(post_field_params)
-          Cms9Events.new.create_event('post_definition', @field[:post_definition_id], 'update', current_user, nil)
+          create_post_field_event
           redirect_to edit_post_definition_path(id: @field.post_definition_id)
         else
           render :edit
         end
       else
-        @field.errors.add(:name, "of field already exist")
+        @field.errors.add(:name, 'of field already exist')
         render :edit
       end
     end
@@ -94,15 +73,46 @@ module Cms9
     def destroy
       @field = PostField.find(params[:id])
       @field.destroy
-
-      Cms9Events.new.create_event('post_definition', @field[:post_definition_id], 'update', current_user, nil)
-
+      create_post_field_event
       redirect_to request.referrer
     end
 
     private
-      def post_field_params
-        params.require(:post_field).permit(:name, :field_type, :post_definition_id, :required, :metadata)
+
+    def create_post_field_event
+      Cms9Events.new.create_event('post_definition',
+                                  @field[:post_definition_id], 'update',
+                                  current_user, nil)
+    end
+
+    def check_selectors
+      if check_single_multiple
+        @field.metadata = ''
+        params[:multi_values].each_with_index do |value, index|
+          if value != '' && index.zero?
+            @field.metadata = value
+          elsif !index.zero?
+            @field.metadata = @field.metadata + ',' + value
+          end
+        end
+        params[:post_field][:metadata] = @field.metadata
+      elsif check_select_image
+        @field.metadata = nil
       end
+    end
+
+    def check_single_multiple
+      ['select_single', 'select_multiple'].include?(@field[:field_type])
+    end
+
+    def check_select_image
+      !['select_single', 'select_multiple', 'image'].include?(@field[:field_type])
+    end
+
+    def post_field_params
+      params.require(:post_field).permit(:name, :field_type,
+                                         :post_definition_id,
+                                         :required, :metadata)
+    end
   end
 end

data/app/controllers/cms9/posts_controller.rb

@@ -1,11 +1,12 @@
 module Cms9
+  # posts controller
   class PostsController < Cms9::ApplicationController
     def index
       @post_definition = Cms9::PostDefinition.find(params[:post_definition_id])
       @posts = Post.where(post_definition: @post_definition)
-                  .order('created_at desc')
-                  .page(params[:page])
-                  .per(20)
+                   .order('created_at desc')
+                   .page(params[:page])
+                   .per(20)
     end
 
     def new
@@ -19,11 +20,10 @@ module Cms9
 
     def create
       @post = Post.new(post_params)
-
       @post.user_id = current_user.id
 
       if @post.save
-        Cms9Events.new.create_event('post', @post.id, params[:action], current_user, nil)
+        create_post_event(@post.id, nil)
         redirect_to posts_path(post_definition_id: @post.post_definition.id)
       else
         render :new
@@ -42,11 +42,10 @@ module Cms9
 
     def update
       @post = Post.find(params[:id])
-
       @post.user_id = current_user.id
 
       if @post.update(post_params)
-        Cms9Events.new.create_event('post', @post.id, params[:action], current_user, nil)
+        create_post_event(@post.id, nil)
         redirect_to posts_path(post_definition_id: @post.post_definition.id)
       else
         render :edit
@@ -57,20 +56,29 @@ module Cms9
       @post = Post.find(params[:id])
       post_definition_id = @post.post_definition.id
 
-      post_name = Field.where(post_field_id: @post.post_definition.post_fields[0].id, post_id: @post.id)[0]
-      Cms9Events.new.create_event('post', @post.id, params[:action], current_user, post_name)
-
-      @post.destroy
-
+      create_post_event(@post.id, post_name) && @post.destroy
       redirect_to posts_path(post_definition_id: post_definition_id)
     end
 
     private
-      def post_params
-        params.require(:post).permit(:post_definition_id, fields_attributes:
-                                    [:id, :post_id, :post_field_id, :value, { :value => [] },
-                                     :image, :image_uid, :image_name, :remove_image, :image_custom_size])
-      end
 
+    def post_name
+      Field.where(post_field_id: @post.post_definition
+                                      .post_fields[0].id,
+                  post_id: @post.id)[0]['value']
+    end
+
+    def create_post_event(post_id, post_name)
+      Cms9Events.new.create_event('post', post_id, params[:action],
+                                  current_user, post_name)
+    end
+
+    def post_params
+      params.require(:post).permit(:post_definition_id, fields_attributes:
+                                  [:id, :post_id, :post_field_id, :value,
+                                   { value: [] },
+                                   :image, :image_uid, :image_name,
+                                   :remove_image, :image_custom_size])
+    end
   end
 end

data/app/controllers/cms9/welcome_controller.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # welcome controller
   class WelcomeController < Cms9::ApplicationController
     def index
       limit = params[:limit] ? params[:limit] : 10

data/app/helpers/cms9/application_helper.rb

@@ -1,58 +1,65 @@
 module Cms9
+  # main application fields displaying helper
   module ApplicationHelper
+    def cms9_field(field, options = {})
+      check_type(field, options) if field.present?
+    end
 
-    def cms9_field(field, options={})
-      if field.present?
-        case field.post_field.field_type
-          when 'text', 'number', 'select_single', 'date', 'time', 'date_time'
-            return field.value.blank? ? '' : cms9_text_tag(field)
-          when 'text_area'
-            return field.value.blank? ? '' : cms9_text_area_tag(field)
-          when 'select_multiple'
-            return field.value.blank? ? '' : cms9_multiple_choice(field)
-          when 'image'
-            return field.blank? ? '' : cms9_image_tag(field, options)
-          else
-            return '<unsupported type>'
-        end
-      end
-    end   
-   
     def cms9_text_tag(model)
-      return model.to_s 
-    end 
+      model.to_s
+    end
 
-    def cms9_text_area_tag(model)      
-        return raw(model.to_s)
-    end 
+    def cms9_text_area_tag(model)
+      raw(model.to_s)
+    end
 
-    def cms9_multiple_choice(model)     
-      @m = model.value.to_s.split("\' ")[0]
-      return  "#{@m}" 
-    end 
+    def cms9_multiple_choice(model)
+      model.value.to_s.split("\' ")[0].to_s
+    end
 
-    def cms9_image_tag(model, options={})
-      return image_tag(model.image.url, options)
-    end 
+    def cms9_image_tag(model, options = {})
+      image_tag(model.image.url, options)
+    end
 
     def cms9_number_tag(model)
-      return model.to_s 
-    end 
+      model.to_s
+    end
 
     def cms9_select_single_tag(model)
-      return model.to_s 
-    end 
+      model.to_s
+    end
 
     def cms9_date_tag(model)
-      return model.to_s 
+      model.to_s
     end
 
     def cms9_time_tag(model)
-      return model.to_s 
+      model.to_s
     end
 
     def cms9_date_time_tag(model)
-      return model.to_s 
+      model.to_s
+    end
+
+    def check_type(field, options) # rubocop:disable CyclomaticComplexity
+      case field.post_field.field_type
+      when 'text', 'number', 'select_single', 'date', 'time', 'date_time'
+        field_value(field) ? '' : cms9_text_tag(field)
+      when 'text_area' then field_value(field) ? '' : cms9_text_area_tag(field)
+      when 'select_multiple'
+        field_value(field) ? '' : cms9_multiple_choice(field)
+      when 'image' then field_blank(field) ? '' : cms9_image_tag(field, options)
+      else
+        '<unsupported type>'
+      end
+    end
+
+    def field_blank(field)
+      field.blank?
+    end
+
+    def field_value(field)
+      field.value.blank?
     end
   end
 end

data/app/helpers/cms9/fields_helper.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # fields helper
   module FieldsHelper
   end
 end

data/app/helpers/cms9/post_definitions_helper.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # post definition helper
   module PostDefinitionsHelper
   end
 end

data/app/helpers/cms9/post_fields_helper.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # post field helper
   module PostFieldsHelper
   end
 end

data/app/helpers/cms9/posts_helper.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # posts helper
   module PostsHelper
   end
 end

data/app/helpers/cms9/welcome_helper.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # welcome helper
   module WelcomeHelper
   end
 end

data/app/mailers/cms9/application_mailer.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # mailer
   class ApplicationMailer < ActionMailer::Base
     default from: 'from@example.com'
     layout 'mailer'

data/app/models/ckeditor/asset.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # ckeditor main model
   class Ckeditor::Asset < ActiveRecord::Base
     include Ckeditor::Orm::ActiveRecord::AssetBase
     include Ckeditor::Backend::Dragonfly

data/app/models/ckeditor/attachment_file.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # ckeditor attachment model
   class Ckeditor::AttachmentFile < Ckeditor::Asset
     validates_property :ext, of: :data, in: attachment_file_types unless attachment_file_types.empty?
 

data/app/models/ckeditor/picture.rb

@@ -1,7 +1,13 @@
 module Cms9
+  # ckeditor picture model
   class Ckeditor::Picture < Ckeditor::Asset
-    validates_property :format, of: :data, in: image_file_types unless image_file_types.empty?
-    validates_property :image?, of: :data, as: true, message: :invalid
+    validates_property :format,
+                       of: :data,
+                       in: image_file_types unless image_file_types.empty?
+    validates_property :image?,
+                       of: :data,
+                       as: true,
+                       message: :invalid
 
     def url_content
       data.thumb('800x800>').url

data/app/models/cms9/application_record.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # main application model
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
   end

data/app/models/cms9/event.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # event model
   class Event < ApplicationRecord
     belongs_to :post
     belongs_to :post_definition

data/app/models/cms9/field.rb

@@ -1,19 +1,18 @@
 module Cms9
+  # field model
   class Field < ApplicationRecord
     belongs_to :post_field
     belongs_to :post, optional: true
     dragonfly_accessor :image
 
     def to_s
-      case self.post_field.field_type
-        when 'text', 'text_area', 'number', 'select_single', 'date', 'time', 'date_time'
-          return self.value
-        when 'select_multiple'
-          return self.value.split(',')
-        when 'image'
-          return !self.image_uid.blank? ? self.image.url : ''
-        else
-          return ''
+      case post_field.field_type
+      when 'text', 'text_area', 'number',
+           'select_single', 'date', 'time', 'date_time' then value
+      when 'select_multiple' then value.split(',')
+      when 'image' then !image_uid.blank? ? image.url : ''
+      else
+        ''
       end
     end
   end

data/app/models/cms9/post.rb

@@ -1,4 +1,5 @@
 module Cms9
+  # post model
   class Post < ApplicationRecord
     belongs_to :post_definition
     has_many   :fields, dependent: :destroy
@@ -6,11 +7,10 @@ module Cms9
     accepts_nested_attributes_for :fields
 
     def field(name)
-      @cache_fields ||= self.fields.joins(:post_field).includes(:post_field)
-                            .map { |field| [field.post_field.name, field] }
-                            .to_h
+      @cache_fields ||= fields.joins(:post_field).includes(:post_field)
+                              .map { |field| [field.post_field.name, field] }
+                              .to_h
       @cache_fields[name]
     end
-
   end
 end

data/app/models/cms9/post_definition.rb

@@ -1,15 +1,17 @@
 module Cms9
+  # post definition model
   class PostDefinition < ApplicationRecord
-    validates :name, presence: true, uniqueness: { case_sensitive: false },
+    validates :name,
+              presence: true,
+              uniqueness: { case_sensitive: false },
               length: { minimum: 3 }
 
     has_many :post_fields, dependent: :destroy
     has_many :posts, dependent: :destroy
 
-
     def fields
       if @cache_fields.nil?
-        @cache_fields = self.post_fields.map { |field| [field.name, field] }.to_h
+        @cache_fields = post_fields.map { |field| [field.name, field] }.to_h
       end
 
       @cache_fields.values
@@ -17,9 +19,8 @@ module Cms9
 
     # Get field by name
     def field(name)
-      fields()
+      fields
       @cache_fields[name]
     end
-
   end
 end

data/app/models/cms9/post_field.rb

@@ -1,23 +1,22 @@
 module Cms9
+  # post field model
   class PostField < ApplicationRecord
-    validates :name,  presence: true,  length: { minimum:3, maximum: 15 }
+    validates :name, presence: true, length: { minimum: 3, maximum: 15 }
     validates :field_type, presence: true
 
     belongs_to :post_definition
     attr_accessor :multi_values
 
     def self.all_types
-      return [
-        { key: 'text', display_name: 'Text' },
-        { key: 'text_area', display_name: 'Text Area' },
-        { key: 'number', display_name: 'Number'},
-        { key: 'select_single', display_name: 'Select Single' },
-        { key: 'select_multiple', display_name: 'Select Multiple' },
-        { key: 'date', display_name: 'Date' },
-        { key: 'time', display_name: 'Time' },
-        { key: 'date_time', display_name: 'Date & Time' },
-        { key: 'image', display_name: 'Image' }
-      ]
+      [{ key: 'text', display_name: 'Text' },
+       { key: 'text_area', display_name: 'Text Area' },
+       { key: 'number', display_name: 'Number' },
+       { key: 'select_single', display_name: 'Select Single' },
+       { key: 'select_multiple', display_name: 'Select Multiple' },
+       { key: 'date', display_name: 'Date' },
+       { key: 'time', display_name: 'Time' },
+       { key: 'date_time', display_name: 'Date & Time' },
+       { key: 'image', display_name: 'Image' }]
     end
   end
 end

data/app/views/cms9/posts/index.html.erb

@@ -1,4 +1,3 @@
-
 <div class="row">
   <div class="col-md-12">
     <div class="box box-info">

data/app/views/cms9/posts/inputs/_time.html.erb

@@ -1,2 +1,2 @@
 <%= field.label field.object.post_field.name %>
-<%= field.time_field :value, as: :time, value: field.object.value, { class: 'form-control', required: field.object.post_field.required } %>
+<%= field.time_field :value, as: :time, value: field.object.value, class: 'form-control', required: field.object.post_field.required %>

data/app/views/layouts/cms9/application.html.erb

@@ -10,8 +10,10 @@
     <%= csrf_meta_tags %>
     <%= favicon_link_tag 'cms9/favicon-16.png', type: 'image/png' %>
     <%= favicon_link_tag 'cms9/favicon-32.png', type: 'image/png' %>
-    <%= favicon_link_tag 'cms9/favicon-64.png', type: 'image/png' %>
-    <%= favicon_link_tag 'cms9/favicon-64.png', type: 'image/png' %>
+    <%= favicon_link_tag 'cms9/favicon-48.png', type: 'image/png' %>
+    <%= favicon_link_tag 'cms9/favicon-128.png', type: 'image/png' %>
+    <%= favicon_link_tag 'cms9/favicon-256.png', type: 'image/png' %>
+    <%= favicon_link_tag 'cms9/favicon-512.png', type: 'image/png' %>
   </head>
 
   <body class="skin-blue">

data/config/initializers/assets.rb

@@ -1,4 +1,6 @@
-Rails.application.config.assets.precompile += %w( cms9/favicon-16.png )
-Rails.application.config.assets.precompile += %w( cms9/favicon-32.png )
-Rails.application.config.assets.precompile += %w( cms9/favicon-64.png )
-Rails.application.config.assets.precompile += %w( cms9/favicon-128.png )
+Rails.application.config.assets.precompile += %w(cms9/favicon-16.png)
+Rails.application.config.assets.precompile += %w(cms9/favicon-32.png)
+Rails.application.config.assets.precompile += %w(cms9/favicon-48.png)
+Rails.application.config.assets.precompile += %w(cms9/favicon-128.png)
+Rails.application.config.assets.precompile += %w(cms9/favicon-256.png)
+Rails.application.config.assets.precompile += %w(cms9/favicon-512.png)

data/config/initializers/ckeditor.rb

@@ -1,15 +1,17 @@
+# ckeditor config file
 module Cms9
   Ckeditor.setup do |config|
     # ==> ORM configuration
-    # Load and configure the ORM. Supports :active_record (default), :mongo_mapper and
+    # Load and configure the ORM. Supports :active_record (default),
+    # :mongo_mapper and
     # :mongoid (bson_ext recommended) by default. Other ORMs may be
     # available as additional gems.
-    require "ckeditor/orm/active_record"
+    require 'ckeditor/orm/active_record'
 
     # Allowed image file types for upload.
     # Set to nil or [] (empty array) for all file types
     # By default: %w(jpg jpeg png gif tiff)
-    # config.image_file_types = %w(jpg jpeg png gif tiff)
+    config.image_file_types = %w(jpg jpeg png gif tiff)
 
     # Allowed flash file types for upload.
     # Set to nil or [] (empty array) for all file types
@@ -19,7 +21,8 @@ module Cms9
     # Allowed attachment file types for upload.
     # Set to nil or [] (empty array) for all file types
     # By default: %w(doc docx xls odt ods pdf rar zip tar tar.gz swf)
-    # config.attachment_file_types = %w(doc docx xls odt ods pdf rar zip tar tar.gz swf)
+    # config.attachment_file_types =
+    # %w(doc docx xls odt ods pdf rar zip tar tar.gz swf)
 
     # Setup authorization to be run as a before filter
     # By default: there is no authorization.
@@ -41,7 +44,8 @@ module Cms9
     # By default: nil
     # config.asset_path = "http://www.example.com/assets/ckeditor/"
 
-    # To reduce the asset precompilation time, you can limit plugins and/or languages to those you need:
+    # To reduce the asset precompilation time, you can limit plugins and/or
+    # languages to those you need:
     # By default: nil (no limit)
     # config.assets_languages = ['en', 'uk']
     # config.assets_plugins = ['image', 'smiley']

data/config/initializers/ckeditor_dragonfly.rb

@@ -3,13 +3,15 @@ require 'dragonfly'
 
 Dragonfly.app(:ckeditor).configure do
   plugin :imagemagick
-  secret "761fa77ae747b0b82ddbc54f3ada94d9259690f701852a398130261e117f3798"
+  secret '761fa77ae747b0b82ddbc54f3ada94d9259690f701852a398130261e117f3798'
 
   # Store files in public/uploads/ckeditor. This is not
   # mandatory and the files don't even have to be stored under
   # public. See http://markevans.github.io/dragonfly/data-stores
-  datastore :file, root_path: Rails.root.join('public/uploads/ckeditor', Rails.env).to_s,
-                   server_root: 'public'
+  datastore :file,
+            root_path: Rails.root.join('public/uploads/ckeditor',
+                                       Rails.env).to_s,
+            server_root: 'public'
 
   # Accept asset requests on /ckeditor_assets. Again, this path is
   # not mandatory. Just be sure to include :job somewhere.

data/config/initializers/ckeditor_init.rb

@@ -1,3 +1,3 @@
-require "ckeditor/orm/active_record"
+require 'ckeditor/orm/active_record'
 
-Rails.application.config.assets.precompile += %w( ckeditor/* )
+Rails.application.config.assets.precompile += %w(ckeditor/*)

data/config/initializers/dragonfly.rb

@@ -4,13 +4,13 @@ require 'dragonfly'
 Dragonfly.app.configure do
   plugin :imagemagick
 
-  secret "0faed7549aa86f0847364e39af20ac099ca03cc542912c1deff473b78bd5700f"
+  secret '0faed7549aa86f0847364e39af20ac099ca03cc542912c1deff473b78bd5700f'
 
-  url_format "/media/:job/:name"
+  url_format '/media/:job/:name'
 
   datastore :file,
-    root_path: Rails.root.join('public/system/dragonfly', Rails.env),
-    server_root: Rails.root.join('public')
+            root_path: Rails.root.join('public/system/dragonfly', Rails.env),
+            server_root: Rails.root.join('public')
 end
 
 # Logger

data/lib/cms9.rb

@@ -1,6 +1,7 @@
-require "cms9/engine"
-require "dragonfly"
+require 'cms9/engine'
+require 'dragonfly'
 
+# main cms9 module
 module Cms9
   class << self
     attr_accessor :configuration
@@ -10,7 +11,7 @@ module Cms9
     self.configuration ||= Configuration.new
     yield(configuration)
   end
-
+  # configuration
   class Configuration
     attr_accessor :current_user, :destroy_user_session
 
@@ -21,4 +22,4 @@ module Cms9
   end
 end
 
-require "sdk/cms9"
+require 'sdk/cms9'

data/lib/cms9/engine.rb

@@ -8,9 +8,10 @@ require 'rails-assets-tether'
 require 'font-awesome-rails'
 require 'ckeditor'
 require 'cms9'
-require "events/cms9_events"
+require 'events/cms9_events'
 
 module Cms9
+  # main cms9 engine class
   class Engine < ::Rails::Engine
     isolate_namespace Cms9
 
@@ -19,6 +20,5 @@ module Cms9
     config.to_prepare do
       ::ApplicationController.helper(Cms9::ApplicationHelper)
     end
-
   end
 end

data/lib/cms9/version.rb

@@ -1,3 +1,3 @@
 module Cms9
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'.freeze
 end

data/lib/events/cms9_events.rb

@@ -1,42 +1,23 @@
 module Cms9
+  # Events for every action in administration part
   class Cms9Events
-
     def create_event(event_type, event_id, action, user, del_name)
-      post_definition_id = nil
-      post_id = nil
-
-      user_info = [ user.id, user.email ? user.email : nil ]
+      @post_definition_id = nil
+      @post_id = nil
 
-      case event_type
-        when 'post_definition'
-          post_definition_id = event_id
-        when 'post'
-          post_id = event_id
-      end
+      check_event_type(event_type, event_id)
 
-      @event = Event.new({
-        'user': user_info,
-        'action': action,
-        'post_definition_id': post_definition_id,
-        'post_id': post_id,
-        'deleted_field': del_name
-      })
+      @event = Event.new(
+        user: [user.id, user.email ? user.email : nil], action: action,
+        post_definition_id: @post_definition_id, post_id: @post_id,
+        deleted_field: del_name
+      )
 
-      if @event.save
-        if del_name != nil
-          if event_type == 'post_definition'
-            Event.where(post_definition_id: post_definition_id).update_all(deleted_field: del_name)
-          elsif event_type == 'post'
-            Event.where(post_id: post_id).each do |event|
-              event.update(deleted_field: del_name)
-            end
-          end
-        end
-      end
+      after_save(event_type) if @event.save && !del_name.nil?
     end
 
     def get_title_value_for_post(post_id)
-      return @post = Cms9::Field.where(post_id: post_id)[0]
+      @post = Cms9::Field.where(post_id: post_id)[0]
     end
 
     def timeline_events(limit)
@@ -46,5 +27,24 @@ module Cms9
         Event.order('created_at desc')
       end
     end
+
+    def after_save(event_type)
+      if event_type == 'post_definition'
+        Event.where(post_definition_id: @post_definition_id)
+             .update_all(deleted_field: @event.deleted_field)
+      elsif event_type == 'post'
+        Event.where(post_id: @post_id)
+             .update_all(deleted_field: @event.deleted_field)
+      end
+    end
+
+    def check_event_type(event_type, event_id)
+      case event_type
+      when 'post_definition'
+        @post_definition_id = event_id
+      when 'post'
+        @post_id = event_id
+      end
+    end
   end
 end

data/lib/generators/cms9/install/install_generator.rb

@@ -1,34 +1,37 @@
-require "rails/generators/base"
+require 'rails/generators/base'
 require 'rails/generators/migration'
 require 'rails/generators/active_record'
 
 module Cms9
   module Generators
+    # Install generator for route mounting and copying necessary files
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
 
-      argument :def_route, type: :string, default: "cms9"
+      argument :def_route, type: :string, default: 'cms9'
       source_root File.expand_path(File.dirname(__FILE__))
 
       def mount_engine_route
-        puts "\nMounting Cms9::Engine on " + "/" + file_name + " route"
-        route "mount Cms9::Engine => " + "'/" + file_name + "'"
+        puts "\nMounting Cms9::Engine on " + '/' + file_name + ' route'
+        route "mount Cms9::Engine => '/#{file_name}'"
         puts "\n"
       end
 
       def copy_initializer
-        puts "Copying necessary files..."
-        copy_file 'templates/cms9_configurator.rb', 'config/initializers/cms9_configurator.rb'
-        puts ""
+        puts 'Copying necessary files...'
+        copy_file 'templates/cms9_configurator.rb',
+                  'config/initializers/cms9_configurator.rb'
+        puts ''
       end
 
       def copy_ckeditor_config
-        copy_file 'templates/ckeditor_config.js', 'app/assets/javascripts/ckeditor/config.js'
+        copy_file 'templates/ckeditor_config.js',
+                  'app/assets/javascripts/ckeditor/config.js'
 
-        data = File.read("app/assets/javascripts/ckeditor/config.js")
-        filtered_data = data.gsub("cms9", file_name)
+        data = File.read('app/assets/javascripts/ckeditor/config.js')
+        filtered_data = data.gsub('cms9', file_name)
 
-        File.open("app/assets/javascripts/ckeditor/config.js", "w") do |f|
+        File.open('app/assets/javascripts/ckeditor/config.js', 'w') do |f|
           f.write(filtered_data)
         end
       end
@@ -38,28 +41,18 @@ module Cms9
       end
 
       def generate_migration
-        cms9_file_dir = File.expand_path('../../../../../db/migrate/.', __FILE__)
-        files = []
-
-        Dir.foreach(cms9_file_dir) do |file|
-          files << file unless file =~ /^\.\.?$/
-        end
-
-        files.each do |migration|
-          destination   = File.expand_path('db/migrate/' + migration, self.destination_root)
+        migraton_files.each do |migration|
+          destination   = File.expand_path('db/migrate/' + migration,
+                                           destination_root)
           migration_dir = File.dirname(destination)
           only_name     = File.basename(migration, File.extname(migration))
           destination   = self.class.migration_exists?(migration_dir, only_name)
 
-          if destination
-            puts "\n\e[0m\e[31mFound existing " + migration + " migration. Remove it if you want to regenerate.\e[0m"
-          else
-            puts ""
-            migration_template '../../../../db/migrate/' + migration, 'db/migrate/' + migration
-          end
+          migration_templating(destination, migration)
         end
       end
 
+      # rubocop:disable all
       def show_info
         puts "\n  *************************************************************************"
         puts "  *                                                                       *"
@@ -70,12 +63,37 @@ module Cms9
         puts "  *     Visit \033[32mhttps://github.com/klikaba/cms9\033[0m for more informations       *"
         puts "  *                                                                       *"
         puts "  *************************************************************************\n\n"
+        binding.pry
       end
 
       private
-        def file_name
-          def_route.underscore
+
+      def file_name
+        def_route.underscore
+      end
+
+      def migraton_files
+        cms9_file_dir = File.expand_path('../../../../../db/migrate/.',
+                                         __FILE__)
+        files = []
+
+        Dir.foreach(cms9_file_dir) do |file|
+          files << file unless file =~ /^\.\.?$/
         end
+
+        files
+      end
+
+      def migration_templating(destination, migration)
+        if destination
+          puts "\n\e[0m\e[31mFound existing " + migration +
+               " migration. Remove it if you want to regenerate.\e[0m"
+        else
+          puts ''
+          migration_template '../../../../db/migrate/' + migration,
+                             'db/migrate/' + migration
+        end
+      end
     end
   end
 end

data/lib/generators/cms9/install/templates/cms9_configurator.rb

@@ -1,4 +1,4 @@
 Cms9.configure do |config|
-  config.current_user =  :current_user
-  config.destroy_user_session =  :destroy_user_session_path
+  config.current_user = :current_user
+  config.destroy_user_session = :destroy_user_session_path
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cms9
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Klika.ba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -296,6 +296,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: brakeman
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Small CMS Admin module for Rails
 email:
 - contact@klika.ba
@@ -311,8 +339,10 @@ files:
 - app/assets/images/cms9/cms9_logo_readme.png
 - app/assets/images/cms9/favicon-128.png
 - app/assets/images/cms9/favicon-16.png
+- app/assets/images/cms9/favicon-256.png
 - app/assets/images/cms9/favicon-32.png
-- app/assets/images/cms9/favicon-64.png
+- app/assets/images/cms9/favicon-48.png
+- app/assets/images/cms9/favicon-512.png
 - app/assets/images/cms9/iCheck/flat/blue.png
 - app/assets/images/cms9/iCheck/flat/blue@2x.png
 - app/assets/javascripts/cms9/admin_lte.js