beautiful_scaffold 1.0.0.pre → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c788ac3707c3a554a7fd4b8d7796645899275068
-  data.tar.gz: 194fa4ea7f3f50c1548dd1306d9718e3e6eaaf76
+SHA256:
+  metadata.gz: f2c5cc9830b52e9bdc57663e3e93779e3457502e4f3656f0c541b8213775edca
+  data.tar.gz: 03260e7d438e1aa4c9161a5fdf1b221fd21c2acc4625857ac00eadf4686ac04c
 SHA512:
-  metadata.gz: ccdaf02eeca18d1b3e84857a16ca055349207879ff83846b1e794d60efb0c2a6068f6a57351001eacbf96941ac3f3a3b293f3e2a72ac3be4efb0e10c2c337629
-  data.tar.gz: cd77e358cab2f4c04db96e08d7b52357d07e2223121fa5f67dacf8fae893c971e403e32a039043b982a2051a52a437d6f3d9f801260318dea64a52e6fe9ef7bd
+  metadata.gz: d95e8b02e11a731844977432a230d83b200da69018184d3583a3ade48f448face2799f8e76bcb01ee13b40b7166813f0921fe57442db6fa7f18ec23eb6b62f79
+  data.tar.gz: 7ab3d32603cf3c89f6c34a7d5798610b60ccbf701a3c8583eee89bdabadb0a090c96436e8e17c11f2c9d41d7ba4262820414b1096e54124df2b02cccaf9b777e

data/.gitignore

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

data/CHANGELOG

@@ -1,3 +1,75 @@
+== master
+
+* enhancement
+
+* bugfix
+
+== 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
+  * replace chardinjs by driverjs : https://github.com/kamranahmedse/driver.js
+  * replace bootstrapdatetimepicker by https://tempusdominus.github.io/bootstrap-4/Usage/
+  * Update JStreeview
+  * Update Bootstrap 4.2
+  * Update FontAwesome 5
+  * Generate beautiful scaffold for mountable engine
+  * Tests generators works !
+  * Refactoring ruby code.
+
+* bugfix
+  * Bugfix for engine
+
+== 1.0.3
+
+* enhancement
+  * You can generate scaffold in a mountable engine, now. (see README for syntax)
+
+* Bugfix
+  * I18n translation default value (model.column).
+
+== 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
+  * 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
@@ -174,4 +246,4 @@
 
 == Previous versions
 
-* See commits on github
+* See commits on github

data/Gemfile

@@ -2,20 +2,28 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "~> 4.0"
-# Pagination
-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'
-# Clear html tag
-gem 'sanitize'
+gem "rails", "~> 6.1"
+
+group :test do
+  gem 'sqlite3'
+
+  gems = {
+      'will_paginate' => nil, # v 3.1.5
+      'ransack' => nil, #'2.3.2',
+      'jquery-ui-rails' => nil,
+      'prawn' => nil, #'2.1.0',
+      'prawn-table' => nil, #'0.2.2',
+      'sanitize' => nil,
+      'bootstrap' => '~> 4.3.1',
+      'font-awesome-rails' => '4.7.0.7',
+      'momentjs-rails' => '>= 2.9.0',
+      'bootstrap4-datetime-picker-rails' => nil,
+      'jquery-rails' => '4.3.1',
+      'sorcery' => '0.15.0'
+  }
+
+  gems.each{ |gem_to_add, version|
+    gem(gem_to_add, version)
+  }
+end
+

data/README.rdoc

@@ -2,28 +2,18 @@
 
 Beautiful Scaffold is a gem which propose generators for a complete scaffold with paginate, sort and filter.
 Fully customizable.
-Info : https://github.com/rivsc/Beautiful-Scaffold
-Demo : http://demo.beautiful-scaffold.escarworld.com/
-
-== Install
-
-=== RubyOnRails 4.1
-
-Add this in your Gemfile :
 
-    gem 'beautiful_scaffold', '0.3.4'
+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.
 
