card-mod-carrierwave 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4db88ba4c61088ed0c4b4f7f449391c40989dc9e65dab9351ba39adbca478ab3
-  data.tar.gz: 00eeb5ca66fcc328ab975537e1412c6321fe9698830ef0118b627f81e88a1a9f
+  metadata.gz: b3189d4e4979c66b05d69e7b09a602098410d5df3faa5cdd19a96b7b026a69bb
+  data.tar.gz: 774a0049c1c77d4373d5769a965734b797e916606f8ebd959ed97c39315f5646
 SHA512:
-  metadata.gz: a9c4885adefd2d41ebbc579a427c06431b3b88539fba3723a27cccefe18603853ee21f8cce4423f7f4c52acbe83173b94bee094833d3db21b47ce46349b94ad9
-  data.tar.gz: c67f091d70fed1c80f7a842ac69f4f620547ef9b4679e9c48f036021f255be0c2a88b6ee81940c09c25b63b17056fca344b60d47b6c8d77bd437c655efd49f70
+  metadata.gz: 2091526b0eb3da1d50ec833d7d990848a4bd6968b4595a235debccd6b5d802dcb5b32bf20a2abe6b2d0ba2679ad1d8564c755ea2d06f435563cdb08bf76e46e1
+  data.tar.gz: d10af461b8cc1ef9d0eaf8147274ab8e40f9a0106f87e8f153ccd2b4884ff73667fc53c6dfab8391f541dd3e80a552b06fc1d3eb03fd42d3174fdbd150653632

data/lib/carrier_wave/file_card_uploader.rb

@@ -125,16 +125,17 @@ 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,
-                      :authenticated_url_expiration, :use_ssl_for_aws].freeze
-    CONFIG_CREDENTIAL_OPTIONS = [
-      :provider,
-      :aws_access_key_id, :aws_secret_access_key, :region, :host, :endpoint,
-      :google_access_key_id, :google_secret_access_key
+    STORAGE_TYPES = %i[cloud web coded local].freeze
+    CONFIG_OPTIONS = %i[provider attributes directory public credentials
+                        authenticated_url_expiration use_ssl_for_aws].freeze
+    CONFIG_CREDENTIAL_OPTIONS = %i[
+      provider
+      aws_access_key_id aws_secret_access_key region host endpoint
+      google_access_key_id google_secret_access_key
     ].freeze
     delegate :store_dir, :retrieve_dir, :file_dir, :mod, :bucket, to: :model
 
@@ -170,6 +171,7 @@ module CarrierWave
       model.with_storage_options opts do
         return model.content if model.web?
         return "" unless file.present?
+
         "%s/%s" % [file_dir, url_filename]
       end
     end

data/lib/carrier_wave/file_card_uploader/path.rb

@@ -20,7 +20,7 @@ module CarrierWave
       end
 
       def cache_dir
-        @model.files_base_dir + "/cache"
+        "#{@model.files_base_dir}/cache"
       end
 
       # Carrierwave calls store_path without argument when it stores the file

data/lib/carrier_wave/image_card_uploader.rb

@@ -10,7 +10,7 @@ module CarrierWave
     include CarrierWave::MiniMagick
 
     def path version=nil
-      (version && version != :original) ? versions[version].path : super()
+      version && version != :original ? versions[version].path : super()
     end
 
     version :icon, if: :create_versions?, from_version: :small do

data/set/abstract/attachment.rb

@@ -17,11 +17,13 @@ end
 
 event :save_original_filename, :prepare_to_store, on: :save, when: :file_ready_to_save? do
   return unless @current_action
+
   @current_action.update! comment: original_filename
 end
 
 event :validate_file_exist, :validate, on: :create do
   return if empty_ok?
+
   if will_be_stored_as == :web
     errors.add "url is missing" if content.blank?
   elsif !attachment.file.present?
@@ -40,12 +42,14 @@ def file_ready_to_save?
     attachment_is_changing?
 end
 
-def item_names _args={} # needed for flexmail attachments.  hacky.
+# needed for flexmail attachments.  hacky.
+def item_names _args={}
   [name]
 end
 
 def original_filename
   return content.split("/").last if web?
+
   attachment.original_filename
 end
 
@@ -90,6 +94,7 @@ end
 
 def revision action, before_action=false
   return unless (result = super)
+
   result[:empty_ok] = true
   result
 end

data/set/abstract/attachment/cloud.rb

@@ -20,6 +20,7 @@ end
 
 def new_card_bucket
   return unless new_card?
+
   # If the file is assigned before the bucket option we have to
   # check if there is a bucket options in set_specific.
   # That happens for exmaple when the file appears before the bucket in the
@@ -34,6 +35,7 @@ end
 
 def load_bucket_config
   return {} unless bucket
+
   bucket_config = Cardio.config.file_buckets&.dig(bucket.to_sym) || {}
   bucket_config.symbolize_keys!
   bucket_config[:credentials]&.symbolize_keys!
@@ -96,6 +98,7 @@ def each_credential_from_env
   regexp = credential_from_env_regexp
   ENV.each_key do |env_key|
     next unless (m = regexp.match env_key)
+
     yield m[:option].downcase.to_sym
   end
 end
@@ -112,6 +115,7 @@ end
 
 def bucket_from_content
   return unless content
+
   content.match(/^\((?<bucket>[^)]+)\)/) { |m| m[:bucket] }
 end
 

