card-mod-carrierwave 0.13.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7304e98064495ce7fd04793d2c5ba725a3d03badb878d8b7fb5a413cf28a71c
-  data.tar.gz: ebcc5e035dea1a675d2372a2e062d8bf5fade776e65cd867721a251be863ff3d
+  metadata.gz: 74d69d0957e4946371f5aabcb6abaedd5f50123cbe70fbaa7b328817eaf08f32
+  data.tar.gz: 1d3c28ee81ab22e9ceb1aeec7676f82c5c8b4b86ef8b049e3edf624d43b3f3d6
 SHA512:
-  metadata.gz: 2c47c08a8a7f0266be5138934258442158374fb4b7b6604d677df3294c33f2bb2a3d6c9b375224f39f67e8b478448bcca9e42165312e5dbb1b59a68150106963
-  data.tar.gz: 3d5dc7e994acb72df1a2517328f7232babfa0271da38a4ed552a8f5a349ed53cc6dc1f9ee8c94becd03ce39f111c59c671ef0829b60ff593a694df930cbdcc91
+  metadata.gz: a632c57d6d8f90f337dae763b28ca1f31203ddd965df6c7e76fc153289db021801f740891029577eb4b97f2d166f9ca0c11ae0163fed8ac03df9bbf9435a12fd
+  data.tar.gz: '087cb9ac0b11218b8edc46c1f9502860f899edb13ed81eabcf910e6e9075f124320fef93cd894ff3dacee419b6799f6f36564a7759a1d83a50fc696d325ce924'

data/lib/carrier_wave/card_mount.rb

@@ -53,6 +53,7 @@ module CarrierWave
         end
 
         def store_attachment!
+          set_specific.delete :#{column}
           store_#{column}!
         end
 

data/lib/carrier_wave/file_card_uploader/path.rb

@@ -7,7 +7,7 @@ module CarrierWave
     # 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))]
+        "%s/%s/%s" % [local_url_base(opts), file_dir, full_filename(url_filename)]
       end
 
       def local_url_base opts={}

data/lib/carrier_wave/file_card_uploader.rb

@@ -145,7 +145,7 @@ module CarrierWave
 
     def filename
       if model.coded?
-        "#{model.type_code}#{extension}"
+        "#{model.attachment_name}#{extension}"
       else
         "#{action_id}#{extension}"
       end
@@ -167,22 +167,18 @@ module CarrierWave
     # @option opts [Symbol] storage_type
     # @option opts [String] mod
     # @option opts [Symbol] bucket
-    def db_content opts={}
-      model.with_storage_options opts do
-        return model.content if model.web?
-        return "" unless file.present?
+    def db_content
+      return model.content if model.web?
+      return "" unless file.present?
 
-        "%s/%s" % [file_dir, url_filename]
-      end
+      "%s/%s" % [file_dir, url_filename]
     end
 
-    def url_filename opts={}
-      model.with_storage_options opts do
-        if model.coded?
-          "#{model.mod}#{extension}"
-        else
-          "#{action_id}#{extension}"
-        end
+    def url_filename
+      if model.coded?
+        "#{model.mod}#{extension}"
+      else
+        "#{action_id}#{extension}"
       end
     end
 
@@ -206,7 +202,9 @@ module CarrierWave
     end
 
     def action_id
-      model.selected_content_action_id || action_id_stand_in
+      model.selected_content_action_id ||
+        model.last_content_action_id ||
+        action_id_stand_in
     end
 
     # delegate carrierwave's fog config methods to bucket configuration
@@ -227,7 +225,7 @@ module CarrierWave
     # used as action_id in the filename
     # if card is not #actionable?
     def action_id_stand_in
-      Time.now.to_i
+      @action_id_stand_in ||= Time.now.to_i
     end
 
     def storage

data/locales/de.yml

@@ -0,0 +1,13 @@
+de:
+  carrierwave_add_item: "%{attachment_name} hinzufügen..."
+  carrierwave_codename_needed_for_storage: Codename erforderlich für Speichertyp coded
+  carrierwave_delete: Löschen
+  carrierwave_download: Download %{title}
+  carrierwave_error_invalid_storage_type: "%{type} ist keine gültige Dateispeicheroption"
+  carrierwave_file_error: Dateifehler
+  carrierwave_is_missing: fehlt
+  carrierwave_mod_argument_needed_to_save: mod-Argument erforderlich um Karte als coded zu speichern.
+  carrierwave_moving_files_is_not_supported: verschieben von Dateien aus einer Cloud wird nicht unterstützt
+  carrierwave_replace_item: Ersetze %{attachment_name}...
+  carrierwave_unknown_storage_type: unbekannter Speichertyp %{new_storage_type}
+  carrierwave_url_is_missing: Url fehlt

