beautiful_scaffold 2.0.0.pre → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5449d8a941dda266c1fd1277af6ab6ff75754c1393674443b4f94148881fe14
-  data.tar.gz: 687cbd191d192abc632c070476585be443dc85388640a54cf505524bcc19cb27
+  metadata.gz: d1fe3aee750d2046a19d5f956820fb36e03a49ecac78cef8046d75e573e44e5e
+  data.tar.gz: aa521359c646d5171eeb3981f67ba5c7138ef9f422f2f88856e04280acc4b434
 SHA512:
-  metadata.gz: cd6eb226ae5e30a72098b7992270bad5091e1abd9e444818f145bddff12a25f9619c51c19ea0ed9775e9d443cba75b2a3cd55154b26a4a44f7df349248742a69
-  data.tar.gz: b74ecf56db7af523a9886ecdf35bfb9950d07276dee3e767ad32148c61d20ac55a9de1c0e9a74e60028c95ad488bf4d05cc6ace427c7e0ec4fc071c239227e31
+  metadata.gz: a3816f89d26548eccf73546dd698a3606f739bd1637e70fc53b19eaa27e7455ce61ea65a18fdc504ec8a8bea5f24dfd2d3bf6d030480c84f077e427d1481a447
+  data.tar.gz: 1256a2a3b5534405148fb3a0f9f2c3a404703e4ea2ff521887e8bb5f61c6937da8793a69fcfa8e4a584c131cd6af44c9d14c8bc8886b0daf97bfb54be4f98ebe

data/.gitignore

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

data/CHANGELOG

@@ -4,6 +4,14 @@
 
 * bugfix
 