data/set/abstract/attachment/coded.rb

@@ -1,6 +1,7 @@
 event :lose_coded_status_on_update, :initialize, on: :update, when: :coded? do
   # unless explicit
   return if @new_mod
+
   @new_storage_type ||= storage_type_from_config
 end
 

data/set/abstract/attachment/local.rb

@@ -1,4 +1,3 @@
-
 event :update_public_link_on_create, :integrate, on: :create, when: :local? do
   update_public_link
 end
@@ -9,6 +8,7 @@ end
 
 event :update_public_link, after: :update_read_rule, when: :local? do
   return if content.blank?
+
   if who_can(:read).include? Card::AnyoneID
     create_public_links
   else
@@ -21,6 +21,7 @@ private
 def create_public_links
   path = attachment.public_path
   return if File.exist? path
+
   FileUtils.mkdir_p File.dirname(path)
   File.symlink attachment.path, path unless File.symlink? path
   create_versions_public_links
@@ -29,6 +30,7 @@ end
 def create_versions_public_links
   attachment.versions.each_value do |version|
     next if File.symlink? version.public_path
+
     File.symlink version.path, version.public_path
   end
 end
@@ -36,5 +38,6 @@ end
 def remove_public_links
   symlink_dir = File.dirname attachment.public_path
   return unless Dir.exist? symlink_dir
+
   FileUtils.rm_rf symlink_dir
 end

data/set/abstract/attachment/paths.rb

@@ -25,6 +25,7 @@ def mod_dir new_mod=nil
   dir = Cardio::Mod.dirs.path(mod_name) || (mod_name.to_sym == :test && "test")
 
   raise Error, "can't find mod \"#{mod_name}\"" unless dir
+
   dir
 end
 

data/set/abstract/attachment/storage_type.rb

@@ -61,8 +61,8 @@ def mod
 end
 
 def mod_from_content
-  if content =~ %r{^:[^/]+/([^.]+)}
-    Regexp.last_match(1) # current mod_file format
+  if (m = content.match %r{^:[^/]+/([^.]+)})
+    m[1] # current mod_file format
   else
     mod_from_deprecated_content
   end
@@ -70,8 +70,9 @@ end
 
 # old format is still used in card_changes
 def mod_from_deprecated_content
-  return if content =~ /^\~/
+  return if content.match?(/^~/)
   return unless (lines = content.split("\n")) && lines.size == 4
+
   lines.last
 end
 
@@ -95,10 +96,10 @@ end
 
 def storage_type_from_content
   case content