data/set/abstract/attachment/{upload_cache.rb → 00_upload_cache.rb}

@@ -42,6 +42,7 @@ event :assign_attachment_on_update, :initialize,
 end
 
 def assign_attachment file, original_filename
+  @attaching = true
   send "#{attachment_name}=", file
   write_identifier
   @current_action&.update! comment: original_filename
@@ -63,7 +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))
+  return unless (action = Card::Action.fetch(@action_id_of_cached_upload))
 
   delete_files_for_action action
   action.delete
@@ -76,7 +77,7 @@ def upload_cache_card
 end
 
 def preliminary_upload?
-  Card::Env && Card::Env.params[:attachment_upload]
+  Card::Env.params[:attachment_upload]
 end
 
 def save_preliminary_upload?

data/set/abstract/attachment/01_storage_type.rb

@@ -0,0 +1,105 @@
+attr_writer :bucket, :new_storage_type
+
+event :update_storage, :store, on: :update, when: :storage_changed? do
+  send "#{attachment_name}=", current.attachment.file unless @attaching
+  write_identifier
+end
+
+event :validate_storage_type, :validate, on: :save do
+  errors.add :storage_type, unknown_storage_type unless known_storage_type?
+end
+
+def current
+  @current ||= refresh true
+end
+
+def read_only?
+  web? || (cloud? && bucket_config[:read_only])
+end
+
+def cloud?
+  storage_type == :cloud
+end
+
+def web?
+  storage_type == :web
+end
+
+def local?
+  storage_type == :local
+end
+
+def coded?
+  storage_type == :coded
+end
+
+def remote_storage?
+  cloud? || web?
+end
+
+def storage_type= value
+  @explicit_storage_type = true
+  @storage_type = value&.to_sym
+end
+
+def storage_type
+  @storage_type ||= new_card? ? storage_type_from_config : storage_type_from_content
+end
+
+def storage_type_from_config
+  valid_storage_type ENV["FILE_STORAGE"] || Cardio.config.file_storage
+end
+
+def valid_storage_type storage_type
+  storage_type.to_sym.tap do |type|
+    invalid_storage_type! type unless type.in? valid_storage_type_list
+  end
+end
+
+def valid_storage_type_list
+  CarrierWave::FileCardUploader::STORAGE_TYPES
+end
+
+def invalid_storage_type! type
+  raise Card::Error, t(:carrierwave_error_invalid_storage_type, type: type)
+end
+
+def storage_type_from_content
+  @storage_type_from_content ||=
+    case content
+    when /^\(/          then :cloud
+    when %r{/^https?:/} then :web
+    when /^~/           then :local
+    when /^:/           then :coded
+    else
+      if deprecated_mod_file?
+        :coded
+      else
+        storage_type_from_config
+      end
+    end
+end
+
+def storage_changed?
+  (storage_type != current.storage_type) ||
+    (bucket != current.bucket) ||
+    (mod != current.mod)
+end
+
+def known_storage_type?
+  storage_type.in? CarrierWave::FileCardUploader::STORAGE_TYPES
+end
+
+def unknown_storage_type
+  t :carrierwave_unknown_storage_type, new_storage_type: storage_type
+end
+
+def file_updated_at
+  if coded?
+    File.mtime file.path
+  else
+    updated_at
+  end
+rescue Errno::ENOENT # no file at path
+  nil
+end

data/set/abstract/attachment/cloud.rb

@@ -1,17 +1,8 @@
+attr_writer :bucket
+
 event :change_bucket_if_read_only, :initialize,
       on: :update, when: :change_bucket_if_read_only? do
-  @new_storage_type = storage_type_from_config
-end
-
-event :validate_storage_type_update, :validate, on: :update, when: :cloud? do
-  # FIXME: make it possible to retrieve the file from cloud storage
-  #   to store it somewhere else. Currently, it only works to change the
-  #   storage type if a new file is provided
-  #   i.e. `update storage_type: :local` fails but
-  #        `update storage_type: :local, file: [file handle]` is ok
-  return unless storage_type_changed? && !attachment_is_changing?
-
-  errors.add :storage_type, t(:carrierwave_moving_files_is_not_supported)
+  @storage_type = storage_type_from_config
 end
 
 def bucket
@@ -127,11 +118,3 @@ end
 def change_bucket_if_read_only?
   cloud? && bucket_config[:read_only] && attachment_is_changing?
 end
-
-def bucket= value
-  if @action == :update
-    @new_bucket = value
-  else
-    @bucket = value
-  end
-end

data/set/abstract/attachment/coded.rb

@@ -1,27 +1,62 @@
-event :lose_coded_status_on_update, :initialize, on: :update, when: :coded? do
-  # unless explicit
-  return if @new_mod
+MOD_FILE_DIR = "data/files".freeze
 
-  @new_storage_type ||= storage_type_from_config
+event :uncode_attachment_storage, :initialize, on: :update, when: :uncode? do
+  @storage_type = storage_type_from_config unless @explicit_storage_type
 end
 
-event :validate_coded_storage_type, :validate, on: :save, when: :will_become_coded? do
-  storage_type_error :mod_argument_needed_to_save unless mod || @new_mod
+event :validate_coded_storage_type, :validate, on: :save, when: :coded? do
+  storage_type_error :mod_argument_needed_to_save unless 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}")
+def mod= value
+  @mod = value.to_s
 end
 
