card-mod-carrierwave 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3780d7a761d471d21388bf3fd35501a6a5aeb0c2e81d8dd96c80cb455193ced
-  data.tar.gz: ffea7deb06932ccdf53e45a58ef86404b52675d24fc583ea8b1541958143f2c3
+  metadata.gz: 4db88ba4c61088ed0c4b4f7f449391c40989dc9e65dab9351ba39adbca478ab3
+  data.tar.gz: 00eeb5ca66fcc328ab975537e1412c6321fe9698830ef0118b627f81e88a1a9f
 SHA512:
-  metadata.gz: 2c5c2e376a1e068a70ec7bbc6f3675da0c6cb3de0e2e51e01f9bc4b34a18c453515a939b8d7372267b9a218acd111750876b50f682b8586ffb4fc47622bb06d0
-  data.tar.gz: fe0acad939beedab5b5284f357089e2157095c97326b4486f0d8810111ddff23cfc7e75d058f8f034b3b25735d982823a85cfb946ab1fdc6d3ecef717b3c9010
+  metadata.gz: a9c4885adefd2d41ebbc579a427c06431b3b88539fba3723a27cccefe18603853ee21f8cce4423f7f4c52acbe83173b94bee094833d3db21b47ce46349b94ad9
+  data.tar.gz: c67f091d70fed1c80f7a842ac69f4f620547ef9b4679e9c48f036021f255be0c2a88b6ee81940c09c25b63b17056fca344b60d47b6c8d77bd437c655efd49f70

data/lib/carrier_wave/file_card_uploader.rb

@@ -1,40 +1,4 @@
 module CarrierWave
-  class << self
-    def tmp_path
-      @tmp_path ||= Card.paths["tmp"].existent.first
-    end
-  end
-
-  class SanitizedFile
-    def content_type
-      # the original content_type method doesn't seem to be very reliable
-      # It uses mime_magic_content_type  - which returns invalid/invalid for css files
-      # that start with a comment - as the second option.  (we switch the order and
-      # use it as the third option)
-      @content_type ||=
-        existing_content_type ||
-        mini_mime_content_type ||
-        mime_magic_content_type
-    end
-  end
-
-  module Uploader
-    # Implements a different name pattern for versions than CarrierWave's
-    # default: we expect the version name at the end of the filename separated
-    # by a dash
-    module Versions
-      private
-
-      # put version at the end of the filename
-      def full_filename for_file
-        name = super(for_file)
-        parts = name.split "."
-        basename = [parts.shift, version_name].compact.join("-")
-        "#{basename}.#{parts.join('.')}"
-      end
-    end
-  end
-
   # Takes care of the file upload for cards with attached files.
   # Most of the upload behaviour depends on the card itself.
   # (e.g. card type and storage option chosen for the card). So in contrary
@@ -162,6 +126,7 @@ module CarrierWave
   class FileCardUploader < Uploader::Base
     attr_accessor :mod
     include Card::Env::Location
