spotlight_search 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc74895f3a5f55970160db1457820b6f00334528d14cfbb7f2bf693afe3ff972
-  data.tar.gz: 71060fb2c54856d67a85a4d2c97b49933c2bacc459bd3d52ecc6105ace9740d3
+  metadata.gz: 6c0ea70816711ee5ddc92a80692e72fba928b39161c2d24deb08b4ab58484f16
+  data.tar.gz: 27427b059ab99ac747e3239b5bf5e3675924966f724eecac804185c8b7198132
 SHA512:
-  metadata.gz: 13be0c5c2c695c350f63a16c1c24c73645ad6768993f7afbe6dec22d0be2db58a3d3e1227cbfffa91adc83937caaadee0128b6ed2fd0cae1764452e46354619a
-  data.tar.gz: 70e6cca5f7ccce8297fb72497b6e3f54eeaaa76ea4903ec546ab1dc946b2ef2e62f232845cd7e3ce462a899de465aaea29987ef37dbe59a970b7a95090f2250d
+  metadata.gz: b898869bc37e815628e98a1851e63cdb854b5f5a3b5056cefca336aef92430fbb6755d07f22c33fde9cb43635ac25d88a9298e8c4b90dbd6c7b96f688acaa92f
+  data.tar.gz: 0e740359d3610928b62382c6eecf38f81faff3e82039236c63e6c3909e82ce8e0536ee96e313b610417650888f7f1ac9955284177a4fa5051435c66f4492abeb

data/app/jobs/spotlight_search/export_job.rb

@@ -5,7 +5,7 @@ module SpotlightSearch
     def perform(email, klass, columns = [], filters = {})
       klass = klass.constantize
       records = get_records(klass, filters, columns)
-      file_path = create_excel(records, klass.name)
+      file_path = create_excel(records, klass.name, columns)
       subject = "#{klass.name} export at #{Time.now}"
       ExportMailer.send_excel_file(email, file_path, subject).deliver_now
       File.delete(file_path)
@@ -33,20 +33,18 @@ module SpotlightSearch
 
     # Creating excel with the passed records
     # Keys as headers and values as row
-    def create_excel(records, klass)
-      records = records.as_json
-      headers = records.first.keys
+    def create_excel(records, klass, columns)
       size_arr = []
-      headers.size.times { size_arr << 22 }
+      columns.size.times { size_arr << 22 }
       xl = Axlsx::Package.new
       xl.workbook.add_worksheet do |sheet|
-        sheet.add_row headers, b: true
+        sheet.add_row columns, b: true
         records.each do |record|
-          sheet.add_row record.values
+          sheet.add_row columns.map { |column| record.send(column) }
         end
         sheet.column_widths *size_arr
       end
-      file_location = "#{Rails.root}/public/export_#{klass}_#{Time.now.to_s}"
+      file_location = "#{Rails.root}/public/export_#{klass}_#{Time.now.to_s}.xls"
       xl.serialize(file_location)
       file_location
     end

data/lib/spotlight_search/exportable_columns.rb

@@ -29,28 +29,33 @@ module SpotlightSearch
       #   end
       #
       def export_columns(enabled: false, only: nil, except: nil)
-        if enabled
-          self.export_enabled = true
-          all_columns = self.column_names.map(&:to_sym)
-          if only.present?
-            unless (valid_columns = only & all_columns).size == only.size
-              invalid_columns = only - valid_columns
-              raise SpotlightSearch::Exceptions::InvalidColumns.new(nil, invalid_columns)
+        begin
+          unless ActiveRecord::Base.connection.migration_context.needs_migration?
+            if enabled
+              self.export_enabled = true
+              all_columns = self.column_names.map(&:to_sym)
+              if only.present?
+                unless (valid_columns = only & all_columns).size == only.size
+                  invalid_columns = only - valid_columns
+                  raise SpotlightSearch::Exceptions::InvalidColumns.new(nil, invalid_columns)
+                end
+                self.enabled_columns = only
+              else
+                self.enabled_columns = all_columns
+              end
+              if except.present?
+                unless (valid_columns = except & all_columns).size == except.size
+                  invalid_columns = except - valid_columns
+                  raise SpotlightSearch::Exceptions::InvalidColumns.new(nil, invalid_columns)
+                end
+                self.enabled_columns = self.enabled_columns - except
+              end
+            else
+              self.export_enabled = false
+              self.enabled_columns = nil
             end
-            self.enabled_columns = only
-          else
-            self.enabled_columns = all_columns
           end
-          if except.present?
-            unless (valid_columns = except & all_columns).size == except.size
-              invalid_columns = except - valid_columns
-              raise SpotlightSearch::Exceptions::InvalidColumns.new(nil, invalid_columns)
-            end
-            self.enabled_columns = self.enabled_columns - except
-          end
-        else
-          self.export_enabled = false
-          self.enabled_columns = nil
+        rescue ActiveRecord::NoDatabaseError
         end
       end
 

data/lib/spotlight_search/version.rb

@@ -1,3 +1,3 @@
 module SpotlightSearch
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotlight_search
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Anbazhagan Palani