better_record 0.14.2 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10693339476d84da7e105549ee3479725c69bc9dd3960bfbfafd7f3f94716387
-  data.tar.gz: da86ab0688c1204e84814744dcf29e4aad44a825de7341286b406cdd11b6c006
+  metadata.gz: 7a2ed3d62e84a39ecb61ad3477e689758e95b22a369ffcc79d6fbcae6499b455
+  data.tar.gz: bcaa6746d5cda1499bc80fb45c72ad20c3c1023711f8e784a719768425ae1340
 SHA512:
-  metadata.gz: a8c4bc986a04d078db1a5caae062dce3493ac4346140c6f63e4dc1e12052efefe16ed4140f1bcc05bc5a9eecece16580861e0f9a6348d302ef34852036fd835b
-  data.tar.gz: a651c863574c81a8b85412bd6f0dfe2e50ddcbaa5ab1fd31a94c129a627d4ce38516a0ac97d3475839f5ed97915dd0a676cbb1e80b90628056d1230ea83ce73b
+  metadata.gz: a66740d53fbec76869ab77a58764244a80e5f84742a2bf1ac9a5f960cf41120877e1579b5e799217a338545be42160db7d533d872f6feef3d532f662d53a4a0f
+  data.tar.gz: 539875e24030c254395ac8e1b50f3f4951017677eed9a5b6e8ed34eeedc817d89a2db2520d4301a5f1f62c075178bd51a333edee1a5574db25ec49832648b16c

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

@@ -1,68 +1,70 @@
 # frozen_string_literal: true
 
-module Uploadable
-  extend ActiveSupport::Concern
+module BetterRecord
+  module Uploadable
+    extend ActiveSupport::Concern
 
-  def whitelisted_upload_params
-    params.require(:upload).permit(:file, :staff_id)
-  end
+    def whitelisted_upload_params
+      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
-    uploaded = whitelisted_params[upload_key]
-    job_id = whitelisted_params[job_sym]
-    @file_stats = {
-      name: uploaded.original_filename,
-      "mime-type" => uploaded.content_type,
-      size: view_context.number_to_human_size(uploaded.size)
-    }
-    if verify_file(whitelisted_params, upload_key)
-      File.open(Rails.root.join('public', 'import_csv', "#{prefix}_#{Time.now.to_i}#{rand(1000..100000)}.csv"), 'wb') do |file|
-        uploaded = BetterRecord::Encoder.new(uploaded.read).to_utf8
-        file.write(uploaded)
-        job.perform_later file.path, job_id, @file_stats[:name]
-      end
-      if redirecting
-        flash[:success] ||= []
-        flash[:success] << 'File Uploaded'
+    def csv_upload(job, whitelisted_params, upload_key, prefix, job_sym = :staff_id, redirecting = false)
+      p whitelisted_params
+      uploaded = whitelisted_params[upload_key]
+      job_id = whitelisted_params[job_sym]
+      @file_stats = {
+        name: uploaded.original_filename,
+        "mime-type" => uploaded.content_type,
+        size: view_context.number_to_human_size(uploaded.size)
+      }
+      if verify_file(whitelisted_params, upload_key)
+        File.open(Rails.root.join('public', 'import_csv', "#{prefix}_#{Time.now.to_i}#{rand(1000..100000)}.csv"), 'wb') do |file|
+          uploaded = BetterRecord::Encoder.new(uploaded.read).to_utf8
+          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
       else
-        flash.now[:success] ||= []
-        flash.now[:success] << 'File Uploaded'
-      end
-      return true
-    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}"
-      ]
+        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}"
+        ]
 
-      if redirecting
-        flash[:danger] = msg
-      else
-        flash.now[:danger] = msg
+        if redirecting
+          flash[:danger] = msg
+        else
+          flash.now[:danger] = msg
 
-        render :show
+          render :show
+        end
       end
     end
-  end
 
-  private
-    def verify_file(whitelisted_params, upload_key)
-      correct_mime_type(whitelisted_params, upload_key) && /\.csv/ =~ whitelisted_params[upload_key].original_filename
-    end
+    private
+      def verify_file(whitelisted_params, upload_key)
+        correct_mime_type(whitelisted_params, upload_key) && /\.csv/ =~ whitelisted_params[upload_key].original_filename
+      end
 
-    def correct_mime_type(whitelisted_params, upload_key)
-      [
-        "text/csv",
-        "text/plain",
-        "application/vnd.ms-excel",
-        "text/x-csv",
-        "application/csv",
-        "application/x-csv",
-        "text/csv",
-        "text/comma-separated-values",
-        "text/x-comma-separated-values"
-      ].any? {|mime| mime == whitelisted_params[upload_key].content_type}
-    end
+      def correct_mime_type(whitelisted_params, upload_key)
+        [
+          "text/csv",
+          "text/plain",
+          "application/vnd.ms-excel",
+          "text/x-csv",
+          "application/csv",
+          "application/x-csv",
+          "text/csv",
+          "text/comma-separated-values",
+          "text/x-comma-separated-values"
+        ].any? {|mime| mime == whitelisted_params[upload_key].content_type}
+      end
+  end
 end

data/lib/better_record/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.3
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails