carnival 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 108150e630fd28b1cb4ad92a023207994d6d9af2
-  data.tar.gz: aa9162dee32339443b33f442d78e3fba4a06bfee
+  metadata.gz: b9776fbf2f82b701598d223c42928aeaaf266b40
+  data.tar.gz: 9361afb9c6b303e0b7701bc5bf16305ec08da1fb
 SHA512:
-  metadata.gz: 1a9bafd9c4134db442b6097525e340c0dffd1f12de34449b82333c5e5f95a23218e1c9f7213356f2ddf6f1176a25c36ed7e452ac4904e5eb7f1143eee7fe464d
-  data.tar.gz: f14adc7b44bebca8d203555ed75b6f101a55eee4edde1b29b5d83a5d8dc72b40e281d5a6d66d18866b69ce69a3c9e0cb8cdede7becf4d0e06ca2ca72ee1e34c1
+  metadata.gz: 0b09b7d9b078d4848a7944485e1bdf51b7373e3c7c3a29bff68d0a72276ca4a4f55370214e996b67d0ea3fe94cae7b436483eda76f01d2857368a6e329a39616
+  data.tar.gz: f3f7be398e760f22f346c753bb89725a26f15dbca358016089deba748d162ef4ea4c5f0ee8b3583cf9ed6f875af7937c8689453127139f53705e603e3adb497b

data/Rakefile

@@ -4,31 +4,15 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Carnival'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
-task default: :test
+task :default => :spec

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

@@ -25,7 +25,7 @@
   background: -moz-linear-gradient(-90deg, #fff, #f0f0f0);
   background: linear, -90deg, white, #f0f0f0;
   color: #333;
-  line-height: 26px;
+  line-height: 27px;
   border: 1px solid rgba(0, 0, 0, 0.21);
   opacity: 0.7;
 }
@@ -67,22 +67,22 @@
 
 .novo, .search-submit{
   background: #007ae1;
-  color: #fff; 
+  color: #fff;
 }
 
 .novo:hover, .search-submit:hover{
   background: #007ae1;
-  color: #fff; 
+  color: #fff;
 }
 
 .remover{
   background: #d63e30;
-  color: #fff; 
+  color: #fff;
 }
 
 .remover:hover{
   background: #d63e30;
-  color: #fff; 
+  color: #fff;
 }
 
 .apagar{
@@ -134,7 +134,13 @@
 }
 
 .csv:before{
-  background-position: -101px -50px; 
+  background-position: -101px -50px;
 }
 
+.carnival-action-button.blue{
+  background:#007ae1;
+  color:#fff;
+}
+
+
 /********************** ACTIONS SPECIFIC STYLES ********************* START */

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

