carnival 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ce08ea49042844a83161a4a8b911a252986b4d9
-  data.tar.gz: c9a47da79376b4166c7e8e3ed702f5ae8a1ea4fd
+  metadata.gz: cc6432ec857f2c48bcda5425d440c76bfcf1b29e
+  data.tar.gz: 477ac6e3b42d4c3817fbeb5e9669cd32b03040c4
 SHA512:
-  metadata.gz: 82c4bf1e74d99b1619d5031c57cdb23c10ebadf4ac90d0c955e16106b6088601d893521f0ae5eb45d21e3150068211585e5d61e0cfc9fa97c10c6c806c81a721
-  data.tar.gz: a1f55e8cdf14f41ad7b02860f13d7fa5c453473f455c36c399fb604c0cdca8a99ed0b1da6e200b9d92d7642845a0f73cedfaee57ed78c3705c2028585e7444b2
+  metadata.gz: e41db819877a10da000827e97ec761263fdf58e38a7ca4e9f3697987fa32a696eca884d47b16f47553dc299fda11892f4e04fc804375e7cf1bc2196eca4076fd
+  data.tar.gz: 6f842d0d0680941967d9e2e3009bfc7bfe5c847c189cb83c7c8599191e81710af3ac4d97c3d2400df3c33e8f3e2f44401ff2f81e53c8f0bdc89719e21eb92497

data/app/assets/javascripts/carnival/advanced_search.js

@@ -6,10 +6,10 @@ $(document).ready(function(){
     $(".as-form-overlay").click(function(e){
       $(".as-form-overlay").remove();
       $("#advanced_search_form").hide();
-      $(".select2-drop").hide();      
-      return false
+      $(".select2-drop").hide();
+      return false;
     });
-    return false
+    return false;
   });
 
 

data/app/assets/javascripts/carnival/vizir_admin.js.erb

