carnival 0.2.7 → 0.2.8

data/app/helpers/carnival/base_admin_helper.rb

@@ -1,7 +1,7 @@
 module Carnival
   module BaseAdminHelper
     def set_resource_actived_if_current(path)
-      (request.fullpath == path)? 'actived' : ''
+      (request.fullpath == path) ? 'actived' : ''
     end
 
     def show_messages
@@ -18,38 +18,36 @@ module Carnival
       ''
     end
 
-    def caminho_modelo(action, extra_params=nil)
-      params = {controller: controller.controller_name, action: action}
+    def caminho_modelo(action, extra_params = nil)
+      params = { controller: controller.controller_name, action: action }
       params = params.merge(extra_params) if extra_params.present?
       url_for(params)
     end
 
-    def carnival_render_if_exist partial_path
-      if partial_exist?(partial_path)
-        return render partial_path
-      end
+    def carnival_render_if_exist(partial_path)
+      render partial_path if partial_exist?(partial_path)
     end
 
-    def partial_exist? partial_path
-      File.exists?(get_partial_path(partial_path))
+    def partial_exist?(partial_path)
+      File.exist?(get_partial_path(partial_path))
     end
 
-    def has_many_relation? model, field
+    def has_many_relation?(model, field)
       klass = Carnival::KlassService.new model.class
       klass.is_a_has_many_relation?(field.to_sym)
     end
 
-    def has_one_relation? model, field
+    def has_one_relation?(model, field)
       klass = Carnival::KlassService.new model.class
       klass.is_a_has_one_relation?(field.to_sym)
     end
 
-    def many_to_many_relation? model, field
+    def many_to_many_relation?(model, field)
       klass = Carnival::KlassService.new model.class
       klass.is_a_many_to_many_relation?(field.to_sym)
     end
 
-    def get_partial_path partial_path
+    def get_partial_path(partial_path)
       path = Rails.root.join('app', 'views')
       partial_path_array = partial_path.split('/')
       partial_path_array.each do |pp|
@@ -62,9 +60,9 @@ module Carnival
       path
     end
 
-    def menu_link link
+    def menu_link(link)
       link.strip!
-      if link.to_s.end_with?('_path') or link.to_s.end_with?('_url')
+      if link.to_s.end_with?('_path') || link.to_s.end_with?('_url')
         return eval link
       elsif link.index(/_path.+/) #path with arguments
         return eval link
@@ -87,7 +85,7 @@ module Carnival
     end
 
     def field_to_show(presenter, field_name, record, show_only_values=false)
-      if presenter.fields[field_name].params[:as] == :partial 
+      if presenter.fields[field_name].params[:as] == :partial
         raw(render field_name.to_s, record: record)
       else
         rendered = field_value_and_type presenter, field_name, record
@@ -96,49 +94,47 @@ module Carnival
 
         is_relation = presenter.relation_field?(field_name)
 
-        unless value.nil?
+        if value.present?
           formatted_field = format_field(presenter, field_name, field_type, value)
-          if is_relation and !show_only_values
+          if is_relation && !show_only_values
             link_to(formatted_field, presenter.relation_path(field_name, record))
           else
             formatted_field
           end
-        else
-          nil
         end
       end
     end
 
-    def field_value_and_type presenter, field_name, record
+    def field_value_and_type(presenter, field_name, record)
       renderer = FieldRenderers::RendererCreator
-        .create_field_renderer(presenter, field_name)
+                 .create_field_renderer(presenter, field_name)
 
-      rendered = renderer.render_field(record)
+      renderer.render_field(record)
     end
 
-    def is_image? field_type, value
+    def is_image?(field_type, value)
       field_type.nil? and value.class.to_s == "Paperclip::Attachment" and value.content_type.include? "image"
     end
 
     def format_field(presenter, field_name, field_type, value)
       if is_image?(field_type, value)
-        "<img class='attr' src='#{value.url(:thumb)}' alt='#{translate_field(presenter, field_name)}' />"
+        image_tag value.url(:thumb), alt: translate_field(presenter, field_name), class: 'attr'
       else
         case field_type
         when :datetime
           begin
             I18n.l(value, format: :long_date)
           rescue I18n::MissingTranslationData
-            value.strftime("%d/%m/%y %H:%M:%S")
+            value.strftime('%d/%m/%y %H:%M:%S')
           end
         when :date
           begin
             I18n.l(value, format: :short_date)
           rescue I18n::MissingTranslationData
-            value.strftime("%d/%m/%Y")
+            value.strftime('%d/%m/%Y')
           end
         when :number
