carnival 0.2.7 → 0.2.8

data/app/presenters/carnival/dsl.rb

@@ -0,0 +1,55 @@
+module Carnival
+  module Dsl
+    extend ActiveSupport::Concern
+
+    included do
+      [:index_as, :actions, :batch_actions, :items_per_page,
+       :model_names, :fields, :scopes, :forms]
+        .each do |variable_name|
+        class_variable_set("@@#{variable_name}", {})
+      end
+    end
+
+    module ClassMethods
+      def index_as(type)
+        class_variable_get('@@index_as')[presenter_class_name] = type
+      end
+
+      def action(name, params = {})
+        class_variable_get('@@actions')[presenter_class_name] ||= {}
+        class_variable_get('@@actions')[presenter_class_name][name] = Carnival::Action.new(name, params)
+      end
+
+      def batch_action(name, params = {})
+        class_variable_get('@@batch_actions')[presenter_class_name] ||= {}
+        class_variable_get('@@batch_actions')[presenter_class_name][name] = Carnival::BatchAction.new(self.new({}), name, params)
+      end
+
+      def items_per_page(per_page)
+        class_variable_get('@@items_per_page')[presenter_class_name] ||= {}
+        class_variable_get('@@items_per_page')[presenter_class_name][:items_per_page] = per_page
+      end
+
+      def scope(name, params = {})
+        instantiate_element(class_variable_get('@@scopes'), Carnival::Scope, name.to_sym, params)
+      end
+
+      def field(name, params = {})
+        instantiate_element(class_variable_get('@@fields'), Carnival::Field, name.to_sym, params)
+      end
+
+      def form(action, params = {})
+        instantiate_element(class_variable_get('@@forms'), Carnival::Form, name.to_sym, params)
+      end
+
+      def model_name(name)
+        class_variable_get('@@model_names')[presenter_class_name] = name
+      end
+
+      def instantiate_element(container, klass, name, params)
+        container[presenter_class_name] ||= {}
+        container[presenter_class_name][name] = klass.new(name, params)
+      end
+    end
+  end
+end

data/app/services/carnival/klass_service.rb

@@ -1,6 +1,6 @@
 module Carnival
   class KlassService
-
+    ONE_TO_ONE_RELATION_TYPES = [:has_one, :belongs_to]
     def initialize(klass)
       @klass = klass
     end
@@ -9,6 +9,10 @@ module Carnival
       !get_association(sym).nil?
     end
 
+    def is_a_one_to_one_relation?(sym)
+      relation_type(sym).try(:in?, ONE_TO_ONE_RELATION_TYPES)
+    end
+
     def relation_type sym
       return nil if !relation?(sym)
       association = get_association(sym)

data/app/services/carnival/presenters/advanced_search_parser.rb

@@ -41,13 +41,12 @@ module Carnival
           end
 
           if @klass_service.relation? search_field.to_sym
-            related_model = @klass_service.get_related_class(search_field.to_sym).name.underscore
-            foreign_key = @klass_service.get_foreign_key(search_field.to_sym)
-            if @klass_service.is_a_belongs_to_relation?(search_field.to_sym)
-              records = records.joins(related_model.split("/").last.to_sym)
+            if @klass_service.is_a_one_to_one_relation?(search_field.to_sym)
+              records = records.joins(search_field.split("/").last.to_sym)
             else
-              records = records.joins(related_model.split("/").last.pluralize.to_sym)
+              records = records.joins(search_field.split("/").last.pluralize.to_sym)
             end
+            related_model = @klass_service.get_related_class(search_field.to_sym).name.underscore
             table = related_model.split("/").last.classify.constantize.table_name
             column = "id" if column.nil?
           else

data/app/services/carnival/query_service.rb

@@ -1,7 +1,7 @@
 module Carnival
   class QueryService
-
     attr_accessor :total_records
+
     def initialize(model, presenter, query_form)
       @model = model
       @presenter = presenter
@@ -18,12 +18,15 @@ module Carnival
     def records_without_pagination_and_scope
       records = @model
       records = date_period_query(records)
-      records = search_query(records)
       records = advanced_search_query(records)
       records = order_query(records)
       includes_relations(records)
     end
 
+    def page_count
+      (total_records / @presenter.items_per_page.to_f).ceil
+    end
+
     def records_without_pagination
       scope_query records_without_pagination_and_scope
     end