+== 2.0.0
+
+* enhancement
+  * Bootstrap 4.5 for search field.
+
+* bugfix
+  * Beautiful migration & Rails 6 (fix #23)
+
 == 2.0.0.pre
 
 * enhancement

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.0'
 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_generator.rb

@@ -145,7 +145,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

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

@@ -177,10 +177,12 @@ html, body {
   margin-bottom: 0px;
   margin-left: 20px;
 }
+/*
 .search-and-filter .form-group label{
   margin-bottom: 0;
   margin-top: 5px;
 }
+*/
 
 /*
 div.filler.show-menu{

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

@@ -92,12 +92,15 @@ module BeautifulHelper
 
     cap = i18n_translate_path(model_name, attribute_name)
 
+    type_of_column = ar_model.columns_hash[attribute_name].type unless ar_model.columns_hash[attribute_name].nil?
+    type_of_column ||= :other
+
     infostr   = ''
     response  = '' # See at end
+    response += '<div class="form-check form-check-inline">' if type_of_column == :boolean
     response += f.label name_field, t(cap, :default => default_caption).capitalize, :class => "control-label"
+    response += '</div>' if type_of_column == :boolean
 
-    type_of_column = ar_model.columns_hash[attribute_name].type unless ar_model.columns_hash[attribute_name].nil?
-    type_of_column ||= :other
     case type_of_column
       when :date, :datetime
         dt = (type_of_column == :datetime)
@@ -178,9 +181,20 @@ module BeautifulHelper
         infostr = info_input(model_name, [(name_field + "_dp_lt").to_sym, (name_field + "_tp_lt").to_sym, (name_field + "_dp_gt").to_sym, (name_field + "_tp_gt").to_sym])
       when :boolean
         # Specify a default value (false) in rails migration
-        response += f.label name_field + "_eq_true",   raw(f.radio_button((name_field + "_eq").to_sym, true))   + " " + h(t(:yes, :default => "Yes")), :class => "checkbox inline"
-        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"
+        response += '<div class="form-check form-check-inline">'
+        response += f.radio_button((name_field + "_eq").to_sym, true, { class: 'form-check-input'})
+        response += f.label name_field + "_eq_true", h(t(:yes, default: "Yes")), class: "form-check-label"
+        response += '</div>'
+
+        response += '<div class="form-check form-check-inline">'
+        response += f.radio_button((name_field + "_eq").to_sym, false, { class: 'form-check-input'})
+        response += f.label name_field + "_eq_false", h(t(:no, default: "No")), class: "form-check-label"
+        response += '</div>'
+
+        response += '<div class="form-check form-check-inline">'
+        response += f.radio_button((name_field + "_eq").to_sym, nil, { class: 'form-check-input'})
+        response += f.label name_field + "_eq", h(t(:all, default: "All")), class: "form-check-label"
+        response += '</div>'
 
         infostr = (begin session['search'][model_name][(name_field + "_eq").to_sym] == "on" ? "" : "info" rescue "" end)
       when :string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre
+  version: 2.0.0
 platform: ruby
 authors:
 - Sylvain Claudel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies: []
 description: Beautiful Scaffold generate a complete scaffold (sort, export, paginate
   and filter data) http://beautiful-scaffold.rivsc.ovh
@@ -21,7 +21,6 @@ files:
 - ".gitignore"
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -118,9 +117,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: []
 rubygems_version: 3.1.2
 signing_key:

data/Gemfile.lock

@@ -1,209 +0,0 @@
-PATH
-  remote: .
-  specs:
-    beautiful_scaffold (1.0.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actioncable (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      mail (>= 2.7.1)
-    actionmailer (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.2)
-      activesupport (= 6.0.3.2)
-      globalid (>= 0.3.6)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activestorage (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      marcel (~> 0.3.1)
-    activesupport (6.0.3.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    autoprefixer-rails (9.8.6.1)
-      execjs
-    bootstrap (4.3.1)
-      autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 1.14.3, < 2)
-      sassc-rails (>= 2.0.0)
-    bootstrap4-datetime-picker-rails (0.3.1)
-      jquery-rails (~> 4.2, >= 4.2.0)
-      moment-timezone-rails (~> 1.0)
-      momentjs-rails (>= 2.10.5, <= 3.0.0)
-    builder (3.2.4)
-    concurrent-ruby (1.1.7)
-    crass (1.0.6)
-    erubi (1.9.0)
-    execjs (2.7.0)
-    ffi (1.13.1)
-    font-awesome-rails (4.7.0.5)
-      railties (>= 3.2, < 6.1)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    jquery-rails (4.3.1)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
-      railties (>= 3.2.16)
-    loofah (2.6.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    moment-timezone-rails (1.0.0)
-      momentjs-rails (>= 2.10.5, <= 3.0.0)
-    momentjs-rails (2.20.1)
-      railties (>= 3.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.2)
-      nokogiri (~> 1.8, >= 1.8.4)
-    pdf-core (0.8.1)
-    polyamorous (2.3.2)
-      activerecord (>= 5.2.1)
-    popper_js (1.16.0)
-    prawn (2.3.0)
-      pdf-core (~> 0.8.1)
-      ttfunk (~> 1.6)
-    prawn-table (0.2.2)
-      prawn (>= 1.3.0, < 3.0.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.0.3.2)
-      actioncable (= 6.0.3.2)
-      actionmailbox (= 6.0.3.2)
-      actionmailer (= 6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actiontext (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.2)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.1)
-    ransack (2.3.2)
-      activerecord (>= 5.2.1)
-      activesupport (>= 5.2.1)
-      i18n
-      polyamorous (= 2.3.2)
-    sanitize (5.2.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.8.0)
-      nokogumbo (~> 2.0)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tilt (2.0.10)
-    ttfunk (1.6.2.1)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.3)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    will_paginate (3.3.0)
-    zeitwerk (2.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  beautiful_scaffold!
-  bootstrap (~> 4.3.1)
-  bootstrap4-datetime-picker-rails
-  font-awesome-rails (= 4.7.0.5)
-  jquery-rails (= 4.3.1)
-  jquery-ui-rails
-  momentjs-rails (>= 2.9.0)
-  prawn
-  prawn-table
-  rails (~> 6.0)
-  ransack
-  sanitize
-  sqlite3
-  will_paginate
-
-BUNDLED WITH
-   2.1.4