beautiful_scaffold 0.3.0.pre → 0.3.0.rc1

data/CHANGELOG

@@ -11,6 +11,7 @@
   * 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
+  * Generate locale file with auto translation
 
 * Bugfix
   * Avoid to re-generate created_at, updated_at, id search field at each migration

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.0'
+gem 'beautiful_scaffold', '0.3.0.rc1'
 
 === Next
 
@@ -39,19 +39,25 @@ type available :
 * wysiwyg
 
 # Example : products
-rails generate beautiful_scaffold product name:string price:price tva:float description:richtext visible:boolean && rake db:migrate
+rails g beautiful_scaffold product name:string price:price tva:float description:richtext visible:boolean && rake db:migrate
 
 # Example : admin products
-rails generate beautiful_scaffold product name:string price:price tva:float description:richtext overview_description:richtext visible:boolean --namespace=admin && rake db:migrate
+rails g beautiful_scaffold product name:string price:price tva:float description:richtext overview_description:richtext visible:boolean --namespace=admin && rake db:migrate
 
-=== Locale (i18n)
+=== Migration (Use Add[Field]To[ModelPluralize] syntax)
 
-rails generate beautiful_locale all
+rails g beautiful_migration AddFieldToModels field:type
+
+=== Locale (i18n) (Example)
+
+rails g beautiful_locale all
+rails g beautiful_locale fr
+rails g beautiful_locale de
 
 === Join Table (has_and_belongs_to_many relation)
 
-rails generate beautiful_jointable model1 model2
+rails g beautiful_jointable model1 model2
 
 === Install et Configure Devise (authentification) and Cancan (authorization)
 
-rails generate beautiful_devisecancan model
+rails g beautiful_devisecancan model

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.0.pre"
+  s.version     = "0.3.0.rc1"
   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

@@ -60,7 +60,7 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
 
     Dir.glob("app/models/**/*").each { |model_file|
       puts model_file
-      next if File.directory?(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
 
@@ -105,6 +105,8 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
     file.close
   end
 
+  private
+
   def translate_string(locale, str)
     # See http://www.microsofttranslator.com/dev/
     #

data/lib/generators/beautiful_migration_generator.rb

@@ -39,10 +39,8 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
       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")
-        inject_into_file("app/models/#{a}.rb", ":#{model}_ids, ", :after => "attr_accessible ")
         a += "_id"
       end
-      inject_into_file("app/models/#{model}.rb", ":#{a}, ", :after => "attr_accessible ")
     }
   end
 

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -124,6 +124,21 @@ module BeautifulScaffoldCommonMethods
     return newmyattributes
   end
 
+  def attributes_without_type
+    newmyattributes = []
+    myattributes.each{ |attr|
+      a,t = attr.split(':')
+
+      if ['references', 'reference'].include?(t) then
+        a = a + '_id'
+      end
+
+      newmyattributes << a
+    }
+
+    return newmyattributes
+  end
+
   def fulltext_attribute
     fulltext_field = []
     myattributes.each{ |attr|

data/lib/generators/beautiful_scaffold_generator.rb

@@ -132,19 +132,22 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
     order("#{attribute} #{direction}")
   }
-    # You can OVERRIDE this method used in model form and search form (in belongs_to relation)
-  def caption
-    (self["name"] || self["label"] || self["description"] || "##{id}")
-  end', :after => "class #{model_camelize} < ActiveRecord::Base")
-    
-     inject_into_file("app/models/#{model}.rb",'
-  include BeautifulScaffoldModule      
 
+  include BeautifulScaffoldModule
   before_save :fulltext_field_processing
 
+  # You can OVERRIDE this method used in model form and search form (in belongs_to relation)
+  def caption
+    (self["name"] || self["label"] || self["description"] || "##{id}")
+  end
+
   def fulltext_field_processing
     # You can preparse with own things here
     generate_fulltext_field([' + fulltext_attribute.map{ |e| ('"' + e + '"') }.join(",") + '])
+  end
+
+  def self.permitted_attributes
+    return ' + attributes_without_type.map{ |attr| ":#{attr}" }.join(",") + '
   end', :after => "class #{model_camelize} < ActiveRecord::Base")
 
     inject_into_file("config/application.rb", '    config.autoload_paths += %W(#{config.root}/app/modules)' + "\n", :after => "< Rails::Application\n")
@@ -154,14 +157,12 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   end
 
   def add_to_model
-    # Add relation and foreign_key in attr_accessible
+    # Add relation
     myattributes.each{ |attr|
       a,t = attr.split(':')
       if ['references', 'reference'].include?(t) then
-        inject_into_file("app/models/#{model}.rb", ":#{a}_id, ", :after => "attr_accessible ")
         begin
           inject_into_file("app/models/#{a}.rb", "\n  has_many :#{model_pluralize}, :dependent => :nullify", :after => "ActiveRecord::Base")
-          inject_into_file("app/models/#{a}.rb", ":#{model}_ids, ", :after => "attr_accessible ")
         rescue
         end
       end

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

@@ -97,7 +97,7 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
   end
 
   def create
-    @<%= model %> = <%= model_camelize %>.create(params[:<%= model %>])
+    @<%= model %> = <%= model_camelize %>.create(params_for_model)
 
     respond_to do |format|
       if @<%= model %>.save
@@ -125,7 +125,7 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
   def update
 
     respond_to do |format|
-      if @<%= model %>.update_attributes(params[:<%= model %>])
+      if @<%= model %>.update_attributes(params_for_model)
         format.html { redirect_to <%= namespace_for_route %><%= singular_table_name %>_path(@<%= model %>), :notice => t(:update_success, :model => "<%= model %>") }
         format.json { head :ok }
       else
@@ -199,5 +199,9 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
   def load_<%= model %>
     @<%= model %> = <%= model_camelize %>.find(params[:id])
   end
+
+  def params_for_model
+    params.require(:<%= model %>).permit(<%= model_camelize %>.permitted_attributes)
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre
+  version: 0.3.0.rc1
   prerelease: 6
 platform: ruby
 authors: