Cleaner rake task integration

Andrew
1 parent 3ce4ba21
Showing 4 changed files with 35 additions and 36 deletions Show diff stats
lib/searchkick.rb
lib/searchkick/railtie.rb
lib/searchkick/tasks.rb
lib/tasks/searchkick.rake
@@ -17,15 +17,9 @@ require &quot;searchkick/record_indexer&quot;
 require "searchkick/results"
 require "searchkick/version"
+require "searchkick/railtie" if defined?(Rails)
 require "searchkick/logging" if defined?(ActiveSupport::Notifications)
-begin
-  require "rake"
-rescue LoadError
-  # do nothing
-end
-require "searchkick/tasks" if defined?(Rake)
-
 # background jobs
 begin
   require "active_job"
@@ -0,0 +1,7 @@
+module Searckick
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      load "tasks/searchkick.rake"
+    end
+  end
+end
@@ -1,29 +0,0 @@
-namespace :searchkick do
-  desc "reindex model"
-  task reindex: :environment do
-    if ENV["CLASS"]
-      klass = ENV["CLASS"].constantize rescue nil
-      if klass
-        klass.reindex
-      else
-        abort "Could not find class: #{ENV['CLASS']}"
-      end
-    else
-      abort "USAGE: rake searchkick:reindex CLASS=Product"
-    end
-  end
-
-  if defined?(Rails)
-    namespace :reindex do
-      desc "reindex all models"
-      task all: :environment do
-        Rails.application.eager_load!
-        Searchkick.models.each do |model|
-          puts "Reindexing #{model.name}..."
-          model.reindex
-        end
-        puts "Reindex complete"
-      end
-    end
-  end
-end
@@ -0,0 +1,27 @@
+namespace :searchkick do
+  desc "reindex model"
+  task reindex: :environment do
+    if ENV["CLASS"]
+      klass = ENV["CLASS"].constantize rescue nil
+      if klass
+        klass.reindex
+      else
+        abort "Could not find class: #{ENV['CLASS']}"
+      end
+    else
+      abort "USAGE: rake searchkick:reindex CLASS=Product"
+    end
+  end
+
+  namespace :reindex do
+    desc "reindex all models"
+    task all: :environment do
+      Rails.application.eager_load!
+      Searchkick.models.each do |model|
+        puts "Reindexing #{model.name}..."
+        model.reindex
+      end
+      puts "Reindex complete"
+    end
+  end
+end
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+module Searckick
	2	+ class Railtie < Rails::Railtie
	3	+ rake_tasks do
	4	+ load "tasks/searchkick.rake"
	5	+ end
	6	+ end
	7	+end
	@@ -1,29 +0,0 @@	@@ -1,29 +0,0 @@
1	-namespace :searchkick do
2	- desc "reindex model"
3	- task reindex: :environment do
4	- if ENV["CLASS"]
5	- klass = ENV["CLASS"].constantize rescue nil
6	- if klass
7	- klass.reindex
8	- else
9	- abort "Could not find class: #{ENV['CLASS']}"
10	- end
11	- else
12	- abort "USAGE: rake searchkick:reindex CLASS=Product"
13	- end
14	- end
15	-
16	- if defined?(Rails)
17	- namespace :reindex do
18	- desc "reindex all models"
19	- task all: :environment do
20	- Rails.application.eager_load!
21	- Searchkick.models.each do \|model\|
22	- puts "Reindexing #{model.name}..."
23	- model.reindex
24	- end
25	- puts "Reindex complete"
26	- end
27	- end
28	- end
29	-end
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+namespace :searchkick do
	2	+ desc "reindex model"
	3	+ task reindex: :environment do
	4	+ if ENV["CLASS"]
	5	+ klass = ENV["CLASS"].constantize rescue nil
	6	+ if klass
	7	+ klass.reindex
	8	+ else
	9	+ abort "Could not find class: #{ENV['CLASS']}"
	10	+ end
	11	+ else
	12	+ abort "USAGE: rake searchkick:reindex CLASS=Product"
	13	+ end
	14	+ end
	15	+
	16	+ namespace :reindex do
	17	+ desc "reindex all models"
	18	+ task all: :environment do
	19	+ Rails.application.eager_load!
	20	+ Searchkick.models.each do \|model\|
	21	+ puts "Reindexing #{model.name}..."
	22	+ model.reindex
	23	+ end
	24	+ puts "Reindex complete"
	25	+ end
	26	+ end
	27	+end