@@ -34,16 +37,15 @@ module Carnival
 
     def scopes_number
       records = records_without_pagination_and_scope
-      scopes = {}
-      @presenter.scopes.each do |key, index|
-        scopes[key] = scope_query(records, key).size
-      end
-      scopes
+
+      Hash[@presenter.scopes.keys.map do |key|
+        [key, scope_query(records, key).size]
+      end]
     end
 
     def scope_query(records, scope = @query_form.scope)
-      if(scope.present? && scope.to_sym != :all)
-        records = records.send(scope)
+      if scope.present? && scope.to_sym != :all
+        records.send(scope)
       else
         records
       end
@@ -51,20 +53,10 @@ module Carnival
 
     def date_period_query(records)
       date_filter_field = @presenter.date_filter_field
-      if(date_filter_field.present? && @query_form.date_period_from.present? && @query_form.date_period_from != "" && @query_form.date_period_to.present? && @query_form.date_period_to != "")
-        records.where("#{@presenter.table_name}.#{date_filter_field.name} between ? and ?", "#{@query_form.date_period_from} 00:00:00", "#{@query_form.date_period_to} 23:59:59")
-      else
-        records
-      end
-    end
-
-    def search_query(records)
-      if @query_form.search_term.present? and @presenter.searchable_fields.size > 0
-        filters = @presenter.searchable_fields.map do |key, field|
-          " #{key.to_s} like :search"
-        end
-        records = includes_relations(records) if @should_include_relation
-        records.where(filters.join(" or "), search: "%#{@query_form.search_term}%")
+      if date_filter_field.present? && @query_form.date_period_from.present? && @query_form.date_period_from != "" && @query_form.date_period_to.present? && @query_form.date_period_to != ""
+        from = DateTime.parse(@query_form.date_period_from).beginning_of_day
+        to = DateTime.parse(@query_form.date_period_to).end_of_day
+        records.where(@presenter.date_filter_field.name.to_sym => [from..to])
       else
         records
       end
@@ -103,6 +95,5 @@ module Carnival
     def sort_direction
       @query_form.sort_direction
     end
-
   end
 end

data/app/view_objects/carnival/paginator.rb

@@ -1,6 +1,5 @@
 module Carnival
   class Paginator
-
     def initialize(current_page, last_page, max_fast_pages = 5)
       @current_page = current_page
       @last_page = last_page >= 1 ? last_page : 1
@@ -9,27 +8,27 @@ module Carnival
 
     def fast_pages_links_indexes
       fast_page_links = []
-      first_index = -(@max_fast_pages/2)
-      while fast_page_links.size < @max_fast_pages do
+      first_index = -(@max_fast_pages / 2)
+      while fast_page_links.size < @max_fast_pages
         fast_page = @current_page + first_index
         break if fast_page > @last_page
         fast_page_links << fast_page if fast_page > 0
-        first_index = first_index + 1
+        first_index += 1
       end
       fast_page_links
     end
 
     def fast_pages_links_html
       fast_pages_links_indexes.map do |page|
-        {:label => page, :css_class => get_css_class(page), :js_function => get_js_function(page)}
+        { label: page, css_class: get_css_class(page), js_function: get_js_function(page) }
       end
     end
 
-    def get_js_function page
+    def get_js_function(page)
       "javascript:Carnival.goToPage(#{page})"
     end
 
-    def get_css_class page
+    def get_css_class(page)
       if page == @current_page
         'carnival-selected-page-button'
       else
@@ -55,12 +54,11 @@ module Carnival
 
     def pages
       htmls = []
-      htmls << {:label => ('paginate_first'), :js_function => get_js_function(1)}
-      htmls << {:label => ('paginate_previous'), :js_function => get_js_function(previous_page)}
+      htmls << { label: ('paginate_first'), js_function: get_js_function(1) }
+      htmls << { :label => ('paginate_previous'), js_function: get_js_function(previous_page) }
       htmls = htmls + fast_pages_links_html
-      htmls << {:label => ('paginate_next'), :js_function => get_js_function(next_page)}
-      htmls << {:label => ('paginate_last'), :js_function => get_js_function(@last_page)}
+      htmls << { label: ('paginate_next'), js_function: get_js_function(next_page) }
+      htmls << { label: ('paginate_last'), js_function: get_js_function(@last_page) }
     end