-=== RubyOnRails 4.2
-
-Add this in your Gemfile :
-
-    gem 'beautiful_scaffold', '0.3.5'
-
-=== RubyOnRails 5+
+Info : https://github.com/rivsc/Beautiful-Scaffold
+Demo : http://beautiful-scaffold.rivsc.ovh/
 
-Add this in your Gemfile :
+== Install
 
-    gem 'beautiful_scaffold', '1.0.0.pre'
+Add this in the Gemfile of your rails app or engine :
+    gem 'beautiful_scaffold'
 
 === Next
 
@@ -35,7 +25,10 @@ And run
 
 === Scaffold
 
-    rails generate beautiful_scaffold model attr:type attr:type... [--namespace=name] [--donttouchgem=name]
+    # model : underscore and singular
+    # mountable_engine : underscore
+    # namespace : underscore
+    rails generate beautiful_scaffold model attr:type attr:type... [--namespace=name] [--donttouchgem=yes] [--mountable_engine=name]
 
 Types available:
 * integer
@@ -46,6 +39,8 @@ Types available:
 * color
 * wysiwyg
 
+(See below #label-Barcodes)
+
 # Example : products
 
     rails g beautiful_scaffold product name:string price:price tva:float description:wysiwyg visible:boolean && rake db:migrate
@@ -54,6 +49,15 @@ Types available:
 
     rails g beautiful_scaffold product name:string price:price tva:float description:wysiwyg overview_description:wysiwyg visible:boolean --namespace=admin && rake db:migrate
 
+# Example (for an engine) :
+    # You need to add beautiful-scaffold to the gemfile of the engine (not the gemspec !).
+
+    rails g beautiful_scaffold user code:string --mountable-engine=faq
+    rails g beautiful_scaffold question title:string description:wysiwyg user:references resolved:boolean --mountable-engine=faq
+    rails g beautiful_scaffold answer description:wysiwyg user:references up:integer down:integer --mountable-engine=faq
+    rails g beautiful_migration AddPositionToFaqAnswers position:integer --mountable-engine=faq
+    rails g beautiful_jointable answer tag --mountable-engine=faq
+
 === Migration (Use Add[Field]To[ModelPluralize] syntax)
 
     rails g beautiful_migration AddFieldToModels field:type
@@ -71,9 +75,23 @@ Run `rake db:migrate` before `rails g beautiful_locale` (to get lastest attribut
 
     rails g beautiful_jointable model1 model2
 
-=== 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
 
@@ -97,16 +115,15 @@ data-type-barcode can be :
     msi
     datamatrix (ASCII + extended)
 
-==== Chardinjs (overlay instructions)
+==== Driverjs (overlay instructions)
 
-Example : This button triggers chardinjs on element with 'menu' id.
+Example : when you click on the #bs-help tag presentation tour display on screen !
 
-    <a href="#" class="bs-chardinjs" data-selector="#menu">Help Menu</a>
+If you want to add 'slide' :
 
-If you want display all chardinjs :
+For add instruction to DOM element, add this to your markup :
 
-    <a href="#" class="bs-chardinjs" data-selector="body">Help</a>
+id="myunique-id-in-the-page" data-present-title="Title for the slide" data-present-description="Short description" data-present-order="1"
 
-Just add `class="bs-chardinjs"` in a button / link for trigger chardinjs. Beautiful-Scaffold does the job !
+And Beautiful-Scaffold does the job !
 
-For add instruction to element, read official documentation : https://github.com/heelhook/chardin.js#adding-data-for-the-instructions

data/Rakefile

@@ -0,0 +1,29 @@
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rdoc/task'
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Beautiful-Scaffold'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.md')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+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|
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+task default: :test

data/beautiful_scaffold.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 
+require "beautiful_scaffold/version"
+
 Gem::Specification.new do |s|
   s.name        = "beautiful_scaffold"
-  s.version     = "1.0.0.pre"
+  s.version     = BeautifulScaffold::VERSION
   s.platform    = Gem::Platform::RUBY  
   s.summary     = "Beautiful Scaffold generate fully customizable scaffold"
   s.email       = "claudel.sylvain@gmail.com"
-  s.homepage    = "http://beautiful-scaffold.com"
-  s.description = "Beautiful Scaffold generate a complete scaffold (sort, export, paginate and filter data) http://www.beautiful-scaffold.com"
+  s.homepage    = "https://blog.rivsc.ovh"
+  s.description = "Beautiful Scaffold generate a complete scaffold (sort, export, paginate and filter data) http://beautiful-scaffold.rivsc.ovh"
   s.authors     = ['Sylvain Claudel']
-  s.files       = `git ls-files`.split("\n")
+  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"]
+  s.require_paths = ["lib","lib/generators","test/*"]
 end

data/lib/beautiful_scaffold/version.rb

@@ -0,0 +1,3 @@
+module BeautifulScaffold
+  VERSION = '2.0.1'
+end

data/lib/generators/USAGE

@@ -12,5 +12,7 @@ Example:
 
     rails generate beautiful_jointable product tag
 
-    rails generate beautiful_devisecancan user
+    rails generate beautiful_sorcery
+    rails generate beautiful_cancancan
+
        

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

@@ -1,11 +1,13 @@
 # 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__)
 
-  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
   
   def create_join_table
     if join_models.length != 2 then
@@ -13,14 +15,21 @@ class BeautifulJointableGenerator < Rails::Generators::Base
     else
       sorted_model = join_models.sort
 
+      prefix_str = ''
+      if engine_name.present?
+        prefix_str = "#{engine_opt}_"
+      end
+
+      join_table_name = "#{prefix_str}#{sorted_model[0].pluralize}_#{sorted_model[1].pluralize}"
+
       # Generate migration
       migration_content = "
-      create_table :#{sorted_model[0].pluralize}_#{sorted_model[1].pluralize}, :id => false do |t|
+      create_table :#{join_table_name}, :id => false do |t|
         t.integer :#{sorted_model[0]}_id
         t.integer :#{sorted_model[1]}_id
       end
 
-      add_index :#{sorted_model[0].pluralize}_#{sorted_model[1].pluralize}, [:#{sorted_model[0]}_id, :#{sorted_model[1]}_id]
+      add_index :#{join_table_name}, [:#{sorted_model[0]}_id, :#{sorted_model[1]}_id]
       "
 
       migration_name = "create_join_table_for_#{sorted_model[0]}_and_#{sorted_model[1]}"
@@ -31,11 +40,35 @@ class BeautifulJointableGenerator < Rails::Generators::Base
       inject_into_file(filename, migration_content, :after => "def change")
 
       # Add habtm relation
-      inject_into_file("app/models/#{sorted_model[0]}.rb", "\n  has_and_belongs_to_many :#{sorted_model[1].pluralize}", :after => "ActiveRecord::Base")
-      inject_into_file("app/models/#{sorted_model[1]}.rb", "\n  has_and_belongs_to_many :#{sorted_model[0].pluralize}", :after => "ActiveRecord::Base")
-      inject_into_file("app/models/#{sorted_model[0]}.rb", ":#{sorted_model[1]}_ids, ", :after => "attr_accessible ")
-      inject_into_file("app/models/#{sorted_model[1]}.rb", ":#{sorted_model[0]}_ids, ", :after => "attr_accessible ")
+      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 ")
     end
   end
 
+  def add_habtm_field_in_forms
+    models = join_models.sort
+
+    2.times do
+      html = "<%=
+    render :partial => 'layouts/#{engine_name}form_habtm_tag', :locals => {
+      :model_class => @#{models[0]},
+      :model_name => '#{models[0]}',
+      :plural_model_name => '#{models[0].pluralize}',
+      :linked_model_name => '#{models[1]}',
+      :plural_linked_model_name => '#{models[1].pluralize}',
+      :namespace_bs => '',
+      :engine_bs => '#{engine_opt}',
+      :field_to_search_for_linked_model => 'name',
+      :attr_to_show => 'caption',
+      :f => f
+  } %>"
+
+      inject_into_file("app/views/#{engine_name}#{models[0].pluralize}/_form.html.erb", html, :before => "<!-- Beautiful_scaffold - AddField - Do not remove -->")
+      models = models.reverse
+    end
+  end
 end