beautiful_scaffold 1.0.0.pre → 1.0.1

data/lib/generators/templates/app/controllers/master_base.rb

@@ -3,53 +3,67 @@ class BeautifulController < ApplicationController
   
   layout "beautiful_layout"
 
+  # That clear cookie to avoid cookie overflow
+  # if you want to keep all in memory and you use ARCookieStore, just comment next line
+  before_action :delete_session_for_others_models_scaffold
+
   def dashboard
     render :layout => "beautiful_layout"
   end
 
+  def delete_session_for_others_models_scaffold
+    current_model = params[:controller].split('/').last.singularize
+
+    ['fields','sorting','search','scope','paginate'].each{ |k|
+      session[k] = session[k].delete_if {|key, v| key != current_model } if not session[k].blank?
+    }
+  end
+
   # Call in AJAX
   def select_fields
     model_sym = params[:model_sym]
 
-    do_select_fields(model_sym)
+    do_select_fields(model_sym.to_s) #TODO vérifier si nécessaire
 
     render :nothing => true
   end
 
-  def do_select_fields(model_sym)
+  # TODO session use key string because json serializer don't know the type of key.
+
+  def do_select_fields(model_str)
     # Fields
-    session[:fields] ||= {}
-    session[:fields][model_sym] ||= nil
-    params[:fields] ||= session[:fields][model_sym]
-    session[:fields][model_sym] = params[:fields]
+    session['fields'] ||= {}
+    session['fields'][model_str] ||= nil
+    params[:fields] ||= session['fields'][model_str]
+    session['fields'][model_str] = params[:fields]
   end
 
-  def do_sort_and_paginate(model_sym)
+  def do_sort_and_paginate(model_str)
     # Sort
-    session[:sorting] ||= {}
-    session[:sorting][model_sym] ||= { :attribute => "id", :sorting => "DESC" }
-    params[:sorting] ||= session[:sorting][model_sym]
-    session[:sorting][model_sym] = params[:sorting]
-    
+    session['sorting'] ||= {}
+    session['sorting'][model_str] ||= { 'attribute' => "id", 'sorting' => "DESC" }
+    params[:sorting] ||= session['sorting'][model_str]
+    session['sorting'][model_str] = params[:sorting]
+
     # Search and Filter
-    session[:search] ||= {}
-    session[:search][model_sym] = nil if not params[:nosearch].blank?
+    session['search'] ||= {}
+    session['search'][model_str] = nil if not params[:nosearch].blank?
     params[:page] = 1 if not params[:q].nil?
-    params[:q] ||= session[:search][model_sym]
-    session[:search][model_sym] = params[:q] if params[:skip_save_search].blank?
-        
+    params[:q] ||= session['search'][model_str]
+    session['search'][model_str] = params[:q] if params[:skip_save_search].blank?
+
     # Scope
-    session[:scope] ||= {}
-    session[:scope][model_sym] ||= nil
+    session['scope'] ||= {}
+    session['scope'][model_str] ||= nil
     params[:page] = 1 if not params[:scope].nil?
-    params[:scope] ||= session[:scope][model_sym]
-    session[:scope][model_sym] = params[:scope]
+    params[:scope] ||= session['scope'][model_str]
+    session['scope'][model_str] = params[:scope]
 
     # Paginate
-    session[:paginate] ||= {}
-    session[:paginate][model_sym] ||= nil
-    params[:page] ||= session[:paginate][model_sym]
-    session[:paginate][model_sym] = params[:page]
+    session['paginate'] ||= {}
+    session['paginate'][model_str] ||= nil
+    params[:page] ||= session['paginate'][model_str]
+    session['paginate'][model_str] = params[:page]
   end
   
   def boolean(string)

data/lib/generators/templates/app/helpers/beautiful_helper.rb

@@ -1,8 +1,18 @@
 # encoding : utf-8
+<%
+if !engine_name.blank?
+b_module = "module #{engine_camel}"
+e_module = "end"
+else
+b_module = ""
+e_module = ""
+end
+%>
+<%= b_module %>
 module BeautifulHelper
 
   def visible_column(model_name, field_name, display_default = 'table-cell', other_css = "")
