mdd 2.0.3 → 3.0.0

data/README.md

@@ -22,7 +22,7 @@ Run the bundle command to install it.
 After you install MDD and add it to your Gemfile, you need to run the generator:
 
 ```console
-rails generate mdd:sandbox
+rails generate mdwa:sandbox
 ```
 This generator will setup the clean sandbox environment with:
 

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end

data/app/helpers/{mdd_helper.rb → mdwa_helper.rb}

@@ -1,4 +1,4 @@
-module MddHelper
+module MdwaHelper
   
   def pagination_footer( object_list )
     html = []

data/lib/generators/{mdd → mdwa}/association/USAGE

@@ -3,20 +3,20 @@ Description:
 	Use the model class name.
 
 Example:
-	rails g mdd:association Library has_many Books
+	rails g mdwa:association Library has_many Books
 
-	rails g mdd:association Book belongs_to Library --with-opposite
+	rails g mdwa:association Book belongs_to Library --with-opposite
 		Generates the first example as the opposite
 
-	rails g mdd:association Company nested_one Address
+	rails g mdwa:association Company nested_one Address
 		Creates address_id in migration and belongs_to :address and accepts_nested_attrs in Company model
 		Creates has_one :company in Address model if opposite requested
 
-	rails g mdd:association Sale nested_many SaleItem
+	rails g mdwa:association Sale nested_many SaleItem
 		Creates sale_id and belongs_to in SaleItem
 		Creates has_many and accepts_nested_attrs in Sale
 
-	rails g mdd:association User has_and_belongs_to_many Project
+	rails g mdwa:association User has_and_belongs_to_many Project
 		Creates the join table projects_users
 		Creates has_and_belongs_to_many association in both models
 		The generated code indicates the join_table parameter, because often users have many to many associations and may be inheritance involved.

data/lib/generators/mdwa/association/association_generator.rb

@@ -0,0 +1,152 @@
+# -*- encoding : utf-8 -*-
+
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'mdwa/generators'
+
+module Mdwa
+  module Generators
+    class AssociationGenerator < Rails::Generators::Base
+      
+      include Rails::Generators::Migration
+      
+      source_root File.expand_path("../templates", __FILE__)
+
+      attr_accessor :model1, :attribute, :model2, :pending_migrations
+
+      argument :model1, :type => :string, :banner => "First part of relation"
+      argument :relation, :type => :string, :banner => "has_many, belongs, has_one, nested_many, nested_one..."
+      argument :model2, :type => :string, :banner => "Second part of relation"
+
+      class_option :with_opposite, :desc => 'Generate the opposite relation too. For example, the oposite of belongs_to is has_many.', :type => :boolean, :default => false
+      class_option :skip_rake_migrate, :desc => 'Skips rake db:migrate', :type => :boolean, :default => false
+      class_option :skip_migrations, :desc => 'Skips migration files', :type => :boolean, :default => false
+      class_option :ask, :desc => 'Asks if the opposite should be generated.', :type => :boolean, :default => false
+
+      def initialize(*args, &block)
+
+        super
+        
+        @association = Generators::ModelAssocation.new(model1, model2, relation)
+
+      end
+      
+
+      def model
+        if @association.belongs_to?
+          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.klass.classify.constantize do
+            ret = []
+            ret << "\n\tbelongs_to :#{@association.model2.singular_name}, :class_name => '#{@association.model2.klass}'"
+            ret << "\tattr_accessible :#{@association.model2.singular_name.foreign_key}"
+            ret.join("\n")
+          end
+        end
+        if @association.has_one?
+          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.klass.classify.constantize do
+            "\n\thas_one :#{@association.model2.singular_name}, :class_name => '#{@association.model2.klass}'\n"
+          end
+        end
+        if @association.has_many?
+          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.klass.classify.constantize do
+            "\n\thas_many :#{@association.model2.plural_name}, :class_name => '#{@association.model2.klass}'\n"
+          end
+        end
+        if @association.has_and_belongs_to_many?
+          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.klass.classify.constantize do
+            "\n\thas_and_belongs_to_many :#{@association.model2.plural_name}, :join_table => :#{many_to_many_table_name}\n"
+          end
+          inject_into_class "app/models/#{@association.model2.space}/#{@association.model2.singular_name}.rb", @association.model2.klass.classify.constantize do
+            "\n\thas_and_belongs_to_many :#{@association.model1.plural_name}, :join_table => :#{many_to_many_table_name}\n"
+          end
+        end
+        if @association.nested_one?
+          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.klass.classify.constantize do
+            # belongs_to
+            # attr_accessible attributes
+            # attr_nested_attributes 
+            "\n\tbelongs_to :#{@association.model2.singular_name}, :class_name => '#{@association.model2.klass}'\n\tattr_accessible :#{@association.model2.singular_name}_attributes, :#{@association.model2.singular_name.foreign_key}\n\taccepts_nested_attributes_for :#{@association.model2.singular_name}, :allow_destroy => true\n"
+          end
+        end
+        if @association.nested_many?
+          inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.klass.classify.constantize do
+            # belongs_to
+            # attr_accessible attributes
+            # attr_nested_attributes 
+            "\n\thas_many :#{@association.model2.plural_name}, :class_name => '#{@association.model2.klass}', :dependent => :destroy\n\tattr_accessible :#{@association.model2.plural_name}_attributes\n\taccepts_nested_attributes_for :#{@association.model2.plural_name}, :allow_destroy => true\n"
+          end
+        end
+
+      end
+      
+      def migrate
+        unless options.skip_migrations
+          
+          @pending_migrations = true
+          case @association.relation.to_sym 
+          when :belongs_to, :nested_one
+            @table = @association.model1
+            @field = @association.model2
+            migration_template 'migrate/one_field.rb', "db/migrate/add_#{@field.singular_name.foreign_key}_to_#{@table.plural_name}.rb"
+          when :has_and_belongs_to_many
+            migration_template 'migrate/many_to_many.rb', "db/migrate/create_#{many_to_many_table_name}.rb"
+          else
+            @pending_migrations = false
+          end
+          
+        end
+
+      end
+
+      def run_rake_db_migrate
+        rake('db:migrate') if !options.skip_rake_migrate and @pending_migrations and yes? 'Run rake db:migrate?'
+      end
+
+      def opposite
+
+        if options.with_opposite or options.ask
+          # belongs_to
+          if @association.belongs_to? and (options.with_opposite or ( options.ask and yes?("#{@association.model1.name} belongs to #{@association.model2.singular_name}. Create has_many association?") ))
+            generate "mdwa:association #{@association.model2.raw} has_many #{@association.model1.raw} #{'--force' if options.force}"
+          end
+
+          # has_many
+          if @association.has_many? and (options.with_opposite or ( options.ask and yes?("#{@association.model1.name} has many #{@association.model2.plural_name}. Create belongs_to association?") ))
+            generate "mdwa:association #{@association.model2.raw} belongs_to #{@association.model1.raw} #{'--force' if options.force}"
+          end
+          
+          # has_one
+          if @association.has_one? and (options.with_opposite or ( options.ask and yes?("#{@association.model1.name} has one #{@association.model2.singular_name}. Create belongs_to association?") ))
+            generate "mdwa:association #{@association.model2.raw} belongs_to #{@association.model1.raw} #{'--force' if options.force}"
+          end
+
+          # nested_many
+          if @association.nested_many? and (options.with_opposite or ( options.ask and yes?("#{@association.model1.name} has many (nested) with #{@association.model2.plural_name}. Create belongs_to association?") ))
+            generate "mdwa:association #{@association.model2.raw} belongs_to #{@association.model1.raw} #{'--force' if options.force}"
+          end
+
+          # nested_one          
+          if @association.nested_one? and (options.with_opposite or ( options.ask and yes?("#{@association.model1.name} belongs nested to #{@association.model2.singular_name}. Create has_one association?") ))
+            generate "mdwa:association #{@association.model2.raw} has_one #{@association.model1.raw} #{'--force' if options.force}"
+          end
+
+        end
+      end
+
+      # Implement the required interface for Rails::Generators::Migration.
+      def self.next_migration_number(dirname)
+        if ActiveRecord::Base.timestamped_migrations
+          Time.now.utc.strftime("%Y%m%d%H%M%S").to_s
+        else
+          "%.3d" % (current_migration_number(dirname) + 1)
+        end
+      end
+
+      private 
+        def many_to_many_table_name
+          "#{@association.ordered.first.plural_name}_#{@association.ordered.last.plural_name}"
+        end
+
+
+    end
+  end
+end

