beautiful_scaffold 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22819b7aae444a86cc628089c52962012d24c031
-  data.tar.gz: 26aa274ae0fa88969e570ef22415ac490ef7e913
+  metadata.gz: e51faa22a7e9fbad343b1597ca5bb417c144476b
+  data.tar.gz: fb09b6d7228778e26ec391109ab77e35f8839f29
 SHA512:
-  metadata.gz: 1e555f0e2242f97ead7b3ff4ed8b1260ea9bd73f66e6ea27498a514f7990b3aafb582cac388eac8a0a3663a83a1e7769a33ae6a672380c542e1c261448163345
-  data.tar.gz: 1408deef315e1e3d7a1fa84f7e9543a32c5c70db40138f186ec4368abbbf7f8bfde3ddd2de6283a212571046ac1028dcc02067ec0ef264a40ee1c2913b6b9d72
+  metadata.gz: aa11569d24429d62e3f5f3ba79db359921bbcd70c233aa7a1730973468d861b6a7967e2f0aa56a4efd114bb9c8fb7977fa75f3c0073f2e41f9e8f48862dbab5a
+  data.tar.gz: 1a59f7aaad1ea361376af40e7fd8f16713e3ce61473aa39cbcd41063524ca14467478878405d29724d983d63978f7cf396c0b528c8a94ef8112fd895579cd310

data/CHANGELOG

@@ -1,3 +1,22 @@
+== master
+
+* enhancement
+
+* bugfix
+
+== 1.0.2
+
+* enhancement
+  * Using static twitter bootstrap files
+  * UI : button back & submit on the same line
+  * Add tests (better late than never :/)
+
+* bugfix
+  * Fix #18 : Responsive Theme Navbar Overlaps Content When Resizing Below ~979px
+  * Fix generator locales
+  * Fix icon datetimepicker
+  * render nothing: true replace with head :ok
+
 == 1.0.1
 
 * enhancement

data/Rakefile

@@ -0,0 +1,9 @@
+require 'rake/testtask'
+
+task default: :test
+
+task :test do |t|
+  ruby "test/scaffold_test.rb"
+end
+
+

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.1"
+  s.version     = "1.0.2"
   s.platform    = Gem::Platform::RUBY  
   s.summary     = "Beautiful Scaffold generate fully customizable scaffold"
   s.email       = "claudel.sylvain@gmail.com"
@@ -15,5 +15,5 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "beautiful_scaffold"
 
-  s.require_paths = ["lib","lib/generators"]
+  s.require_paths = ["lib","lib/generators","test/*"]
 end

data/lib/generators/beautiful_devisecancan_generator.rb

@@ -1,6 +1,6 @@
 # encoding : utf-8
 class BeautifulDevisecancanGenerator < Rails::Generators::Base
-  require 'beautiful_scaffold_common_methods'
+  require_relative 'beautiful_scaffold_common_methods'
   include BeautifulScaffoldCommonMethods
 
   source_root File.expand_path('../templates', __FILE__)

data/lib/generators/beautiful_jointable_generator.rb

@@ -1,6 +1,6 @@
 # encoding : utf-8
 class BeautifulJointableGenerator < Rails::Generators::Base
-  require 'beautiful_scaffold_common_methods'
+  require_relative 'beautiful_scaffold_common_methods'
   include BeautifulScaffoldCommonMethods
 
   source_root File.expand_path('../templates', __FILE__)

data/lib/generators/beautiful_locale_generator.rb

@@ -1,6 +1,6 @@
 # encoding : utf-8
 class BeautifulLocaleGenerator < Rails::Generators::Base
-  require 'beautiful_scaffold_common_methods'
+  require_relative 'beautiful_scaffold_common_methods'
   include BeautifulScaffoldCommonMethods
 
   source_root File.expand_path('../templates', __FILE__)
@@ -8,21 +8,16 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
   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
+
+  def list_locales
     availablelocale = ["fr", "en", "ja"]
-    
-    localestr = name.downcase
-    
-    locale_to_process = []
 
