beautiful_scaffold 1.0.0.pre → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c788ac3707c3a554a7fd4b8d7796645899275068
-  data.tar.gz: 194fa4ea7f3f50c1548dd1306d9718e3e6eaaf76
+  metadata.gz: 22819b7aae444a86cc628089c52962012d24c031
+  data.tar.gz: 26aa274ae0fa88969e570ef22415ac490ef7e913
 SHA512:
-  metadata.gz: ccdaf02eeca18d1b3e84857a16ca055349207879ff83846b1e794d60efb0c2a6068f6a57351001eacbf96941ac3f3a3b293f3e2a72ac3be4efb0e10c2c337629
-  data.tar.gz: cd77e358cab2f4c04db96e08d7b52357d07e2223121fa5f67dacf8fae893c971e403e32a039043b982a2051a52a437d6f3d9f801260318dea64a52e6fe9ef7bd
+  metadata.gz: 1e555f0e2242f97ead7b3ff4ed8b1260ea9bd73f66e6ea27498a514f7990b3aafb582cac388eac8a0a3663a83a1e7769a33ae6a672380c542e1c261448163345
+  data.tar.gz: 1408deef315e1e3d7a1fa84f7e9543a32c5c70db40138f186ec4368abbbf7f8bfde3ddd2de6283a212571046ac1028dcc02067ec0ef264a40ee1c2913b6b9d72

data/CHANGELOG

@@ -1,3 +1,12 @@
+== 1.0.1
+
+* enhancement
+  * Change datetimepicker (eyecon.ro -> eonasdan)
+  * Support CamelCase syntaxe for models.
+
+* bugfix
+  * Change keys symbol into string on session (begin at 0.3.5)
+
 == 1.0.0.pre
 
 * enhancement

data/Gemfile

@@ -8,14 +8,6 @@ gem "will_paginate"
 # Search and filter
 gem "ransack"
 # Pdf
-gem 'prawn', '1.0.0.rc2'
-# Textile
-gem 'RedCloth'
-# BBCode
-gem 'bb-ruby'
-# Markdown
-gem 'bluecloth'
-# Markdown
-gem 'rdiscount'
+gem 'prawn'
 # Clear html tag
 gem 'sanitize'

data/README.rdoc

@@ -23,7 +23,7 @@ Add this in your Gemfile :
 
 Add this in your Gemfile :
 
-    gem 'beautiful_scaffold', '1.0.0.pre'
+    gem 'beautiful_scaffold', '1.0.1'
 
 === Next
 

data/beautiful_scaffold.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "beautiful_scaffold"
-  s.version     = "1.0.0.pre"
+  s.version     = "1.0.1"
   s.platform    = Gem::Platform::RUBY  
   s.summary     = "Beautiful Scaffold generate fully customizable scaffold"
   s.email       = "claudel.sylvain@gmail.com"

data/lib/generators/beautiful_locale_generator.rb

@@ -6,6 +6,8 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
   argument :name, :type => :string, :desc => "type of locale : fr OR en OR de OR ja all..."
+
+  class_option :mountable_engine, :default => nil
   
   def install_locale
     availablelocale = ["fr", "en", "ja"]
@@ -56,7 +58,15 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
 
     already_processed = { name.downcase => {}}
 
-    filepath = File.join(Rails.root, 'config', 'locales', "#{Rails.application.class.parent_name.downcase}.#{name.downcase}.yml")
+    app_name = (Rails.root || engine_opt)
+    engine_or_apps = (Rails.application.class.parent_name || engine_opt).downcase
+
+    puts "===>"
+    puts app_name
+    puts "=======>"
+    puts engine_or_apps
+
+    filepath = File.join(app_name, 'config', 'locales', "#{engine_or_apps}.#{name.downcase}.yml")
     begin
       hi18n                                   = YAML.load_file(filepath)
     rescue