@@ -24,19 +24,19 @@ input::-webkit-inner-spin-button {
 }
 
 .carnival-form input{
+  -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
   width: 100%;
-  outline:none;
-  height:21px;
+  outline: none;
   border: 1px solid #c8c8c8;
-  font-family: 'OpenSansRegular';
-  padding:2px 6px 2px 6px;
-  color:#555;
+  padding: 2px 8px;
+  color: #555;
   border-radius: 3px;
-  -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
-  background:#fff;
+  background-clip: padding-box;
+  background: #fff;
   box-sizing: border-box;
   -moz-box-sizing: border-box;
   height: 35px;
+  font-size: 0.9rem;
 }
 
 .carnival-form input[type='file']{
@@ -177,8 +177,18 @@ input[type="checkbox"]{
   height: auto !important;
 }
 
-input{
-  margin-bottom:10px;
+.boolean label{
+  float: left;
+  width: auto;
+  margin-bottom: 10px;
+}
+.boolean input{
+  float: left;
+  width: auto;
+}
+
+input, .select2-container{
+  margin-bottom:10px !important;
 }
 
 .hidden{

data/app/assets/stylesheets/carnival/grid.css

@@ -722,3 +722,6 @@ div .dt-grid-6{
   margin-left:0.4%;
 }
 
+.row > div.input {
+  padding: 0 1% !important;
+}

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

@@ -328,3 +328,7 @@ ul.menu .dropdown_main_menu_sublevel li a{
   background-position:27px 6px;
   background-repeat:no-repeat;
 }
+
+a.btn_usuario.sublevel.link{
+  display: none !important;
+}

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

@@ -34,11 +34,14 @@ body, html{
   font-size:14px;
   line-height:22px;
   color:#666;
-  font-family: 'OpenSansRegular', sans-serif;
   overflow-y: auto !important;
   height: 100%;
 }
 
+*{
+  font-family: 'OpenSansRegular', sans-serif !important;
+}
+
 .link{
   color: #007ae1;
 }
@@ -47,7 +50,7 @@ li{list-style: none;}
 a{text-decoration:none;}
 
 .carnival-wrapper{
-  width: 100%; 
+  width: 100%;
   height: 100%;
 }
 
@@ -235,4 +238,3 @@ a.confirm, a.cancel{
   margin-left: 10px;
   text-transform: uppercase;
 }
-

data/app/controllers/carnival/base_admin_controller.rb

@@ -1,11 +1,11 @@
-require 'csv'
 module Carnival
   class BaseAdminController < InheritedResources::Base
     respond_to :html, :json
     layout "carnival/admin"
+    before_action :instantiate_presenter
+    helper_method :back_or_model_path
 
     def home
-
     end
 
     def table_items
@@ -13,9 +13,9 @@ module Carnival
     end
 
     def render_inner_form
-      @model_presenter = presenter_name(params[:field]).new controller: self
+      @presenter = presenter_name(params[:field]).new controller: self
       model_class = params[:field].classify.constantize
-      @model_object = model_class.send(:find_by_id, params[:id])
+      @model_object = model_class.find(params[:id])
     end
 
     def presenter_name field
@@ -25,89 +25,61 @@ module Carnival
     end
 
     def index
-      @presenter = instantiate_presenter
       @query_form = Carnival::QueryFormCreator.create(@presenter, params)
-      @model = instantiate_model(@presenter)
-      base_query = table_items || @model
-      @query_service = Carnival::QueryService.new(base_query, @presenter, @query_form)
+      @model = @presenter.model_class
+      @query_service = Carnival::QueryService.new(table_items || @model, @presenter, @query_form)
 
       respond_to do |format|
-        format.html do |render|
+        format.html do
           @records = @query_service.get_query
           last_page = (@query_service.total_records / @presenter.items_per_page.to_f).ceil
           @paginator = Carnival::Paginator.new @query_form.page, last_page
           @thead_renderer = Carnival::TheadRenderer.new @presenter.fields_for_action(:index), @query_form.sort_column, @query_form.sort_direction
-          render 'index' and return
         end
         format.csv do
           @records = @query_service.records_without_pagination
-          render :csv => t("activerecord.attributes.#{@presenter.full_model_name}.csv_name") , :template => 'carnival/base_admin/index.csv.haml' and return
+          render :csv => @model.model_name.human
         end
         format.pdf do
           @records = @query_service.records_without_pagination
           @thead_renderer = Carnival::TheadRenderer.new @presenter.fields_for_action(:index), @query_form.sort_column, @query_form.sort_direction
-          render :pdf => t("activerecord.attributes.#{@presenter.full_model_name}.pdf_name") , :template => 'carnival/base_admin/index.pdf.haml',  :show_as_html => params[:debug].present? and return
+          render :pdf => t("activerecord.attributes.#{@presenter.full_model_name}.pdf_name") , :template => 'carnival/base_admin/index.pdf.haml',  :show_as_html => params[:debug].present?
         end
       end
     end
 
     def show
-      @model_presenter = instantiate_presenter
-      show! do |format|
-        @model = instance_variable_get("@#{resource_instance_name}")
-        format.html do |render|
-          render 'show' and return
-        end
+      show! do
+        instantiate_model
       end
     end
 
     def new
-      @model_presenter = instantiate_presenter
-      new! do |format|
-        @model = instance_variable_get("@#{resource_instance_name}")
-        format.html do |render|
-          render 'new' and return
-        end
+      new! do
+        instantiate_model
       end
     end
 
     def edit
-      @model_presenter = instantiate_presenter
-      edit! do |format|
-        @model = instance_variable_get("@#{resource_instance_name}")
-        format.html do |render|
-          render 'edit' and return
-        end
+      edit! do
+        instantiate_model
       end
     end
 
     def create
-      @model_presenter = instantiate_presenter
       create! do |success, failure|
-        success.html{ redirect_to @model_presenter.model_path(:index), :notice => I18n.t("messages.created") and return}
-        failure.html do |render|
-          @model = instance_variable_get("@#{resource_instance_name}")
-          render 'new' and return
-        end
+        success.html { redirect_to back_or_model_path, :notice => I18n.t("messages.created") }
+        failure.html { instantiate_model and render 'new' }
       end
     end
 
     def update
-      @model_presenter = instantiate_presenter
       update! do |success, failure|
-        success.html{ redirect_to @model_presenter.model_path(:index), :notice => I18n.t("messages.updated") and return}
-        failure.html do |render|
-          @model = instance_variable_get("@#{resource_instance_name}")
-          render 'edit' and return
-        end
+        success.html { redirect_to back_or_model_path, :notice => I18n.t("messages.updated") }
+        failure.html { instantiate_model and render 'edit' }
       end
     end
 
-    def render_popup partial
-      @application_modal = partial
-      render '/carnival/shared/render_popup' and return
-    end
-
     def load_dependent_select_options
       presenter = params[:presenter].constantize.send(:new, :controller => self)
       model = presenter.relation_model(params[:field].gsub("_id", "").to_sym)
@@ -127,14 +99,15 @@ module Carnival
 
       render :json => list
     end
-    private
 
-    def instantiate_model(presenter)
-      presenter.full_model_name.classify.constantize
+    protected
+
+    def instantiate_model
+      @model = instance_variable_get("@#{resource_instance_name}")
     end
 
     def instantiate_presenter
-      carnival_presenter_class.new controller: self
+      @presenter = carnival_presenter_class.new controller: self
     end
 
     def carnival_presenter_class
@@ -147,10 +120,17 @@ module Carnival
     end
 
     def extract_namespace
-      namespace = ""
-      arr = self.class.to_s.split("::")
-      namespace = arr[0] if arr.size > 1
-      namespace
+      module_class_split = self.class.to_s.split("::")
+      if module_class_split.size > 1
+        module_class_split[0]
+      else
+        ''
+      end
     end
+
+    def back_or_model_path
+      params[:HTTP_REFERER] || @presenter.model_path(:index)
+    end
+
   end
 end

data/app/helpers/carnival/base_admin_helper.rb

@@ -86,22 +86,26 @@ module Carnival
       end
     end
 
-    def field_to_show(presenter, field_name, record, show_only_value=false)
-      rendered = field_value_and_type presenter, field_name, record
-      field_type = rendered[:field_type]
-      value = rendered[:value]
+    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)
+      else
+        rendered = field_value_and_type presenter, field_name, record
+        field_type = rendered[:field_type]
+        value = rendered[:value]
 
-      is_relation = presenter.relation_field?(field_name)
+        is_relation = presenter.relation_field?(field_name)
 
-      unless value.nil?
-        formatted_field = format_field(presenter, field_name, field_type, value)
-        if is_relation and !show_only_value
-          link_to(formatted_field, presenter.relation_path(field_name, record))
+        unless value.nil?
+          formatted_field = format_field(presenter, field_name, field_type, value)
+          if is_relation and !show_only_values
+            link_to(formatted_field, presenter.relation_path(field_name, record))
+          else
+            formatted_field
+          end
         else
-          formatted_field
+          nil
         end
-      else
-        nil
       end
     end
 
@@ -180,12 +184,14 @@ module Carnival
 
     def list_buttons(presenter, record)
       result = ""
-      presenter.actions_for_record.each do |key, action|
-        if action.show(record)
-          if action.remote?
-            result << button_action_remote(action, presenter, record)
-          else
-            result << button_action(action, presenter, record)
+      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
           end
         end
       end

data/app/inputs/admin_relationship_select_input.rb

@@ -15,7 +15,7 @@ class AdminRelationshipSelectInput < SimpleForm::Inputs::CollectionSelectInput
     end
 
     @builder.collection_select(
-      "#{@builder.object.class.name.constantize.reflections[attribute_name.to_sym].foreign_key}",
+      "#{HashWithIndifferentAccess.new(@builder.object.class.name.constantize.reflections)[attribute_name.to_sym].foreign_key}",
       collection,
       :first, :last,
       {prompt: I18n.t("#{@builder.object.class.to_s.gsub(/^.*::/, '').downcase}.lista_#{attribute_name}.selecione", default: I18n.t("messages.select"))},

data/app/inputs/carnival_select_remote_input.rb

@@ -18,7 +18,7 @@ class CarnivalSelectRemoteInput < SimpleForm::Inputs::CollectionSelectInput
     end
 
     html = @builder.collection_select(
-      "#{@builder.object.class.name.constantize.reflections[attribute_name.to_sym].foreign_key}",
+      "#{HashWithIndifferentAccess.new(@builder.object.class.name.constantize.reflections)[attribute_name.to_sym].foreign_key}",
       collection,
       :first, :last,
       {prompt: I18n.t("#{@builder.object.class.to_s.gsub(/^.*::/, '').downcase}.lista_#{attribute_name}.selecione", default: I18n.t("messages.select"))},