beautiful_scaffold 0.3.1 → 0.3.2

data/CHANGELOG

@@ -1,3 +1,14 @@
+== 0.3.2
+
+* bugfix
+  * Don't try to translate EN to EN (beautiful_locale)
+  * rails destroy beautiful_scaffold don't remove app/controllers directory
+
+* enhancement
+  * Add error class to control-group (bootstrap + rails validates)
+  * :data => { :confirm => "" } replace :confirm => "" (Rails 4 deprecation warning)
+  * activerelation.all -> .to_a (rails 4)
+
 == 0.3.1
 
 * enhancement

data/README.rdoc

@@ -15,7 +15,7 @@ gem 'beautiful_scaffold', '0.2.7'
 === RubyOnRails 4.X
 
 Add this in your Gemfile :
-gem 'beautiful_scaffold', '0.3.1'
+gem 'beautiful_scaffold', '~>0.3'
 
 === Next
 
@@ -53,6 +53,7 @@ rails g beautiful_migration AddFieldToModels field:type
 Run rake db:migrate before rail g beautiful_locale (to get lastest attribute translation)
 
 rails g beautiful_locale all
+rails g beautiful_locale en
 rails g beautiful_locale fr
 rails g beautiful_locale de
 

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

data/lib/generators/beautiful_locale_generator.rb

@@ -128,12 +128,16 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
   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}"
+    if locale == "en" then
+      attr_translate = "#{str.gsub(/_/, " ")}"
+    else
+      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
+      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
+    end
     raise 'Free Limit' if attr_translate =~ /mymemory/
 
     return attr_translate

data/lib/generators/beautiful_scaffold_generator.rb

@@ -174,7 +174,8 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   def generate_controller
     copy_file  "app/controllers/master_base.rb", "app/controllers/beautiful_controller.rb"
     dirs = ['app', 'controllers', options[:namespace]].compact
-    empty_directory File.join(dirs)
+    # Avoid to remove app/controllers directory (https://github.com/rivsc/Beautiful-Scaffold/issues/6)
+    empty_directory File.join(dirs) if not options[:namespace].blank?
     template   "app/controllers/base.rb", File.join([dirs, "#{model_pluralize}_controller.rb"].flatten)
   end
   

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

@@ -154,6 +154,10 @@ function bs_init(){
         return false;
     });
 
+    // Add Error Form style with bootstrap
+    $("div.control-group>div.field_with_errors").parent().addClass("error");
+    $("#error_explanation").addClass("text-error");
+
     // Mass inserting set focus
     elt = $('form.mass-inserting div[style*="inline"][class*="col"] .input-small').first();
     if($('form.mass-inserting').hasClass('setfocus')){

data/lib/generators/templates/app/controllers/base.rb

@@ -31,27 +31,27 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
     @<%= model_pluralize %> = @<%= model %>_scope.paginate(
       :page => params[:page],
       :per_page => 20
-    ).all
+    ).to_a
 
     respond_to do |format|
       format.html{
         render
       }
       format.json{
-        render :json => @<%= model %>_scope.all 
+        render :json => @<%= model %>_scope.to_a
       }
       format.csv{
         require 'csv'
         csvstr = CSV.generate do |csv|
           csv << <%= model_camelize %>.attribute_names
-          @<%= model %>_scope.all.each{ |o|
+          @<%= model %>_scope.to_a.each{ |o|
             csv << <%= model_camelize %>.attribute_names.map{ |a| o[a] }
           }
         end 
         render :text => csvstr
       }
       format.xml{ 
-        render :xml => @<%= model %>_scope.all 
+        render :xml => @<%= model %>_scope.to_a
       }             
       format.pdf{
         pdfcontent = PdfReport.new.to_pdf(<%= model_camelize %>,@<%= model %>_scope)

data/lib/generators/templates/app/controllers/master_base.rb

@@ -68,7 +68,7 @@ class BeautifulController < ApplicationController
     if modelclass.column_names.include?("position") then
       new_pos = 0
       modelclass.transaction do
-        all_elt = modelclass.where(foreignkey => parent_id).order("position ASC").all
+        all_elt = modelclass.where(foreignkey => parent_id).order("position ASC").to_a
 
         begin
           if index == all_elt.length then

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

@@ -77,7 +77,7 @@
             </td>
             <td><%%= link_to '<i class="icon-search"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :title => t(:show, :default => "Show") %></td>
             <td><%%= link_to '<i class="icon-pencil"></i>'.html_safe, edit_<%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :title => t(:edit, :default => "Edit") %></td>
-            <td><%%= link_to '<i class="icon-remove"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :confirm => t(:are_you_sure, :default => "Are you sure?"), :method => :delete, :title => t(:destroy, :default => "Destroy") %></td>
+            <td><%%= link_to '<i class="icon-remove"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :data => { :confirm => t(:are_you_sure, :default => "Are you sure?") }, :method => :delete, :title => t(:destroy, :default => "Destroy") %></td>
           </tr>
           <%% end %>
         </tbody>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies: []
 description: Beautiful Scaffold generate a complete scaffold (sort, export, paginate
   and filter data) http://www.beautiful-scaffold.com