data/lib/generators/{mdd → mdwa}/sandbox/USAGE

@@ -6,4 +6,4 @@ Description:
     Referenced models also have their relations configured in models and views.
 
 Example:
-    rails generate mdd:scaffold Model name:string initial_date:date category_id:category:name:belongs
+    rails generate mdwa:scaffold Model name:string initial_date:date category_id:category:name:belongs

data/lib/generators/{mdd → mdwa}/sandbox/sandbox_generator.rb

@@ -3,7 +3,7 @@
 require 'rails/generators'
 require 'rails/generators/migration'
 
-module Mdd
+module Mdwa
   module Generators
     class SandboxGenerator < Rails::Generators::Base
       
@@ -112,13 +112,14 @@ module Mdd
       def config
         # initializers
         copy_file 'config/initializers/devise.rb', 'config/initializers/mdwa_devise.rb'
-        copy_file 'config/initializers/mdd_inflections.rb', 'config/initializers/mdwa_inflections.rb'
-        copy_file 'config/initializers/mdd_layout.rb', 'config/initializers/mdwa_layout.rb'
-        copy_file 'config/initializers/will_paginate.rb', 'config/initializers/mdwa_will_paginte.rb'
+        copy_file 'config/initializers/mdwa_inflections.rb', 'config/initializers/mdwa_inflections.rb'
+        copy_file 'config/initializers/mdwa_layout.rb', 'config/initializers/mdwa_layout.rb'
+        copy_file 'config/initializers/will_paginate.rb', 'config/initializers/mdwa_will_paginate.rb'
 
         # language files
         copy_file 'config/locales/devise.en.yml', 'config/locales/devise.en.yml'
         copy_file 'config/locales/mdwa.en.yml', 'config/locales/mdwa.en.yml'
+        copy_file 'config/locales/mdwa.en.yml', 'config/locales/mdwa_model_specific.en.yml'
       end
 
       def routes

data/lib/generators/{mdd → mdwa}/sandbox/templates/app/controllers/a/administrators_controller.rb

@@ -1,6 +1,8 @@
 # -*- encoding : utf-8 -*-
 class A::AdministratorsController < A::BackendController
   
+  load_and_authorize_resource
+  
   def index
     @administrators = Administrator.paginate :page => params[:page]