@@ -51,6 +51,10 @@ Carnival.callFunc = function(functionName, data){
 }
 
 Carnival.submitIndexForm = function(){
+  $(".carnival-index-form form").submit();
+}
+
+Carnival.cleanIndexForm = function(){
   $("#advanced_search_form input").each(function(){
     var $input = $(this);
     var inputValue = $input.val();
@@ -68,8 +72,6 @@ Carnival.submitIndexForm = function(){
     if(inputValue == "-1")
       $(this).val('');
   });
-  var form = $('.carnival-index-form').find('form')
-  form.submit();
 }
 
 Carnival.setIndexPageParam = function(name, value){

data/app/assets/stylesheets/carnival/search.css.scss

@@ -156,3 +156,16 @@
 .select2-drop {
   z-index: 99999999999 !important;
 }
+
+.advanced-search button{
+  background: #007ae1;
+  color: #fff;
+  margin-top: 8px;
+  border: 1px solid rgba(0, 0, 0, 0.21);
+  border-radius: 2px;
+  padding: 0px 15px;
+}
+
+.advanced-search button:hover{
+  color: #fff
+}

data/app/helpers/carnival/base_admin_helper.rb

@@ -86,7 +86,7 @@ module Carnival
 
     def field_to_show(presenter, field_name, record, show_only_values=false)
       if presenter.fields[field_name].params[:as] == :partial
-        raw(render field_name.to_s, record: record)
+        raw(render presenter.fields[field_name].params[:partial_name], record: record)
       else
         rendered = field_value_and_type presenter, field_name, record
         field_type = rendered[:field_type]
@@ -106,7 +106,10 @@ module Carnival
     end
 
     def field_value_and_type(presenter, field_name, record)
-      presenter.render_field(field_name, record)
+      renderer = FieldRenderers::RendererCreator
+                 .create_field_renderer(presenter, field_name)
+
+      renderer.render_field(record)
     end
 
     def is_image?(field_type, value)
@@ -154,12 +157,27 @@ module Carnival
       "#{td}#{result}</td>"
     end
 
+    def empty_cel(presenter, field, record, only_render_fields)
+      return "<td class='first-td'><span class='#{get_css_class(presenter, field, record)}'></span></td>" if presenter.get_field(field).css_class.present?
+      "<td class='first-td'></td>"
+    end
+
     def grid_attr(presenter, field, record, only_render_fields)
       result = field_to_show(presenter, field, record, only_render_fields)
       return result if only_render_fields
       list_attr(presenter, field, record, only_render_fields)
     end
 
+    def hide_column?(field, records, controller)
+      hide = true
+      records.each do |record|
+        unless field.hidden?(record, controller)
+          hide = false
+        end
+      end
+      hide
+    end
+
     def list_attr(presenter, field, record, only_render_fields)
       result = field_to_show(presenter, field, record, only_render_fields)
       return result if only_render_fields
@@ -180,7 +198,7 @@ module Carnival
       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)
+          next if record_action.hidden?(record, controller)
           if record_action.remote?
             button_action_remote(record_action, presenter, record)
           else

data/app/models/carnival/action.rb

@@ -31,6 +31,16 @@ module Carnival
       end
     end
 
+    def hidden?(record, controller)
+      if @params.has_key?(:hide_if)
+        block = @params[:hide_if]
+        controller.instance_variable_set(:@record, record)
+        controller.instance_eval(&block)
+      else
+        false
+      end
+    end
+
     def show(record)
       return true if !params[:show_func]
       return true if !record.respond_to? params[:show_func]

data/app/models/carnival/field.rb

@@ -9,9 +9,15 @@ module Carnival
       validate
     end
 
-    #def name
-    #  @name.to_s
-    #end
+    def hidden?(record, controller)
+      if @params.has_key?(:hide_if)
+        block = @params[:hide_if]
+        controller.instance_variable_set(:@record, record)
+        controller.instance_eval(&block)
+      else
+        false
+      end
+    end
 
     def specified_association?
       not get_association_and_field[:association].nil?
@@ -158,7 +164,6 @@ module Carnival
     end
 
     def sort_name
-      return @params[:related_to].to_s if @params[:related_to].present?
       @name.to_s
     end
 

data/app/presenters/carnival/base_admin_presenter.rb

@@ -346,6 +346,17 @@ module Carnival
     def renderer_for(field_name)
       FieldRenderers::RendererCreator.create_field_renderer(self, field_name)
     end
+    
+    def translate_field field_name
+      field = get_field(field_name)
+      if field.specified_association?
+        related_class = model_class.reflect_on_association(field.association_name.to_sym).klass
+        related_class.human_attribute_name(field.association_field_name)
+      else
+        field_key = field.name_for_translation
+        model_class.human_attribute_name field_key
+      end
+    end
 
     protected
 

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

@@ -46,8 +46,7 @@ module Carnival
             else
               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
+            table = @klass_service.get_related_class(search_field.to_sym).table_name
             column = "id" if column.nil?
           else
             table = @klass_service.table_name

data/app/services/carnival/query_service.rb

@@ -37,7 +37,6 @@ module Carnival
 
     def scopes_number
       records = records_without_pagination_and_scope
-
       Hash[@presenter.scopes.keys.map do |key|
         [key, scope_query(records, key).size]
       end]

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

@@ -5,9 +5,10 @@
         .row
           .col-md-12
             - @presenter.fields_for_action(:index).each do |key, field|
-              - if ( @presenter.render_field?(field, :index))
-                = grid_attr(@presenter, key,record, false).html_safe
+              - unless field.hidden?(record, controller)
+                - if ( @presenter.render_field?(field, :index))
+                  = grid_attr(@presenter, key,record, false).html_safe
         .row
           -if presenter.has_batch_actions?
             =check_box_tag(:batch_action_item, record.id, false, class: 'batch_action_items')
-          = list_buttons(@presenter, record).html_safe
+          = list_buttons(@presenter, record).try(:html_safe)

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

@@ -7,7 +7,8 @@
             =check_box_tag(:batch_action_item, record.id, false, class: 'batch_action_items')
         %div{class: "#{presenter.has_batch_actions? ? 'col-md-9' : 'col-md-10' }"}
           - @presenter.fields_for_action(:index).each do |key, field|
-            - if ( @presenter.render_field?(field, :index))
-              = list_attr(@presenter, key,record, false).html_safe
+            - unless field.hidden?(record, controller)
+              - if ( @presenter.render_field?(field, :index))
+                = list_attr(@presenter, key,record, false).html_safe
         .col-md-2
-          = list_buttons(@presenter, record).html_safe
+          = list_buttons(@presenter, record).try(:html_safe)

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

@@ -5,8 +5,9 @@
         %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])