-def will_become_coded?
-  will_be_stored_as == :coded
+def mod
+  @mod ||= coded? && mod_from_content
 end
 
-def mod= value
-  if @action == :update && mod != value
-    @new_mod = value.to_s
+private
+
+def uncode?
+  (@explicit_storage_type != :coded) && !set_specific[:mod].present? && current.coded?
+  # (@explicit_storage_type != :coded) && !mod && current.coded?
+end
+
+def storage_type_error error_name
+  errors.add :storage_type, t("carrierwave_#{error_name}")
+end
+
+def mod_from_content
+  if (m = content.match %r{^:[^/]+/([^.]+)})
+    m[1] # current mod_file format
   else
-    @mod = value.to_s
+    mod_from_deprecated_content
   end
 end
+
+# place for files of mod file cards
+def coded_dir new_mod=nil
+  dir = File.join mod_dir(new_mod), MOD_FILE_DIR, codename.to_s
+  FileUtils.mkdir_p(dir) unless File.directory?(dir)
+  dir
+end
+
+def mod_dir new_mod=nil
+  mod_name = new_mod || mod
+  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
+
+def deprecated_mod_file?
+  content.present? && !content.match?(/^~/) && content.split("\n")&.size == 4
+end
+
+# old format is still used in card_changes
+def mod_from_deprecated_content
+  content.split("\n").last if deprecated_mod_file?
+end

data/set/abstract/attachment/paths.rb

@@ -1,7 +1,5 @@
-MOD_FILE_DIR = "file".freeze
-
 def store_dir
-  will_become_coded? ? coded_dir(@new_mod) : upload_dir
+  coded? ? coded_dir : upload_dir
 end
 
 def retrieve_dir
@@ -13,22 +11,6 @@ def upload_dir
   id ? "#{files_base_dir}/#{id}" : tmp_upload_dir
 end
 
-# place for files of mod file cards
-def coded_dir new_mod=nil
-  dir = File.join mod_dir(new_mod), MOD_FILE_DIR, codename.to_s
-  FileUtils.mkdir_p(dir) unless File.directory?(dir)
-  dir
-end
-
-def mod_dir new_mod=nil
-  mod_name = new_mod || mod
-  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
-
 def files_base_dir
   dir = bucket ? bucket_config[:subdirectory] : Card.paths["files"].existent.first
   dir || files_base_dir_configuration_error

data/set/abstract/attachment.rb

@@ -11,7 +11,7 @@ end
 # we need a card id for the path so we have to update db_content when we have
 # an id
 event :correct_identifier, :finalize, on: :create, when: proc { |c| !c.web? } do
-  update_column(:db_content, attachment.db_content)
+  update_column :db_content, attachment.db_content
   expire
 end
 
@@ -24,7 +24,7 @@ end
 event :validate_file_exist, :validate, on: :create do
   return if empty_ok?
 
-  if will_be_stored_as == :web
+  if web?
     errors.add "url is missing" if content.blank?
   elsif !attachment.file.present?
     errors.add attachment_name, "is missing"
@@ -54,7 +54,7 @@ def original_filename
 end
 
 def unfilled?
-  !attachment.present? && !save_preliminary_upload? && !subcards? && blank_content?
+  !attachment.present? && !save_preliminary_upload? && super
 end
 
 def attachment_changed?
@@ -78,8 +78,9 @@ def empty_ok?
 end
 
 def assign_set_specific_attributes
+  @attaching = set_specific[attachment_name].present?
   # reset content if we really have something to upload
-  self.content = nil if set_specific[attachment_name].present?
+  self.content = nil if @attaching
   super
 end
 

data/set/type/file.rb

@@ -8,8 +8,6 @@ module SelectedAction
   end
 
   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]
   end