-          number_with_precision(value, :precision => 2, :separator => ",")
+          number_with_precision(value, precision: 2, separator: ',')
         when :enum
           presenter.model_class.const_get(field_name.upcase)[value]
         else
@@ -150,7 +146,7 @@ module Carnival
     def translate_field(presenter, field_name)
       field = presenter.get_field(field_name)
       field_key = field.name_for_translation
-      presenter.full_model_name.classify.constantize.human_attribute_name field_key
+      presenter.model_class.human_attribute_name field_key
     end
 
     def list_cel(presenter, field, record, only_render_fields)
@@ -174,68 +170,54 @@ module Carnival
       "<div class='attr'><div class='label #{field}'>#{translate_field(presenter, field)}:</div><div class='field_value #{field}'>#{result}</div></div>"
     end
 
-    def get_css_class presenter, field, record
+    def get_css_class(presenter, field, record)
       css_class = presenter.get_field(field).css_class
-      return '' if !css_class
-      return record.send(css_class[:method]) if css_class.is_a? Hash
-      return css_class if css_class.is_a? String
-      return ''
+      if css_class.is_a? Hash
+        record.send(css_class[:method])
+      else css_class
+        css_class.presence || ''
+      end
     end
 
     def list_buttons(presenter, record)
-      result = ""
-      presenter.actions_for_record.each do |key, record_action|
-        if presenter.render_action?(record, record_action, params[:action])
-          if record_action.show(record)
-            if record_action.remote?
-              result << button_action_remote(record_action, presenter, record)
-            else
-              result << button_action(record_action, presenter, record)
-            end
+      if presenter.actions_for_record.any?
+        presenter.actions_for_record.map do |_, record_action|
+          next unless presenter.render_action?(record, record_action, params[:action])
+          next unless record_action.show(record)
+          if record_action.remote?
+            button_action_remote(record_action, presenter, record)
+          else
+            button_action(record_action, presenter, record)
           end
-        end
+        end.reject(&:nil?).inject(:+)
+      else
+        ""
       end
-      result
     end
 
     def button_action(action, presenter, record)
       label = t("#{presenter.model_name.underscore}.#{action.name}", default: t("carnival.#{action.name}"))
-      path = action.path(presenter, :id => record.id)
+      path = action.path(presenter, id: record.id)
+
       if action.default_partial == :default
-        "<a class='carnival-action-link #{label.parameterize}' href='#{path}'>#{label}</a>"
+        link_to label, path, class: "carnival-action-link #{label.parameterize}"
       elsif action.default_partial == :delete
-        confirm = I18n.t("are_you_sure")
-        "<a class='carnival-action-link apagar' data-confirm='#{confirm}' data-method='delete' href='#{path}' rel='nofollow'>#{label}</a>"
+        link_to label, path, class: 'carnival-action-link apagar', method: :delete, data: { confirm: I18n.t('are_you_sure') }
       end
     end
 
     def button_action_remote(action, presenter, record)
-      name = action.name
       params = action.params
       label =  t("#{presenter.model_name}.#{action.name}", default: t("carnival.#{action.name}"))
-      path = action.path(presenter, :id => record.id)
+      path = action.path(presenter, id: record.id)
 
-      success_callback = "#{name}_success_callback"
-      if params[:success]
-        success_callback = params[:success]
-      end
-
-      error_callback = "#{name}_error_callback"
-      if params[:error]
-        error_callback = params[:error]
-      end
+      success_callback = params[:success] || "#{action.name}_success_callback"
+      error_callback = params[:error] || "#{action.name}_error_callback"
+      params[:show_overlay] = params[:show_overlay].presence || false
 
-      data_overlay = ''
-      if params[:show_overlay]
-        data_overlay = 'data-carnival-show-overlay=true'
-      end
+      remote_function = "Carnival.remoteFunction('#{path}', '#{success_callback}', '#{error_callback}', '#{params[:method]}', {} , #{params[:show_overlay]})"
 
-      params[:show_overlay] = false if params[:show_overlay].nil?
-
-      remote_function = "Carnival.remoteFunction(\"#{path}\", \"#{success_callback}\", \"#{error_callback}\", \"#{params[:method]}\", {} ,#{params[:show_overlay]})"
-
-      "<a class='carnival-action-link editar' href='javascript:#{remote_function}'>#{label}</a>"
+      link_to label, "javascript: #{remote_function}", class: 'carnival-action-link editar'
     end
-
   end
 end

data/app/inputs/admin_date_input.rb

