carnival 0.0.59 → 0.1.0

data/app/helpers/carnival/field_renderers/field_renderer.rb

@@ -0,0 +1,12 @@
+module Carnival::FieldRenderers
+  class FieldRenderer
+    def initialize(presenter, field_name)
+      @presenter = presenter
+      @field_name = field_name
+    end
+
+    def render_field(model)
+     { field_type: @presenter.field_type(@field_name), value: model.send(@field_name) }
+    end
+  end
+end

data/app/helpers/carnival/field_renderers/many_relation_renderer.rb

@@ -0,0 +1,17 @@
+module Carnival::FieldRenderers
+  class ManyRelationRenderer < FieldRenderer
+    def render_field(model)
+      field = @presenter.get_field(@field_name)
+
+      related_presenter_name =
+        @presenter.get_related_class(field.association_name)
+      related_presenter_name.gsub!(/.*[(::)\/]/, '')
+      related_presenter =
+        @presenter.presenter_to_field_sym(related_presenter_name)
+      full_model_name = related_presenter.full_model_name
+
+      value = I18n.t("activerecord.models.#{full_model_name}").pluralize
+      { field_type: :relation, value: value }
+    end
+  end
+end

data/app/helpers/carnival/field_renderers/renderer_creator.rb

@@ -0,0 +1,16 @@
+module Carnival::FieldRenderers
+  class RendererCreator
+    def self.create_field_renderer(presenter, field_name)
+      renderer = if presenter.relation_field? field_name
+                   if presenter.is_relation_has_many?(field_name)
+                     ManyRelationRenderer
+                   else
+                     SingleRelationRenderer
+                   end
+                 else
+                   FieldRenderer
+                 end
+      renderer.new(presenter, field_name)
+    end
+  end
+end

data/app/helpers/carnival/field_renderers/single_relation_renderer.rb

@@ -0,0 +1,15 @@
+module Carnival::FieldRenderers
+  class SingleRelationRenderer < FieldRenderer
+    def render_field(model)
+      field = @presenter.get_field(@field_name)
+
+      related_presenter_name = @presenter.get_related_class(field.association_name)
+      related_presenter_name.gsub!(/.*[(::)\/]/, '')
+      related_presenter = @presenter.presenter_to_field_sym(related_presenter_name)
+
+      related_model = model.send(field.association_name)
+      { field_type: related_presenter.field_type(field.association_field_name),
+        value: related_model.try(field.association_field_name) }
+    end
+  end
+end

data/app/inputs/admin_date_input.rb

@@ -3,8 +3,9 @@ class AdminDateInput < SimpleForm::Inputs::Base
   include AdminBaseInput
 
   def input
-    default_input_html_options = {class: 'datepicker',
-      value: @builder.object.send(attribute_name).nil? ? "" : @builder.object.send(attribute_name).strftime('%d/%m/%Y')}
+    format = if column.type == :datetime then '%Y/%m/%d %H:%M' else '%Y/%m/%d' 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)
     return "#{@builder.text_field(attribute_name, options)}".html_safe
   end

data/app/inputs/admin_enum_input.rb

@@ -1,7 +1,7 @@
 class AdminEnumInput < SimpleForm::Inputs::CollectionSelectInput
   def input
     super
