jro_apps/redmine Commit - r15582:9c3e3a427661

Code cleanup (#24007)....

Jean-Philippe Lang -

r15582:9c3e3a427661

parent child

Context file:

r15582:9c3e3a427661

Collapse all files

lib/generators/redmine_plugin/redmine_plugin_generator.rb +1 -6

             class RedminePluginGenerator < Rails::Generators::NamedBase
               source_root File.expand_path("../templates", __FILE__)
               attr_reader :plugin_path, :plugin_name, :plugin_pretty_name
               def initialize(*args)
                 super
                 @plugin_name = file_name.underscore
                 @plugin_pretty_name = plugin_name.titleize
-                if Redmine::Configuration['plugins_path'].nil?
+                @plugin_path = File.join(Redmine::Plugin.directory, plugin_name)
-                  @plugin_path = File.join(Rails.root, 'plugins', plugin_name)
-                else
-                  @plugin_path = File.join(Redmine::Configuration['plugins_path'], plugin_name)
-                end
-                puts @plugin_path
               end
               def copy_templates
                 empty_directory "#{plugin_path}/app"
                 empty_directory "#{plugin_path}/app/controllers"
                 empty_directory "#{plugin_path}/app/helpers"
                 empty_directory "#{plugin_path}/app/models"
                 empty_directory "#{plugin_path}/app/views"
                 empty_directory "#{plugin_path}/db/migrate"
                 empty_directory "#{plugin_path}/lib/tasks"
                 empty_directory "#{plugin_path}/assets/images"
                 empty_directory "#{plugin_path}/assets/javascripts"
                 empty_directory "#{plugin_path}/assets/stylesheets"
                 empty_directory "#{plugin_path}/config/locales"
                 empty_directory "#{plugin_path}/test"
                 empty_directory "#{plugin_path}/test/fixtures"
                 empty_directory "#{plugin_path}/test/unit"
                 empty_directory "#{plugin_path}/test/functional"
                 empty_directory "#{plugin_path}/test/integration"
                 template 'README.rdoc',    "#{plugin_path}/README.rdoc"
                 template 'init.rb.erb',   "#{plugin_path}/init.rb"
                 template 'routes.rb',    "#{plugin_path}/config/routes.rb"
                 template 'en_rails_i18n.yml',    "#{plugin_path}/config/locales/en.yml"
                 template 'test_helper.rb.erb',    "#{plugin_path}/test/test_helper.rb"
               end
             end

lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb +1 -5

             class RedminePluginControllerGenerator < Rails::Generators::NamedBase
               source_root File.expand_path("../templates", __FILE__)
               argument :controller, :type => :string
               argument :actions, :type => :array, :default => [], :banner => "ACTION ACTION ..."
               attr_reader :plugin_path, :plugin_name, :plugin_pretty_name
               def initialize(*args)
                 super
                 @plugin_name = file_name.underscore
                 @plugin_pretty_name = plugin_name.titleize
-                if Redmine::Configuration['plugins_path'].nil?
+                @plugin_path = File.join(Redmine::Plugin.directory, plugin_name)
-                  @plugin_path = File.join(Rails.root, 'plugins', plugin_name)
-                else
-                  @plugin_path = File.join(Redmine::Configuration['plugins_path'], plugin_name)
-                end
                 @controller_class = controller.camelize
               end
               def copy_templates
                 template 'controller.rb.erb', "#{plugin_path}/app/controllers/#{controller}_controller.rb"
                 template 'helper.rb.erb', "#{plugin_path}/app/helpers/#{controller}_helper.rb"
                 template 'functional_test.rb.erb', "#{plugin_path}/test/functional/#{controller}_controller_test.rb"
                 # View template for each action.
                 actions.each do |action|
                   path = "#{plugin_path}/app/views/#{controller}/#{action}.html.erb"
                   @action_name = action
                   template 'view.html.erb', path
                 end
               end
             end

lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb +1 -5

             class RedminePluginModelGenerator < Rails::Generators::NamedBase
               source_root File.expand_path("../templates", __FILE__)
               argument :model, :type => :string
               argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
               class_option :migration,  :type => :boolean
               class_option :timestamps, :type => :boolean
               class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
               class_option :indexes,    :type => :boolean, :default => true, :desc => "Add indexes for references and belongs_to columns"
               attr_reader :plugin_path, :plugin_name, :plugin_pretty_name
               def initialize(*args)
                 super
                 @plugin_name = file_name.underscore
                 @plugin_pretty_name = plugin_name.titleize
-                if Redmine::Configuration['plugins_path'].nil?
+                @plugin_path = File.join(Redmine::Plugin.directory, plugin_name)
-                  @plugin_path = File.join(Rails.root, 'plugins', plugin_name)
-                else
-                  @plugin_path = File.join(Redmine::Configuration['plugins_path'], plugin_name)
-                end
                 @model_class = model.camelize
                 @table_name = @model_class.tableize
                 @migration_filename = "create_#{@table_name}"
                 @migration_class_name = @migration_filename.camelize
               end
               def copy_templates
                 template 'model.rb.erb', "#{plugin_path}/app/models/#{model.underscore}.rb"
                 template 'unit_test.rb.erb', "#{plugin_path}/test/unit/#{model.underscore}_test.rb"
                 migration_filename = "%03i_#{@migration_filename}.rb" % (migration_number + 1)
                 template "migration.rb", "#{plugin_path}/db/migrate/#{migration_filename}"
               end
               def attributes_with_index
                 attributes.select { |a| a.has_index? || (a.reference? && options[:indexes]) }
               end
               def migration_number
                 current = Dir.glob("#{plugin_path}/db/migrate/*.rb").map do |file|
                   File.basename(file).split("_").first.to_i
                 end.max.to_i
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages