beautiful_scaffold 0.2.2 → 0.2.3

data/CHANGELOG

@@ -0,0 +1,15 @@
+== 0.2.3
+
+* enhancement
+  * Add preselect collection_select in mass inserting with filter params
+  * Adapt ransack_field helper for nested resource
+  * Add custom caption for treeview element in build_treeview helper
+  * I18n for menu
+  * I18n for fields name (placeholder mass inserting and select fields)
+  * I18n for title h2
+  * I18n for button New
+  * Show caption in table instead of #id
+
+== Previous versions
+
+* See commits on github

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

data/lib/generators/USAGE

@@ -9,4 +9,8 @@ Example:
     rails generate beautiful_migration AddColorToProducts color:string
 
     rails generate beautiful_locale {fr|en|all}
+
+    rails generate beautiful_jointable product tag
+
+    rails generate beautiful_devisecancan user
        

data/lib/generators/beautiful_scaffold_generator.rb

@@ -114,7 +114,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 "' + model.capitalize.pluralize + '", ' + namespace_for_route + model.pluralize + '_path %>
+        <%= link_to t(:' + model.pluralize + ', :default => "' + model.pluralize + '").capitalize, ' + namespace_for_route + model.pluralize + '_path %>
       </li>', :after => "<!-- Beautiful Scaffold Menu Do Not Touch This -->")
   end
 

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

@@ -41,7 +41,7 @@ module BeautifulHelper
       default_caption = get_belongs_to_model(default_caption)
     end
 
-    caption =   t(attribute_name, :default => default_caption)
+    caption =   t(attribute_name, :default => default_caption).capitalize
     strpath = model_name.pluralize + "_url"
     strpath = namespace + '_' + strpath if not namespace.blank?
 
@@ -52,7 +52,12 @@ module BeautifulHelper
     ).html_safe
   end
 
-  def ransack_field(model_name, attribute_name, f, caption = nil)
+  def ransack_field(path_of_model, attribute_name, f, caption = nil)
+    model_path = path_of_model.split("/")
+    model_name = model_path.last
+    model_path.delete(model_path.first)
+    model_name_for_ransack = model_path.join("_")
+
     ar_model = model_name.classify.constantize
 
     default_caption = caption
@@ -63,12 +68,20 @@ module BeautifulHelper
       end
     end
 
-    name_field = attribute_name
+    name_field    = attribute_name
+    name_field_bk = attribute_name
+    label_field   = attribute_name
+
+    if is_belongs_to_column?(name_field_bk) then
+      label_field = get_belongs_to_model(attribute_name)
+    end
+
+    name_field = model_name_for_ransack + "_" + name_field unless model_name_for_ransack.blank?
+
     response   = '<div class="control-group">'
-    response += f.label name_field, t(attribute_name, :default => default_caption), :class => "control-label"
+    response += f.label name_field, t(label_field, :default => default_caption).capitalize, :class => "control-label"
     response += '<div class="controls">'
 
-
     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
@@ -141,8 +154,8 @@ module BeautifulHelper
       when :string then
         response += f.text_field((name_field + "_cont").to_sym, :class => "filter span12")
       when :integer, :float, :decimal then
-        if is_belongs_to_column?(name_field) then
-          btmodel = get_belongs_to_model(name_field).classify.constantize
+        if is_belongs_to_column?(name_field_bk) then
+          btmodel = get_belongs_to_model(name_field_bk).classify.constantize
           response += f.collection_select((name_field + "_eq").to_sym, btmodel.all, :id, :caption, { :include_blank => t(:all, :default => "All") }, { :class => "span12" })
         elsif name_field == "id" then
           response += f.text_field((name_field + "_eq").to_sym, :class => "filter span12")
@@ -199,15 +212,15 @@ module BeautifulHelper
     return column[0..-4]
   end
 
-  def build_treeview(obj, child_relation)
+  def build_treeview(obj, child_relation, caption_method = "caption")
     out = '
       <li id="treeelt_' + obj.id.to_s + '" data-id="' + obj.id.to_s + '">
-        <a href="#" class="nopjax">' + obj.caption + '</a>
+        <a href="#" class="nopjax">' + obj.send(caption_method).to_s + '</a>
         <ul>'
     ar = obj.send(child_relation.to_sym)
     ar = ar.order('position') if obj.class.column_names.include?("position")
     for o in ar.all
-      out += build_treeview(o, child_relation)
+      out += build_treeview(o, child_relation, caption_method)
     end
     out += '
         </ul>

data/lib/generators/templates/app/views/_mass_inserting.html.erb

@@ -8,9 +8,9 @@
           case ar.type
           when 'integer' then
             if col =~ /.*_id/ then
-              f.collection_select((col).to_sym, col.classify.constantize.all, :id, :caption, { :include_blank => true }, { :class => "input-small", :placeholder => col.capitalize })
+              f.collection_select((col).to_sym, col.classify.constantize.all, :id, :caption, { :include_blank => true, :selected => (begin params[:q][col + "_eq"].to_i rescue '' end) }, { :class => "input-small" })
             else
-              f.text_field(col.to_sym, :class => "input-small", :placeholder => col.capitalize)
+              f.text_field(col.to_sym, :class => "input-small", :placeholder => t(col.to_sym, :default => col.capitalize))
             end
           when 'boolean' then
             (
@@ -20,10 +20,10 @@
             f.label((col + "_false").to_sym, t(:no))
             )
           else
-            f.text_field(col.to_sym, :class => "input-small", :placeholder => col.capitalize)
+            f.text_field(col.to_sym, :class => "input-small", :placeholder => t(col.to_sym, :default => col.capitalize))
           end
         else
