mdd 3.0.2 → 3.0.3

data/lib/generators/mdwa/sandbox/templates/config/initializers/devise.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|

data/lib/generators/mdwa/sandbox/templates/config/initializers/mdwa_layout.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'mdwa/layout'
 MDWA::Layout::Base.config do |config|
 	config['/*'] 						            = 'public'
@@ -5,4 +6,4 @@ MDWA::Layout::Base.config do |config|
   config['/a/users/passwords#*'] 		  = 'system'
   config['/a/users/sessions#new'] 	  = 'login'
   config['/a/users/sessions#create'] 	= 'login'
-end
+end

data/lib/generators/mdwa/sandbox/templates/config/locales/mdwa.en.yml

@@ -30,7 +30,7 @@ en:
     index_title: "System users"
     index_id: "ID"
     index_name: "Name"
-    index_email: "Email"
+    index_email: "E-mail"
     index_remove: "Remove?"
     index_remove_label: "Remove"
     index_confirm_deletion: "Are you sure?"

data/lib/generators/mdwa/sandbox/templates/db/migrate/devise_create_users.rb

@@ -35,4 +35,4 @@ class DeviseCreateUsers < ActiveRecord::Migration
     add_index :users, :type
   end
 
-end
+end

data/lib/generators/mdwa/sandbox/templates/db/seeds.rb

@@ -1,2 +1,2 @@
 # -*- encoding : utf-8 -*-
-require File.expand_path( '../seeds/site', __FILE__ )
+require File.expand_path( '../seeds/site', __FILE__ )

data/lib/generators/mdwa/sandbox/templates/db/seeds/site.rb