-    input_html_options[:class] << ' chosen'
+    input_html_options[:class] << ' carnival-select'
 
     @builder.collection_select(
       attribute_name, @builder.object.class.const_get(attribute_name.to_s.upcase),

data/app/inputs/admin_previewable_file_input.rb

@@ -0,0 +1,9 @@
+class AdminPreviewableFileInput < SimpleForm::Inputs::FileInput
+  def input
+    template.image_tag(object.send(attribute_name).url(:thumb), class: 'previewable') + super
+  end
+  
+  def input_html_classes
+    super.push('previewable')
+  end
+end

data/app/inputs/admin_relationship_select_input.rb

@@ -1,7 +1,7 @@
 class AdminRelationshipSelectInput < SimpleForm::Inputs::CollectionSelectInput
   def input
     super
-    input_html_options[:class] << ' chosen'
+    input_html_options[:class] << ' carnival-select'
     if input_html_options[:data][:depends_on].nil?
       collection = @builder.object.class.name.constantize.reflect_on_association(attribute_name.to_sym).klass.name.constantize.list_for_select
     else

data/app/models/carnival/action.rb

@@ -1,38 +1,60 @@
 module Carnival
   class Action
     include Rails.application.routes.url_helpers
-    PARTIAL_DEFAULT = "/carnival/shared/action_default"
-    PARTIAL_DELETE = "/carnival/shared/action_delete"
-    PARTIAL_REMOTE = "/carnival/shared/action_remote"
+    PARTIAL_DEFAULT = :default
+    PARTIAL_DELETE = :delete
+    PARTIAL_REMOTE = :remote
 
-    def initialize(presenter, name, params={})
-      @presenter = presenter
+    def initialize(name, params={})
       @name = name
       @params = params
       @partial = default_partial
       @path = params[:path] if params[:path].present?
+      @controller = params[:controller]
+      @route_name = params[:route_name]
     end
 
-    def path(extra_params={})
+    def path(presenter, extra_params={})
       if @path.nil?
-        params = {controller: @presenter.controller_name, action: @name}
+        params = {controller: @controller || presenter.controller_name, action: @name}
+      elsif !@path[:controller].nil?
+        params = @path
       else
         params = {path: @path}
       end
       params = params.merge(extra_params) if extra_params.present?
       params = params.merge(:only_path => true)
-      url_for(params)
+      if @route_name
+        Rails.application.routes.url_helpers.send(@route_name, params)
+      else
+        url_for(params)
+      end
+    end
+
+    def show(record)
+      return true if !params[:show_func]
+      return true if !record.respond_to? params[:show_func]
+      record.send params[:show_func]
     end
 
     def partial
       @partial
     end
 
+    def params
+      @params
+    end
+
     def name
       @name
     end
 
+    def remote?
+      @params[:remote]
+    end
+
     def target
+      return :record if @params[:target].nil?
       @params[:target]
     end
 
@@ -41,7 +63,7 @@ module Carnival
         PARTIAL_DEFAULT
       elsif @name == :destroy
         PARTIAL_DELETE
-      elsif @params[:remote]
+      elsif remote?
         PARTIAL_REMOTE
       else
         PARTIAL_DEFAULT

data/app/models/carnival/batch_action.rb

@@ -0,0 +1,26 @@
+module Carnival
+  class BatchAction < Action
+    include Rails.application.routes.url_helpers
+
+    def initialize(presenter, name, params={})
+      @presenter = presenter
+      @name = name
+      @params = params
+      @path = params[:path] if params[:path].present?
+    end
+
+
+    def params
+      @params
+    end
+
+    def name
+      @name
+    end
+
+    def to_label
+      I18n.t("#{@presenter.model_name}.#{name}") 
+    end
+
+  end
+end

data/app/models/carnival/field.rb

@@ -1,18 +1,36 @@
 module Carnival
   class Field
-
     attr_accessor :size, :column, :line, :name, :params
 
     def initialize(name, params={})
       @params = params
       @name = name
       set_position_by_params
+      validate
     end
 
     def name
       @name.to_s
     end
 
+    def specified_association?
+      not get_association_and_field[:association].nil?
+    end
+
+    def association_name
+      get_association_and_field[:association] || @name
+    end
+
+    def association_field_name
+      if specified_association?
+        get_association_and_field[:field]
+      end
+    end
+
+    def name_for_translation
+      @name.to_s.gsub('.', '_')
+    end
+
     def css_class
       if @params[:css_class]
         return @params[:css_class]
@@ -38,13 +56,13 @@ module Carnival
         @params[:date_filter_periods]
       else
         {:today => ["#{Date.today}", "#{Date.today}"],
-                                  :yesterday => ["#{Date.today - 1.day}", "#{Date.today - 1.day}"],
-                                  :this_week => ["#{Date.today.beginning_of_week}", "#{Date.today.end_of_week}"],
-                                  :last_week => ["#{(Date.today - 1.week).beginning_of_week}", "#{(Date.today - 1.week).end_of_week}"],
-                                  :this_month => ["#{Date.today.beginning_of_month}", "#{Date.today.end_of_month}"],
-                                  :last_month => ["#{(Date.today - 1.month).beginning_of_month}", "#{(Date.today - 1.month).end_of_month}"],
-                                  :this_year => ["#{Date.today.beginning_of_year}", "#{Date.today.end_of_year}"],
-                                  :last_year => ["#{(Date.today - 1.year).beginning_of_year}", "#{(Date.today - 1.year).end_of_year}"]
+         :yesterday => ["#{Date.today - 1.day}", "#{Date.today - 1.day}"],
+         :this_week => ["#{Date.today.beginning_of_week}", "#{Date.today.end_of_week}"],
+         :last_week => ["#{(Date.today - 1.week).beginning_of_week}", "#{(Date.today - 1.week).end_of_week}"],
+         :this_month => ["#{Date.today.beginning_of_month}", "#{Date.today.end_of_month}"],
+         :last_month => ["#{(Date.today - 1.month).beginning_of_month}", "#{(Date.today - 1.month).end_of_month}"],
+         :this_year => ["#{Date.today.beginning_of_year}", "#{Date.today.end_of_year}"],
+         :last_year => ["#{(Date.today - 1.year).beginning_of_year}", "#{(Date.today - 1.year).end_of_year}"]
         }
       end
     end
@@ -88,6 +106,7 @@ module Carnival
     end
 
     def sortable?
+      return true if @params[:sortable].nil?
       return true if @params[:sortable]
       return true if @params[:sortable].class == Hash
       return false
@@ -116,7 +135,12 @@ module Carnival
       :like
     end
 
+    def actions
+      @params[:actions]
+    end
+
     def valid_for_action?(action)
+      return false if @params[:actions].nil?
       @params[:actions].include?(action)
     end
 
@@ -128,7 +152,29 @@ module Carnival
       @params[:widget].present? ? @params[:widget] : :input
     end
 
-  private
+    def show_view
+      @params[:show_view]
+    end
+
+    private
+
+    def get_association_and_field
+      split = @name.to_s.split('.')
+      if split.size > 1
+        association = split[0]
+        field = split[1]
+      else
+        field = split[0]
+      end
+      { association: association, field: field }
+    end
+
+    def validate
+      if nested_form_modes?(:new) and nested_form_modes?(:associate)
+        raise ArgumentError.new("field does not support nested_forms_modes with :new and :associate options at same time")
+      end
+    end
+
     def set_position_by_params
       if @params[:position].present?
         @line = @params[:position][:line]
@@ -138,6 +184,7 @@ module Carnival
     end
 
     def get_associate_nested_form_mode
+      return nil if @params[:nested_form_modes].nil?
       @params[:nested_form_modes].each do |mode|
         if mode.is_a? Hash
           return mode[:associate] if mode[:associate].present?

data/app/models/carnival/query_form.rb

@@ -0,0 +1,36 @@
+module Carnival
+  class QueryForm
+    attr_accessor :scope, :search_term, :date_period_label, :date_period_from, :date_period_to, :sort_column, :sort_direction
+
+    def initialize(params)
+      @scope = params[:scope]
+      @search_term = params[:search_term]
+      @advanced_search = params[:advanced_search]
+      @date_period_label = params[:date_period_label]
+      @date_period_from = params[:date_period_from]
+      @date_period_to = params[:date_period_to]
+      @sort_column = params[:sort_column]
+      @sort_direction = params[:sort_direction]
+      @page = params[:page]
+    end
+
+    def advanced_search
+      return {} if @advanced_search.nil? 
+      @advanced_search
+    end
+
+    def to_hash
+      params = {} 
+      self.instance_variables.each do |var|
+        var_name = var.to_s.gsub('@', '')
+        params[var_name] = self.send(var_name)
+      end
+      params
+    end
+
+    def page
+      return 1 if @page.nil?
+      @page.to_i
+    end
+  end
+end

data/app/models/carnival/scope.rb

@@ -6,11 +6,20 @@ module Carnival
     end
 
     def default?
-      @params[:default].present? && @params[:default] == true
+      @params[:default]
     end
 
     def name
       @name
     end
+
+    def hidden?(controller)
+      if @params.has_key?(:hide_if)
+        block = @params[:hide_if]
+        controller.instance_eval(&block)
+      else
+        false
+      end
+    end
   end
 end

data/app/presenters/carnival/base_admin_presenter.rb

@@ -5,8 +5,18 @@ module Carnival
     attr_accessor :special_scope_to_exec
 
     def initialize(params)
-      @@controller = params[:controller]
+      @controller = params[:controller]
       @special_scopes_to_exec = nil
+      @klass_service = KlassService.new model_class
+      @advanced_search_parser = Presenters::AdvancedSearchParser.new(@klass_service)
+      @validators = [Carnival::PresenterValidators::FieldValidator]
+      validates
+    end
+
+    def validates
+      @validators.each do |validator|
+        validator.new(self).validates
+      end
     end
 
     def base_query
@@ -17,16 +27,68 @@ 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] = {} if @@actions[presenter_class_name].nil?
-      @@actions[presenter_class_name][name] = Carnival::Action.new(self.new({}), name, params)
+      @@actions[presenter_class_name][name] = Carnival::Action.new(name, params)
+    end
+
+    @@batch_actions = {}
+    def self.batch_action(name, params = {})
+      @@batch_actions[presenter_class_name] = {} if @@batch_actions[presenter_class_name].nil?
+      @@batch_actions[presenter_class_name][name] = Carnival::BatchAction.new(self.new({}), name, params)
+    end
+
+    def has_batch_actions?
+      return false if @@batch_actions[presenter_class_name].nil?
+      @@batch_actions[presenter_class_name].keys.size > 0
+    end
+
+    @@items_per_page = {}
+    def self.items_per_page(per_page)
+      @@items_per_page[presenter_class_name] = {} if @@items_per_page[presenter_class_name].nil?
+      @@items_per_page[presenter_class_name][:items_per_page] = per_page
+    end
+
+    def items_per_page
+      @@items_per_page[presenter_class_name] = {} if @@items_per_page[presenter_class_name].nil?
+      unless @@items_per_page[presenter_class_name].present? and @@items_per_page[presenter_class_name][:items_per_page].present? and @@items_per_page[presenter_class_name][:items_per_page] > 0
+        @@items_per_page[presenter_class_name][:items_per_page] = Carnival::Config.items_per_page
+      end
+      @@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
+    end
+
+    def index_as
+      index_as = @@index_as[presenter_class_name]
+      index_as = :table if index_as.nil?
+      index_as
     end
 
     def actions
       @@actions[presenter_class_name]
     end
 
