beautiful_scaffold 2.0.0.pre → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5449d8a941dda266c1fd1277af6ab6ff75754c1393674443b4f94148881fe14
-  data.tar.gz: 687cbd191d192abc632c070476585be443dc85388640a54cf505524bcc19cb27
+  metadata.gz: c90c697cd1e3c71ed04460ed4f75cc9320e6a843fb3df59eb605dc294e46ce19
+  data.tar.gz: 7891a26affac91b9251b4364a279b2ecd340decf6b4ce34f5837006bfa995286
 SHA512:
-  metadata.gz: cd6eb226ae5e30a72098b7992270bad5091e1abd9e444818f145bddff12a25f9619c51c19ea0ed9775e9d443cba75b2a3cd55154b26a4a44f7df349248742a69
-  data.tar.gz: b74ecf56db7af523a9886ecdf35bfb9950d07276dee3e767ad32148c61d20ac55a9de1c0e9a74e60028c95ad488bf4d05cc6ace427c7e0ec4fc071c239227e31
+  metadata.gz: 98703dfffcad9793f1c3391c7016ed558f35f8fb4c6ffa0f2dcac9c501033dd40dbb18f7440c32662a0eb7d81cb0be8bfe512f4f0239c3af843e939583709903
+  data.tar.gz: dc4a1c435dc7117b840afc0d1b686f52790ca8203e64d6cb5d4463a5fc8a53c1128e227e01b5733c7763e7367a7855b092f3902ce3b2e09092a063a64d75bae9

data/.gitignore

@@ -1 +1,2 @@
-test/dummy/log/test.log
+test/dummy/log/test.log
+Gemfile.lock

data/CHANGELOG

@@ -4,6 +4,51 @@
 
 * bugfix
 
