beautiful_scaffold 0.2.7 → 0.3.0.pre

data/CHANGELOG

@@ -1,3 +1,21 @@
+== 0.3.0
+
+* enhancement
+  * Refactoring i18n (avoid reserved words) :
+  *   t(:my_model) -> t('models.my_model.caption')
+  *   t(:my_attribute) -> t('models.my_model.attributes.my_attribute')
+  * Add javascript/css to change DOM for a fixed menu
+  * Add responsive menu
+  * Update for rails 4
+  * Replace PJAX with turbolinks
+  * Update prawn version 1.0.0.rc2
+  * Big refactoring with javascript
+  * Using twitter-bootstrap-rails with turbolinks compatibility and last version of bootstrap and fontawesome
+
+* Bugfix
+  * Avoid to re-generate created_at, updated_at, id search field at each migration
+  * Bugfix for several responsive behavior
+
 == 0.2.7
 
 * enhancement

data/Gemfile

@@ -2,13 +2,13 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "~> 3.1.0"
+gem "rails", "~> 4.0"
 # Pagination
 gem "will_paginate"
 # Search and filter
 gem "ransack"
 # Pdf
-gem 'prawn', '1.0.0.rc1'
+gem 'prawn', '1.0.0.rc2'
 # Textile
 gem 'RedCloth'
 # BBCode

data/README.rdoc

@@ -7,8 +7,18 @@ Demo : http://demo.beautiful-scaffold.com/
 
 == Install
 
+=== RubyOnRails 3.X
+
 Add this in your Gemfile :
 gem 'beautiful_scaffold', '0.2.7'
+
+=== RubyOnRails 4.X
+
+Add this in your Gemfile :
+gem 'beautiful_scaffold', '0.3.0'
+
+=== Next
+
 And run
 bundle install
 

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     = "0.2.7"
+  s.version     = "0.3.0.pre"
   s.platform    = Gem::Platform::RUBY  
   s.summary     = "Beautiful Scaffold generate fully customizable scaffold"
   s.email       = "claudel.sylvain@gmail.com"

data/lib/generators/beautiful_jointable_generator.rb

@@ -9,7 +9,7 @@ class BeautifulJointableGenerator < Rails::Generators::Base
   
   def create_join_table
     if join_models.length != 2 then
-      puts "Error need two singular models : example : user product"
+      say_status("Error", "Error need two singular models : example : user product", :red)
     else
       sorted_model = join_models.sort
 

data/lib/generators/beautiful_locale_generator.rb

@@ -13,22 +13,110 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
     localestr = name.downcase
     
     locale_to_process = []
-    if availablelocale.include?(localestr) then
-      locale_to_process << localestr
-    elsif localestr == 'all' then
+
+    if localestr == 'all' then
       locale_to_process = availablelocale
     else
-      puts "This locale #{localestr} doesn't exist !"
+      locale_to_process << localestr
     end
     
     locale_to_process.each{ |temp_locale|
       filename = "beautiful_scaffold.#{temp_locale}.yml"
       gem_localepath = "app/locales/#{filename}"
       app_localepath = "config/locales/#{filename}"
-      copy_file gem_localepath, app_localepath
+      begin
+        copy_file gem_localepath, app_localepath
+      rescue
+        say_status("Error", "This beautiful_locale #{localestr} doesn't exist !", :red)
+      end
+
+      rails_locale_file = "#{temp_locale}.yml"
+      download_path = "https://raw.github.com/svenfuchs/rails-i18n/master/rails/locale/#{rails_locale_file}"
+      begin
+        get download_path, "config/locales/#{rails_locale_file}"
+      rescue
+        say_status("Error", "Error to download locale, verify if locale exist at : #{download_path}", :red)
+      end
     }