+    def batch_actions
+      @@batch_actions[presenter_class_name]
+    end
+
     def actions_for_record
       filter_actions([:show, :edit, :destroy], :record)
     end
@@ -46,27 +108,21 @@ module Carnival
     @@presenters = []
 
     def scopes
-      @@scopes[presenter_class_name]
-    end
-
-    def scopes_counters
-      scopes = {}
-      if @@scopes[presenter_class_name].present?
-        @@scopes[presenter_class_name].each do |key, scope|
-          if base_query.present?
-            scopes[scope.name] = base_query.send(scope.name).count
-          else
-            scopes[scope.name] = model_class.send(scope.name).count
-          end
-        end
-      end
-      scopes
+      @@scopes[presenter_class_name] || {}
     end
 
     def fields
       @@fields[presenter_class_name]
     end
 
+    def get_field(field)
+      if field.respond_to? :to_sym
+        @@fields[presenter_class_name][field.to_sym]
+      else
+        field
+      end
+    end
+
     def fields_for_action(action)
       fields_action = {}
       @@fields[presenter_class_name].each do |key, field|
@@ -97,6 +153,10 @@ module Carnival
       end
     end
 
+    def model_params(params)
+      params.select{|key, value| key != "action" && key != "controller"}
+    end
+
     def model_path(action, extra_params=nil)
       params = {controller: controller_name, action: action}
       params = params.merge(extra_params) if extra_params.present?
