beautiful_scaffold 0.3.5 → 2.0.0.pre

data/Rakefile

@@ -0,0 +1,32 @@
+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,18 +1,21 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 
+require "beautiful_scaffold/version"
+
 Gem::Specification.new do |s|
   s.name        = "beautiful_scaffold"
-  s.version     = "0.3.5"
+  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.0.pre'
+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,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"
+
+  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

data/lib/generators/beautiful_locale_generator.rb

@@ -1,26 +1,23 @@
 # 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__)
 
-  argument :name, :type => :string, :desc => "type of locale : fr OR en OR de OR all..."
+  argument :name, :type => :string, :desc => "type of locale : fr OR en OR de OR ja all..."
+
+  class_option :mountable_engine, :default => nil
+
+  def list_locales
+    availablelocale = ["fr", "en", "ja"]
+
+    localestr = name.downcase
+    (localestr == 'all' ? availablelocale : [localestr])
+  end
   
   def install_locale
-    availablelocale = ["fr", "en"]
-    
-    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|
+    list_locales.each{ |temp_locale|
       filename = "beautiful_scaffold.#{temp_locale}.yml"
       gem_localepath = "app/locales/#{filename}"
       app_localepath = "config/locales/#{filename}"
@@ -54,86 +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}::"
 
-    filepath = File.join(Rails.root, 'config', 'locales', "#{Rails.application.class.parent_name.downcase}.#{name.downcase}.yml")
-    begin
-      hi18n                                   = YAML.load_file(filepath)
-    rescue
-      puts "Error loading locale file : #{filepath}"
-    end
-
-    hi18n                                 ||= { name.downcase => {} }
-    hi18n[name.downcase]                  ||= { 'app' => {} }
-    hi18n[name.downcase]['app']           ||= { 'models' => {} }
-    hi18n[name.downcase]['app']['models'] ||= {}
+    already_processed = {}
+    hi18n = {}
 
-    # 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
-      }
-    }
+    list_locales.each do |locale_str|
+      locale = locale_str.downcase
 
-    Dir.glob("app/models/**/*").each { |model_file|
-      puts model_file
-      next if File.directory?(model_file) or File.basename(model_file).first == '.'
-      model = File.basename(model_file, File.extname(model_file))
-      klass = model.camelize.constantize
+      already_processed[locale] ||= {}
 
+      filepath = File.join(app_name, 'config', 'locales', "#{engine_or_apps}.#{locale}.yml")
       begin
-        sorted_attr = klass.attribute_names.sort
+        if File.exist?(filepath)
+          hi18n = YAML.load_file(filepath)
+        end
       rescue
-        next
+        puts "Error loading locale file (YAML invalid?) : #{filepath}"
       end
 
-      newmodel = !hi18n[name.downcase]['app']['models'].has_key?(model)
+      hi18n[locale]                  ||= { 'app' => {} }
+      hi18n[locale]['app']           ||= { 'models' => {} }
+      hi18n[locale]['app']['models'] ||= {}
+
+      # 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
 
-      hi18n[name.downcase]['app']['models'][model] ||= {
+      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
+
+        newmodel = !hi18n[locale]['app']['models'].has_key?(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
@@ -141,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,20 +1,21 @@
 # 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
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :name, :type => :string, :desc => "Name of the migration CamelCase AddXxxToYyy (Yyy must be plural)"
-  argument :myattributes, :type => :array, :default => [], :banner => "field:type field:type (for bt relation model:references)"
+  argument :name, type: :string, desc: "Name of the migration (in CamelCase) AddXxxTo[Engine]Yyy (Yyy must be plural)"
+  argument :myattributes, type: :array, default: [], banner: "field:type field:type (for bt relation model:references)"
 
-  class_option :namespace, :default => nil
-  class_option :donttouchgem, :default => nil
+  class_option :namespace, default: nil
+  class_option :donttouchgem, default: nil
+  class_option :mountable_engine, default: nil
 
   def install_gems
-    if options[:donttouchgem].blank? then
+    if options[:donttouchgem].blank?
       require_gems
     end
   end
@@ -24,7 +25,7 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
     @fulltext_field = []
     myattributes.each{ |attr|
       a,t = attr.split(':')
-      if ['richtext', 'wysiwyg'].include?(t) then
+      if ['richtext', 'wysiwyg'].include?(t)
         # _typetext = {bbcode|html|text|wiki|textile|markdown}
         # _fulltext = text without any code
         @fulltext_field << [a + '_typetext', 'string'].join(':')
@@ -34,24 +35,15 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
   end
 
   def generate_model
-    generate("migration", "#{name} #{beautiful_attr_to_rails_attr(true).join(' ')} #{@fulltext_field.join(' ')}")
+    generate("migration", "#{name} #{beautiful_attr_to_rails_attr.join(' ')} #{@fulltext_field.join(' ')}")
   end
 
   def add_to_model
-    myattributes.each{ |attr|
-      a,t = attr.split(':')
-      if ['references', 'reference'].include?(t) then
-        inject_into_file("app/models/#{model}.rb", "\n  belongs_to :#{a}", :after => "ActiveRecord::Base")
-        inject_into_file("app/models/#{a}.rb", "\n  has_many :#{model_pluralize}, :dependent => :nullify", :after => "ActiveRecord::Base")
-        a += "_id"
-      end
-
-      inject_into_file("app/models/#{model}.rb", ":#{a},", :after => "def self.permitted_attributes\n    return ")
-    }
+    add_relation
   end
 
   def generate_views
-    commonpath = "app/views/#{namespace_for_url}#{model_pluralize}/"
+    commonpath = "app/views/#{engine_name}#{namespace_for_url}#{model_pluralize}/"
     
     # Form
     inject_into_file("#{commonpath}_form.html.erb", render_partial("app/views/partials/_form_field.html.erb"), :before => "<!-- Beautiful_scaffold - AddField - Do not remove -->\n" )
@@ -68,7 +60,7 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
   private
 
   def model
-    return name.scan(/^Add(.*)To(.*)$/).flatten[1].underscore.singularize
+    return name.scan(/^Add(.*)To(.*)$/).flatten[1].underscore.singularize.gsub("#{options[:mountable_engine].underscore}_",'')
   end
 
 end