data/set/type/image.rb

@@ -21,7 +21,7 @@ format do
     render_core size: :icon
   end
 
-  view :source do
+  view :source, unknown: :blank do
     return card.content if card.web?
 
     image = selected_version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.4
+        version: 1.104.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.4
+        version: 1.104.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
 description: ''
 email:
 - info@decko.org
@@ -95,14 +95,15 @@ files:
 - lib/carrier_wave/file_card_uploader.rb
 - lib/carrier_wave/file_card_uploader/path.rb
 - lib/carrier_wave/image_card_uploader.rb
+- locales/de.yml
 - locales/en.yml
 - set/abstract/attachment.rb
+- set/abstract/attachment/00_upload_cache.rb
+- set/abstract/attachment/01_storage_type.rb
 - set/abstract/attachment/cloud.rb
 - set/abstract/attachment/coded.rb
 - set/abstract/attachment/local.rb
 - set/abstract/attachment/paths.rb
-- set/abstract/attachment/storage_type.rb
-- set/abstract/attachment/upload_cache.rb
 - set/abstract/attachment/web.rb
 - set/all/file_utils.rb
 - set/self/admin.rb
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: File and Image handling

data/set/abstract/attachment/storage_type.rb

@@ -1,171 +0,0 @@
-attr_writer :bucket, :new_storage_type
-
-event :storage_type_change, :store, on: :update, when: :storage_type_changed? do
-  # carrierwave stores file if @cache_id is not nil
-  attachment.cache_stored_file!
-  # attachment.retrieve_from_cache!(attachment.cache_name)
-  update_storage_attributes
-  # next line might be necessary to move files to cloud
-
-  # make sure that we get the new identifier
-  # otherwise action_id will return wrong id for new identifier
-  db_content_will_change!
-  write_identifier
-end
-
-event :validate_storage_type, :validate, on: :save do
-  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
-  @new_storage_type || storage_type
-end
-
-def read_only?
-  web? || (cloud? && bucket_config[:read_only])
-end
-
-def cloud?
-  storage_type == :cloud
-end
-
-def web?
-  storage_type == :web
-end
-
-def local?
-  storage_type == :local
-end
-
-def coded?
-  storage_type == :coded
-end
-
-def remote_storage?
-  cloud? || web?
-end
-
-def storage_type
-  @storage_type ||=
-    new_card? ? storage_type_from_config : storage_type_from_content
-end
-
-def deprecated_mod_file?
-  content && (lines = content.split("\n")) && lines.size == 4
-end
-
-def mod
-  @mod ||= coded? && mod_from_content
-end
-
-def mod_from_content
-  if (m = content.match %r{^:[^/]+/([^.]+)})
-    m[1] # current mod_file format
-  else
-    mod_from_deprecated_content
-  end
-end
-
-# old format is still used in card_changes
-def mod_from_deprecated_content
-  return if content.match?(/^~/)
-  return unless (lines = content.split("\n")) && lines.size == 4
-
-  lines.last
-end
-
-def storage_type_from_config
-  valid_storage_type ENV["FILE_STORAGE"] || Cardio.config.file_storage
-end
-
-def valid_storage_type storage_type
-  storage_type.to_sym.tap do |type|
-    invalid_storage_type! type unless type.in? valid_storage_type_list
-  end
-end
-
-def valid_storage_type_list
-  CarrierWave::FileCardUploader::STORAGE_TYPES
-end
-
-def invalid_storage_type! type
-  raise Card::Error, t(:carrierwave_error_invalid_storage_type, type: type)
-end
-
-def storage_type_from_content
-  case content
-  when /^\(/          then :cloud
-  when %r{/^https?:/} then :web
-  when /^~/           then :local
-  when /^:/           then :coded
-  else
-    if deprecated_mod_file?
-      :coded
-    else
-      storage_type_from_config
-    end
-  end
-end
-
-def update_storage_attributes
-  @mod = @new_mod if @new_mod
-  @bucket = @new_bucket if @new_bucket
-  @storage_type = @new_storage_type
-end
-
-def storage_type_changed?
-  @new_bucket || (@new_storage_type && @new_storage_type != storage_type) || @new_mod
-end
-
-def storage_type= value
-  known_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
-  else
-    @storage_type = value
-  end
-end
-
-def with_storage_options opts={}
-  old_values = stash_and_set_storage_options opts
-  validate_temporary_storage_type_change opts[:storage_type]
-  @temp_storage_type = true
-  yield
-ensure
-  @temp_storage_type = false
-  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
-
-def temporary_storage_type_change?
-  @temp_storage_type
-end
-
-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
-
-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