@@ -104,7 +164,15 @@ module Carnival
       url_for(params)
     end
 
+    def is_from_carnival?
+      self.class.to_s.include? 'Carnival::'
+    end
+
     def full_model_name
+      if Carnival::Config.use_full_model_name == false and !is_from_carnival?
+        return model_name
+      end
+
       if @@model_names[presenter_class_name].nil?
         self.class.to_s.gsub("Presenter", "").underscore
       else
@@ -113,15 +181,15 @@ module Carnival
     end
 
     def controller_class_name
-      @@controller.class.name
+      @controller.class.name
     end
 
     def controller_name
       namespace = extract_namespace
       if namespace.present?
-        "#{extract_namespace.downcase}/#{@@controller.controller_name}"
+        "#{extract_namespace.downcase}/#{@controller.controller_name}"
       else
-        @@controller.controller_name
+        @controller.controller_name
       end
     end
 
@@ -132,11 +200,24 @@ module Carnival
     def searchable_fields
       searchable_fields = {}
       @@fields[presenter_class_name].each do |key, field|
-        searchable_fields[key] = field if field.searchable?
+        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
+      end
+      joins
+    end
+
     def build_relation_field(field, model_object)
       if is_relation_belongs_to?(field.name)
         model_object.send("#{field.name}_build")