+    include Path
 
     STORAGE_TYPES = [:cloud, :web, :coded, :local].freeze
     CONFIG_OPTIONS = [:provider, :attributes, :directory, :public, :credentials,
@@ -230,54 +195,10 @@ module CarrierWave
       end
     end
 
-    def local_url opts={}
-      "%s/%s/%s" % [local_url_base(opts), file_dir, full_filename(url_filename(opts))]
-    end
-
-    def local_url_base opts={}
-      web_path = Card.config.files_web_path
-      opts.delete(:absolute) ? card_url(web_path) : card_path(web_path)
-    end
-
-    def public_path
-      File.join Cardio.paths["public"].existent.first, url
-    end
-
-    def cache_dir
-      @model.files_base_dir + "/cache"
-    end
-
-    # Carrierwave calls store_path without argument when it stores the file
-    # and with the identifier from the db when it retrieves the file.
-    # In our case the first part of our identifier is not part of the path
-    # but we can construct the filename from db data. So we don't need the
-    # identifier.
-    def store_path for_file=nil
-      if for_file
-        retrieve_path
-      else
-        File.join([store_dir, full_filename(filename)].compact)
-      end
-    end
-
-    def retrieve_path
-      File.join([retrieve_dir, full_filename(filename)].compact)
-    end
-
-    def tmp_path
-      Dir.mkdir model.tmp_upload_dir unless Dir.exist? model.tmp_upload_dir
-      File.join model.tmp_upload_dir, filename
-    end
-
     def create_versions? new_file
       model.create_versions? new_file
     end
 
-    # paperclip compatibility used in type/file.rb#core (base format)
-    def path version=nil
-      version ? versions[version].path : super()
-    end
-
     def original_filename
       @original_filename ||= model.selected_action&.comment
     end
@@ -316,4 +237,34 @@ module CarrierWave
       end
     end
   end
+
+  class SanitizedFile
+    def content_type
+      # the original content_type method doesn't seem to be very reliable
+      # It uses mime_magic_content_type  - which returns invalid/invalid for css files
+      # that start with a comment - as the second option.  (we switch the order and
+      # use it as the third option)
+      @content_type ||=
+        existing_content_type ||
+        mini_mime_content_type ||
+        mime_magic_content_type
+    end
+  end
+
+  module Uploader
+    # Implements a different name pattern for versions than CarrierWave's
+    # default: we expect the version name at the end of the filename separated
+    # by a dash
+    module Versions
+      private
+
+      # put version at the end of the filename
+      def full_filename for_file
+        name = super(for_file)
+        parts = name.split "."
+        basename = [parts.shift, version_name].compact.join("-")
+        "#{basename}.#{parts.join('.')}"
+      end
+    end
+  end
 end

data/lib/carrier_wave/file_card_uploader/path.rb

@@ -0,0 +1,54 @@
+module CarrierWave
+  def self.tmp_path
+    @tmp_path ||= Card.paths["tmp"].existent.first
+  end
+
+  class FileCardUploader
+    # path-related methods for uploader
+    module Path
+      def local_url opts={}
+        "%s/%s/%s" % [local_url_base(opts), file_dir, full_filename(url_filename(opts))]
+      end
+
+      def local_url_base opts={}
+        web_path = Card.config.files_web_path
+        opts.delete(:absolute) ? card_url(web_path) : card_path(web_path)
+      end
+
+      def public_path
+        File.join Cardio.paths["public"].existent.first, url
+      end
+
+      def cache_dir
+        @model.files_base_dir + "/cache"
+      end
+
+      # Carrierwave calls store_path without argument when it stores the file
+      # and with the identifier from the db when it retrieves the file.
+      # In our case the first part of our identifier is not part of the path
+      # but we can construct the filename from db data. So we don't need the
+      # identifier.
+      def store_path for_file=nil
+        if for_file
+          retrieve_path
+        else
+          File.join([store_dir, full_filename(filename)].compact)
+        end
+      end
+
+      def retrieve_path
+        File.join([retrieve_dir, full_filename(filename)].compact)
+      end
+
+      def tmp_path
+        Dir.mkdir model.tmp_upload_dir unless Dir.exist? model.tmp_upload_dir
+        File.join model.tmp_upload_dir, filename
+      end
+
+      # paperclip compatibility used in type/file.rb#core (base format)
+      def path version=nil
+        version ? versions[version].path : super()
+      end
+    end
+  end
+end

data/set/abstract/attachment.rb

@@ -110,7 +110,7 @@ rescue StandardError => e
 end
 
 def detect_extension ext
-  return unless (mime_types = Mime::Types[attachment.content_type])
+  return unless (mime_types = MIME::Types[attachment.content_type])
 
   recognized_extension?(mime_types, ext) ? ext : mime_types[0].extensions[0]
 end

data/set/abstract/attachment/cloud.rb

@@ -11,7 +11,7 @@ event :validate_storage_type_update, :validate, on: :update, when: :cloud? do
   #        `update storage_type: :local, file: [file handle]` is ok
   return unless storage_type_changed? && !attachment_is_changing?
 
-  errors.add :storage_type, tr(:moving_files_is_not_supported)
+  errors.add :storage_type, t(:carrierwave_moving_files_is_not_supported)
 end
 
 def bucket

data/set/abstract/attachment/coded.rb

@@ -5,8 +5,12 @@ event :lose_coded_status_on_update, :initialize, on: :update, when: :coded? do
 end
 
 event :validate_coded_storage_type, :validate, on: :save, when: :will_become_coded? do
-  errors.add :storage_type, tr(:mod_argument_needed_to_save) unless mod || @new_mod
-  errors.add :storage_type, tr(:codename_needed_for_storage) if codename.blank?
+  storage_type_error :mod_argument_needed_to_save unless mod || @new_mod
+  storage_type_error :codename_needed_for_storage if codename.blank?
+end
+
+def storage_type_error error_name
+  errors.add :storage_type, t("carrierwave_#{error_name}")
 end
 
 def will_become_coded?

data/set/abstract/attachment/storage_type.rb

@@ -14,12 +14,9 @@ event :storage_type_change, :store, on: :update, when: :storage_type_changed? do
 end
 
 event :validate_storage_type, :validate, on: :save do
-  unless known_storage_type? will_be_stored_as
-    errors.add :storage_type, tr(
-      :unknown_storage_type,
-      new_storage_type: @new_storage_type
-    )
-  end
+  return if known_storage_type? will_be_stored_as
+
+  errors.add :storage_type, unknown_storage_type(@new_storage_type)
 end
 
 def will_be_stored_as
@@ -93,7 +90,7 @@ def valid_storage_type_list
 end
 
 def invalid_storage_type! type
-  raise Card::Error, tr(:error_invalid_storage_type, type: type)
+  raise Card::Error, t(:carrierwave_error_invalid_storage_type, type: type)
 end
 
 def storage_type_from_content
@@ -133,19 +130,21 @@ def storage_type= value
 end
 
 def with_storage_options opts={}
-  old_values = {}
+  old_values = stash_and_set_storage_options opts
   validate_temporary_storage_type_change opts[:storage_type]
-  %i[storage_type mod bucket].each do |opt_name|
-    next unless opts[opt_name]
-    old_values[opt_name] = instance_variable_get "@#{opt_name}"
-    instance_variable_set "@#{opt_name}", opts[opt_name]
-    @temp_storage_type = true
-  end
+  @temp_storage_type = true
   yield
 ensure
   @temp_storage_type = false
-  old_values.each do |key, val|
-    instance_variable_set "@#{key}", val
+  old_values.each { |key, val| instance_variable_set "@#{key}", val }
+end
+
+def stash_and_set_storage_options opts
+  %i[storage_type mod bucket].each_with_object({}) do |opt_name, old_values|
+    next unless opts[opt_name]
+    old_values[opt_name] = instance_variable_get "@#{opt_name}"
+    instance_variable_set "@#{opt_name}", opts[opt_name]
+    old_values
   end
 end
 
@@ -153,14 +152,10 @@ def temporary_storage_type_change?
   @temp_storage_type
 end
 
-def validate_temporary_storage_type_change new_storage_type=nil
-  new_storage_type ||= @new_storage_type
-  return unless new_storage_type
-  unless known_storage_type? new_storage_type
-    raise Error, tr(:unknown_storage_type, new_storage_type: new_storage_type)
-  end
-
-  if new_storage_type == :coded && codename.blank?
+def validate_temporary_storage_type_change type=nil
+  return unless (type ||= @new_storage_type)
+  raise Error, unknown_storage_type(type) unless known_storage_type? type
+  if type == :coded && codename.blank?
     raise Error, "codename needed for storage type :coded"
   end
 end
@@ -168,3 +163,7 @@ end
 def known_storage_type? type=storage_type
   type.in? CarrierWave::FileCardUploader::STORAGE_TYPES
 end
+
+def unknown_storage_type type
+  t :carrierwave_unknown_storage_type, new_storage_type: type
+end

data/set/type/file.rb

@@ -38,7 +38,7 @@ format do
     block_given? ? yield(source) : source
   rescue => e
     Rails.logger.info "Error with file source: #{e.message}"
-    tr :file_error
+    t :carrierwave_file_error
   end
 
   def selected_version
@@ -77,7 +77,7 @@ end
 format :html do
   view :core do
     handle_source do |source|
-      "<a href=\"#{source}\">#{tr :download, title: title_in_context(voo.title)}</a>"
+      haml :core, source: source
     end
   end
 
@@ -111,6 +111,6 @@ format :html do
   end
 
   def preview_editor_delete_text
-    tr :delete
+    t :carrierwave_delete
   end
 end

data/set/type/file/core.haml

@@ -0,0 +1,2 @@
+%a{ href: source }<
+  = t :carrierwave_download, title: title_in_context(voo.title)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.3
+        version: 1.101.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.3
+        version: 1.101.4
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
 description: ''
 email:
 - info@decko.org
@@ -92,6 +92,7 @@ files:
 - config/core_initializers/carrierwave.rb
 - lib/carrier_wave/card_mount.rb
 - lib/carrier_wave/file_card_uploader.rb
+- lib/carrier_wave/file_card_uploader/path.rb
 - lib/carrier_wave/image_card_uploader.rb
 - set/abstract/attachment.rb
 - set/abstract/attachment/cloud.rb
@@ -107,6 +108,7 @@ files:
 - set/self/new_file.rb
 - set/self/new_image.rb
 - set/type/file.rb
+- set/type/file/core.haml
 - set/type/file/file_chooser.haml
 - set/type/file/preview_editor.haml
 - set/type/image.rb