-    
-    puts "/!\\ Remember to download rails locale and update your application.rb file !"
+
+    say_status("Warning", "/!\\ Remember to update your application.rb file !", :yellow)
+  end
+
+  def regenerate_app_locale
+    require 'net/http'
+
+    already_processed = { name.downcase => {}}
+
+    filepath = File.join(Rails.root, 'config', 'locales', "#{Rails.application.class.parent_name.downcase}.#{name.downcase}.yml")
+    begin
+      hi18n                                   = YAML.load_file(filepath)
+    rescue
+    end
+    hi18n                                 ||= { name.downcase => {} }
+    hi18n[name.downcase]                  ||= { 'app' => {} }
+    hi18n[name.downcase]['app']           ||= { 'models' => {} }
+    hi18n[name.downcase]['app']['models'] ||= {}
+
+
+    Dir.glob("app/models/**/*").each { |model_file|
+      puts model_file
+      next if File.directory?(model_file)
+      model = File.basename(model_file, File.extname(model_file))
+      klass = model.camelize.constantize
+
+      begin
+        sorted_attr = klass.attribute_names.sort
+      rescue
+        next
+      end
+
+      hi18n[name.downcase]['app']['models'][model] ||= {
+          'bs_caption'            => model,
+          'bs_caption_pluralize'  => model.pluralize,
+          'bs_attributes'         => {},
+      }
+
+      hi18n[name.downcase]['app']['models'][model]['bs_caption']              = translate_string(name.downcase, model)
+      hi18n[name.downcase]['app']['models'][model]['bs_caption_pluralize']    = translate_string(name.downcase, model.pluralize)
+      hi18n[name.downcase]['app']['models'][model]['bs_attributes']         ||= {}
+
+      sorted_attr.each { |k|
+        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
+          end
+        else
+          attr_translate = already_processed[name.downcase][k]
+        end
+
+        puts "====> #{k} / #{attr_translate} / #{hi18n[name.downcase]['app']['models'][model]}"
+        hi18n[name.downcase]['app']['models'][model]['bs_attributes'][k] = attr_translate
+      }
+    }
+
+    File.unlink(filepath) if File.exist?(filepath)
+
+    file = File.open(filepath, "w")
+    file.write(hi18n.to_yaml)
+    file.close
+  end
+
+  def translate_string(locale, str)
+    # See http://www.microsofttranslator.com/dev/
+    #
+    url_domain    = "mymemory.translated.net"
+    url_translate = "/api/get?q=to_translate&langpair=en%7C#{locale}"
+
+    urlstr = url_translate.gsub(/to_translate/, str.gsub(/_/, "%20"))
+    json = JSON.parse(Net::HTTP.get(url_domain, urlstr))
+    attr_translate = json["responseData"]["translatedText"].strip.downcase
+    raise 'Free Limit' if attr_translate =~ /mymemory/
+
+    return attr_translate
   end
 
 end

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -2,28 +2,26 @@ module BeautifulScaffoldCommonMethods
   require 'erb'
 
   private
+
+  #############
+  # Namespace
+  #############
   
   def namespace_for_class
     str = namespace_alone
-    if not str.blank? then
-      str = str.camelcase + '::'
-    end
+    str = str.camelcase + '::' if not str.blank?
     return str
   end
   
   def namespace_for_route
     str = namespace_alone
-    if not str.blank? then
-      str = str.downcase + '_'
-    end
+    str = str.downcase + '_' if not str.blank?
     return str
   end
   
   def namespace_for_url
     str = namespace_alone
-    if not str.blank? then
-      str = str.downcase + '/'
-    end
+    str = str.downcase + '/' if not str.blank?
     return str
   end
   
@@ -37,6 +35,10 @@ module BeautifulScaffoldCommonMethods
     return result
   end
 
+  ############
+  # Models
+  ############
+
   def model_camelize
     model.camelize
   end
@@ -49,7 +51,10 @@ module BeautifulScaffoldCommonMethods
     model.camelize
   end
   
-  # For the views
+  ############
+  # Table
+  ############
+
   def plural_table_name
     model_pluralize
   end
@@ -57,6 +62,34 @@ module BeautifulScaffoldCommonMethods
     model
   end
 