@@ -3,7 +3,8 @@ class AdminDateInput < SimpleForm::Inputs::Base
   include AdminBaseInput
 
   def input(wrapper_options)
-    format = if column.type == :datetime then '%Y/%m/%d %H:%M' else '%Y/%m/%d' end
+    f = I18n.t('date.formats.default')
+    format = if column.type == :datetime then "#{f} %H:%M" else "#{f}" end
     default_input_html_options = {class: "#{column.type}picker",
       value: @builder.object.send(attribute_name).nil? ? "" : @builder.object.send(attribute_name).strftime(format)}
     options = merge_options(default_input_html_options, input_html_options)

data/app/models/carnival/batch_action.rb

@@ -9,7 +9,6 @@ module Carnival
       @path = params[:path] if params[:path].present?
     end
 
-
     def params
       @params
     end
@@ -19,7 +18,7 @@ module Carnival
     end
 
     def to_label
-      I18n.t("#{@presenter.model_name}.#{name}") 
+      I18n.t("#{@presenter.model_name}.#{name}")
     end
 
   end

data/app/models/carnival/field.rb

@@ -66,6 +66,7 @@ module Carnival
         }
       end
     end
+
     def default_sortable?
       @params[:sortable] && @params[:sortable].class == Hash && @params[:sortable][:default] == true
     end
@@ -157,8 +158,8 @@ module Carnival
     end
 
     def sort_name
-      return @params[:related_to].to_s if @params[:related_to].present? 
-      @name.to_s 
+      return @params[:related_to].to_s if @params[:related_to].present?
+      @name.to_s
     end
 
     private

data/app/presenters/carnival/base_admin_presenter.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 module Carnival
   class BaseAdminPresenter
+    include Dsl
     include Rails.application.routes.url_helpers
 
     def initialize(params)
@@ -24,23 +25,6 @@ module Carnival
       self.class.to_s
     end
 
-    @@index_as = {}
-    def self.index_as(type)
-      @@index_as[presenter_class_name] = type
-    end
-
-    @@actions = {}
-    def self.action(name, params = {})
-      @@actions[presenter_class_name] ||= {}
-      @@actions[presenter_class_name][name] = Carnival::Action.new(name, params)
-    end
-
-    @@batch_actions = {}
-    def self.batch_action(name, params = {})
-      @@batch_actions[presenter_class_name] ||= {}
-      @@batch_actions[presenter_class_name][name] = Carnival::BatchAction.new(self.new({}), name, params)
-    end
-
     def has_batch_actions?
       if @@batch_actions[presenter_class_name].present?
         @@batch_actions[presenter_class_name].keys.size > 0
@@ -49,12 +33,6 @@ module Carnival
       end
     end
 
-    @@items_per_page = {}
-    def self.items_per_page(per_page)
-      @@items_per_page[presenter_class_name] ||= {}
-      @@items_per_page[presenter_class_name][:items_per_page] = per_page
-    end
-
     def items_per_page
       @@items_per_page[presenter_class_name] ||= {}
       unless @@items_per_page[presenter_class_name][:items_per_page].present? and @@items_per_page[presenter_class_name][:items_per_page] > 0
@@ -63,16 +41,10 @@ module Carnival
       @@items_per_page[presenter_class_name][:items_per_page]
     end
 
-    def index_as_table?
-      index_as == :table
-    end
-
-    def index_as_list?
-      index_as == :list
-    end
-
-    def index_as_grid?
-      index_as == :grid
+    [:table, :list, :grid].each do |index_type|
+      define_method "index_as_#{index_type}?" do
+        index_as == index_type
+      end
     end
 
     def index_as
@@ -99,11 +71,6 @@ module Carnival
       @@actions[presenter_class_name].present? && @@actions[presenter_class_name][action].present?
     end
 
-    @@model_names = {}
-    @@fields = {}
-    @@scopes = {}
-    @@forms = {}
-
     def scopes
       @@scopes[presenter_class_name] || {}
     end
@@ -131,13 +98,16 @@ module Carnival
     end
 
     def form_for(action)
-      form = Carnival::Form.new(action)
-      form =  @@forms[presenter_class_name][action] if @@forms[presenter_class_name].present? and  @@forms[presenter_class_name][action].present?
+      if @@forms[presenter_class_name].present? &&
+         @@forms[presenter_class_name][action].present?
+        form =  @@forms[presenter_class_name][action]
+      else
+        form = Carnival::Form.new(action)
+      end
       form.fields = fields_for_action(action)
       form
     end
 
