blacklight.rake in blacklight-7.0.0.rc1

- old
+ new

@@ -3,42 +3,47 @@
   # task to clean out old, unsaved searches
   # rake blacklight:delete_old_searches[days_old]
   # example cron entry to delete searches older than 7 days at 2:00 AM every day:
   # 0 2 * * * cd /path/to/your/app && /path/to/rake blacklight:delete_old_searches[7] RAILS_ENV=your_env
   desc "Removes entries in the searches table that are older than the number of days given."
-  task :delete_old_searches, [:days_old] => [:environment] do |t, args|
-    args.with_defaults(:days_old => 7)
+  task :delete_old_searches, [:days_old] => [:environment] do |_t, args|
+    args.with_defaults(days_old: 7)
     Search.delete_old_searches(args[:days_old].to_i)
   end
 
   namespace :index do
     desc "Put sample data into solr"
-    task :seed => [:environment]  do
+    task seed: [:environment]  do
       require 'yaml'
 
-      docs = YAML.load(File.open(File.join(Blacklight.root, 'solr', 'sample_solr_documents.yml')))
+      docs = YAML.safe_load(File.open(File.join(Blacklight.root, 'spec', 'fixtures', 'sample_solr_documents.yml')))
       conn = Blacklight.default_index.connection
       conn.add docs
       conn.commit
     end
   end
 
   namespace :check do
     desc "Check the Solr connection and controller configuration"
     task :solr, [:controller_name] => [:environment] do
+      errors = 0
+      verbose = ENV.fetch('VERBOSE', false).present?
+
+      conn = Blacklight.default_index.connection
+      puts "[#{conn.uri}]"
+
+      print " - admin/ping: "
       begin
-        conn = Blacklight.default_index
-        if conn.ping
-          puts "OK"
-        else
-          puts "Unable to reach: #{conn.uri}"
-          exit 1
-        end
+        response = conn.send_and_receive 'admin/ping', {}
+        puts response['status']
+        errors += 1 unless response['status'] == "OK"
       rescue => e
+        errors += 1
         puts e.to_s
-        exit 1
       end
+
+      exit 1 if errors > 0
     end
 
     task :controller, [:controller_name] => [:environment] do |_, args|
       errors = 0
       verbose = ENV.fetch('VERBOSE', false).present?
@@ -71,11 +76,11 @@
       print " - search_results: "
 
       begin
         response, docs = controller.search_results(q: '{!lucene}*:*')
 
-        if response.header['status'].zero? and docs.any?
+        if response.header['status'].zero? && docs.any?
           puts "OK"
         else
           errors += 1
         end
 
@@ -94,10 +99,10 @@
 
       begin
         doc_id = response.documents.first.id
         response, doc = controller.fetch doc_id
 
-        if response.header['status'].zero? and doc
+        if response.header['status'].zero? && doc
           puts "OK"
         else
           errors += 1
         end
 