+  ############
+  # I18n
+  ############
+
+  def attribute_path_i18n(model, attribute)
+    "app.models.#{model}.bs_attributes.#{attribute}"
+  end
+
+  def model_path_i18n(model)
+    "app.models.#{model}.bs_caption"
+  end
+
+  def model_p_path_i18n(model)
+    "app.models.#{model}.bs_caption_pluralize"
+  end
+
+  def i18n_t_a(model, attribute)
+    "t('#{attribute_path_i18n(model, attribute)}', :default => '#{model}')"
+  end
+
+  def i18n_t_m(model)
+    "t('#{model_path_i18n(model)}', :default => '#{model}')"
+  end
+
+  def i18n_t_m_p(model)
+    "t('#{model_p_path_i18n(model)}', :default => '#{model}')"
+  end
+
   def available_views
     %w(index edit show new _form)
   end
@@ -107,14 +140,18 @@ module BeautifulScaffoldCommonMethods
   end
 
   def require_gems
+    # for jquery-ui add "2.3.0" version for jquery-rails
+    say_status("Warning", "Set 2.0.1 version for jquery-rails (for a good compatibility with beautiful_scaffold)", :yellow)
+
     gem('will_paginate')
-    gem('ransack')
-    gem('prawn', '1.0.0.rc1')
+    gem('ransack', :github => 'ernie/ransack', :branch => 'rails-4')
+    gem('prawn', '1.0.0.rc2')
     gem('RedCloth')
     gem('bb-ruby')
     gem('bluecloth')
     gem('rdiscount')
     gem('sanitize')
+    gem('twitter-bootstrap-rails')
   end
 
 end

data/lib/generators/beautiful_scaffold_generator.rb

@@ -20,6 +20,9 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
   def install_gems
     require_gems
+    inside Rails.root do
+      run "bundle install"
+    end
   end
 
   def add_field_for_fulltext
