beautiful_scaffold 0.2.5 → 0.2.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.2.6
+
+* Bugfix
+  * Thanks to : gregwis Problem with models ending with s (http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-classify)
+
 == 0.2.5
 
 * enhancement

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

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -46,7 +46,7 @@ module BeautifulScaffoldCommonMethods
   end
 
   def model_class
-    model.classify
+    model.camelize
   end
   
   # For the views

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

@@ -61,7 +61,7 @@ module BeautifulHelper
     model_path.delete(model_path.first)
     model_name_for_ransack = model_path.join("_")
 
-    ar_model = model_name.classify.constantize
+    ar_model = model_name.camelize.constantize
 
     default_caption = caption
     if default_caption.blank? then
@@ -162,7 +162,7 @@ module BeautifulHelper
         response += f.text_field((name_field + "_cont").to_sym, :class => "filter span12")
       when :integer, :float, :decimal then
         if is_belongs_to_column?(name_field_bk) then
-          btmodel = get_belongs_to_model(name_field_bk).classify.constantize
+          btmodel = get_belongs_to_model(name_field_bk).camelize.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")

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

@@ -2,18 +2,18 @@
 <% if not namespace.blank? then %>
   <% formparams << namespace %>
 <% end %>
-<% formparams << model_name.classify.constantize.new %>
+<% formparams << model_name.camelize.constantize.new %>
 <%= form_for formparams, :method => :post, :html => { :class => "well well-small form-horizontal mass-inserting" } do |f| %>
   <%= hidden_field_tag :mass_inserting, true %>
   <% for col in model_columns %>
     <div <%= visible_column(model_name, col, 'inline') %> class="col-<%= col %>">
       <%=
-        ar = model_name.classify.constantize.columns_hash[col]
+        ar = model_name.camelize.constantize.columns_hash[col]
         if not ar.nil? then
           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, :selected => (begin params[:q][col + "_eq"].to_i rescue '' end) }, { :class => "input-small" })
+              f.collection_select((col).to_sym, col.camelize.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 => t(col.to_sym, :default => col).capitalize)
             end
@@ -25,7 +25,7 @@
             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, :selected => (begin params[:q][col + "_id_eq"].to_i rescue '' end) }, { :class => "input-small" })
+          f.collection_select((col + '_id').to_sym, col.camelize.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/partials/_register_form.html.erb

@@ -5,7 +5,7 @@
     <h3><%%= t(:register, :default => "Register") %></h3>
   </div>
   <div class="modal-body">
-    <%% resource ||= <%= model.classify %>.new %>
+    <%% resource ||= <%= model.camelize %>.new %>
     <%%= form_for(resource, :as => '<%= model %>', :url => registration_path('<%= model %>'), :html => { :class => "form-horizontal" }) do |f| %>
       <%% begin %>
         <%%= devise_error_messages! %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies: []
 description: Beautiful Scaffold generate a complete scaffold (sort, export, paginate
   and filter data) http://www.beautiful-scaffold.com
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: beautiful_scaffold
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Beautiful Scaffold generate fully customizable scaffold