-
   end
 end

data/app/view_objects/carnival/thead_renderer.rb

@@ -1,52 +1,45 @@
 module Carnival
   class TheadRenderer
-
-    def initialize fields, sort_column, sort_direction
+    def initialize(fields, sort_column, sort_direction)
       @fields = fields
       @sort_column = sort_column.to_sym
       @sort_direction = sort_direction
     end
 
-
     def columns
-      columns = []
-      @fields.each do |key, field|
-        column = {
+      @fields.values.map do |field|
+        {
           field: field,
           name: field.name,
           sort_dir: sort_dir(field),
           sort_function: sort_function(field),
           class: css_class(field)
         }
-        columns << column
       end
-      columns
     end
 
-    def css_class field
-      return 'sorting_disabled' if !field.sortable?
+    def css_class(field)
+      return 'sorting_disabled' unless field.sortable?
 
       if field.sort_name.to_sym == @sort_column
-        return "sorting_#{@sort_direction.to_s}"
+        "sorting_#{@sort_direction}"
       else
-        return 'sorting'
+        'sorting'
       end
     end
 
-    def sort_function field
-      return '' if !field.sortable?
+    def sort_function(field)
+      return '' unless field.sortable?
       sort_direction = sort_dir field
       "Carnival.sortColumn('#{field.sort_name}', '#{sort_direction}')"
     end
 
-    def sort_dir field
+    def sort_dir(field)
       sort_direction = 'asc'
       if field.sort_name.to_sym == @sort_column
-       sort_direction = 'desc' if @sort_direction == 'asc'
+        sort_direction = 'desc' if @sort_direction == 'asc'
       end
       sort_direction
     end
-
-
   end
 end

data/app/views/carnival/base_admin/_index_as_table.html.haml

@@ -2,12 +2,13 @@
   %thead
     %tr
       -if presenter.has_batch_actions?
-        %th
+        %th.batching
           %input{id: 'toggle-all-batch-actions-items',type: 'checkbox'}
       - @thead_renderer.columns.each do |column|
         - if ( @presenter.render_field?(column[:field], :index))
           %th{"onclick" => "javascript:#{column[:sort_function]}",  "class" => "#{column[:class]}"}= translate_field(presenter, column[:field])
-      %th.buttons
+      - if @presenter.actions_for_record.any?
+        %th.buttons
   %tbody
     - @records.each do |record|
       %tr
@@ -17,5 +18,6 @@
         - @presenter.fields_for_action(:index).each do |key, field|
           - if ( @presenter.render_field?(field, :index))
             = list_cel(@presenter, key,record, false).html_safe
-        %td
-          = list_buttons(@presenter, record).html_safe
+        - if @presenter.actions_for_record.any?
+          %td
+            = list_buttons(@presenter, record).html_safe

data/app/views/carnival/base_admin/index.html.haml

@@ -1,3 +1,6 @@
+.gray_border.with_margin_bottom.header
+  %h1= @presenter.model_class.model_name.human(default: t('carnival.index'))
+
 - special_scope =  params[:special_scope]
 - presenter = @presenter
 - params = {:class => "carnival-#{presenter.index_as}"}
@@ -10,7 +13,10 @@
   .batch-operations
     - batch_operation_actions = []
     - presenter.batch_actions.each do |key, item|
-      = button_to item.to_label, item.path(presenter), {:method => :post, :class => "batch_action_button"}
+      - if item.params[:type].try(:to_sym) == :ajax
+        %span= link_to item.to_label, item.path(presenter), :class => "batch_action_button", remote: true, data: {'carnival-show-overlay' => true}
+      - else
+        = button_to item.to_label, item.path(presenter), {:method => :post, :class => "batch_action_button"}
   :javascript
     $(document).ready(function(){
       Carnival.batchActionInitialize("#{t('select_one_item')}");
@@ -60,8 +66,7 @@
 
     .table-download-links
       - params = @query_form.to_hash
-      = link_to t('download_as_csv'), presenter.model_path(:index, {:format => 'csv'}.merge(params)), :class => "carnival-action-button pdf" if presenter.has_action?(:csv)
-      = link_to t('download_as_pdf'), presenter.model_path(:index, {:format => 'pdf'}.merge(params)), :class => "carnival-action-button csv" if presenter.has_action?(:pdf)
+      = link_to t('download_as_csv'), presenter.model_path(:index, { format: 'csv' }.merge(params)), class: 'carnival-action-button csv' if presenter.has_action?(:csv)
 
 - else
   .empty-result
@@ -69,6 +74,5 @@
       = t('no_results')
     %h4
       %span
-        Adicionar novo registro
       - presenter.actions_for_page.each do |key, action|
         = render '/carnival/shared/action_default', :label=>t("#{presenter.model_name}.#{action.name}", default: t("carnival.#{action.name}")), :path=> action.path(presenter)

data/app/views/carnival/shared/_advanced_search.html.haml

@@ -8,11 +8,11 @@
       .search_field
         .label
           - label_field = presenter.get_field(field)
-          - default_label = t("activerecord.attributes.#{presenter.full_model_name}.#{key}")
+          - translation_prefix = "activerecord.attributes.#{presenter.full_model_name}"
           - if presenter.relation_field?(label_field)
-            = label_tag key, t("activerecord.attributes.#{label_field.name}", default: default_label)
+            = label_tag key, t("#{translation_prefix}.#{key.to_s.gsub('.', '_')}")
           - else
-            = label_tag key, default_label
+            = label_tag key, t("#{translation_prefix}.#{key}")
         .field
           = render '/carnival/shared/advanced_search_field', :field => field, :presenter => presenter, :value => value
   %li.search_item
@@ -26,6 +26,7 @@
     - if params[key.to_s].present? && params[key.to_s] != "undefined"
       - value =  params[key.to_s]
       %li.advanced-search-tag
-        = t("activerecord.attributes.#{presenter.full_model_name}.#{key}")
-        = ": #{value}"
+        %span
+          = t("activerecord.attributes.#{presenter.full_model_name}.#{key.to_s.gsub('.', '_')}")
+          = ": #{value}"
         %a{:href => "javascript:Carnival.removeAdvancedSearch('"+key.to_s+"')"}

data/app/views/carnival/shared/form/_form.html.haml

@@ -9,9 +9,10 @@
   $(document).ready(function(){
     nestedForm = $(".nested-form-list .form-new-association").each(function(index, element){
       nestedForms[getFormName(element)] = element;
-      element.remove();
     });
 
+    $(".nested-form-list .form-new-association:last-child").remove();
+
     $(".existing-options").hide();
     $(".nested-form-subtitle").hide();
   });
@@ -50,7 +51,7 @@
       var parentIndex = container.parents('li').index();
 
       newForm = replaceInputIndexes(newForm, parentForm, parent, parentIndex);
-    }    
+    }
 
     return newForm;
   }