-    return ('style="display:' + ((session[:fields][model_name].to_a.include?(field_name))  ? display_default : 'none') + ';' + other_css + '"').html_safe
+    return ('style="display:' + ((session['fields'][model_name].to_a.include?(field_name))  ? display_default : 'none') + ';' + other_css + '"').html_safe
   end
 
   def dropdown_submenu(link_caption, &block)
@@ -54,13 +64,13 @@ module BeautifulHelper
     ).html_safe
   end
 
-  def ransack_field(path_of_model, attribute_name, f, caption = nil)
+  def ransack_field(path_of_model, attribute_name, f, caption = nil, engine = nil)
     model_path = path_of_model.split("/")
     model_name = model_path.last
     model_path.delete(model_path.first)
     model_name_for_ransack = model_path.join("_")
 
-    ar_model = model_name.camelize.constantize
+    ar_model = (engine.blank? ? model_name.camelize.constantize : "#{engine.camelize}::#{model_name.camelize}".constantize)
 
     default_caption = caption
     if default_caption.blank? then
@@ -158,14 +168,16 @@ module BeautifulHelper
         response += f.label name_field + "_eq_false",  raw(f.radio_button((name_field + "_eq").to_sym, false))  + " " + h(t(:no, :default => "No")),   :class => "checkbox inline"
         response += f.label name_field + "_eq",        raw(f.radio_button((name_field + "_eq").to_sym, nil))    + " " + h(t(:all, :default => "All")), :class => "checkbox inline"
 
-        infostr = (begin session[:search][model_name.to_sym][(name_field + "_eq").to_sym] == "on" ? "" : "info" rescue "" end)
+        infostr = (begin session['search'][model_name][(name_field + "_eq").to_sym] == "on" ? "" : "info" rescue "" end)
       when :string then
         response += f.text_field((name_field + "_cont").to_sym, :class => "filter col-md-12 form-control")
 
         infostr = info_input(model_name, (name_field + "_cont").to_sym)
       when :integer, :float, :decimal then
         if is_belongs_to_column?(name_field_bk) then
-          btmodel = get_belongs_to_model(name_field_bk).camelize.constantize
+          bt_model_name = get_belongs_to_model(name_field_bk).camelize
+          bt_model_name = "#{engine.camelize}::#{bt_model_name}" if !engine.blank?
+          btmodel = bt_model_name.constantize
           response += f.collection_select((name_field + "_eq").to_sym, btmodel.all, :id, :caption, { :include_blank => t(:all, :default => "All") }, { :class => "col-md-12 form-control" })
 
           infostr = info_input(model_name, (name_field + "_eq").to_sym)
@@ -199,13 +211,13 @@ module BeautifulHelper
   end
 
   def info_input(modname, attr)
-    model_name = modname.to_sym
+    model_name = modname
     rep = false
-    if not session[:search].blank? and not session[:search][model_name].blank? then
+    if not session['search'].blank? and not session['search'][model_name].blank? then
       if attr.kind_of?(Array) then
-        rep = (attr.any? { |elt| (not session[:search][model_name][elt].blank?) })
+        rep = (attr.any? { |elt| (not session['search'][model_name][elt].blank?) })
       else
-        rep = (not session[:search][model_name][attr].blank?)
+        rep = (not session['search'][model_name][attr].blank?)
       end
     end
     return (rep ? "info" : "")
@@ -264,6 +276,7 @@ module BeautifulHelper
   def clean_params
     params.delete :q
     params.delete :fields
+    params.delete :scope
   end
 
   def i18n_translate_path(model, attr)
@@ -278,3 +291,4 @@ module BeautifulHelper
     "app.models.#{model}.bs_caption_plural"
   end
 end
+<%= e_module %>

data/lib/generators/templates/app/helpers/model_helper.rb

@@ -1,4 +1,15 @@
 # encoding : utf-8