-          f.collection_select((col + '_id').to_sym, col.classify.constantize.all, :id, :caption, { :include_blank => true }, { :class => "input-small", :placeholder => col.capitalize })
+          f.collection_select((col + '_id').to_sym, col.classify.constantize.all, :id, :caption, { :include_blank => true, :selected => (begin params[:q][col + "_id_eq"].to_i rescue '' end) }, { :class => "input-small" })
         end
       %>
     </div>

data/lib/generators/templates/app/views/_modal_columns.html.erb

@@ -6,7 +6,7 @@
   <div class="modal-body">
     <% for field in model_columns %>
       <label class="checkbox">
-        <input type="checkbox" name="field[]" value="<%= field %>" <%= "checked" if session[:fields][model_name.to_sym].include?(field) %>> <%= field %>
+        <input type="checkbox" name="field[]" value="<%= field %>" <%= "checked" if session[:fields][model_name.to_sym].include?(field) %>> <%= t(field, :default => field.capitalize) %>
       </label><br />
     <% end %>
   </div>

data/lib/generators/templates/app/views/edit.html.erb

@@ -1,4 +1,4 @@
-<h2><%%= t(:editing, :default => 'Editing') %> <%= singular_table_name %></h2>
+<h2><%%= t(:editing, :default => 'Editing') %> <%%= t(:<%= singular_table_name %>, :default => "<%= singular_table_name %>") %></h2>
 
 <%%= render 'form' %>
 

data/lib/generators/templates/app/views/index.html.erb

@@ -1,9 +1,9 @@
-<h2><%%= t(:listing, :default => "Listing") %> <%= plural_table_name %></h2>
+<h2><%%= t(:listing, :default => "Listing") %> <%%= t(:<%= plural_table_name %>, :default => "<%= plural_table_name %>") %></h2>
 
 <p>
-  <%%= link_to '<i class="icon-plus"></i>'.html_safe + t(:new, :default => "New") + ' <%= model %>', new_<%= namespace_for_route %><%= singular_table_name %>_path, :class => "btn" %>
+  <%%= link_to '<i class="icon-plus"></i>'.html_safe + t(:new, :default => "New") + ' ' + t(:<%= model %>, :default => "<%= model %>"), new_<%= namespace_for_route %><%= singular_table_name %>_path, :class => "btn" %>
   <%% if <%= model_camelize %>.columns.map(&:name).include?("<%= model %>_id") then %>
-    <%%= link_to '<i class="icon-folder-close"></i>'.html_safe + t(:treeview, :default => "Treeview") + ' <%= model %>', treeview_<%= namespace_for_route %><%= model_pluralize %>_path, :class => "btn" %>
+    <%%= link_to '<i class="icon-folder-close"></i>'.html_safe + t(:treeview, :default => "Treeview") + ' ' + t(:<%= model %>, :default => "<%= model %>"), treeview_<%= namespace_for_route %><%= model_pluralize %>_path, :class => "btn" %>
   <%% end %>
 </p>
 

data/lib/generators/templates/app/views/new.html.erb

@@ -1,4 +1,4 @@
-<h2><%%= t(:new, :default => 'New') %> <%= singular_table_name %></h2>
+<h2><%%= t(:new, :default => 'New') %> <%%= t(:<%= singular_table_name %>, :default => "<%= singular_table_name %>") %></h2>
 
 <%%= render 'form' %>
 

data/lib/generators/templates/app/views/partials/_index_column.html.erb

@@ -8,7 +8,7 @@
       <%%= t((<%= singular_table_name %>.<%= attribute.name %> ? "yes" : "no").to_sym) %>
     <%- elsif @beautiful_attributes.include?(attribute.name + ':references') then -%>
       <%% if not <%= singular_table_name %>.<%= attribute.name %>_id.nil? then %>
-        <%%= link_to "#" + <%= singular_table_name %>.<%= attribute.name %>_id.to_s, <%= namespace_for_route %><%= attribute.name %>_path(<%= singular_table_name %>.<%= attribute.name %>_id) %>
+        <%%= link_to <%= singular_table_name %>.<%= attribute.name %>.caption, <%= namespace_for_route %><%= attribute.name %>_path(<%= singular_table_name %>.<%= attribute.name %>_id) %>
       <%% else %>
         <%%= t(:any, :default => "Any") %>
       <%% end %>

data/lib/generators/templates/app/views/show.html.erb

@@ -1,4 +1,4 @@
-<h2><%%= t(:show, :default => "Show") %> <%= singular_table_name %></h2>
+<h2><%%= t(:show, :default => "Show") %> <%%= t(:<%= singular_table_name %>, :default => "<%= singular_table_name %>") %></h2>
 
 <%= render_partial 'app/views/partials/_show_field.html.erb' %>
 <!-- Beautiful_scaffold - AddField - Field - Do not remove -->

data/lib/generators/templates/app/views/treeview.html.erb

@@ -1,4 +1,4 @@
-<h2><%%= t(:treeview, :default => 'Treeview') %> <%= singular_table_name %></h2>
+<h2><%%= t(:treeview, :default => 'Treeview') %> <%%= t(:<%= singular_table_name %>, :default => "<%= singular_table_name %>") %></h2>
 
 <div id="treeview">
   <ul>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000Z
+date: 2012-09-06 00:00:00.000000000Z
 dependencies: []
 description: Beautiful Scaffold generate a complete scaffold (sort, export, paginate
   and filter data) http://www.beautiful-scaffold.com
@@ -18,6 +18,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG
 - Gemfile
 - MIT-LICENSE
 - README.rdoc