-
     def model_name
       if @@model_names[presenter_class_name].nil?
         self.class.to_s.split("::").last().gsub("Presenter", "").underscore
@@ -194,33 +164,18 @@ module Carnival
       model_class.table_name
     end
 
-    def searchable_fields
-      searchable_fields = {}
-      @@fields[presenter_class_name].each do |key, field|
-        if relation_field? key
-          field_name = "#{field.name.pluralize}.name"
-        else
-          field_name = "#{self.table_name}.#{field.name}"
-        end
-        searchable_fields[field_name] = field if field.searchable?
-      end
-      searchable_fields
-    end
-
     def join_tables
-      joins = []
-      @@fields[presenter_class_name].each do |key, field|
-        joins << field.association_name if relation_field? key.to_sym
+      @@fields[presenter_class_name].map do |key, field|
+        field.association_name if relation_field? key.to_sym
       end
-      joins
     end
 
     def render_field?(field, action = nil)
-      return true
+      true
     end
 
     def render_action?(record, record_action, action = nil)
-      return true
+      true
     end
 
     def build_relation_field(field, model_object)
@@ -232,49 +187,32 @@ module Carnival
     end
 
     def must_render_field?(nested_in, field, model_object)
-      must_render = true
-      if nested_in.present?
-        if field.as == :partial
-          must_render = true
-        elsif nested_in.class == model_object.send(field.name).class
-          must_render = false
-        elsif nested_in.class.name.underscore.split("/").last == field.name
-          must_render = false
-        end
+      return true unless nested_in.present?
+      if field.as == :partial
+        true
+      elsif nested_in.class == model_object.send(field.name).class ||
+            nested_in.class.name.underscore.split('/').last == field.name
+        false
+      else
+        true
       end
-      return must_render
     end
 
     def default_scope
       return if scopes.empty?
-      @@scopes[presenter_class_name].each do |key, scope|
-        return scope if scope.default?
-      end
-      @@scopes[presenter_class_name].values.first
+      @@scopes[presenter_class_name].values.find(&:default?) ||
+        @@scopes[presenter_class_name].values.first
     end
 
     def default_sortable_field
-      default_field = nil
-      @@fields[presenter_class_name].each do |key, field|
-        default_field = field if field.default_sortable?
-        break
-      end
-      default_field = @@fields[presenter_class_name].first[1] if default_field.nil?
-      default_field
+      @@fields[presenter_class_name].values.find(&:default_sortable?) ||
+        @@fields[presenter_class_name].values.first
     end
 
     def default_sort_direction
       default_sortable_field.default_sort_direction
     end
 
-    def sortable_fields
-      sortable_fields = {}
-      @@fields[presenter_class_name].each do |key, field|
-        sortable_fields[key] = field if field.sortable?
-      end
-      sortable_fields
-    end
-
     def advanced_search_fields
       fields = @@fields[presenter_class_name]
       @advanced_search_parser.get_advanced_search_fields fields
@@ -348,14 +286,14 @@ module Carnival
       return nil if !relation_field?(field)
       relation_name = get_related_class_for_field(field)
       related = record.send(field.association_name)
-      unless related.nil?
+      if related.present?
         if is_one_to_one_relation?(field)
-          params = {:controller =>  "#{extract_namespace.downcase}/#{relation_name}", :action => :show, :id => related.id}
+          params = { controller: "#{extract_namespace.downcase}/#{relation_name}", action: :show, id: related.id }
         else
-          params = {:controller => "#{extract_namespace.downcase}/#{get_association_from_field(field)}", :action => :index, :advanced_search => make_relation_advanced_query_url_options(field.name, record)}
+          params = { controller: "#{extract_namespace.downcase}/#{get_association_from_field(field)}", action: :index, advanced_search: make_relation_advanced_query_url_options(field.name, record) }
         end
-        params = params.merge(:only_path => true)
-        return generate_route_path params
+        params = params.merge(only_path: true)
+        generate_route_path params
       else
         '#'
       end
@@ -397,142 +335,59 @@ module Carnival
     def controller_to_field_sym field
       "#{extract_namespace}::#{field.to_s.classify.pluralize}Controller".constantize.send("new")
     end
+
     def load_dependent_select_options_path
       if extract_namespace.present?
         "/#{extract_namespace.downcase}/carnival-base/load_dependent_select_options"
       else
-        "/carnival-base/load_dependent_select_options"
+        '/carnival-base/load_dependent_select_options'
       end
     end
 
     protected