-  when /^\(/           then :cloud
-  when %r{/^https?\:/} then :web
-  when /^~/            then :local
-  when /^\:/           then :coded
+  when /^\(/          then :cloud
+  when %r{/^https?:/} then :web
+  when /^~/           then :local
+  when /^:/           then :coded
   else
     if deprecated_mod_file?
       :coded
@@ -120,7 +121,7 @@ end
 
 def storage_type= value
   known_storage_type? value
-  if @action == :update #&& storage_type != value
+  if @action == :update # && storage_type != value
     # we cant update the storage type directly here
     # if we do then the uploader doesn't find the file we want to update
     @new_storage_type = value
@@ -142,6 +143,7 @@ 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
@@ -153,7 +155,7 @@ def temporary_storage_type_change?
 end
 
 def validate_temporary_storage_type_change type=nil
-  return unless (type ||= @new_storage_type)
+  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"

data/set/abstract/attachment/upload_cache.rb

@@ -27,6 +27,7 @@ end
 event :assign_attachment_on_create, :initialize,
       after: :assign_action, on: :create, when: :save_preliminary_upload? do
   return unless  (action = Card::Action.fetch(@action_id_of_cached_upload))
+
   upload_cache_card.selected_action_id = action.id
   upload_cache_card.select_file_revision
   assign_attachment upload_cache_card.attachment.file, action.comment
@@ -35,6 +36,7 @@ end
 event :assign_attachment_on_update, :initialize,
       after: :assign_action, on: :update, when: :save_preliminary_upload? do
   return unless (action = Card::Action.fetch(@action_id_of_cached_upload))
+
   uploaded_file = with_selected_action_id(action.id) { attachment.file }
   assign_attachment uploaded_file, action.comment
 end
@@ -48,6 +50,7 @@ end
 event :delete_cached_upload_file_on_create, :integrate,
       on: :create, when: :save_preliminary_upload? do
   return unless (action = Card::Action.fetch(@action_id_of_cached_upload))
+
   upload_cache_card.delete_files_for_action action
   action.delete
 end
@@ -61,6 +64,7 @@ end
 event :delete_cached_upload_file_on_update, :integrate,
       on: :update, when: :save_preliminary_upload? do
   return unless  (action = Card::Action.fetch(@action_id_of_cached_upload))
+
   delete_files_for_action action
   action.delete
 end

data/set/self/favicon.rb

@@ -6,6 +6,7 @@ format :html do
 
   view :link_tag, perms: :none do
     return unless (source = render :source, size: :small)
+
     tag :link, rel: "shortcut icon", href: source
   end
 

data/set/type/file.rb

@@ -9,8 +9,9 @@ module SelectedAction
 
   def last_content_action_id
     return super if temporary_storage_type_change?
+
     # find action id from content (saves lookups)
-    db_content.to_s.split(%r{[/\.]})[-2]
+    db_content.to_s.split(%r{[/.]})[-2]
   end
 end
 include SelectedAction
@@ -19,6 +20,7 @@ format do
   view :source do
     file = card.attachment
     return "" unless file.valid?
+
     contextualize_path file.url
   end
 
@@ -33,17 +35,26 @@ format do
   end
 
   def handle_source
-    source = _render_source
-    return "" if source.blank?
-    block_given? ? yield(source) : source
-  rescue => e
-    Rails.logger.info "Error with file source: #{e.message}"
-    t :carrierwave_file_error
+    rescuing_file_source_error do
+      source = _render_source
+      return "" if source.blank?
+
+      block_given? ? yield(source) : source
+    end
   end
 
   def selected_version
     card.attachment
   end
+
+  private
+
+  def rescuing_file_source_error
+    yield
+  rescue StandardError => e
+    Rails.logger.info "Error with file source: #{e.message}"
+    t :carrierwave_file_error
+  end
 end
 
 format :file do
@@ -53,6 +64,7 @@ format :file do
     attachment_format = card.attachment_format(params[:format])
     return _render_not_found unless attachment_format
     return card.format(:html).render_core if card.remote_storage?
+
     set_response_headers
     args_for_send_file
   end
@@ -60,13 +72,14 @@ format :file do
   def args_for_send_file
     file = selected_version
     [file.path, { type: file.content_type,
-                  filename:  "#{card.name.safe_key}#{file.extension}",
+                  filename: "#{card.name.safe_key}#{file.extension}",
                   x_sendfile: true,
                   disposition: (params[:format] == "file" ? "attachment" : "inline") }]
   end
 
   def set_response_headers
     return unless params[:explicit_file] && (response = controller&.response)
+
     response.headers["Expires"] = 1.year.from_now.httpdate
     # currently using default "private", because proxy servers could block
     # needed permission checks
@@ -74,6 +87,10 @@ format :file do
   end
 end
 
+format :json do
+  view(:content) { render_core }
+end
+
 format :html do
   view :core do
     handle_source do |source|

data/set/type/image.rb

@@ -23,8 +23,10 @@ format do
 
   view :source do
     return card.content if card.web?
+
     image = selected_version
     return "" unless image.valid?
+
     contextualize_path image.url
   end
 
@@ -37,10 +39,6 @@ format do
     end
   end
 
-  def handle_source
-    super
-  end
-
   def closed_size
     :icon
   end
@@ -70,11 +68,16 @@ format do
   end
 end
 
+format :json do
+  include File::JsonFormat
+end
+
 format :email_html do
   view :inline, cache: :never do
     handle_source do |source|
       return source unless (mail = inherit :active_mail) &&
                            ::File.exist?(path = selected_version.path)
+
       url = attach_image mail, path
       image_tag url
     end

data/set/type/image/html_views.rb

@@ -4,6 +4,7 @@ format :html do
   # core HTML image view.
   view :core do
     return card.attachment.read if card.svg?
+
     with_valid_source do |source|
       image_tag source, alt: card.name
     end
@@ -34,6 +35,7 @@ format :html do
 
   def preview
     return if card.new_card? && !card.preliminary_upload?
+
     wrap_with :div, class: "attachment-preview",
                     id: "#{card.attachment.filename}-preview" do
       _render_core size: :medium

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-10 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.4
+        version: 1.101.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.4
+        version: 1.101.5
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
 description: ''
 email:
 - info@decko.org