@@ -158,13 +239,11 @@ module Carnival
     end
 
     def default_scope
-      default_scope = nil
+      return if scopes.empty?
       @@scopes[presenter_class_name].each do |key, scope|
-        default_scope = scope if scope.default?
-        break
+        return scope if scope.default?
       end
-      default_scope = @@scopes[presenter_class_name].first[1] if default_scope.nil?
-      default_scope
+      @@scopes[presenter_class_name].values.first
     end
 
     def default_sortable_field
@@ -190,11 +269,8 @@ module Carnival
     end
 
     def advanced_search_fields
-      advanced_search_fields = {}
-      @@fields[presenter_class_name].each do |key, field|
-        advanced_search_fields[key] = field if field.advanced_searchable?
-      end
-      advanced_search_fields
+      fields = @@fields[presenter_class_name]
+      @advanced_search_parser.get_advanced_search_fields fields
     end
 
     def date_filter_field
@@ -212,94 +288,126 @@ module Carnival
       full_model_name.classify.constantize
     end
 
-    def relation_field?(field)
-      model_class.reflect_on_association(field.to_sym)
+    def relation_field?(field_name)
+      field = get_field(field_name)
+      return false if field.nil?
+      field.specified_association? or @klass_service.relation?(field.name)
+    end
+
+    def get_association(association)
+      @klass_service.get_association(association)
+    end
+
+    def relation_type sym
+      @klass_service.relation_type sym
     end
 
     def is_relation_belongs_to?(field)
       model_class.reflect_on_association(field.to_sym).macro == :belongs_to
     end
 
-    def relation_label(field, record)
-      if relation_field?(field)
-        if is_relation_belongs_to?(field)
-          value = record.send(field.to_s)
-          return value.to_label if value.present?
-        else
-          return I18n.t("activerecord.attributes.#{full_model_name}.#{field}")
-        end
+    def is_relation_has_many?(field)
+      field = get_field(field)
+      association = @klass_service.relation_type(field.association_name || field.name)
+      association.to_s.include? 'many'
+    end
+
+    def field_type(field)
+      type = model_class.columns_hash[field.to_s].try(:type)
+      if relation_field?(field.to_sym) then :relation
+      elsif type == :date || type == :datetime then type
+      elsif type == :number || type == :float then :number
+      elsif type == :integer and model_class.const_defined? field.upcase then :enum
+      else type
       end
-      return ""
     end
 
     def relation_model(field)
-      if is_relation_belongs_to?(field)
-        model_class.reflect_on_association(field).klass.name.constantize
-      end
+      field = get_field(field)
+      @klass_service.get_association(field.association_name).klass
+    end
+
+    def is_one_to_one_relation?(field_name)
+      field = get_field(field_name)
+      @klass_service.is_a_belongs_to_relation?(field.association_name) ||
+        @klass_service.is_a_has_one_relation?(field.association_name)
     end
 
     def relation_path(field, record)
-      if relation_field?(field)
-        if is_namespaced? and !model_class.reflect_on_association(field).klass.name.pluralize.underscore.include?("/")
-          related_class = "#{extract_namespace.downcase}/#{model_class.reflect_on_association(field).klass.name.pluralize.underscore}"
+      field = get_field(field)
+      return nil if !relation_field?(field)
+      relation_name = get_related_class_for_field(field)
+      controller_path = "#{extract_namespace.downcase}/#{relation_name}"
+      related = record.send(field.association_name)
+      unless related.nil?
+        if is_one_to_one_relation?(field)
+          params = {:controller => controller_path, :action => :show, :id => related.id}
         else