@@ -48,10 +51,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     # Css
     reset            = "#{stylesheetspath}reset.css"
     bc_css           = [
-                        "#{stylesheetspath}bootstrap.css",
-                        "#{stylesheetspath}bootstrap.min.css",
-                        "#{stylesheetspath}bootstrap-responsive.css",
-                        "#{stylesheetspath}bootstrap-responsive.min.css",
+                        "#{stylesheetspath}application-bs.css",
                         "#{stylesheetspath}datepicker.css",
                         "#{stylesheetspath}timepicker.css",
                         "#{stylesheetspath}beautiful-scaffold.css.scss",
@@ -64,13 +64,8 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     
     # Js
     bc_js            = [
+                        "#{javascriptspath}application-bs.js",
                         "#{javascriptspath}beautiful_scaffold.js",
-                        "#{javascriptspath}bootstrap.js",
-                        "#{javascriptspath}bootstrap.min.js",
-                        "#{javascriptspath}bootstrap-alert.js",
-                        "#{javascriptspath}bootstrap-dropdown.js",
-                        "#{javascriptspath}bootstrap-modal.js",
-                        "#{javascriptspath}bootstrap-tooltip.js",
                         "#{javascriptspath}bootstrap-datepicker.js",
                         "#{javascriptspath}bootstrap-datetimepicker-for-beautiful-scaffold.js",
                         "#{javascriptspath}bootstrap-timepicker.js",
@@ -79,26 +74,22 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
                         "#{javascriptspath}tagit.js",
                         "#{javascriptspath}bootstrap-colorpicker.js",
                         "#{javascriptspath}a-wysihtml5-0.3.0.min.js",
-                        "#{javascriptspath}bootstrap-wysihtml5.js"
+                        "#{javascriptspath}bootstrap-wysihtml5.js",
+                        "#{javascriptspath}fixed_menu.js"
                        ]
-    pjax_js          = "#{javascriptspath}jquery.pjax.js"
 
-    [reset, bc_css, bc_js, pjax_js].flatten.each{ |path|
+    [reset, bc_css, bc_js].flatten.each{ |path|
       copy_file path, path
     }
 
     # Jstree theme
     directory "app/assets/stylesheets/themes", "app/assets/stylesheets/themes"
 
-    # Inject jquery-ui
-    appjs = "app/assets/javascripts/application.js"
-    if not File.read(appjs)[/\/\/= require jquery-ui/] then
-      inject_into_file(appjs, "//= require jquery-ui\n", :after => "//= require jquery\n")
-    end
-    
     # Images
     dir_image = "app/assets/images"
     directory dir_image, dir_image
+
+    generate("bootstrap:install","static")
   end
   
   def generate_layout
@@ -114,7 +105,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     
     inject_into_file("app/views/layouts/_beautiful_menu.html.erb",'
       <li class="<%= "active" if params[:controller] == "' + namespace_for_url + model.pluralize + '" %>">
-        <%= link_to t(:' + model.pluralize + ', :default => "' + model.pluralize + '").capitalize, ' + namespace_for_route + model.pluralize + '_path %>
+        <%= link_to ' + i18n_t_m_p(model) + '.capitalize, ' + namespace_for_route + model.pluralize + '_path %>
       </li>', :after => "<!-- Beautiful Scaffold Menu Do Not Touch This -->")
   end
 
@@ -206,7 +197,6 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
       template empty_template_path, current_template_path
     end
 
-    copy_file  "app/views/_treeview_js.html.erb",    "app/views/layouts/_treeview_js.html.erb"
     copy_file  "app/views/_form_habtm_tag.html.erb", "app/views/layouts/_form_habtm_tag.html.erb"
   end
 
@@ -219,7 +209,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
     if not routes_in_text[/beautiful#dashboard/] and not routes_in_text[/beautiful#select_fields/] then
       myroute = "root :to => 'beautiful#dashboard'\n"
-      myroute += "  match ':model_sym/select_fields' => 'beautiful#select_fields'\n"
+      myroute += "  match ':model_sym/select_fields' => 'beautiful#select_fields', :via => [:get, :post]\n"
       route(myroute)
     end
 

data/lib/generators/templates/app/assets/javascripts/application-bs.js

@@ -0,0 +1,34 @@
+//= require jquery
+//= require jquery-ui
+//= require jquery_ujs
+//= require jquery.livequery
+//= require turbolinks
+//= require a-wysihtml5-0.3.0.min
+//= require bootstrap-colorpicker
+//= require bootstrap-datepicker
+//= require bootstrap-timepicker
+//= require bootstrap-datetimepicker-for-beautiful-scaffold
+//= require bootstrap-wysihtml5
+//= require jquery.jstree
+//= require jquery.markitup
+//= require markitup/sets/bbcode/set
+//= require markitup/sets/default/set
+//= require markitup/sets/html/set
+//= require markitup/sets/markdown/set
+//= require markitup/sets/textile/set
+//= require markitup/sets/wiki/set
+//= require tagit.js
+//= require beautiful_scaffold
+//= require fixed_menu
+
+function initPage(){
+    datetimepicker_init();
+    bs_init();
+    modify_dom_init();
+}
+$(function() {
+    initPage();
+});
+$(window).bind('page:change', function() {
+    initPage();
+})

data/lib/generators/templates/app/assets/javascripts/beautiful_scaffold.js

@@ -1,4 +1,4 @@
-$(document).ready(function(){
+function bs_init(){
 
     /* Richtext editor */
     $('.select-richtext').click(function(){
@@ -32,25 +32,129 @@ $(document).ready(function(){
         $('#' + ideditor).removeClass("bbcode html markdown textile wiki").addClass(newSet);
         return true;
     });
-});
 
-$(function(){
-    try{
-        /* PJAX initializer */
-        $('a:not(.nopjax)').pjax('#pjax-container').live('click');
-        $('a:not(.nopjax)').live('click', function(){
-            /* Work on all bootstrap navbar */
-            $(this).parent().parent().find('.active').removeClass('active');
-            $(this).parent().addClass('active');
+    // Tagit
+    $('.bs-tagit').each(function( index ) {
+        var tagitelt = this;
+        $(tagitelt).tagit({
+            tagSource : function( request, response ) {
+
+                var par = $(tagitelt).attr("data-param");
+                var url = $(tagitelt).attr("data-url");
+                var result = $(tagitelt).attr("data-result");
+                var data_to_send = {
+                    "skip_save_search": true
+                };
+                data_to_send[par] = request.term;
+                $.ajax({
+                    url: url,
+                    type: "POST",
+                    data: data_to_send,
+                    dataType: "json",
+                    success: function( data ) {
+                        response( $.map( data, function( item ) {
+                            return { label: String(item[result]), value: item.id };
+                        }));
+                    }
+                });
+            },
+            triggerKeys:['enter', 'comma', 'tab'],
+            select : true,
+            allowNewTags : false
+        });
+    });
+
+    // Wysiwyg and color field
+    $('.wysiwyg-editor').wysihtml5({"html": true});
+    $('.color').colorpicker({format: 'rgba'});
+
+    // Processing
+    $('#checkall').click(function(){
+        $('.cbbatch').attr('checked', ($(this).attr('checked') != undefined));
+    });
+
+    // Filter columns
+    $('#filter-columns').on('click', function(){
+        var return_json = [];
+        $.each($('input[name^="field"]:checked'), function(index, value) {
+            return_json.push($(value).val());
+        });
+        var url = $(this).attr('data-url');
+        $.ajax({
+            url: url,
+            data: { 'fields' : return_json },
+            success: function(data) {
+                $('table.table th[class^="col"], table.table td[class^="col"]').css('display', 'none');
+                $.each(return_json, function(index, value) {
+                    $('table.table th.col-' + value + ', table.table td.col-' + value).css('display', 'table-cell');
+                });
+                $('div[class^="col"]').css('display', 'none');
+                $.each(return_json, function(index, value) {
+                    $('div.col-' + value).css('display', 'inline');
+                });
+                $('#modal-columns').modal('hide');
+            }
         });
-        $('#pjax-container').bind('pjax:start', function() {
-            $('.loader').show();
-        }).bind('pjax:end',   function() {
-            $('.loader').hide();
-        }).bind('pjax:timeout', function() { $('.loader').show();return false; });
+        return false;
+    });
+    $('#cancel-filter-columns').on('click', function(){
+        $('#modal-columns').modal('hide');
+        return false;
+    });
+
+    // TreeView JS
+    var opened = eval($("#treeview").attr("data-opened"));
+    var url = $("#treeview").attr("data-url");
+    var model = $("#treeview").attr("data-model");
+    $("#treeview")
+        .jstree({
+            "plugins" : [
+                "themes","html_data","ui","dnd"
+            ],
+            "core" : {
+                "initially_open" : [opened]
+            }
+        })
+        .bind("move_node.jstree", function (e, data) {
+            data.rslt.o.each(function (i) {
+                var dataajax = {
+                    "operation" : "move_node",
+                    "position" : data.rslt.cp + i,
+                    "title" : data.rslt.name,
+                    "copy" : data.rslt.cy ? 1 : 0
+                };
+                dataajax[model + "_id"] = data.rslt.cr === -1 ? "" : data.rslt.np.data("id");
+                $.ajax({
+                    async : false,
+                    type: 'POST',
+                    url: url + $(this).data("id") + "/treeview_update",
+                    data : dataajax,
+                    success : function (r) {
+                        $(data.rslt.oc).attr("id", "treeelt_" + r.id);
+                        if(data.rslt.cy && $(data.rslt.oc).children("UL").length) {
+                            data.inst.refresh(data.inst._get_parent(data.rslt.oc));
+                        }
+                    },
+                    error : function (r) {
+                        $.jstree.rollback(data.rlbk);
+                    }
+                });
+            });
+        });
+
+    // Mass inserting set focus
+    elt = $('form.mass-inserting div[style*="inline"][class*="col"] .input-small').first();
+    if($('form.mass-inserting').hasClass('setfocus')){
+        $(elt).focus();
     }
-    catch(err)
-    {
-        //Handle errors here
+
+    // Menu dropdown
+    try{
+        $('.dropdown-toggle').dropdown();
+        $('.dropdown-menu').find('form').click(function (e) {
+            e.stopPropagation();
+        });
+    }catch (e){
     }
-});
+
+}