+        - unless hide_column?(column[:field], @records, controller)
+          - if ( @presenter.render_field?(column[:field], :index))
+            %th{"onclick" => "javascript:#{column[:sort_function]}",  "class" => "#{column[:class]}"}= translate_field(presenter, column[:field])
       - if @presenter.actions_for_record.any?
         %th.buttons
   %tbody
@@ -16,8 +17,12 @@
           %td
             =check_box_tag(:batch_action_item, record.id, false, class: 'batch_action_items')
         - @presenter.fields_for_action(:index).each do |key, field|
-          - if ( @presenter.render_field?(field, :index))
-            = list_cel(@presenter, key,record, false).html_safe
+          - unless field.hidden?(record, controller)
+            - if ( @presenter.render_field?(field, :index))
+              = list_cel(@presenter, key,record, false).html_safe
+          - else
+            - unless hide_column?(field, @records, controller)
+              = empty_cel(@presenter, key,record, false).html_safe
         - if @presenter.actions_for_record.any?
           %td
-            = list_buttons(@presenter, record).html_safe
+            = list_buttons(@presenter, record).try(:html_safe)

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

@@ -29,4 +29,4 @@
         %span
           = t("activerecord.attributes.#{presenter.full_model_name}.#{key.to_s.gsub('.', '_')}")
           = ": #{value}"
-        %a{:href => "javascript:Carnival.removeAdvancedSearch('"+key.to_s+"')"}
+        %a{:href => "javascript:Carnival.removeAdvancedSearch('"+key.to_s+"')"}

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

@@ -1,5 +1,5 @@
 - presenter.actions_for_record.each do |key, action|
-  - if action.show(record)
+  - unless action.hide?(record)
     - if action.remote?
       = render action.partial, :path => action.path(presenter, :id => record.id), :name => action.name, :params => action.params, :label => t("#{presenter.model_name}.#{action.name}", default: t("carnival.#{action.name}"))
     - else

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

@@ -10,7 +10,7 @@
 - options[:input_html] = {}
 - options[:input_html][:class] = "field-#{field.name}"
 - options[:input_html][:data] = {}
-- options[:input_html][:data][:presenter_name] = presenter.presenter_name 
+- options[:input_html][:data][:presenter_name] = presenter.presenter_name
 
 - if options[:as].is_a? Hash
   - options[:input_html][:data][:carnival_options] = options[:as].first[1]
@@ -28,6 +28,6 @@
 
 - options[:label] = translate_field(presenter, field)
 - if options[:as] == :partial
-  = render field.name.to_s, f: f, record: f.object
+  = render options[:partial_name], f: f, record: f.object
 - else
   = f.input field.name, options

data/lib/carnival/version.rb

@@ -1,3 +1,3 @@
 module Carnival
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,307 +1,307 @@
 --- !ruby/object:Gem::Specification
 name: carnival
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Vizir Software Studio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: unicode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.4.2
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: better_errors
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: bullet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.14.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.4.4
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.10
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   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: Carnival is an easy-to-use and extensible Rails Engine to speed the development
@@ -552,17 +552,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Carnival is an easy-to-use and extensible Rails Engine to speed the development