+
     def make_relation_advanced_query_url_options(field, record)
       relation_model = @klass_service.get_association(field).klass.name.pluralize.underscore.split("/").last
       relation_field = @klass_service.get_association(field).foreign_key
       relation_value = record.id
-      {"#{relation_model}.#{relation_field}" => relation_value}
+      { "#{relation_model}.#{relation_field}" => relation_value }
     end
 
     def filter_actions(default_actions, target)
       actions = {}
-      return actions if !@@actions[presenter_class_name]
+      return actions unless @@actions[presenter_class_name]
 
       @@actions[presenter_class_name].each do |key, action|
-        if default_actions.include?(key) || (action.target == target && key != :new && key != :csv && key != :pdf)
+        if default_actions.include?(key) || (action.target == target && key != :new && key != :csv)
           actions[key] = action
         end
       end
       actions
     end
 
-    def presenter_class_name
-      if self.class.name == "Class"
-        self.to_s
+    def self.presenter_class_name
+      if self.class.name == 'Class'
+        to_s
       else
         self.class.name
       end
     end
 
-    def parse_advanced_search_field search_field, field_param, records
-      return records if not field_param["value"].present?
-      return records if field_param["value"] == ""
-
-      if relation_field?(search_field.to_sym)
-        related_model = model_class.reflect_on_association(search_field.to_sym).klass.name.underscore
-        foreign_key = model_class.reflect_on_association(search_field.to_sym).foreign_key
-        if model_class.reflect_on_association(search_field.to_sym).macro == :belongs_to
-          records = records.joins(related_model.split("/").last.to_sym)
-        else
-          records = records.joins(related_model.split("/").last.pluralize)
-        end
-        table = related_model.split("/").last.pluralize
-        column = "id"
-      else
-        table = table_name
-        column = search_field
-      end
-      full_column_query = "#{table}.#{column}"
-      where_clause = nil
-
-      case field_param["operator"]
-        when "equal"
-          if field_param["value"] == "nil"
-            where_clause = "#{full_column_query} is null"
-          else
-            where_clause = "#{full_column_query} = '#{advanced_search_field_value_for_query(field_param["value"])}'"
-          end
-        when "like"
-          where_clause = "#{full_column_query} like '%#{field_param["value"]}%'"
-        when "greater_than"
-          where_clause = "#{full_column_query} >= '#{field_param["value"]}'"
-        when "less_than"
-          where_clause = "#{full_column_query} <= '#{field_param["value"]}'"
-        when "between"
-          where_clause = "#{full_column_query} between '#{field_param["value"]}' and '#{field_param["value2"]}'"
-        else
-          where_clause = "#{full_column_query} = #{advanced_search_field_value_for_query(field_param["value"])}"
-      end
-      records = records.where(where_clause) if where_clause.present?
-      records
-    end
-
-    def advanced_search_field_value_for_query(value)
-      if "true" == value.downcase
-        return "'t'"
-      elsif "false" == value.downcase
-        return "'f'"
-      else
-        "#{value}"
-      end
+    def presenter_class_name
+      self.class.presenter_class_name
     end
 
     def is_namespaced?
-      self.class.to_s.split("::").size > 0
+      self.class.to_s.split('::').size > 0
     end
 
     def extract_namespace
-      namespace = ""
-      arr = self.class.to_s.split("::")
-      namespace = arr[0] if arr.size > 1
-      namespace
-    end
-
-    def self.instantiate_element(container, klass, name, params)
-      container[presenter_class_name] ||= {}
-      container[presenter_class_name][name] = klass.new(name, params)
-    end
-
-    def self.scope(name, params = {})
-      self.instantiate_element(@@scopes, Carnival::Scope, name.to_sym, params)
-    end
-
-    def self.field(name, params = {})
-      self.instantiate_element(@@fields, Carnival::Field, name.to_sym, params)
-    end
-
-    def self.form(action, params = {})
-      self.instantiate_element(@@forms, Carnival::Form, name.to_sym, params)
-    end
-
-    def self.model_name(name)
-      @@model_names[presenter_class_name] = name
+      module_and_class = self.class.to_s.split('::')
+      module_and_class.size > 1 ? module_and_class.first : ''
     end
 
-    def generate_route_path params
+    def generate_route_path(params)
       url_for(params) rescue nil
     end
-
-    def self.presenter_class_name
-      if self.class.name == "Class"
-        self.to_s
-      else
-        self.class.name
-      end
-    end
-
-    def current_user
-      return @controller.current_user if @controller.respond_to?(:current_user)
-      nil
-    end
   end
 end