leonardo 1.8.2 → 1.8.3

data/CHANGELOG

@@ -1,16 +1,21 @@
-1.8.2 (October 10th, 2011) Marco Mastrodonato
-* List: Added id as first column
-* Replaced String.any? with String.size>0 for ruby 1.9.2 support
+1.8.3 (November 8th, 2011) Marco Mastrodonato
+* Controller/sort_column => Fixed an issue with multiple tables
+* Dev users are now added by rake db:seed, no more by migration
 
 TODO:
 * Lists: Multiple selection and multiple operation
-* Lists: Add id as first column
 * Model: Create name attribute for every one that does not have
 * Handle eager loading including child resources
 * Add user management
 
 
 
+1.8.2 (October 10th, 2011) Marco Mastrodonato
+* List: Added id as first column
+* Replaced String.any? with String.size>0 for ruby 1.9.2 support
+
+
+
 1.8.1 (October 10th, 2011) Marco Mastrodonato
 * Updated rspec to pass index view test with two new controller helpers
 * Date managed with datepicker are now in year-month-day format and now works with sqlite3

data/lib/generators/leolay/leolay_generator.rb

@@ -163,35 +163,51 @@ class LeolayGenerator < Rails::Generators::Base
   end
 
 
-  def create_admin_migration
-    file = "db/migrate/*_create_admin.rb"
-    return unless options.authentication? and Dir[file].empty?
-    file = file.sub('*', Time.now.strftime("%Y%m%d%H%M99"))
-    create_file file do
+  #def create_admin_migration
+  #  file = "db/migrate/*_create_admin.rb"
+  #  return unless options.authentication? and Dir[file].empty?
+  #  file = file.sub('*', Time.now.strftime("%Y%m%d%H%M99"))
+  #  create_file file do
+  #    <<-FILE.gsub(/^      /, '')
+  #    class CreateAdmin < ActiveRecord::Migration
+  #      def self.up
+  #        add_column :users, :roles_mask, :integer
+  #        user=User.new :email => 'admin@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
+  #        user.roles=['admin']
+  #        user.save
+  #        user=User.new :email => 'manager@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
+  #        user.roles=['manager']
+  #        user.save
+  #        user=User.new :email => 'user@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
+  #        user.roles=['user']
+  #        user.save
+  #      end
+  #      def self.down
+  #        User.delete User.find_all_by_email(['admin@#{app_name.downcase}.com',
+  #                                            'manager@#{app_name.downcase}.com',
+  #                                            'user@#{app_name.downcase}.com']).map(&:id)
+  #        remove_column :users, :roles_mask
+  #      end
+  #    end
+  #    FILE
+  #  end
+  #end
+  def create_users_for_development
+    return unless options.authentication?
+    file = "db/seeds.rb"
+    append_file file do
       <<-FILE.gsub(/^      /, '')
-      class CreateAdmin < ActiveRecord::Migration
-        def self.up
-          add_column :users, :roles_mask, :integer
-          user=User.new :email => 'admin@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
-          user.roles=['admin']
-          user.save
-          user=User.new :email => 'manager@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
-          user.roles=['manager']
-          user.save
-          user=User.new :email => 'user@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
-          user.roles=['user']
-          user.save
-        end
-        def self.down
-          User.delete User.find_all_by_email(['admin@#{app_name.downcase}.com',
-                                              'manager@#{app_name.downcase}.com',
-                                              'user@#{app_name.downcase}.com']).map(&:id)
-          remove_column :users, :roles_mask
-        end
-      end
+      user=User.new :email => 'admin@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
+      #{"user.roles=['admin']" if options.authorization?}
+      user.save
+      user=User.new :email => 'manager@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
+      #{"user.roles=['manager']" if options.authorization?}
+      user.save
+      user=User.new :email => 'user@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
+      #{"user.roles=['user']" if options.authorization?}
+      user.save
       FILE
-    end
-
+    end if File.exists?(file)
   end
 
   def setup_formtastic

data/lib/generators/rails/leosca_controller/templates/controller.rb

@@ -163,7 +163,7 @@ end
       %w[asc desc].include?(params[:direction]) ?  params[:direction] : "asc"
     end
     def sort_column
-      <%= class_name %>.column_names.include?(params[:sort]) ? params[:sort] : "id"
+      <%= class_name %>.column_names.include?(params[:sort]) ? params[:sort] : "#{<%= class_name %>.table_name}.id"
     end
 end
 <% end -%>

data/template.rb

@@ -6,7 +6,9 @@
 # USAGE: rails new yourappname -m template.rb
 # 
 # -------------------------------------------------------
+# 08-11-2011: Add roles_mask migration for cancan gem
 # 27-10-2011: Replaced String.any? with String.size>0 for ruby 1.9.2 support
+# 21-10-2011: Davide L. - Added folder creation 'vendor/assets/javascripts/include/' for linux compatibility
 # 05-10-2011: Added ajax option
 # 25-08-2011: Added rspec generation
 #########################################################
@@ -94,7 +96,10 @@ if devise
   #generate("devise:views") #not use since leolay copies custom views
 end
 
-generate "cancan:ability" if cancan
+if cancan
+  generate "cancan:ability"
+  generate "migration", "AddRolesMaskToUsers", "roles_mask:integer"
+end
 
 generate "autocomplete:install" if ajax
 
@@ -141,6 +146,7 @@ File.unlink "public/index.html"
 
 rake "db:create:all"
 rake "db:migrate"
+rake "db:seed"
 
 #rake "gems:unpack" if yes?("Unpack to vendor/gems ?")
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leonardo
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 1
   - 8
-  - 2
-  version: 1.8.2
+  - 3
+  version: 1.8.3
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 Z
+date: 2011-11-08 00:00:00 Z
 dependencies: []
 
 description: A generator for creating Rails 3.1 applications ready to go. It generates the layout, the style, the internationalization and manage external gems for authentication, authorization and other. It also provides a customized scaffold to generates cool sites ajax ready in few minutes. If you find a bug please report to m.mastrodonato@gmail.com