+== TODO
+
+ActionText / trix.
+Include pg_search for fulltext field.
+Remove "image_processing" specific version + add gem 'mini_magick' (pour la génération des variants)
+
+== 2.0.3
+
+* bugfix
+  * _ids in permitted_attributes (beautiful_jointable)
+
+* enhancement
+  * Replace tagit by select2 (+ _ids in permitted_attributes)
+  * Bootstrap 4.3 -> 5.1
+
+== 2.0.2
+
+* enhancement
+  * Native html colorpicker
+
+* bugfix
+  * Datetime picker for model form
+  * Display price in model form
+
+== 2.0.1
+
+* enhancement
+  * Replace Devise by Sorcery
+  * Tests Sorcery and Cancancan generators
+  * New generator for ActiveStorage
+
+* bugfix
+  * Locale : fix all locale in the same file.
+  * Visual fix ('-' in menu)
+  * Will_paginate right locales
+  * Avoid adding gems multiple times
+
+== 2.0.0
+
+* enhancement
+  * Bootstrap 4.5 for search field.
+
+* bugfix
+  * Beautiful migration & Rails 6 (fix #23)
+
 == 2.0.0.pre
 
 * enhancement

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "~> 6.0"
+gem "rails", "~> 6.1"
 
 group :test do
   gem 'sqlite3'
@@ -14,11 +14,12 @@ group :test do
       'prawn' => nil, #'2.1.0',
       'prawn-table' => nil, #'0.2.2',
       'sanitize' => nil,
-      'bootstrap' => '~> 4.3.1',
-      'font-awesome-rails' => '4.7.0.5',
+      'bootstrap' => '~> 5.1.0',
+      'font-awesome-rails' => '4.7.0.7',
       'momentjs-rails' => '>= 2.9.0',
       'bootstrap4-datetime-picker-rails' => nil,
-      'jquery-rails' => '4.3.1'
+      'jquery-rails' => '4.3.1',
+      'sorcery' => '0.15.0'
   }
 
   gems.each{ |gem_to_add, version|

data/README.rdoc

@@ -2,6 +2,11 @@
 
 Beautiful Scaffold is a gem which propose generators for a complete scaffold with paginate, sort and filter.
 Fully customizable.
+
+Note : Avoid to change Beautiful-Scaffold version in your project (incompatibility between generated code).
+Note 2 : Be careful to have a clean git repository for your project because Beautiful-Scaffold change many files.
+It will be easier to revert changes.
+
 Info : https://github.com/rivsc/Beautiful-Scaffold
 Demo : http://beautiful-scaffold.rivsc.ovh/
 
@@ -70,10 +75,23 @@ Run `rake db:migrate` before `rails g beautiful_locale` (to get lastest attribut
 
     rails g beautiful_jointable model1 model2
 
-TODO replace Devise by Sorcery & Cancan by Cancancan
-=== Install et Configure Devise (authentification) and Cancan (authorization)
+=== Install et preconfigure Sorcery (authentification) (this generator doesn't work on engine)
+
+    # If it is not done yet
+    rails g beautiful_scaffold user email:string
+    rails g beautiful_sorcery
+
+=== Install et preconfigure Cancancan (authorization) (this generator doesn't work on engine)
+
+    # If it is not done yet
+    rails g beautiful_scaffold user email:string
+    # If it is not done yet
+    rails g beautiful_sorcery
+    rails g beautiful_cancancan
+
+=== Storage (ActiveStorage)
 
-    rails g beautiful_devisecancan model
+   rails g beautiful_storage model attachment_field
 
 === In views
 
@@ -103,7 +121,7 @@ Example : when you click on the #bs-help tag presentation tour display on screen
 
 If you want to add 'slide' :
 
-For add instruction to element, add this to your markup :
+For add instruction to DOM element, add this to your markup :
 
 id="myunique-id-in-the-page" data-present-title="Title for the slide" data-present-description="Short description" data-present-order="1"
 

data/Rakefile

@@ -16,11 +16,8 @@ end
 
 APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
 load 'rails/tasks/engine.rake'
-
 load 'rails/tasks/statistics.rake'
-
 require 'bundler/gem_tasks'
-
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|

data/beautiful_scaffold.gemspec

@@ -15,7 +15,5 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n").reject{ |filepath| filepath.start_with? 'test/' }
   s.licenses    = ['MIT']
 
-  s.rubyforge_project = "beautiful_scaffold"
-
   s.require_paths = ["lib","lib/generators","test/*"]
 end

data/lib/beautiful_scaffold/version.rb

@@ -1,3 +1,3 @@
 module BeautifulScaffold
-  VERSION = '2.0.0.pre'
+  VERSION = '2.0.3'
 end

data/lib/generators/USAGE

@@ -1,16 +1,30 @@
-Description:
-    scaffold, migration and locale
+#
+# How to test Beautiful-Scaffold in a fresh rails app
+#
 
-Example:
-    rails generate beautiful_scaffold model attribute:type attribute:type ...
-    rails generate beautiful scaffold price:price name:string visible:boolean description:richtext
-    rails generate beautiful_scaffold product family:references price:price name:string visible:boolean description:richtext
-    
-    rails generate beautiful_migration AddColorToProducts color:string
+rails new my_test_app
+cd my_test_app
+echo "gem 'beautiful_scaffold', '2.0.2'" >> Gemfile
+bundle update
 
-    rails generate beautiful_locale {fr|en|all}
+rails generate beautiful_scaffold family name:string description:wysiwyg
+rails generate beautiful_scaffold product family:references price:price name:string visible:boolean description:wysiwyg
+rails generate beautiful_scaffold user pseudo:string email:string
+rails generate beautiful_scaffold tag name:string
 
-    rails generate beautiful_jointable product tag
+rails generate beautiful_jointable product tag
+
+rails generate beautiful_migration AddColorSecToProducts color_secondary:color
+
+rails generate beautiful_locale fr
+
+rails generate beautiful_sorcery
+rails generate beautiful_cancancan
+
+rake db:migrate
+rails server
+
+# Open a web browser http://localhost:3000/
+# Register, and copy/paste the link you see in the rails server log : e.g. http://localhost:3000/users/axfEQ8i38ZtXTi-oTzuw/activate
 
-    rails generate beautiful_devisecancan user
        

data/lib/generators/beautiful_cancancan_generator.rb

@@ -0,0 +1,51 @@
+# encoding : utf-8
+class BeautifulCancancanGenerator < Rails::Generators::Base
+  require_relative 'beautiful_scaffold_common_methods'
+  include BeautifulScaffoldCommonMethods
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  #argument :model, :type => :string, :desc => "Name of model (ex: user)"
+
+  def install_cancancan
+    model = "user"
+
+    gem("cancancan", "3.2.1")
+
+    Bundler.with_unbundled_env do
+      run "bundle install"
+    end
+
+    # Because generators doesn't work !
+    copy_file("app/models/ability.rb")
+
+    # Why that doesn't work... boring...
+    #puts rails_command("generate cancan:ability", capture: true)
+    # Why that doesn't work too... boring...
+    #generate("cancan:ability")
+
+    # current_user method need for CanCan
+    current_user_method = ""
+    if model != "user" then
+      current_user_method = "
+  def current_user
+    current_#{model}
+  end"
+    end
+
+    # Exception for AccessDenied
+    inject_into_file("app/controllers/application_controller.rb", "
+  rescue_from CanCan::AccessDenied do |exception|
+    respond_to do |format|
+      format.json { head :forbidden, content_type: 'text/html' }
+      format.html { redirect_to root_url, :alert => exception.message }
+      format.js   { head :forbidden, content_type: 'text/html' }
+    end
+  end
+  #{current_user_method}
+  ", :after => "class ApplicationController < ActionController::Base\n")
+
+    # Access controlled by CanCanCan (in beautiful_scaffold)
+    inject_into_file("app/controllers/application_controller.rb", "#", :before => "before_action :authenticate_#{model}!, :except => [:dashboard]")
+  end
+end

data/lib/generators/beautiful_jointable_generator.rb

@@ -5,7 +5,7 @@ class BeautifulJointableGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :join_models, :type => :array, :default => [], :banner => "model model"
+  argument :join_models, :type => :array, :default => [], :banner => "Two model names singular downcase (ex: product family)"
 
   class_option :mountable_engine, default: nil
   
@@ -42,10 +42,8 @@ class BeautifulJointableGenerator < Rails::Generators::Base
       # Add habtm relation
       inject_into_file("app/models/#{engine_name}#{sorted_model[0]}.rb", "\n  #{engine_name.present? ? '  ' : ''}has_and_belongs_to_many :#{sorted_model[1].pluralize}", :after => "ApplicationRecord")
       inject_into_file("app/models/#{engine_name}#{sorted_model[1]}.rb", "\n  #{engine_name.present? ? '  ' : ''}has_and_belongs_to_many :#{sorted_model[0].pluralize}", :after => "ApplicationRecord")
-      inject_into_file("app/models/#{engine_name}#{sorted_model[0]}.rb", "{ :#{sorted_model[1]}_ids => [] }, ", :after => "permitted_attributes
-      return ")
-      inject_into_file("app/models/#{engine_name}#{sorted_model[1]}.rb", "{ :#{sorted_model[0]}_ids => [] }, ", :after => "permitted_attributes
-      return ")
+      inject_into_file("app/models/#{engine_name}#{sorted_model[0]}.rb", "{ :#{sorted_model[1]}_ids => [] }, ", :after => /permitted_attributes#{regexp_an_string}return /)
+      inject_into_file("app/models/#{engine_name}#{sorted_model[1]}.rb", "{ :#{sorted_model[0]}_ids => [] }, ", :after => /permitted_attributes#{regexp_an_string}return /)
     end
   end
 

data/lib/generators/beautiful_locale_generator.rb

@@ -5,7 +5,7 @@ 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..."
+  argument :name, :type => :string, :desc => "type of locale : fr, en, de, all"
 
   class_option :mountable_engine, :default => nil
 
@@ -18,13 +18,15 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
   
   def install_locale
     list_locales.each{ |temp_locale|
-      filename = "beautiful_scaffold.#{temp_locale}.yml"
-      gem_localepath = "app/locales/#{filename}"
-      app_localepath = "config/locales/#{filename}"
-      begin
-        copy_file gem_localepath, app_localepath
-      rescue
-        say_status("Error", "This beautiful_locale #{localestr} doesn't exist !", :red)
+
+      ["beautiful_scaffold.#{temp_locale}.yml"].each do |filename|
+        gem_localepath = "app/locales/#{filename}"
+        app_localepath = "config/locales/#{filename}"
+        begin
+          copy_file gem_localepath, app_localepath
+        rescue
+          say_status("Error", "This beautiful_locale #{temp_locale} doesn't exist !", :red)
+        end
       end
 
       rails_locale_file = "#{temp_locale}.yml"
@@ -36,7 +38,7 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
       end
 
       willpaginate_locale_file = "will_paginate.#{temp_locale}.yml"
-      download_path = "https://raw.github.com/mislav/will_paginate/master/lib/will_paginate/locale/en.yml"
+      download_path = "https://raw.githubusercontent.com/tigrish/will-paginate-i18n/master/config/locales/#{temp_locale}.yml"
       begin
         get download_path, "config/locales/#{willpaginate_locale_file}"
         say_status("Warning", "You must modify Will_paginate locale at : Rails.root/config/locale/#{willpaginate_locale_file}", :red)
@@ -51,8 +53,8 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
   def regenerate_app_locale
     require 'net/http'
 
-    app_name = (Rails.root || engine_opt)
-    engine_or_apps = (Rails.application.class.parent_name || engine_opt).downcase
+    app_path = (Rails.root || engine_opt)
+    app_name = Rails.application.class.name.split('::').first.downcase
     prefix = engine_opt.blank? ? '' : "#{engine_opt.camelize}::"
 
     already_processed = {}
@@ -63,7 +65,7 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
 
       already_processed[locale] ||= {}
 
-      filepath = File.join(app_name, 'config', 'locales', "#{engine_or_apps}.#{locale}.yml")
+      filepath = File.join(app_path, 'config', 'locales', "#{app_name}.#{locale}.yml")
       begin
         if File.exist?(filepath)
           hi18n = YAML.load_file(filepath)
@@ -154,7 +156,7 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
       File.unlink(filepath) if File.exist?(filepath)
 
       file = File.open(filepath, "w")
-      file.write(hi18n.to_yaml)
+      file.write(hi18n[locale].to_yaml)
       file.close
     end
   end

data/lib/generators/beautiful_migration_generator.rb

@@ -60,7 +60,9 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
   private
 
   def model
-    return name.scan(/^Add(.*)To(.*)$/).flatten[1].underscore.singularize.gsub("#{options[:mountable_engine].underscore}_",'')
+    model_extracted = name.scan(/^Add(.*)To(.*)$/).flatten[1].underscore.singularize
+    model_extracted = model_extracted.gsub("#{options[:mountable_engine].underscore}_",'') if !options[:mountable_engine].blank?
+    return model_extracted
   end
 
 end

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -51,6 +51,10 @@ module BeautifulScaffoldCommonMethods
     return result
   end
 
+  def regexp_an_string
+    '\s*\R\s*'
+  end
+
   ############
   # Models
   ############
@@ -195,7 +199,7 @@ module BeautifulScaffoldCommonMethods
       'prawn-table' => nil, #'0.2.2',
       'sanitize' => nil,
       #'twitter-bootstrap-rails' => '3.2.2', # Bootstrap 3 for Rails 6+
-      'bootstrap' => '~> 4.3.1', # Bootstrap 4 for Rails 6+
+      'bootstrap' => '~> 5.1.0', # Bootstrap 4 for Rails 6+
       'font-awesome-sass' => '~> 5.13.0',
       'momentjs-rails' => '>= 2.9.0',
       'bootstrap4-datetime-picker-rails' => nil,
@@ -208,8 +212,12 @@ module BeautifulScaffoldCommonMethods
       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
 
+    gemfile_content = File.read('Gemfile')
     gems.each{ |gem_to_add, version|
-      gem(gem_to_add, version)
+      # Bug add at every times, need to check if already present
+      if !gemfile_content.include?(gem_to_add)
+        gem(gem_to_add, version)
+      end
     }
   end
 

data/lib/generators/beautiful_scaffold_generator.rb

@@ -13,7 +13,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :model_opt, type: :string, desc: "Name of model (singular)"
+  argument :model_opt, type: :string, desc: "Name of model singular downcase (ex: family)"
   argument :myattributes, type: :array, default: [], banner: "field:type field:type"
 
   class_option :namespace, default: nil
@@ -62,8 +62,6 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     # Css
     bc_css           = [
                         "beautiful-scaffold.css.scss",
-                        "tagit-dark-grey.css",
-                        "colorpicker.css",
                         "bootstrap-wysihtml5.css"
                        ]
 
@@ -80,8 +78,6 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
     if !engine_name.blank?
       ['beautiful-scaffold',
-      'tagit-dark-grey',
-      'colorpicker',
       'bootstrap-wysihtml5'].each do |fileassets|
         gsub_file File.join(stylesheetspath_dest, "application-bs.scss"), " *= require #{fileassets}", " *= require #{engine_name}#{fileassets}"
       end
@@ -102,8 +98,6 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
                         "bootstrap-datetimepicker-for-beautiful-scaffold.js",
                         "jquery-barcode.js",
                         "jstree.min.js",
-                        "tagit.js",
-                        "bootstrap-colorpicker.js",
                         "a-wysihtml5-0.3.0.min.js",
                         "bootstrap-wysihtml5.js",
                         "fixed_menu.js"
@@ -115,10 +109,8 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
     if !engine_name.blank?
       ['a-wysihtml5-0.3.0.min',
-      'bootstrap-colorpicker',
       'bootstrap-datetimepicker-for-beautiful-scaffold',
       'bootstrap-wysihtml5',
-      'tagit.js',
       'jstree.min.js',
       'jquery-barcode',
       'beautiful_scaffold',
@@ -145,7 +137,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
       manifest_prefix = ""
     end
     #append_to_file("app/assets/config/#{manifest_prefix}manifest.js", '//= link_directory ../stylesheets/faq .css')
-    append_to_file("app/assets/config/#{manifest_prefix}manifest.js", '//= link_directory ../javascripts/faq .js')
+    append_to_file("app/assets/config/#{manifest_prefix}manifest.js", '//= link_directory ../javascripts .js')
   end
 
   def generate_layout