@@ -3,4 +3,4 @@ Permission.create( :name => "SuperAdmin" ) if Permission.find_by_name("SuperAdmi
 
 if Administrator.count.zero?
 	Administrator.create :name => "Administrator", :email => 'admin@admin.com', :password => 'admin123', :password_confirmation => 'admin123'
-end
+end

data/lib/generators/mdwa/scaffold/scaffold_generator.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'rails/generators/migration'
 require 'mdwa/generators'
 
@@ -108,8 +109,14 @@ module Mdwa
 
       def routes
         unless options.skip_interface
-          route "resources :#{@model.plural_name}" unless @model.namespace?
-          route "namespace :#{@model.space} do resources :#{@model.plural_name} end" if @model.namespace?
+          route_str = []
+          route_str << "namespace :#{@model.space} do" if @model.namespace?
+          route_str << "\tcontroller :#{@model.plural_name} do"
+          route_str << "\tend"
+          route_str << "\tresources :#{@model.plural_name}"
+          route_str << "end" if @model.namespace?
+          
+          route route_str.join("\n")
         end
       end
 
@@ -147,4 +154,4 @@ module Mdwa
     end
 
   end 
-end
+end

data/lib/generators/mdwa/scaffold/templates/controllers/ajax_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'ApplicationController' %>
   
   load_and_authorize_resource :class => "<%= @model.klass %>"
@@ -70,4 +71,4 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
 			@<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => 1
 		end
 
-end
+end

data/lib/generators/mdwa/scaffold/templates/controllers/controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'ApplicationController' %>
   
   load_and_authorize_resource :class => "<%= @model.klass %>"
@@ -69,4 +70,4 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
 	    end
 	end
 
-end
+end

data/lib/generators/mdwa/scaffold/templates/db_migrate/migrate.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Create<%= @model.plural_name.camelize %> < ActiveRecord::Migration
 
 	def self.up
@@ -15,4 +16,4 @@ class Create<%= @model.plural_name.camelize %> < ActiveRecord::Migration
 		drop_table :<%= @model.plural_name %>
 	end
 
-end
+end

data/lib/generators/mdwa/scaffold/templates/models/model.rb

@@ -1,5 +1,6 @@
+# -*- encoding : utf-8 -*-
 class <%= @model.klass %> < ActiveRecord::Base
   
 	attr_accessible <%= @model.simple_attributes.collect {|a| ":" + a.name }.join(', ') %>
   
-end
+end

data/lib/generators/mdwa/scaffold/templates/models/module.rb

@@ -1,2 +1,3 @@
+# -*- encoding : utf-8 -*-
 module <%= @model.namespace %>
-end
+end

data/lib/generators/mdwa/user/templates/user.rb

@@ -0,0 +1,12 @@
+# -*- encoding : utf-8 -*-
+require 'mdwa/dsl'
+MDWA::DSL.users.register '<%= @user %>' do |u|
+  
+  # Description of what this user does in the system.
+  # u.description = 'Member of the programmers team.'
+  
+  # User roles
+  # By default, the user name is already included by default.
+  # u.user_roles = ['<%= @user %>']
+  
+end

data/lib/generators/mdwa/user/user_generator.rb

@@ -1,121 +1,30 @@
+# -*- encoding : utf-8 -*-
 require 'rails/generators/migration'
-require 'mdwa/generators'
+require 'mdwa/dsl'
 
 module Mdwa
-  
   module Generators
 
     class UserGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
 
       source_root File.expand_path('../templates', __FILE__)
-
-      attr_accessor :model, :specific_model
       
-      argument :scaffold_name, :type => :string, :banner => "[namespace]/Model"
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-
-      class_option :model, :desc => 'Use if model is different than the scaffold name. Format: "[namespace]/Model"', :type => :string
-      class_option :ajax, :desc => 'Generates modal forms and AJAX submits.', :type => :boolean, :default => false
-      class_option :skip_rake_migrate, :desc => 'Skips running rake db:migrate', :type => :boolean, :default => false
-      class_option :skip_timestamp, :desc => 'Skip timestamp generator on migration files.', :type => :boolean, :default => false
-      class_option :skip_questions, :desc => 'Answer no for all questions by default.', :type => :boolean, :default => false
-      class_option :skip_interface, :desc => 'Cretes only models, migrations and associations.', :type => :boolean, :default => false
-      class_option :only_interface, :desc => 'Skips models, associations and migrations.', :type => :boolean, :default => false
+      attr_accessor :user
+      
+      argument :user_name
 
       def initialize(*args, &block)
-
         super
-
-        @model = MDWA::Generators::Model.new( scaffold_name )        
-
-        # model_name is not valid
-        print_usage unless @model.valid?
-
-        # verifies specific model name
-        @specific_model = MDWA::Generators::Model.new( options.model ) unless options.model.blank?
-        if !@specific_model.nil?
-          if !@specific_model.valid?
-            print_usage 
-          else
-            @model.specific_model_name = @specific_model.raw
-          end
-        end
-        
-        require_all "#{Rails.root}/app/models/user.rb"
-        @predefined_fields = User.column_names
-        @predefined_fields << 'password'
-        @predefined_fields << 'password_confirmation'
-        
-        # sets the model attributes
-        attributes.each do |attribute|
-          @model.add_attribute MDWA::Generators::ModelAttribute.new( attribute ) unless User.accessible_attributes.to_a.include?( attribute.split(':').first )
-        end
-        
-        generate "mdwa:scaffold #{scaffold_name} name:string email:string password:password password_confirmation:password #{attributes.join(' ')} #{'--force' if options.force} #{'--ajax' if options.ajax} #{"model=#{options.model}" if options.model} #{'--skip_interface' if options.skip_interface} #{'--only_interface' if options.only_interface} #{'--skip_rake_migrate' if options.skip_rake_migrate} #{'--skip_timestamp' if options.skip_timestamp} #{'--skip_questions' if options.skip_questions} --skip-migrations"
-
-      end
-
-      def controller_and_view
-        unless options.skip_interface
-          # controllers
-          @inherit_controller = 'A::BackendController' if @model.space == 'a'
-          template "controllers/#{'ajax_' if options.ajax}controller.rb", "app/controllers/#{@model.space}/#{@model.plural_name}_controller.rb"
-          
-          # views - update only 
-          template 'views/update.js.erb', "app/views/#{@model.space}/#{@model.plural_name}/update.js.erb"
-        end
-      end
-
-      def model_and_migration        
-        # model override
-        gsub_file "app/models/#{@model.space}/#{@model.singular_name}.rb", 'ActiveRecord::Base', 'User'
-        inject_into_class "app/models/#{@model.space}/#{@model.singular_name}.rb", @model.model_class do 
-          inj = []
-          inj << "\n\tafter_create :create_#{@model.singular_name}_permission\n"
-          inj << "\tdef create_#{@model.singular_name}_permission"
-          inj << "\t\tself.permissions.push Permission.find_by_name('#{@model.singular_name}')"
-          inj << "\tend"
-          inj.join("\n")
-        end
         
-        # override model attributes to not allow field duplicity (causing errorss)
-        @model.attributes = []
-        attributes.each do |attribute|
-          @model.add_attribute MDWA::Generators::ModelAttribute.new( attribute ) unless @predefined_fields.include?( attribute.split(':').first )
-        end
-        migration_template 'migrate.rb', "db/migrate/add_#{@model.attributes.collect{|a| a.name}.join('_')}_to_users" unless @model.attributes.empty?
-        
-        # include type in db:seed
-        append_file 'db/seeds/site.rb' do
-          "\n\nPermission.create( :name => '#{@model.singular_name}' ) if Permission.find_by_name('#{@model.singular_name}').nil?"
-        end
-        # run rake db:seeds
-        if yes?('Run rake db:seed to create permission type?')
-          rake 'db:migrate'
-          rake 'db:seed' 
-        end
+        @user = user_name.singularize.camelize
       end
-
-
-      def run_rake_db_migrate
-        if !options.skip_rake_migrate and !options.skip_migrations and !options.only_interface
-          rake('db:migrate') if !options.skip_questions and yes? 'Run rake db:migrate?'
-        end
+    
+      def generate_user
+        template 'user.rb', "#{MDWA::DSL::USERS_PATH}#{@user.underscore}.rb"
+        generate "mdwa:entity #{@user} --user"
       end
 
-      private
-
-        # Sets Rails migration timestamp
-        def self.next_migration_number(dirname) #:nodoc:
-          if ActiveRecord::Base.timestamped_migrations
-            Time.now.utc.strftime("%Y%m%d%H%M%S")
-          else
-            "%.3d" % (current_migration_number(dirname) + 1)
-          end
-        end
-
-    end
+    end # class user generator
 
-  end 
-end
+  end # generators
+end # mdwa

data/lib/generators/mdwa/{user → user_scaffold}/USAGE

@@ -1,3 +1,3 @@
 Generates a loggable user, similar to MDWA Scaffold.
 USAGE:
-	rails g mdwa:user birth_date:date
+	rails g mdwa:user_scaffold birth_date:date

data/lib/generators/mdwa/{user → user_scaffold}/templates/controllers/ajax_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'ApplicationController' %>
   
   load_and_authorize_resource :class => "<%= @model.klass %>"
@@ -75,4 +76,4 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
 			@<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => 1
 		end
 
-end
+end

data/lib/generators/mdwa/{user → user_scaffold}/templates/controllers/controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'ApplicationController' %>
   
   load_and_authorize_resource :class => "<%= @model.klass %>"
@@ -74,4 +75,4 @@ class <%= @model.controller_name %>Controller < <%= @inherit_controller || 'Appl
 	    end
 	end
 
-end
+end

data/lib/generators/mdwa/{user → user_scaffold}/templates/migrate.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Add<%= @model.attributes.collect{|a| a.name.camelize}.join('') %>ToUsers < ActiveRecord::Migration
 
 	def self.up
@@ -12,4 +13,4 @@ class Add<%= @model.attributes.collect{|a| a.name.camelize}.join('') %>ToUsers <
 		<%- end -%>
 	end
 
-end
+end

data/lib/generators/mdwa/user_scaffold/user_scaffold_generator.rb

@@ -0,0 +1,139 @@
+# -*- encoding : utf-8 -*-
+require 'rails/generators/migration'
+require 'mdwa/generators'
+require 'mdwa/dsl'
+
+module Mdwa
+  
+  module Generators
+
+    class UserScaffoldGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      attr_accessor :model, :specific_model
+      
+      argument :scaffold_name, :type => :string, :banner => "[namespace]/Model"
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
+      class_option :model, :desc => 'Use if model is different than the scaffold name. Format: "[namespace]/Model"', :type => :string
+      class_option :ajax, :desc => 'Generates modal forms and AJAX submits.', :type => :boolean, :default => false
+      class_option :skip_rake_migrate, :desc => 'Skips running rake db:migrate', :type => :boolean, :default => false
+      class_option :skip_timestamp, :desc => 'Skip timestamp generator on migration files.', :type => :boolean, :default => false
+      class_option :skip_questions, :desc => 'Answer no for all questions by default.', :type => :boolean, :default => false
+      class_option :skip_interface, :desc => 'Cretes only models, migrations and associations.', :type => :boolean, :default => false
+      class_option :only_interface, :desc => 'Skips models, associations and migrations.', :type => :boolean, :default => false
+
+      def initialize(*args, &block)
+
+        super
+
+        @model = MDWA::Generators::Model.new( scaffold_name )        
+
+        # model_name is not valid
+        print_usage unless @model.valid?
+
+        # verifies specific model name
+        @specific_model = MDWA::Generators::Model.new( options.model ) unless options.model.blank?
+        if !@specific_model.nil?
+          if !@specific_model.valid?
+            print_usage 
+          else
+            @model.specific_model_name = @specific_model.raw
+          end
+        end
+        
+        require_all "#{Rails.root}/app/models/user.rb"
+        @predefined_fields = User.column_names
+        @predefined_fields << 'password'
+        @predefined_fields << 'password_confirmation'
+        
+        # sets the model attributes
+        attributes.each do |attribute|
+          @model.add_attribute MDWA::Generators::ModelAttribute.new( attribute ) unless User.accessible_attributes.to_a.include?( attribute.split(':').first )
+        end
+        
+        generate "mdwa:scaffold #{scaffold_name} name:string email:string password:password password_confirmation:password #{attributes.join(' ')} #{'--force' if options.force} #{'--ajax' if options.ajax} #{"model=#{options.model}" if options.model} #{'--skip_interface' if options.skip_interface} #{'--only_interface' if options.only_interface} #{'--skip_rake_migrate' if options.skip_rake_migrate} #{'--skip_timestamp' if options.skip_timestamp} #{'--skip_questions' if options.skip_questions} --skip-migrations"
+
+      end
+
+      def controller_and_view
+        unless options.skip_interface
+          # controllers
+          @inherit_controller = 'A::BackendController' if @model.space == 'a'
+          template "controllers/#{'ajax_' if options.ajax}controller.rb", "app/controllers/#{@model.space}/#{@model.plural_name}_controller.rb"
+          
+          # views - update only 
+          template 'views/update.js.erb', "app/views/#{@model.space}/#{@model.plural_name}/update.js.erb"
+        end
+      end
+      
+      def model_override
+        # locate the mdwa user to discover the roles
+        require_all "#{MDWA::DSL::USERS_PATH}#{@model.singular_name}.rb"
+        @mdwa_user = MDWA::DSL.user(@model.name)
+        if @mdwa_user.nil?
+          @roles = [@model.name]
+        else
+          @roles = @mdwa_user.user_roles
+        end
+        
+        # model override
+        gsub_file "app/models/#{@model.space}/#{@model.singular_name}.rb", 'ActiveRecord::Base', 'User'
+        inject_into_class "app/models/#{@model.space}/#{@model.singular_name}.rb", @model.model_class do 
+          inj = []
+          @roles.each do |role|
+            inj << "\n\n\tafter_create :create_#{role.underscore}_permission\n"
+            inj << "\tdef create_#{role.underscore}_permission"
+            inj << "\t\t#{role.underscore}_permission = Permission.find_by_name('#{role.underscore}')"
+            inj << "\t\t#{role.underscore}_permission = Permission.create(:name => '#{role.underscore}') if #{role.underscore}_permission.nil?" 
+            inj << "\t\tself.permissions.push #{role.underscore}_permission"
+            inj << "\tend"
+          end
+          inj.join("\n")
+        end
+      end
+
+      def migration_override        
+
+        # override model attributes to not allow field duplicity (causing errors)
+        @model.attributes = []
+        attributes.each do |attribute|
+          @model.add_attribute MDWA::Generators::ModelAttribute.new( attribute ) unless @predefined_fields.include?( attribute.split(':').first )
+        end
+        migration_template 'migrate.rb', "db/migrate/add_#{@model.attributes.collect{|a| a.name}.join('_')}_to_users" unless @model.attributes.empty?
+        
+        # include type in db:seed
+        append_file 'db/seeds/site.rb' do
+          "\n\nPermission.create( :name => '#{@model.singular_name}' ) if Permission.find_by_name('#{@model.singular_name}').nil?"
+        end
+        # run rake db:seeds
+        if yes?('Run rake db:seed to create permission type?')
+          rake 'db:migrate'
+          rake 'db:seed' 
+        end
+      end
+
+
+      def run_rake_db_migrate
+        if !options.skip_rake_migrate and !options.skip_migrations and !options.only_interface
+          rake('db:migrate') if !options.skip_questions and yes? 'Run rake db:migrate?'
+        end
+      end
+
+      private
+
+        # Sets Rails migration timestamp
+        def self.next_migration_number(dirname) #:nodoc:
+          if ActiveRecord::Base.timestamped_migrations
+            Time.now.utc.strftime("%Y%m%d%H%M%S")
+          else
+            "%.3d" % (current_migration_number(dirname) + 1)
+          end
+        end
+
+    end
+
+  end 
+end