@@ -77,9 +87,20 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
 
     Dir.glob("app/models/**/*").each { |model_file|
       puts model_file
-      next if File.directory?(model_file) or File.basename(model_file).first == '.'
+      next if File.directory?(model_file) or
+        File.basename(model_file).first == '.' or
+        model_file.include?('/concerns/') or
+        model_file.include?('pdf_report.rb') or
+        model_file.include?('application_record.rb')
+
       model = File.basename(model_file, File.extname(model_file))
-      klass = model.camelize.constantize
+
+      if !engine_opt.blank?
+        prefix = "#{engine_opt.camelize}::"
+      else
+        prefix = ''
+      end
+      klass = "#{prefix}#{model.camelize.constantize}"
 
       begin
         sorted_attr = klass.attribute_names.sort

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -3,6 +3,22 @@ module BeautifulScaffoldCommonMethods
 
   private
 
+  #############
+  # Engine
+  #############
+
+  def engine_opt
+    options[:mountable_engine].to_s
+  end
+
+  def engine_name
+    engine_opt.blank? ? '' : "#{engine_opt}/"
+  end
+
+  def engine_camel
+    options[:mountable_engine].camelize
+  end
+
   #############
   # Namespace
   #############
@@ -39,10 +55,18 @@ module BeautifulScaffoldCommonMethods
   # Models
   ############
 
+  def model
+    model_opt.underscore
+  end
+
   def model_camelize
     model.camelize
   end
 
+  def model_with_engine_camelize
+    (engine_name.blank? ? model.camelize : "#{engine_camel}::#{model_camelize}")
+  end
+
   def model_pluralize
     model.pluralize
   end
@@ -156,16 +180,29 @@ module BeautifulScaffoldCommonMethods
   end
 
   def require_gems
-    gem('less-rails', '2.8.0')
-    gem('will_paginate') # v 3.1.5
-    gem('ransack', '1.8.2')
-    gem('polyamorous', '1.3.1')
-    gem('jquery-ui-rails')
-    gem('prawn', '2.1.0')
-    gem('prawn-table', '0.2.2')
-    gem('sanitize')
-    gem('twitter-bootstrap-rails', '3.2.2')
-    gem('chardinjs-rails')
+    gems = {
+      'less-rails' => '2.8.0',
+      'will_paginate' => nil, # v 3.1.5
+      'ransack' => '1.8.2',
+      'polyamorous' => '1.3.1',
+      'jquery-ui-rails' => nil,
+      'prawn' => '2.1.0',
+      'prawn-table' => '0.2.2',
+      'sanitize' => nil,
+      'twitter-bootstrap-rails' => '3.2.2',
+      'chardinjs-rails' => nil,
+      'momentjs-rails' => '>= 2.9.0',
+      'bootstrap3-datetimepicker-rails' => '~> 4.17.47'
+    }
+
+    # Si engine il faut mettre les gems dans le gemspec et faire le require
+    if !Dir.glob('./*.gemspec').empty?
+      puts "============> Engine : You must add gems to your main app \n #{gems.to_a.map{ |a| "gem '#{a[0]}'#{(a[1].nil? ? '' : ", '#{a[1]}'")} " }.join("\n")}"
+    end
+
+    gems.each{ |gem_to_add, version|
+      gem(gem_to_add, version)
+    }
   end
 
 end

data/lib/generators/beautiful_scaffold_generator.rb

@@ -13,11 +13,12 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :model, :type => :string, :desc => "Name of model (downcase singular)"
+  argument :model_opt, :type => :string, :desc => "Name of model (singular)"
   argument :myattributes, :type => :array, :default => [], :banner => "field:type field:type"
   
   class_option :namespace, :default => nil
   class_option :donttouchgem, :default => nil
+  class_option :mountable_engine, :default => nil
 
   def install_gems
     if options[:donttouchgem].blank? then
@@ -46,62 +47,73 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
   def mimetype
     if not File.exist?("app/controllers/beautiful_controller.rb") then
-      inject_into_file("config/initializers/mime_types.rb", 'Mime::Type.register_alias "application/pdf", :pdf' + "\n", :before => "# Be sure to restart your server when you modify this file." )
+      if File.exist?("config/initializers/mime_types.rb") then # For mountable engine
+        inject_into_file("config/initializers/mime_types.rb", 'Mime::Type.register_alias "application/pdf", :pdf' + "\n", :before => "# Be sure to restart your server when you modify this file." )
+      else
+        puts "============> Engine : You must add `Mime::Type.register_alias \"application/pdf\", :pdf` to your config/initializers/mime_types.rb main app !"
+      end
     end
   end
   
   def generate_assets
     stylesheetspath = "app/assets/stylesheets/"
+    stylesheetspath_dest = "#{stylesheetspath}#{engine_name}"
     
     # Css
-    reset            = "#{stylesheetspath}reset.css"
+    reset            = "reset.css"
     bc_css           = [
-                        "#{stylesheetspath}application-bs.css",
-                        "#{stylesheetspath}datepicker.css",
-                        "#{stylesheetspath}timepicker.css",
-                        "#{stylesheetspath}beautiful-scaffold.css.scss",
-                        "#{stylesheetspath}tagit-dark-grey.css",
-                        "#{stylesheetspath}colorpicker.css",
-                        "#{stylesheetspath}bootstrap-wysihtml5.css"
+                        "application-bs.css",
+                        "beautiful-scaffold.css.scss",
+                        "tagit-dark-grey.css",
+                        "colorpicker.css",
+                        "bootstrap-wysihtml5.css"
                        ]
-        
+
     javascriptspath = "app/assets/javascripts/"
+    javascriptspath_dest = "#{javascriptspath}#{engine_name}"
+
+    [reset, bc_css].flatten.each{ |path|
+      copy_file "#{stylesheetspath}#{path}", "#{stylesheetspath_dest}#{path}"
+    }
     
     # Js
     bc_js            = [
-                        "#{javascriptspath}application-bs.js",
-                        "#{javascriptspath}beautiful_scaffold.js",
-                        "#{javascriptspath}bootstrap-datepicker.js",
-                        "#{javascriptspath}bootstrap-datetimepicker-for-beautiful-scaffold.js",
-                        "#{javascriptspath}bootstrap-timepicker.js",
-                        "#{javascriptspath}jquery.jstree.js",
-                        "#{javascriptspath}jquery-barcode.js",
-                        "#{javascriptspath}tagit.js",
-                        "#{javascriptspath}bootstrap-colorpicker.js",
-                        "#{javascriptspath}a-wysihtml5-0.3.0.min.js",
-                        "#{javascriptspath}bootstrap-wysihtml5.js",
-                        "#{javascriptspath}fixed_menu.js"
+                        "application-bs.js",
+                        "beautiful_scaffold.js",
+                        "bootstrap-datetimepicker-for-beautiful-scaffold.js",
+                        "jquery.jstree.js",
+                        "jquery-barcode.js",
+                        "tagit.js",
+                        "bootstrap-colorpicker.js",
+                        "a-wysihtml5-0.3.0.min.js",
+                        "bootstrap-wysihtml5.js",
+                        "fixed_menu.js"
                        ]
 
-    [reset, bc_css, bc_js].flatten.each{ |path|
-      copy_file path, path
+    [bc_js].flatten.each{ |path|
+      copy_file "#{javascriptspath}#{path}", "#{javascriptspath_dest}#{path}"
     }
 
     # Jstree theme
-    directory "app/assets/stylesheets/themes", "app/assets/stylesheets/themes"
+    directory "#{stylesheetspath}themes", "#{stylesheetspath}themes"
 
     # Images
     dir_image = "app/assets/images"
-    directory dir_image, dir_image
+    dir_image_dest = "app/assets/images/#{engine_opt}"
+    directory dir_image, dir_image_dest
 
     # Old method
     #generate("bootstrap:install","static")
     # New method
     copy_file "#{stylesheetspath}bootstrap_and_overrides.css.less",
-              "#{stylesheetspath}bootstrap_and_overrides.css.less"
+              "#{stylesheetspath_dest}bootstrap_and_overrides.css.less"
 
     # Precompile BS assets
-    inject_into_file("config/initializers/assets.rb", "Rails.application.config.assets.precompile += ['application-bs.css','application-bs.js']", after: /\z/m)
+    if File.exist?("config/initializers/assets.rb") then # For mountable engine
+      inject_into_file("config/initializers/assets.rb", "Rails.application.config.assets.precompile += ['#{engine_name}application-bs.css','#{engine_name}application-bs.js']", after: /\z/m)
+    else
+      puts "============> Engine : You must add `Rails.application.config.assets.precompile += ['#{engine_name}application-bs.css','#{engine_name}application-bs.js']` to your config/initializers/assets.rb main app !"
+    end
   end
   
   def generate_layout
@@ -110,8 +122,8 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
       template  "app/views/_beautiful_menu.html.erb", "app/views/layouts/_beautiful_menu.html.erb"
     end
 
-    empty_directory "app/views/beautiful"
-    template  "app/views/dashboard.html.erb", "app/views/beautiful/dashboard.html.erb"
+    empty_directory "app/views/#{engine_name}beautiful"
+    template  "app/views/dashboard.html.erb", "app/views/#{engine_name}beautiful/dashboard.html.erb"
     copy_file "app/views/_modal_columns.html.erb",  "app/views/layouts/_modal_columns.html.erb"
     copy_file "app/views/_mass_inserting.html.erb", "app/views/layouts/_mass_inserting.html.erb"
     
@@ -126,7 +138,8 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
     directory  "app/models/concerns", "app/models/concerns"
 
-    inject_into_file("app/models/#{model}.rb",'
+    gsub_file "app/models/#{engine_name}#{model}.rb", 'ActiveRecord::Base', 'ApplicationRecord' # Rails 4 -> 5
+    inject_into_file("app/models/#{engine_name}#{model}.rb",'
 
   include DefaultSortingConcern
   include FulltextConcern
@@ -149,7 +162,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
       a,t = attr.split(':')
       if ['references', 'reference'].include?(t) then
         begin
-          inject_into_file("app/models/#{a}.rb", "\n  has_many :#{model_pluralize}, :dependent => :nullify", :after => "ApplicationRecord")
+          inject_into_file("app/models/#{engine_name}#{a}.rb", "\n  has_many :#{model_pluralize}, :dependent => :nullify", :after => "ApplicationRecord")
         rescue
         end
       end
@@ -157,22 +170,26 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   end
 
   def generate_controller
-    copy_file  "app/controllers/master_base.rb", "app/controllers/beautiful_controller.rb"
-    dirs = ['app', 'controllers', options[:namespace]].compact
+    copy_file  "app/controllers/master_base.rb", "app/controllers/#{engine_name}beautiful_controller.rb"
+    dirs = ['app', 'controllers', engine_name, options[:namespace]].compact
     # Avoid to remove app/controllers directory (https://github.com/rivsc/Beautiful-Scaffold/issues/6)
     empty_directory File.join(dirs) if not options[:namespace].blank?
-    template   "app/controllers/base.rb", File.join([dirs, "#{model_pluralize}_controller.rb"].flatten)
+    dest_ctrl_file = File.join([dirs, "#{model_pluralize}_controller.rb"].flatten)
+    template "app/controllers/base.rb", dest_ctrl_file
   end
   
   def generate_helper
-    copy_file  "app/helpers/beautiful_helper.rb", "app/helpers/beautiful_helper.rb"
-    dirs = ['app', 'helpers', options[:namespace]].compact
+    dest_bs_helper_file = "app/helpers/#{engine_name}beautiful_helper.rb"
+    template "app/helpers/beautiful_helper.rb", dest_bs_helper_file
+
+    dirs = ['app', 'helpers', engine_name, options[:namespace]].compact
     empty_directory File.join(dirs)
-    template   "app/helpers/model_helper.rb", File.join([dirs, "#{model_pluralize}_helper.rb"].flatten)
+    dest_helper_file = File.join([dirs, "#{model_pluralize}_helper.rb"].flatten)
+    template "app/helpers/model_helper.rb", dest_helper_file
   end
 
   def generate_views
-    namespacedirs = ["app", "views", options[:namespace]].compact
+    namespacedirs = ["app", "views", engine_name, options[:namespace]].compact
     empty_directory File.join(namespacedirs)
     
     dirs = [namespacedirs, model_pluralize]
@@ -189,6 +206,10 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     copy_file  "app/views/_form_habtm_tag.html.erb", "app/views/layouts/_form_habtm_tag.html.erb"
   end
 
+  def install_ransack_intializer
+    copy_file  "app/initializers/ransack.rb", "config/initializers/ransack.rb"
+  end
+
   def install_willpaginate_renderer_for_bootstrap
     copy_file  "app/initializers/link_renderer.rb", "config/initializers/link_renderer.rb"
   end

data/lib/generators/templates/app/assets/javascripts/application-bs.js

@@ -5,8 +5,9 @@
 //= require turbolinks
 //= require a-wysihtml5-0.3.0.min
 //= require bootstrap-colorpicker
-//= require bootstrap-datepicker
-//= require bootstrap-timepicker
+//= require moment
+//= require moment/fr
+//= require bootstrap-datetimepicker
 //= require bootstrap-datetimepicker-for-beautiful-scaffold
 //= require bootstrap-wysihtml5
 //= require jquery.jstree

data/lib/generators/templates/app/assets/javascripts/beautiful_scaffold.js

@@ -128,7 +128,7 @@ function bs_init(){
     // Collapse without IDS (next)
     $('body').on('click.collapse-next.data-api', '[data-toggle=collapse-next]', function() {
         var $target = $(this).parent().next();
-        $target.data('collapse') ? $target.collapse('toggle') : $target.collapse()
+        $target.collapse('toggle');
         return false;
     });
 
@@ -149,4 +149,40 @@ function bs_init(){
     }catch (e){
     }
 
+    // Toggle display Search
+    $(document).on('click','#hide-search-btn',function(){
+      $('div.index-main div.col-md-9').addClass('col-md-12');
+      $('div.index-main div.col-md-12').removeClass('col-md-9');
+      $('div.index-main div.col-md-3').hide();
+      $('#hide-search-btn').hide();
+      $('#show-search-btn').show();
+    });
+    $(document).on('click','#show-search-btn',function(){
+      $('div.index-main div.col-md-12').addClass('col-md-9');
+      $('div.index-main div.col-md-9').removeClass('col-md-12');
+      $('div.index-main div.col-md-3').show();
+      $('#hide-search-btn').show();
+      $('#show-search-btn').hide();
+    });
+
+    // Toggle display Menu
+    $(document).on('click','#hide-menu-btn',function(){
+      $('body div.fixed').addClass('hide-menu');
+      $('body div.filler').addClass('hide-menu');
+      $('body div.fixed').removeClass('show-menu');
+      $('body div.filler').removeClass('show-menu');
+
+      $('#hide-menu-btn').hide();
+      $('#show-menu-btn').show();
+    });
+    $(document).on('click','#show-menu-btn',function(){
+      $('body div.fixed').addClass('show-menu');
+      $('body div.filler').addClass('show-menu');
+      $('body div.fixed').removeClass('hide-menu');
+      $('body div.filler').removeClass('hide-menu');
+
+      $('#hide-menu-btn').show();
+      $('#show-menu-btn').hide();
+    });
+
 }

data/lib/generators/templates/app/assets/javascripts/bootstrap-datetimepicker-for-beautiful-scaffold.js

@@ -1,48 +1,27 @@
 function datetimepicker_init(){
-    $(document).on('click', '.dpicker', function(e){
-        e.stopPropagation();
-        e.stopImmediatePropagation();
-        $(this).datepicker({ format : 'dd/mm/yyyy', language : $('html').attr("lang") }).on('changeDate', function(ev){
-            var eltid = ev.currentTarget.id;
-            //eltid = $('#' + ev.currentTarget.id).data('id');
-            $('#' + eltid + '_3i').val(ev.date.getDate());          // Day
-            $('#' + eltid + '_2i').val(ev.date.getMonth()+1);       // Month
-            $('#' + eltid + '_1i').val(ev.date.getFullYear());      // Year
-        });
-        $(this).change(function(){
-            if( !$(this).val() ){
-                id = '#' + $(this).data('id');
-                $(id + '_3i').val("");
-                $(id + '_2i').val("");
-                $(id + '_1i').val("");
-            }
-        });
-        $(this).trigger('focus');
-        $(this).trigger('select');
+  $(document).on('click', '.dpicker', function(e){
+    e.stopPropagation();
+    e.stopImmediatePropagation();
+    $(this).datetimepicker({ format : 'DD/MM/YYYY', locale : 'en' }).on('dp.change', function(elt){
+      var eltid = elt.currentTarget.dataset.id;
+      $('#' + eltid + '_3i').val(elt.date.date());
+      $('#' + eltid + '_2i').val(elt.date.month()+1);
+      $('#' + eltid + '_1i').val(elt.date.year());
     });
-    $(document).on('click', '.input-group-addon', function(){
-        try{
-            dpick = $(this).parent().find('.dpicker');
-            dpick.trigger('focus');
-            dpick.trigger('select');
-        }catch (e){
-        }
-    });
-    $(document).on('click', '.tpicker', function(){
-        $(this).timepicker({ template: 'modal', showMeridian: false, minuteStep: 1, defaultTime: false, showInputs: false, disableFocus: true }).on('change', function(ev){
-            tpickerdate = new Date("01/01/1970 " + ev.currentTarget.value);
-            var eltid = ev.currentTarget.id;
-            //eltid = $('#' + ev.currentTarget.id).data('id');
-            $('#' + eltid + '_4i').val(tpickerdate.getHours());  // Hour
-            $('#' + eltid + '_5i').val(tpickerdate.getMinutes()); // Min
-        });
-        $(this).change(function(){
-            if( !$(this).val() ){
-                id = '#' + $(this).data('id');
-                $(id + '_4i').val("");
-                $(id + '_5i').val("");
-            }
-        });
-        $(this).click();
+    $(this).trigger('focus');
+    $(this).trigger('select');
+    return false;
+  });
+  $(document).on('click', '.tpicker', function(e){
+    e.stopPropagation();
+    e.stopImmediatePropagation();
+    $(this).datetimepicker({ format : 'HH:mm', locale : 'en' }).on('dp.change', function(elt){
+      var eltid = elt.currentTarget.dataset.id;
+      $('#' + eltid + '_4i').val(elt.date.hour());
+      $('#' + eltid + '_5i').val(elt.date.minute());
     });
+    $(this).trigger('focus');
+    $(this).trigger('select');
+    return false;
+  });
 }

data/lib/generators/templates/app/assets/stylesheets/application-bs.css

@@ -11,8 +11,7 @@
  *= require_self
  *= require reset
  *= require jquery-ui
- *= require datepicker
- *= require timepicker
+ *= require bootstrap-datetimepicker
  *= require beautiful-scaffold
  *= require tagit-dark-grey
  *= require colorpicker

data/lib/generators/templates/app/assets/stylesheets/beautiful-scaffold.css.scss

@@ -55,7 +55,7 @@ $shadow-spinner:#0060CC;
   height:30px;
   margin:0 auto;
   position:relative;
-  top:-50px;
+  top:-40px;
   -moz-animation:spinoffPulse 1s infinite linear;
   -webkit-animation:spinoffPulse 1s infinite linear;
 }
@@ -166,4 +166,28 @@ html, body {
 }
 .search-and-filter h3{
   margin-top:0;
+}
+
+#modal-columns div.modal-body label{
+  display: inline-block;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-left: 20px;
+}
+.search-and-filter .form-group label{
+  margin-bottom: 0;
+  margin-top: 5px;
+}
+
+div.filler.show-menu{
+  margin-left: 200px;
+}
+div.fixed.show-menu{
+  display: block;
+}
+div.filler.hide-menu{
+  margin-left: 0;
+}
+div.fixed.hide-menu{
+  display: none !important;
 }

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

@@ -1,4 +1,14 @@
 # encoding : utf-8
+<%
+if !engine_name.blank?
+b_module = "module #{engine_camel}"
+e_module = "end"
+else
+b_module = ""
+e_module = ""
+end
+%>
+<%= b_module %>
 class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < BeautifulController
 
   before_action :load_<%= model %>, :only => [:show, :edit, :update, :destroy]
@@ -7,12 +17,12 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
   #authorize_resource
 
   def index
-    session[:fields] ||= {}
-    session[:fields]["<%= model %>"] ||= (<%= model_camelize %>.columns.map(&:name) - ["id"])[0..4]
-    do_select_fields("<%= model %>")
-    do_sort_and_paginate("<%= model %>")
+    session['fields'] ||= {}
+    session['fields']['<%= model %>'] ||= (<%= model_camelize %>.columns.map(&:name) - ["id"])[0..4]
+    do_select_fields('<%= model %>')
+    do_sort_and_paginate('<%= model %>')
     
-    @q = <%= model_camelize %>.search(
+    @q = <%= model_camelize %>.ransack(
       params[:q]
     )
 
@@ -142,7 +152,7 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
         # Selected with filter and search
         do_sort_and_paginate(:<%= model %>)
 
-        @<%= model_pluralize %> = <%= model_camelize %>.search(
+        @<%= model_pluralize %> = <%= model_camelize %>.ransack(
           params[:q]
         ).result(
           :distinct => true
@@ -192,4 +202,4 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
     params.require(:<%= model %>).permit(<%= model_camelize %>.permitted_attributes)
   end
 end
-
+<%= e_module %>