From 3ed69cd5f54c6eda7ee8664aa14c53205ecbb6c5 Mon Sep 17 00:00:00 2001 From: Cristian Bica Date: Tue, 12 Aug 2014 13:53:46 +0300 Subject: Fixed failing tests; Load active_job in railtie; Renamed generator to job --- .../rails/generators/active_job/job_generator.rb | 22 ---------------------- .../rails/generators/active_job/templates/job.rb | 9 --------- .../lib/rails/generators/job/job_generator.rb | 22 ++++++++++++++++++++++ .../lib/rails/generators/job/templates/job.rb | 9 +++++++++ 4 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 activejob/lib/rails/generators/active_job/job_generator.rb delete mode 100644 activejob/lib/rails/generators/active_job/templates/job.rb create mode 100644 activejob/lib/rails/generators/job/job_generator.rb create mode 100644 activejob/lib/rails/generators/job/templates/job.rb (limited to 'activejob/lib/rails') diff --git a/activejob/lib/rails/generators/active_job/job_generator.rb b/activejob/lib/rails/generators/active_job/job_generator.rb deleted file mode 100644 index fe4af0d2cc..0000000000 --- a/activejob/lib/rails/generators/active_job/job_generator.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'rails/generators/named_base' - -module ActiveJob - module Generators # :nodoc: - class JobGenerator < Rails::Generators::NamedBase # :nodoc: - desc 'This generator creates an active job file at app/jobs' - - class_option :queue, type: :string, default: 'default', desc: 'The queue name for the generated job' - - def self.default_generator_root - File.dirname(__FILE__) - end - - check_class_collision suffix: 'Job' - - def create_job_file - template 'job.rb', File.join('app/jobs', class_path, "#{file_name}_job.rb") - end - - end - end -end \ No newline at end of file diff --git a/activejob/lib/rails/generators/active_job/templates/job.rb b/activejob/lib/rails/generators/active_job/templates/job.rb deleted file mode 100644 index 6a21616d30..0000000000 --- a/activejob/lib/rails/generators/active_job/templates/job.rb +++ /dev/null @@ -1,9 +0,0 @@ -<% module_namespacing do -%> -class <%= class_name %>Job < ActiveJob::Base - queue_as :<%= options[:queue] %> - - def perform - # Do something later - end -end -<% end -%> \ No newline at end of file diff --git a/activejob/lib/rails/generators/job/job_generator.rb b/activejob/lib/rails/generators/job/job_generator.rb new file mode 100644 index 0000000000..78a9c27606 --- /dev/null +++ b/activejob/lib/rails/generators/job/job_generator.rb @@ -0,0 +1,22 @@ +require 'rails/generators/named_base' + +module Rails + module Generators # :nodoc: + class JobGenerator < Rails::Generators::NamedBase # :nodoc: + desc 'This generator creates an active job file at app/jobs' + + class_option :queue, type: :string, default: 'default', desc: 'The queue name for the generated job' + + def self.default_generator_root + File.dirname(__FILE__) + end + + check_class_collision suffix: 'Job' + + def create_job_file + template 'job.rb', File.join('app/jobs', class_path, "#{file_name}_job.rb") + end + + end + end +end diff --git a/activejob/lib/rails/generators/job/templates/job.rb b/activejob/lib/rails/generators/job/templates/job.rb new file mode 100644 index 0000000000..6a21616d30 --- /dev/null +++ b/activejob/lib/rails/generators/job/templates/job.rb @@ -0,0 +1,9 @@ +<% module_namespacing do -%> +class <%= class_name %>Job < ActiveJob::Base + queue_as :<%= options[:queue] %> + + def perform + # Do something later + end +end +<% end -%> \ No newline at end of file -- cgit v1.2.3