Skip to content

Commit 92df5e6

Browse files
nard-techvfonic
authored andcommitted
Refactor namespace Annotate (ctran#719)
* Remove Annotate.#loaded_tasks= and .loaded_tasks * Remove unnecessary comment for Rubocop * Make Annotate.load_requires private * Refactor Annotate.load_tasks
1 parent 40957a6 commit 92df5e6

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

lib/annotate.rb

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# rubocop:disable Metrics/ModuleLength
2-
31
$LOAD_PATH.unshift(File.dirname(__FILE__))
42
require 'annotate/version'
53
require 'annotate/annotate_models'
@@ -72,26 +70,14 @@ def self.setup_options(options = {})
7270
options
7371
end
7472

75-
def self.loaded_tasks=(val)
76-
@loaded_tasks = val
77-
end
78-
79-
def self.loaded_tasks
80-
@loaded_tasks
81-
end
82-
8373
def self.load_tasks
84-
return if loaded_tasks
85-
self.loaded_tasks = true
74+
return if @tasks_loaded
8675

8776
Dir[File.join(File.dirname(__FILE__), 'tasks', '**/*.rake')].each do |rake|
8877
load rake
8978
end
90-
end
9179

92-
def self.load_requires(options)
93-
options[:require].count > 0 &&
94-
options[:require].each { |path| require path }
80+
@tasks_loaded = true
9581
end
9682

9783
def self.eager_load(options)
@@ -146,4 +132,13 @@ def self.bootstrap_rake
146132
load_tasks
147133
Rake::Task[:set_annotation_options].invoke
148134
end
135+
136+
class << self
137+
private
138+
139+
def load_requires(options)
140+
options[:require].count > 0 &&
141+
options[:require].each { |path| require path }
142+
end
143+
end
149144
end

0 commit comments

Comments
 (0)