-          related_class = model_class.reflect_on_association(field).klass.name.pluralize.underscore
-        end
-        if is_relation_belongs_to?(field)
-          id = -1
-          id = record.send(model_class.reflect_on_association(field).foreign_key) if record.send(model_class.reflect_on_association(field).foreign_key).present?
-          params = {:controller => related_class, :action => :show, :id => id}
-        else
-          params = {:controller => related_class, :action => :index, :advanced_search => make_relation_advanced_query_url_options(field, record)}
+          params = {:controller => controller_path, :action => :index, :advanced_search => make_relation_advanced_query_url_options(field.name, record)}
         end
         params = params.merge(:only_path => true)
-        return url_for(params)
+        return generate_route_path params
+      else
+        '#'
       end
-      return nil
+    end
+
+    def get_related_class_for_field (field_name)
+      field = get_field(field_name)
+      relation_name = field.specified_association? ? field.association_name : field.name
+      get_related_class(relation_name)
+    end
+
+    def get_related_class relation_name
+      @klass_service.related_class_file_name relation_name
+    end
+
+    def get_class_for field
+      @klass_service.related_class field
     end
 
     def parse_advanced_search records, search_syntax
-      search = JSON.parse(search_syntax)
-      search.keys.each do |key|
-        search_field = key
-        search_field = key.split(".").last if key.include?(".")
-        search_field = search_field.gsub("_id", "") if search_field.ends_with?("_id")
-        if @@fields[presenter_class_name].keys.include? search_field.to_sym
-          if @@fields[presenter_class_name][search_field.to_sym].advanced_searchable?
-            records =  parse_advanced_search_field(search_field, search[key], records)
-          end
-        end
-      end
-      records
+      @advanced_search_parser.parse_advanced_search @@fields[presenter_class_name], records, search_syntax
     end
 
     def presenter_to_field field, record
       "#{extract_namespace}::#{field.name.singularize.classify}Presenter".constantize.send("new", :controller => controller_to_field(field))
     end
 
+    def presenter_to_field_sym field
+      "#{extract_namespace}::#{field.to_s.singularize.classify}Presenter".constantize.send("new", :controller => controller_to_field_sym(field))
+    end
+
     def controller_to_field field
       "#{extract_namespace}::#{field.name.classify.pluralize}Controller".constantize.send("new")
     end
 
+    def controller_to_field_sym field
+      "#{extract_namespace}::#{field.to_s.classify.pluralize}Controller".constantize.send("new")
+    end
     def load_dependent_select_options_path
-      "/#{extract_namespace.downcase}/carnival-base/load_dependent_select_options"
+      if extract_namespace.present?
+        "/#{extract_namespace.downcase}/carnival-base/load_dependent_select_options"
+      else
+        "/carnival-base/load_dependent_select_options"
+      end
     end
 
     protected
     def make_relation_advanced_query_url_options(field, record)
-      relation_model = model_class.reflect_on_association(field).klass.name.pluralize.underscore.split("/").last
-      relation_field = model_class.reflect_on_association(field).foreign_key
+      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}
     end
 
     def filter_actions(default_actions, target)
       actions = {}
-      if @@actions[presenter_class_name]
-        @@actions[presenter_class_name].each do |key, action|
-          if default_actions.include?(key) || action.target == target
-            actions[key] = action
-          end
+      return actions if !@@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)
+          actions[key] = action
         end
       end
       actions
@@ -313,58 +421,6 @@ module Carnival
       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
-    end
 
     def is_namespaced?
       self.class.to_s.split("::").size > 0
@@ -385,21 +441,31 @@ module Carnival
     end
 
     def self.scope(name, params = {})
-      self.instantiate_element(@@scopes, Carnival::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, params)
+      self.instantiate_element(@@fields, Carnival::Field, name.to_sym, params)
     end
 
     def self.form(action, params = {})
-      self.instantiate_element(@@forms, Carnival::Form, name, params)
+      self.instantiate_element(@@forms, Carnival::Form, name.to_sym, params)
     end
 
     def self.model_name(name)
       @@model_names[presenter_class_name] = name
     end
 
+    def generate_route_path params
+      path = nil
+      begin
+        path = url_for params
+      rescue
+
+      end
+      path
+    end
+
     def self.presenter_class_name
       if self.class.name == "Class"
         self.to_s