allow separate configuration for open-invoice uploaders.

Author: Mikhail Varabyou

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    open_invoice (0.1.1)
+    open_invoice (0.1.2)
       carrierwave-aws
       jbuilder (~> 2.9)
       orm_adapter (~> 0.5.0)
@@ -79,13 +79,13 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.263.0)
+    aws-partitions (1.267.0)
     aws-sdk-core (3.89.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.27.0)
+    aws-sdk-kms (1.28.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.60.1)
@@ -125,7 +125,7 @@ GEM
     factory_bot_rails (5.1.1)
       factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
-    ffi (1.11.3)
+    ffi (1.12.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     haml (5.1.2)
@@ -308,7 +308,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
     warden (1.2.8)
       rack (>= 2.0.6)
     websocket-driver (0.7.1)

app/uploaders/open_invoice/base_uploader.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# Author: varaby_m@modulotech.fr
+module OpenInvoice
+
+  class BaseUploader < CarrierWave::Uploader::Base
+
+    # Choose what kind of storage to use for this uploader:
+    storage OpenInvoice.config.storage
+    cache_storage :file
+
+    def initialize(*)
+      super
+
+      self.aws_credentials = { access_key_id:     OpenInvoice.config.aws_key_id,
+                               secret_access_key: OpenInvoice.config.aws_secret,
+                               region:            OpenInvoice.config.aws_region,
+                               stub_responses:    Rails.env.test? }
+      self.aws_bucket = OpenInvoice.config.aws_bucket
+      self.aws_acl = 'private'
+      self.aws_attributes = {}
+      self.aws_authenticated_url_expiration = 5.minutes.to_i
+    end
+
+    # Override the directory where uploaded files will be stored.
+    def store_dir
+      File.join(OpenInvoice.config.dir_prefix,
+                model.class.to_s.underscore,
+                mounted_as.to_s,
+                model&.id.to_s)
+    end
+
+  end
+
+end

app/uploaders/open_invoice/original_file_uploader.rb

@@ -4,29 +4,7 @@ module OpenInvoice
 
   # Author: varaby_m@modulotech.fr
   # uploader for invoice's original file
-  class OriginalFileUploader < CarrierWave::Uploader::Base
-
-    # Choose what kind of storage to use for this uploader:
-    storage OpenInvoice.config.storage
-
-    cache_storage :file
-
-    # Override the directory where uploaded files will be stored.
-    def store_dir
-      File.join(OpenInvoice.config.dir_prefix,
-                model.class.to_s.underscore,
-                mounted_as.to_s,
-                model&.id.to_s)
-    end
-
-    # Provide a default URL as a default if there hasn't been a file uploaded:
-    # def default_url(*args)
-    #   # For Rails 3.1+ asset pipeline compatibility:
-    #   # ActionController::Base.helpers.asset_path("fallback/" +
-    #       [version_name, "default.png"].compact.join('_'))
-    #
-    #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-    # end
+  class OriginalFileUploader < BaseUploader
 
     # Add a white list of extensions which are allowed to be uploaded.
     def extension_whitelist

lib/open_invoice/carrier_wave_configure.rb

@@ -36,10 +36,11 @@ def configure
       require "open_invoice/orm/#{config.orm}"
       # load application record for engine's models
       require_relative 'application_record'
-      # load carrierwave configuration
-      require_relative 'carrier_wave_configure'
       # load application mailer for engine's mailers
       require_relative 'application_mailer'
+      # load carrierwave uploaders
+      require 'open_invoice/base_uploader'
+      require 'open_invoice/original_file_uploader'
     end
 
     # shorthand for app_name

lib/open_invoice/configuration.rb

@@ -2,6 +2,6 @@
 
 module OpenInvoice
 
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 
 end

lib/open_invoice/version.rb

@@ -33,6 +33,28 @@
 RSpec.configure do |config|
   config.before(:all) do
     DatabaseCleaner.clean_with :truncation
+    CarrierWave.configure do |cw|
+      cw.storage = :file
+      cw.enable_processing = false
+    end
+    OpenInvoice::BaseUploader.prepend(Module.new do
+      extend ActiveSupport::Concern
+
+      included do
+        storage :file
+        cache_storage :file
+      end
+
+      def store_dir
+        Rails.root.join('tmp/uploads')
+      end
+
+      alias_method :cache_dir, :store_dir
+    end)
+  end
+
+  config.after(:all) do
+    FileUtils.rm_rf(Rails.root.join('tmp/uploads'))
   end
 
   config.around(:each) do |example|