-    if localestr == 'all' then
-      locale_to_process = availablelocale
-    else
-      locale_to_process << localestr
-    end
-    
-    locale_to_process.each{ |temp_locale|
+    localestr = name.downcase
+    (localestr == 'all' ? availablelocale : [localestr])
+  end
+  
+  def install_locale
+    list_locales.each{ |temp_locale|
       filename = "beautiful_scaffold.#{temp_locale}.yml"
       gem_localepath = "app/locales/#{filename}"
       app_localepath = "config/locales/#{filename}"
@@ -56,105 +51,112 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
   def regenerate_app_locale
     require 'net/http'
 
-    already_processed = { name.downcase => {}}
-
     app_name = (Rails.root || engine_opt)
     engine_or_apps = (Rails.application.class.parent_name || engine_opt).downcase
+    prefix = engine_opt.blank? ? '' : "#{engine_opt.camelize}::"
 
-    puts "===>"
-    puts app_name
-    puts "=======>"
-    puts engine_or_apps
+    already_processed = {}
+    hi18n = {}
 
-    filepath = File.join(app_name, 'config', 'locales', "#{engine_or_apps}.#{name.downcase}.yml")
-    begin
-      hi18n                                   = YAML.load_file(filepath)
-    rescue
-      puts "Error loading locale file : #{filepath}"
-    end
+    list_locales.each do |locale_str|
+      locale = locale_str.downcase
 
-    hi18n                                 ||= { name.downcase => {} }
-    hi18n[name.downcase]                  ||= { 'app' => {} }
-    hi18n[name.downcase]['app']           ||= { 'models' => {} }
-    hi18n[name.downcase]['app']['models'] ||= {}
-
-    # Feed data already translated
-    hi18n[name.downcase]['app']['models'].each{ |modelname,hshtranslations|
-      hshtranslations['bs_attributes'].each{ |attr, translated_attr|
-        already_processed[name.downcase][attr] = translated_attr
-      }
-    }
+      already_processed[locale] ||= {}
 
-    Dir.glob("app/models/**/*").each { |model_file|
-      puts model_file
-      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')
+      filepath = File.join(app_name, 'config', 'locales', "#{engine_or_apps}.#{locale}.yml")
+      begin
+        if File.exist?(filepath)
+          hi18n = YAML.load_file(filepath)
+        end
+      rescue
+        puts "Error loading locale file (YAML invalid?) : #{filepath}"
+      end
 
-      model = File.basename(model_file, File.extname(model_file))
+      hi18n[locale]                  ||= { 'app' => {} }
+      hi18n[locale]['app']           ||= { 'models' => {} }
+      hi18n[locale]['app']['models'] ||= {}
 
-      if !engine_opt.blank?
-        prefix = "#{engine_opt.camelize}::"
-      else
-        prefix = ''
+      # Feed data already translated
+      hi18n[locale]['app']['models'].each do |modelname, hshtranslations|
+        hshtranslations['bs_attributes'].each do |attr, translated_attr|
+          already_processed[locale][attr] = translated_attr
+        end
       end
-      klass = "#{prefix}#{model.camelize.constantize}"
 
-      begin
+      Dir.glob("app/models/**/*").each do |model_file|
+        puts model_file
+
+        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 = "#{prefix}#{model}".camelize.constantize
         sorted_attr = klass.attribute_names.sort
-      rescue
-        next
-      end
 
-      newmodel = !hi18n[name.downcase]['app']['models'].has_key?(model)
+        newmodel = !hi18n[locale]['app']['models'].has_key?(model)
 
-      hi18n[name.downcase]['app']['models'][model] ||= {
+        hi18n[locale]['app']['models'][model] ||= {
           'bs_caption'            => model,
           'bs_caption_plural'     => model.pluralize,
           'bs_attributes'         => {},
-      }
-
-      if newmodel then
-        bs_caption          = (begin translate_string(name.downcase, model) rescue model end)
-        bs_caption_plural   = (begin translate_string(name.downcase, model.pluralize) rescue model.pluralize end)
+        }
+
+        if newmodel then
+          bs_caption = ""
+          begin
+            bs_caption = translate_string(locale, model)
+          rescue Exception => e
+            puts "Erreur traduction #{e.backtrace}"
+            bs_caption = model
+          end
+          bs_caption_plural = ""
+          begin
+            bs_caption_plural = translate_string(locale, model.pluralize)
+          rescue Exception => e
+            puts "Erreur traduction #{e.backtrace}"
+            bs_caption_plural = model.pluralize
+          end
 
-        hi18n[name.downcase]['app']['models'][model]['bs_caption'] = bs_caption
-        hi18n[name.downcase]['app']['models'][model]['bs_caption_plural'] = bs_caption_plural
-      end
+          hi18n[locale]['app']['models'][model]['bs_caption'] = bs_caption
+          hi18n[locale]['app']['models'][model]['bs_caption_plural'] = bs_caption_plural
+        end
 
-      hi18n[name.downcase]['app']['models'][model]['bs_attributes'] ||= {}
-
-      sorted_attr.each { |k|
-        # Si pas déjà renseigné
-        if hi18n[name.downcase]['app']['models'][model]['bs_attributes'][k].blank? then
-          # Si pas déjà traduit
-          if already_processed[name.downcase][k].nil? then
-            begin
-              attr_translate = translate_string(name.downcase, k)
-              already_processed[name.downcase][k] = attr_translate
-            rescue
-              puts "Plantage translate API"
-              attr_translate = k
+        hi18n[locale]['app']['models'][model]['bs_attributes'] ||= {}
+
+        sorted_attr.each do |k|
+          # Si pas déjà renseigné
+          if hi18n[locale]['app']['models'][model]['bs_attributes'][k].blank?
+            # Si pas déjà traduit
+            if already_processed[locale][k].blank?
+              begin
+                attr_translate = translate_string(locale, k)
+                already_processed[locale][k] = attr_translate
+              rescue
+                puts "Plantage translate API"
+                attr_translate = k
+              end
+            else
+              attr_translate = already_processed[locale][k]
             end
           else
-            attr_translate = already_processed[name.downcase][k]
+            # Récupère l'attribut traduit
+            attr_translate = hi18n[locale]['app']['models'][model]['bs_attributes'][k]
           end
-        else
-          # Récupère l'attribut traduit
-          attr_translate = hi18n[name.downcase]['app']['models'][model]['bs_attributes'][k]
-        end
 
-        hi18n[name.downcase]['app']['models'][model]['bs_attributes'][k] = attr_translate
-      }
-    }
+          hi18n[locale]['app']['models'][model]['bs_attributes'][k] = attr_translate
+        end
+      end
 
-    File.unlink(filepath) if File.exist?(filepath)
+      File.unlink(filepath) if File.exist?(filepath)
 
-    file = File.open(filepath, "w")
-    file.write(hi18n.to_yaml)
-    file.close
+      file = File.open(filepath, "w")
+      file.write(hi18n.to_yaml)
+      file.close
+    end
   end
 
   private
@@ -162,14 +164,13 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
   def translate_string(locale, str)
     # See http://www.microsofttranslator.com/dev/
     #
-    if locale == "en" then
+    if locale == "en"
       attr_translate = "#{str.gsub(/_/, " ")}"
     else
-      url_domain    = "mymemory.translated.net"
-      url_translate = "/api/get?q=to_translate&langpair=en%7C#{locale}"
+      url_domain = "api.mymemory.translated.net"
+      url_query = "/get?q=#{str.gsub(/_/, "%20")}&langpair=en%7C#{locale}"
 
-      urlstr = url_translate.gsub(/to_translate/, str.gsub(/_/, "%20"))
-      json = JSON.parse(Net::HTTP.get(url_domain, urlstr))
+      json = JSON.parse(Net::HTTP.get(url_domain, url_query))
       attr_translate = json["responseData"]["translatedText"].strip.downcase
     end
     raise 'Free Limit' if attr_translate =~ /mymemory/

data/lib/generators/beautiful_migration_generator.rb

@@ -1,6 +1,6 @@
 # encoding : utf-8
 class BeautifulMigrationGenerator < Rails::Generators::Base
-  require 'beautiful_scaffold_common_methods'
+  require_relative 'beautiful_scaffold_common_methods'
   include BeautifulScaffoldCommonMethods
 
   #include Rails::Generators::ResourceHelpers

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -181,18 +181,19 @@ module BeautifulScaffoldCommonMethods
 
   def require_gems
     gems = {
-      'less-rails' => '2.8.0',
       'will_paginate' => nil, # v 3.1.5
-      'ransack' => '1.8.2',
+      'ransack' => '1.8.4',
       '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',
+      'font-awesome-rails' => '4.7.0.2',
       'chardinjs-rails' => nil,
       'momentjs-rails' => '>= 2.9.0',
-      'bootstrap3-datetimepicker-rails' => '~> 4.17.47'
+      'bootstrap3-datetimepicker-rails' => '~> 4.17.47',
+      'jquery-rails' => '4.3.1'
     }
 
     # Si engine il faut mettre les gems dans le gemspec et faire le require

data/lib/generators/beautiful_scaffold_generator.rb

@@ -1,6 +1,6 @@
 # encoding : utf-8
 class BeautifulScaffoldGenerator < Rails::Generators::Base
-  require 'beautiful_scaffold_common_methods'
+  require_relative 'beautiful_scaffold_common_methods'
   include BeautifulScaffoldCommonMethods
 
   # Resources
@@ -13,12 +13,12 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  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
+  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
@@ -54,11 +54,11 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
       end
     end
   end
-  
+
   def generate_assets
     stylesheetspath = "app/assets/stylesheets/"
     stylesheetspath_dest = "#{stylesheetspath}#{engine_name}"
-    
+
     # Css
     reset            = "reset.css"
     bc_css           = [
@@ -75,7 +75,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     [reset, bc_css].flatten.each{ |path|
       copy_file "#{stylesheetspath}#{path}", "#{stylesheetspath_dest}#{path}"
     }
-    
+
     # Js
     bc_js            = [
                         "application-bs.js",
@@ -102,12 +102,6 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     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_dest}bootstrap_and_overrides.css.less"
-
     # Precompile BS assets
     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)
@@ -115,7 +109,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
       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
     template  "app/views/layout.html.erb", "app/views/layouts/beautiful_layout.html.erb"
     if not File.exist?("app/views/layouts/_beautiful_menu.html.erb") then
@@ -126,7 +120,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     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"
-    
+
     inject_into_file("app/views/layouts/_beautiful_menu.html.erb",'
       <li class="<%= "active" if params[:controller] == "' + namespace_for_url + model.pluralize + '" %>">
         <%= link_to ' + i18n_t_m_p(model) + '.capitalize, ' + namespace_for_route + model.pluralize + '_path %>
@@ -177,7 +171,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     dest_ctrl_file = File.join([dirs, "#{model_pluralize}_controller.rb"].flatten)
     template "app/controllers/base.rb", dest_ctrl_file
   end
-  
+
   def generate_helper
     dest_bs_helper_file = "app/helpers/#{engine_name}beautiful_helper.rb"
     template "app/helpers/beautiful_helper.rb", dest_bs_helper_file
@@ -191,15 +185,14 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   def generate_views
     namespacedirs = ["app", "views", engine_name, options[:namespace]].compact
     empty_directory File.join(namespacedirs)
-    
+
     dirs = [namespacedirs, model_pluralize]
     empty_directory File.join(dirs)
-    
+
     [available_views, 'treeview'].flatten.each do |view|
       filename = view + ".html.erb"
       current_template_path = File.join([dirs, filename].flatten)
       empty_template_path   = File.join(["app", "views", filename].flatten)
-      
       template empty_template_path, current_template_path
     end
 
@@ -215,12 +208,8 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   end
 
   def routes
-    routes_in_text = File.read("config/routes.rb")
-
-    if not routes_in_text[/beautiful#dashboard/] and not routes_in_text[/beautiful#select_fields/] then
-
-      myroute = <<EOF
-root :to => 'beautiful#dashboard'
+    myroute = <<EOF
+  root :to => 'beautiful#dashboard'
   match ':model_sym/select_fields' => 'beautiful#select_fields', :via => [:get, :post]
 
   concern :bs_routes do
@@ -237,11 +226,7 @@ root :to => 'beautiful#dashboard'
   # Add route with concerns: :bs_routes here # Do not remove
 EOF
 
-      route(myroute)
-    end
-
-    search_namespace = namespace_alone + "/" if not namespace_alone.blank?
-    search_namespace ||= ""
+    inject_into_file("config/routes.rb", myroute, :after => "routes.draw do\n")
 
     myroute =  "\n  "
     myroute += "namespace :#{namespace_alone} do\n    " if not namespace_alone.blank?

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

@@ -2,7 +2,16 @@ function datetimepicker_init(){
   $(document).on('click', '.dpicker', function(e){
     e.stopPropagation();
     e.stopImmediatePropagation();
-    $(this).datetimepicker({ format : 'DD/MM/YYYY', locale : 'en' }).on('dp.change', function(elt){
+    $(this).datetimepicker({
+      format : 'DD/MM/YYYY',
+      locale : 'en',
+      icons: {
+        time: "fa fa-clock-o",
+        date: "fa fa-calendar",
+        up: "fa fa-arrow-up",
+        down: "fa fa-arrow-down"
+      }
+    }).on('dp.change', function(elt){
       var eltid = elt.currentTarget.dataset.id;
       $('#' + eltid + '_3i').val(elt.date.date());
       $('#' + eltid + '_2i').val(elt.date.month()+1);
@@ -15,7 +24,16 @@ function datetimepicker_init(){
   $(document).on('click', '.tpicker', function(e){
     e.stopPropagation();
     e.stopImmediatePropagation();
-    $(this).datetimepicker({ format : 'HH:mm', locale : 'en' }).on('dp.change', function(elt){
+    $(this).datetimepicker({
+      format : 'HH:mm',
+      locale : 'en',
+      icons: {
+        time: "fa fa-clock-o",
+        date: "fa fa-calendar",
+        up: "fa fa-arrow-up",
+        down: "fa fa-arrow-down"
+      }
+    }).on('dp.change', function(elt){
       var eltid = elt.currentTarget.dataset.id;
       $('#' + eltid + '_4i').val(elt.date.hour());
       $('#' + eltid + '_5i').val(elt.date.minute());

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

@@ -11,11 +11,12 @@
  *= require_self
  *= require reset
  *= require jquery-ui
+ *= require twitter-bootstrap-static/bootstrap
+ *= require font-awesome
  *= require bootstrap-datetimepicker
  *= require beautiful-scaffold
  *= require tagit-dark-grey
  *= require colorpicker
  *= require bootstrap-wysihtml5
- *= require bootstrap_and_overrides
  *= require chardinjs
  */

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

@@ -127,7 +127,7 @@ body {
     padding:10px;
   }
   body {
-    padding-top:0px;
+    padding-top: 35px;
   }
 }
 html, body {

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

@@ -58,7 +58,7 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
             csv << <%= model_camelize %>.attribute_names.map{ |a| o[a] }
           }
         end 
-        render :text => csvstr
+        render :plain => csvstr
       }
       format.xml{ 
         render :xml => @<%= model %>_scope.to_a
@@ -189,7 +189,12 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
     modelclass = <%= model_camelize %>
     foreignkey = :<%= model %>_id
 
-    render :nothing => true, :status => (update_treeview(modelclass, foreignkey) ? 200 : 500)
+
+    if update_treeview(modelclass, foreignkey)
+      head :ok
+    else
+      head :internal_server_error
+    end
   end
   
   private 

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

@@ -25,7 +25,7 @@ class BeautifulController < ApplicationController
 
     do_select_fields(model_sym.to_s) #TODO vérifier si nécessaire
 
-    render :nothing => true
+    head :ok
   end
 
   # TODO session use key string because json serializer don't know the type of key.

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

@@ -17,6 +17,9 @@ end
   <%% end %>
   <%= render_partial 'app/views/partials/_form_field.html.erb' %><!-- Beautiful_scaffold - AddField - Do not remove -->
   <div>
+    <%%= link_to <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn btn-default" do %>
+      <i class="fa fa-chevron-left"></i> <%%= t(:back, :default => "Back") %>
+    <%% end %>
     <%%= f.submit :class => "btn btn-primary", :data => { :disable_with => t(:saving, :default => "Saving...") } %>
   </div>
 <%% end %>

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

@@ -1,5 +1,3 @@
 <h2><%%= t(:editing, :default => 'Editing') %> <%%= <%= i18n_t_m(singular_table_name) %> %></h2>
 
-<%%= render 'form' %>
-
-<%%= link_to t(:back, :default => "Back"), <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn btn-default" %>
+<%%= render 'form' %>

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

@@ -1,5 +1,3 @@
 <h2><%%= t(:new, :default => 'New') %> <%%= <%= i18n_t_m(singular_table_name) %> %></h2>
 
 <%%= render 'form' %>
-
-<%%= link_to t(:back, :default => "Back"), <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn btn-default" %>

data/test/scaffold_test.rb

@@ -0,0 +1,68 @@
+require 'bundler'
+require 'thor'
+require 'rails'
+require 'rails/generators'
+require 'minitest/autorun'
+
+require_relative File.expand_path("../../lib/generators/beautiful_scaffold_generator", __FILE__)
+
+ENV["RAILS_ENV"] = 'test'
+
+class ScaffoldGeneratorTest < ::Rails::Generators::TestCase
+
+  tests BeautifulScaffoldGenerator
+  destination File.expand_path("../tmp/dummyapp", File.dirname(__FILE__))
+
+  def create_generator_sample_app
+    if !File.exist?(destination_root)
+      puts "---> Create Dummy App #{destination_root}"
+      FileUtils.cd(File.dirname(destination_root)) do
+        system "rails new dummyapp --quiet --skip-bundle"
+      end
+
+      test_params = "User email:string birthday:datetime children:integer biography:text"
+
+      run_generator test_params.split(' ')
+    end
+  end
+
+  Minitest.after_run do
+    FileUtils.rm_rf(destination_root)
+  end
+
+  setup do
+    create_generator_sample_app
+  end
+
+  test "generates js css" do
+    assert_file "app/assets/javascripts/application-bs.js"
+    assert_file "app/assets/javascripts/beautiful_scaffold.js"
+    assert_file "app/assets/javascripts/bootstrap-colorpicker.js"
+    assert_file "app/assets/javascripts/bootstrap-datetimepicker-for-beautiful-scaffold.js"
+    assert_file "app/assets/javascripts/bootstrap-wysihtml5.js"
+  end
+
+  test "generates model" do
+    assert_file "app/models/user.rb" do |content|
+      assert_match('self.permitted_attributes', content)
+      #assert_match(/return #{test_params.split(' ')[1..-1]keys.map{ |k| ":#{k}"}.join(',')}/, content)
+    end
+  end
+
+  test "generates controller" do
+    assert_file "app/controllers/users_controller.rb" do |content|
+      assert_match("session['fields']['user'] ||= (User.columns.map(&:name) - [\"id\"])[0..4]", content)
+    end
+  end
+
+  test "generates initializer" do
+    assert_file "config/initializers/ransack.rb" do |content|
+      assert_match('Ransack.configure do |config|', content)
+    end
+
+    assert_file "config/initializers/link_renderer.rb" do |content|
+      assert_match('class LinkRenderer < LinkRendererBase', content)
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Sylvain Claudel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies: []
 description: Beautiful Scaffold generate a complete scaffold (sort, export, paginate
   and filter data) http://www.beautiful-scaffold.com
@@ -22,6 +22,7 @@ files:
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
+- Rakefile
 - beautiful_scaffold.gemspec
 - lib/generators/USAGE
 - lib/generators/beautiful_devisecancan_generator.rb
@@ -49,7 +50,6 @@ files:
 - lib/generators/templates/app/assets/stylesheets/application-bs.css
 - lib/generators/templates/app/assets/stylesheets/beautiful-scaffold.css.scss
 - lib/generators/templates/app/assets/stylesheets/bootstrap-wysihtml5.css
-- lib/generators/templates/app/assets/stylesheets/bootstrap_and_overrides.css.less
 - lib/generators/templates/app/assets/stylesheets/colorpicker.css
 - lib/generators/templates/app/assets/stylesheets/datepicker.css
 - lib/generators/templates/app/assets/stylesheets/reset.css
@@ -97,6 +97,7 @@ files:
 - lib/generators/templates/app/views/show.html.erb
 - lib/generators/templates/app/views/treeview.html.erb
 - lib/generators/templates/lib/custom_failure.rb
+- test/scaffold_test.rb
 homepage: http://beautiful-scaffold.com
 licenses:
 - MIT
@@ -106,6 +107,7 @@ rdoc_options: []
 require_paths:
 - lib
 - lib/generators
+- test/*
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -118,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: beautiful_scaffold
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Beautiful Scaffold generate fully customizable scaffold

data/lib/generators/templates/app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -1,40 +0,0 @@
-//= de pend_on_asset "glyphicons-halflings-regular.eot"
-//= de pend_on_asset "glyphicons-halflings-regular.woff"
-//= de pend_on_asset "glyphicons-halflings-regular.ttf"
-//= de pend_on_asset "glyphicons-halflings-regular.svg"
-//= de pend_on_asset "twitter/bootstrap/glyphicons-halflings.png"
-//= de pend_on_asset "twitter/bootstrap/glyphicons-halflings-white.png"
-//= depend_on_asset "fontawesome-webfont.eot"
-//= depend_on_asset "fontawesome-webfont.woff"
-//= depend_on_asset "fontawesome-webfont.ttf"
-//= depend_on_asset "fontawesome-webfont.svg"
-
-@import "twitter/bootstrap/bootstrap";
-
-// Set the correct sprite paths
-@iconSpritePath: image-url("twitter/bootstrap/glyphicons-halflings.png");
-@iconWhiteSpritePath: image-url("twitter/bootstrap/glyphicons-halflings-white.png");
-
-// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
-@fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
-@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot?#iefix");
-@fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
-@fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
-@fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
-
-// Font Awesome
-@import "fontawesome/font-awesome";
-
-// Glyphicons
-//@import "twitter/bootstrap/sprites.less";
-
-// Your custom LESS stylesheets goes here
-//
-// Since bootstrap was imported above you have access to its mixins which
-// you may use and inherit here
-//
-// If you'd like to override bootstrap's own variables, you can do so here as well
-// See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation
-//
-// Example:
-// @linkColor: #ff0000;