-require "beautiful_helper"
-module <%= namespace_for_class %><%= model_pluralize.camelize %>Helper
-end
+require "<%= engine_name %>beautiful_helper"
+<%
+  if engine_name.blank?
+    b_module = e_module = space_indent = ""
+  else
+    b_module = "module #{engine_camel}"
+    e_module = "end"
+    space_indent = "  "
+  end
+%>
+<%= b_module %>
+<%= space_indent %>module <%= namespace_for_class %><%= model_pluralize.camelize %>Helper
+<%= space_indent %>end
+<%= e_module %>

data/lib/generators/templates/app/initializers/ransack.rb

@@ -0,0 +1,16 @@
+Ransack.configure do |config|
+
+  # Change default search parameter key name.
+  # Default key name is :q
+  config.search_key = :q
+
+  # Raise errors if a query contains an unknown predicate or attribute.
+  # Default is true (do not raise error on unknown conditions).
+  config.ignore_unknown_conditions = false
+
+  # Globally display sort links without the order indicator arrow.
+  # Default is false (sort order indicators are displayed).
+  # This can also be configured individually in each sort link (see the README).
+  config.hide_sort_order_indicators = true
+
+end

data/lib/generators/templates/app/views/_mass_inserting.html.erb

@@ -1,14 +1,15 @@
+<% model = ("#{(engine.blank? ? '' : "#{engine.camelize}::")}#{model_name.camelize}").constantize %>
 <% formparams = [] %>
 <% if not namespace.blank? then %>
   <% formparams << namespace %>
 <% end %>
-<% formparams << model_name.camelize.constantize.new %>
+<% formparams << model.new %>
 <%= form_for formparams, :method => :post, :html => { :class => "well well-small form-inline mass-inserting #{(params[:mass_inserting] ? 'setfocus' : '')}" } do |f| %>
   <%= hidden_field_tag :mass_inserting, true %>
   <% for col in model_columns %>
     <div <%= visible_column(model_name, col, 'inline') %> class="col-<%= col %>">
       <%=
-        ar = model_name.camelize.constantize.columns_hash[col]
+        ar = model.columns_hash[col]
         if not ar.nil? then
           case ar.type
           when :integer then

data/lib/generators/templates/app/views/_modal_columns.html.erb

@@ -8,12 +8,12 @@
       <div class="modal-body">
         <% for field in model_columns %>
           <label class="checkbox">
-            <input type="checkbox" name="field[]" value="<%= field %>" <%= "checked" if session[:fields][model_name].include?(field) %>> <%= t("app.models.#{model_name}.bs_attributes.#{field}", :default => field.capitalize) %>
+            <input type="checkbox" name="field[]" value="<%= field %>" <%= "checked" if session['fields'][model_name.to_s].include?(field) %>> <%= t("app.models.#{model_name}.bs_attributes.#{field}", :default => field.capitalize) %>
           </label><br />
         <% end %>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-primary" id="filter-columns" data-url="/<%= model_name %>/select_fields">Ok</button>
+        <button type="button" class="btn btn-primary" id="filter-columns" data-url="/<%= engine_name %><%= model_name %>/select_fields">Ok</button>
         <button type="button" class="btn btn-default" id="cancel-filter-columns"><%= t(:cancel, :default => "Cancel") %></button>
       </div>
     </div>

data/lib/generators/templates/app/views/index.html.erb

@@ -2,12 +2,12 @@
 
 <p>
   <%%= link_to '<i class="fa fa-plus"></i> '.html_safe + t(:new, :default => "New") + ' ' + <%= i18n_t_m(model) %>, new_<%= namespace_for_route %><%= singular_table_name %>_path, :class => "btn btn-default" %>
-  <%% if <%= model_camelize %>.columns.map(&:name).include?("<%= model %>_id") then %>
+  <%% if <%= model_with_engine_camelize %>.columns.map(&:name).include?("<%= model %>_id") then %>
     <%%= link_to '<i class="fa fa-folder-close"></i> '.html_safe + t(:treeview, :default => "Treeview") + ' ' + <%= i18n_t_m(model) %>, treeview_<%= namespace_for_route %><%= model_pluralize %>_path, :class => "btn btn-default" %>
   <%% end %>
 </p>
 
-<%%= render :partial => "layouts/mass_inserting", :locals => { :namespace => '<%= namespace_alone %>', :model_name => '<%= model %>', :model_columns => [<%= attributes.map{ |e| "'#{e.name}'" }.join(',') %>] } %>
+<%%= render :partial => "layouts/mass_inserting", :locals => { :engine => '<%= engine_opt %>', :namespace => '<%= namespace_alone %>', :model_name => '<%= model %>', :model_columns => [<%= attributes.map{ |e| "'#{e.name}'" }.join(',') %>] } %>
 
 <%%# Set your scopes below (string in array) %>
 <%% scopes = [] %>
@@ -22,6 +22,28 @@
 </div>
 <%% end %>
 
+<div class="row">
+  <div class="col-md-12">
+    <a class="btn btn-xs btn-default" id="hide-menu-btn">
+      <i class="fa fa-caret-left"></i>
+      <i class="fa fa-caret-left"></i>
+    </a>
+    <a class="btn btn-xs btn-default" id="show-menu-btn">
+      <i class="fa fa-caret-right"></i>
+      <i class="fa fa-caret-right"></i>
+    </a>
+
+    <a class="btn btn-xs btn-default pull-right" id="hide-search-btn">
+      <i class="fa fa-caret-right"></i>
+      <i class="fa fa-caret-right"></i>
+    </a>
+    <a class="btn btn-xs btn-default pull-right" id="show-search-btn">
+      <i class="fa fa-caret-left"></i>
+      <i class="fa fa-caret-left"></i>
+    </a>
+  </div>
+</div>
+
 <div class="row">
   <div class="col-md-9">
     <%%= form_tag  batch_<%= namespace_for_route %><%= plural_table_name %>_path, :class => "form-inline" do %>
@@ -36,7 +58,7 @@
         <button class="btn btn-default" type="submit"><i class="fa fa-ok"></i> <%%= t(:process, :default => "Process") %></button>
       </div>
 
-      <%%= render :partial => "layouts/modal_columns", :locals => { :model_name => "<%= singular_table_name %>", :model_columns => [<%= (attributes.map{ |e| "'#{e.name}'" }.to_a + ["'created_at'", "'updated_at'"]).join(',') %>] } %>
+      <%%= render :partial => "layouts/modal_columns", :locals => { :engine_name => '<%= engine_opt %>', :model_name => "<%= singular_table_name %>", :model_columns => [<%= (attributes.map{ |e| "'#{e.name}'" }.to_a + ["'created_at'", "'updated_at'"]).join(',') %>] } %>
 
       <table class="table table-striped table-bordered table-condensed">
         <thead>

data/lib/generators/templates/app/views/layout.html.erb

@@ -80,16 +80,5 @@
       $('<%%= @opened_modal %>').modal('show');
       <%% end %>
     </script>
-    <script type="text/javascript">
-        ;(function($){
-            $.fn.datepicker.dates['<%%= I18n.locale.to_s %>'] = {
-                days:        <%%= (t("date.day_names") + [t("date.day_names").first]).map(&:capitalize).to_s.html_safe %>,
-                daysShort:   <%%= (t("date.abbr_day_names") + [t("date.abbr_day_names").first]).map(&:capitalize).to_s.html_safe %>,
-                daysMin:     <%%= (t("date.abbr_day_names") + [t("date.abbr_day_names").first]).map{ |d| d.capitalize[0..2] }.to_s.html_safe %>,
-                months:      <%%= t("date.month_names")[1..12].map(&:capitalize).to_s.html_safe %>,
-                monthsShort: <%%= t("date.abbr_month_names")[1..12].map(&:capitalize).to_s.html_safe %>
-            };
-        }(jQuery));
-    </script>
   </body>
 </html>

data/lib/generators/templates/app/views/partials/_index_search.html.erb

@@ -5,5 +5,5 @@
   <%- if @beautiful_attributes.include?(a.name + ':references') then -%>
     <%- attribute = "_id" -%>
   <%- end -%>
-      <%%= ransack_field("<%= singular_table_name %>", "<%= a.name %><%= attribute %>", f, "<%= caption %>") %>
+      <%%= ransack_field("<%= singular_table_name %>", "<%= a.name %><%= attribute %>", f, "<%= caption %>"<%= (engine_name.blank? ? '' : ", \"#{engine_opt}\"") %>) %>
 <%- end -%>

data/lib/generators/templates/app/views/partials/_index_search_default_fields.html.erb

@@ -1,3 +1,3 @@
 <%- { :created_at => "Created At", :updated_at => "Updated At", :id => "Id" }.each{ |k,v| -%>
-              <%%= ransack_field("<%= singular_table_name %>", "<%= k.to_s %>", f, "<%= v %>") %>
+              <%%= ransack_field("<%= singular_table_name %>", "<%= k.to_s %>", f, "<%= v %>"<%= (engine_name.blank? ? '' : ", \"#{engine_opt}\"") %>) %>
 <%- } -%>

data/lib/generators/templates/app/views/treeview.html.erb

@@ -4,14 +4,14 @@
 namespace_for_url = "<%= namespace_for_url %>"
 plural_model_name = "<%= model_pluralize %>"
 model_name        = "<%= singular_table_name %>"
-opened_node       = <%= model_camelize %>.select(:id).all.map{ |g| "'treeelt_" + g.id.to_s + "'" }.join(',').html_safe
+opened_node       = <%= model_with_engine_camelize %>.select(:id).all.map{ |g| "'treeelt_" + g.id.to_s + "'" }.join(',').html_safe
 %>
 
 <div id="treeview" data-model="<%%= model_name %>" data-url="/<%%= namespace_for_url %><%%= plural_model_name %>/" data-opened="[<%%= opened_node %>]">
   <ul>
-    <%% <%= model_camelize %>.transaction do %>
-    <%% ar = <%= model_camelize %>.where(:<%= model %>_id => nil) %>
-    <%% ar = ar.order("position") if <%= model_camelize %>.column_names.include?("position") %>
+    <%% <%= model_with_engine_camelize %>.transaction do %>
+    <%% ar = <%= model_with_engine_camelize %>.where(:<%= model %>_id => nil) %>
+    <%% ar = ar.order("position") if <%= model_with_engine_camelize %>.column_names.include?("position") %>
       <%% for g in ar.all %>
         <%%= build_treeview(g, '<%= model_pluralize %>') %>
       <%% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.1
 platform: ruby
 authors:
 - Sylvain Claudel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies: []
 description: Beautiful Scaffold generate a complete scaffold (sort, export, paginate
   and filter data) http://www.beautiful-scaffold.com
@@ -39,9 +39,7 @@ files:
 - lib/generators/templates/app/assets/javascripts/application-bs.js
 - lib/generators/templates/app/assets/javascripts/beautiful_scaffold.js
 - lib/generators/templates/app/assets/javascripts/bootstrap-colorpicker.js
-- lib/generators/templates/app/assets/javascripts/bootstrap-datepicker.js
 - lib/generators/templates/app/assets/javascripts/bootstrap-datetimepicker-for-beautiful-scaffold.js
-- lib/generators/templates/app/assets/javascripts/bootstrap-timepicker.js
 - lib/generators/templates/app/assets/javascripts/bootstrap-wysihtml5.js
 - lib/generators/templates/app/assets/javascripts/fixed_menu.js
 - lib/generators/templates/app/assets/javascripts/jquery-barcode.js
@@ -67,6 +65,7 @@ files:
 - lib/generators/templates/app/helpers/beautiful_helper.rb
 - lib/generators/templates/app/helpers/model_helper.rb
 - lib/generators/templates/app/initializers/link_renderer.rb
+- lib/generators/templates/app/initializers/ransack.rb
 - lib/generators/templates/app/locales/beautiful_scaffold.en.yml
 - lib/generators/templates/app/locales/beautiful_scaffold.fr.yml
 - lib/generators/templates/app/locales/beautiful_scaffold.ja.yml
@@ -114,9 +113,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: beautiful_scaffold
 rubygems_version: 2.5.2