data/config/locales/carnival.en.yml

@@ -8,6 +8,11 @@ en:
     errors:
       invalid_field:  "The actions '%{actions}' are invalid for field '%{field}' for presenter '%{presenter}'"
 
+  messages:
+    created: Successfully created!
+    updated: Successfully updated!
+    select: Select
+
   nested_form:
     open: Open
     close: Close
@@ -17,12 +22,15 @@ en:
     existing_option: Existing Options
     existing_option_title: Options
     choose_an_option: Choose an option
+
+  create: Create
   minimize: Minimize
   paginate_first: First
-  paginate_previous: « Previous
-  paginate_next: Next »
   paginate_last: Last
+  paginate_next: Next »
+  paginate_previous: « Previous
   paginate_total: Total
-  sort_by: Sort by
-  asc: Crescent
-  desc: Decrescent
+  please_wait: Wait...
+  update: Update
+  from: From
+  to: To

data/config/locales/carnival.pt-br.yml

@@ -5,6 +5,7 @@ pt-BR:
     new: Novo
     edit: Editar
     destroy: Apagar
+    index: Listagem
     errors:
       invalid_field:  "As actions '%{actions}' não são válidas para o campo '%{field}' do presenter '%{presenter}'"
 
@@ -30,7 +31,6 @@ pt-BR:
   asc: Crescente
   desc: Decrescente
   download_as_csv: Baixar como CSV
-  download_as_pdf: Baixar como PDF
   no_results: Não foram encontrados resultados
   advanced_search: Busca
   select_an_option: Selecione uma opção