better_record 0.14.3 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a2ed3d62e84a39ecb61ad3477e689758e95b22a369ffcc79d6fbcae6499b455
-  data.tar.gz: bcaa6746d5cda1499bc80fb45c72ad20c3c1023711f8e784a719768425ae1340
+  metadata.gz: 4c8c0660e223718e9b182261ae8e634f7cb482282e992d16fff322126329b3d5
+  data.tar.gz: d9d4f4db5cd4de527f1a5dc418ef91729779c919ad2e83bc7018890c9c30eb54
 SHA512:
-  metadata.gz: a66740d53fbec76869ab77a58764244a80e5f84742a2bf1ac9a5f960cf41120877e1579b5e799217a338545be42160db7d533d872f6feef3d532f662d53a4a0f
-  data.tar.gz: 539875e24030c254395ac8e1b50f3f4951017677eed9a5b6e8ed34eeedc817d89a2db2520d4301a5f1f62c075178bd51a333edee1a5574db25ec49832648b16c
+  metadata.gz: ac488a0d94134d588ca0ae9431d7697cd60c00480ecc061304ce50319355021119d52243aed9b5c84e8f637a943dab2613c0a012a3c263112cb10cfecc6049a3
+  data.tar.gz: 546ce5b69ceadb4c63b9f546efd79544c1a5630f12de517602ba264b1020396aac2bcd944d960dc73737d12a76d697cacbcb9de9853505ed7df7d0b5269dfb47

data/lib/better_record/concerns/controllers/uploadable.rb

@@ -8,10 +8,11 @@ module BetterRecord
       params.require(:upload).permit(:file, :staff_id)
     end
 
-    def csv_upload(job, whitelisted_params, upload_key, prefix, job_sym = :staff_id, redirecting = false)
-      p whitelisted_params
+    def csv_upload(job, whitelisted_params, upload_key, prefix, job_sym = :staff_id)
+
       uploaded = whitelisted_params[upload_key]
       job_id = whitelisted_params[job_sym]
+
       @file_stats = {
         name: uploaded.original_filename,
         "mime-type" => uploaded.content_type,
@@ -23,28 +24,28 @@ module BetterRecord
           file.write(uploaded)
           job.perform_later file.path, job_id, @file_stats[:name]
         end
-        if redirecting
-          flash[:success] ||= []
-          flash[:success] << 'File Uploaded'
-        else
-          flash.now[:success] ||= []
-          flash.now[:success] << 'File Uploaded'
-        end
-        return true
+        # begin
+        #   if redirecting
+        #     flash[:success] ||= []
+        #     flash[:success] << 'File Uploaded'
+        #   else
+        #     flash.now[:success] ||= []
+        #     flash.now[:success] << 'File Uploaded'
+        #   end
+        # rescue NoMethodError
+        #   p "Flash Messages not Enabled"
+        # end
+
+        return [200, 'File Uploaded']
       else
-        msg = [
-          'something went wrong',
-          'Only csv files with the correct headers are supported',
-          "content type: #{whitelisted_params[upload_key].content_type}", "file name: #{whitelisted_params[upload_key].original_filename}"
+        return [
+          422,
+          [
+            'something went wrong',
+            'Only csv files with the correct headers are supported',
+            "content type: #{whitelisted_params[upload_key].content_type}", "file name: #{whitelisted_params[upload_key].original_filename}"
+          ]
         ]
-
-        if redirecting
-          flash[:danger] = msg
-        else
-          flash.now[:danger] = msg
-
-          render :show
-        end
       end
     end
 

data/lib/better_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterRecord
-  VERSION = '0.14.3'
+  VERSION = '0.14.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.14.4
 platform: ruby
 authors:
 - Sampson Crowley