card-mod-carrierwave 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9f40c24667705b62968b1a43a7934b3579fc7d67e3442c73182c4c9c85a4242
-  data.tar.gz: 84f324d97c7d194785b5566a64799e0533334d560f91450f1a9517d6bd70cf42
+  metadata.gz: a249b3cb9824547e04d317283684d5c36e27824cf9ed6dc8b8a1754ebe00f161
+  data.tar.gz: 0a6b53cec1fa1132f36b0753c0b7812fbc1beb92ec5c56a9b9f3c54b7a54410a
 SHA512:
-  metadata.gz: 85e5549724e44cb356b0c19290f0eb4941e7b2507b1f582f14d8b20ffce5e43b77954351b590393dbfc1d3815ae5739ccc795fceb661f91213c8aaed4023d7c4
-  data.tar.gz: 9c3818ab31b033e689adc355779c36481c781f6f2468a633ca0d5666908ed7be1734dafc10d483445e27afecfb22b5ad8cc27498b2200aee5824445c3e1e56c4
+  metadata.gz: f50f32137fd27d10eebcf066ddb08d2d3f4d9ad7e2502209985ff75986c2d4827e83488432fecba7650cc7594fb1f1bf0a277c7ee5017c1c1419ce7a8b563136
+  data.tar.gz: '0819efe2f7570fc0a5494e69dd463eb6696351a7435bcb28f7f1998ffa45f4405d5e1cace72ae6056a0b7dabb68e50d171656f735eec4fa3af1fd0f0c798cec1'

data/assets/script/upload.js.coffee

@@ -0,0 +1,72 @@
+decko.editors.init[".file-upload"] = -> decko.upload_file(this)
+
+$.extend decko,
+  upload_file: (fileupload) ->
+    # for file as a subcard in a form,
+    # excess parameters are included in the request which cause errors.
+    # only the file, type_id and attachment_card_name are needed
+    # attachment_card_name is the original card name,
+    # ex: card[subcards][+logo][image], card[file]
+    $(fileupload).on 'fileuploadsubmit', (e,data) ->
+      $_this = $(this)
+      card_name = $_this.siblings(".attachment_card_name:first").attr("name")
+      type_id = $_this.siblings("#attachment_type_id").val()
+      data.formData = {
+        "card[type_id]": type_id,
+        "attachment_upload": card_name
+      }
+    $_fileupload = $(fileupload)
+    if $_fileupload.closest("form").attr("action").indexOf("update") > -1
+      url = "card/update/"+$(fileupload).siblings("#file_card_name").val()
+    else
+      url = "card/create"
+    $(fileupload).fileupload(
+      url: decko.path(url),
+      dataType: 'html',
+      done: decko.doneFile,
+      add: decko.chooseFile,
+      progressall: decko.progressallFile
+    )#, forceIframeTransport: true )
+
+  chooseFile: (e, data) ->
+    data.form.find('button[type=submit]').attr('disabled',true)
+    editor = $(this).closest '.card-editor'
+    $('#progress').show()
+    editor.append '<input type="hidden" class="extra_upload_param" ' +
+                  'value="true" name="attachment_upload">'
+    editor.append '<input type="hidden" class="extra_upload_param" ' +
+                  'value="preview_editor" name="view">'
+    data.submit()
+    editor.find('.choose-file').hide()
+    # editor.find(".file-upload").prop "disabled", true
+    editor.find('.extra_upload_param').remove()
+
+  progressallFile: (e, data) ->
+    progress = parseInt(data.loaded / data.total * 100, 10)
+    $('#progress .progress-bar').css('width', progress + '%')
+
+  doneFile: (e, data) ->
+    editor = $(this).closest '.card-editor'
+    editor.find('.chosen-file').replaceWith data.result
+    data.form.find('button[type=submit]').attr('disabled',false)
+
+$(window).ready ->
+  $('body').on 'click', '.cancel-upload', ->
+    editor = $(this).closest '.card-editor'
+    editor.find('.choose-file').show()
+    # editor.find(".file-upload").prop "disabled", false
+    editor.find('.chosen-file').empty()
+    editor.find('.progress').show()
+    editor.find('#progress .progress-bar').css('width', '0%')
+    editor.find('#progress').hide()
+
+  $('body').on "submit", "form", ->
+    disableUploader this, true
+
+  $("body").on "ajax:complete", "form", ->
+    disableUploader this, false
+
+disableUploader = (form, toggle) ->
+  uploader = $(form).find ".file-upload[type=file]"
+  if uploader[0]
+    uploader.prop "disabled", toggle

data/assets/style/file.scss

@@ -0,0 +1,30 @@
+/* -- file upload -- */
+.fileupload-buttonbar .btn, .fileupload-buttonbar .toggle {
+  margin-bottom: 5px;
+}
+
+.fileinput-button {
+  position: relative;
+  overflow: hidden;
+  display: inline-block;
+  input {
+    position: absolute;
+    top: 0;
+    right: 0;
+    margin: 0;
+    opacity: 0;
+    -ms-filter: 'alpha(opacity=0)';
+    font-size: 200px;
+    direction: ltr;
+    cursor: pointer;
+  }
+}
+
+.TYPE-image {
+  .d0-card-content, .d0-card-body, &.d0-card-content {
+    img {
+      max-width: 100%;
+      max-height: 100%;
+    }
+  }
+}

data/data/files/file1.txt

@@ -0,0 +1 @@
+file1

data/data/files/file2.txt

@@ -0,0 +1 @@
+file2

data/data/files/file3.txt

@@ -0,0 +1 @@
+file3, man.

data/data/files/logo/image-original.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="min-width:65px;min-height:45px;margin-top:-12px;margin-bottom:-14px" version="1.1" viewBox="0 0 242 218"><title>b&amp;w_logo</title><desc>Created with Sketch.</desc><defs><rect id="path-1" width="157.28" height="190.607" x="35.33" y="10.485" rx="12.491"/><filter id="filter-2" width="125.4%" height="121%" x="-12.1%" y="-10.5%" filterUnits="objectBoundingBox"><feMorphology in="SourceAlpha" operator="dilate" radius="1" result="shadowSpreadOuter1"/><feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="5.5"/><feColorMatrix in="shadowBlurOuter1" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/></filter><rect id="path-3" width="123.953" height="171.161" x="51.988" y="19.404" rx="9.689"/><filter id="filter-4" width="132.3%" height="123.4%" x="-15.3%" y="-11.7%" filterUnits="objectBoundingBox"><feMorphology in="SourceAlpha" operator="dilate" radius="1" result="shadowSpreadOuter1"/><feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="5.5"/><feColorMatrix in="shadowBlurOuter1" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/></filter><path id="path-5" d="M70.1050368,35.6666109 L159.089911,35.6666109 L159.089911,35.6666109 C163.678051,35.6666109 167.397473,39.386033 167.397473,43.9741728 L167.397473,87.717145 L167.397473,166.808436 L167.397473,166.808436 C167.397473,171.396576 163.678051,175.115998 159.089911,175.115998 L70.1050368,175.115998 L70.1050368,175.115998 C65.516897,175.115998 61.7974749,171.396576 61.7974749,166.808436 L61.7974749,43.9741728 L61.7974749,43.9741728 C61.7974749,39.386033 65.516897,35.6666109 70.1050368,35.6666109 Z"/><filter id="filter-6" width="137.9%" height="128.7%" x="-18%" y="-14.3%" filterUnits="objectBoundingBox"><feMorphology in="SourceAlpha" operator="dilate" radius="1" result="shadowSpreadOuter1"/><feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="5.5"/><feColorMatrix in="shadowBlurOuter1" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/></filter><rect id="path-7" width="92.149" height="107.187" x="70.764" y="49.853" rx="7.866"/><filter id="filter-8" width="143.4%" height="137.3%" x="-20.6%" y="-18.7%" filterUnits="objectBoundingBox"><feMorphology in="SourceAlpha" operator="dilate" radius="1" result="shadowSpreadOuter1"/><feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="5.5"/><feColorMatrix in="shadowBlurOuter1" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.102553216 0"/></filter></defs><g id="Page-3" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="b&amp;w_logo" fill-rule="nonzero"><g id="Decko-Logo-" transform="translate(7.000000, 4.000000)"><g id="g5642"><g id="svg-card-1" transform="translate(113.969540, 105.788552) scale(-1, 1) rotate(105.855860) translate(-113.969540, -105.788552)"><use fill="#000" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"/><use fill="#4D4D4D" fill-rule="evenodd" xlink:href="#path-1"/></g><g id="svg-card-2" opacity=".88" transform="translate(113.964538, 104.984820) scale(-1, 1) rotate(117.480003) translate(-113.964538, -104.984820)"><use fill="#000" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-3"/><use fill="#FFF" fill-rule="evenodd" xlink:href="#path-3"/></g><g id="svg-card-3" transform="translate(114.597474, 105.391304) scale(-1, 1) rotate(133.539993) translate(-114.597474, -105.391304)"><use fill="#000" fill-opacity="1" filter="url(#filter-6)" xlink:href="#path-5"/><use fill="#4C4C4C" fill-rule="evenodd" xlink:href="#path-5"/></g><g id="svg-card-4" opacity=".88" transform="translate(116.838368, 103.446228) scale(-1, 1) rotate(142.690002) translate(-116.838368, -103.446228)"><use fill="#000" fill-opacity="1" filter="url(#filter-8)" xlink:href="#path-7"/><use fill="#FFF" fill-rule="evenodd" xlink:href="#path-7"/></g></g></g></g></g></svg>

data/data/files/logo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="min-width:65px;min-height:45px;margin-top:-12px;margin-bottom:-14px" version="1.1" viewBox="0 0 242 218"><title>b&amp;w_logo</title><desc>Created with Sketch.</desc><defs><rect id="path-1" width="157.28" height="190.607" x="35.33" y="10.485" rx="12.491"/><filter id="filter-2" width="125.4%" height="121%" x="-12.1%" y="-10.5%" filterUnits="objectBoundingBox"><feMorphology in="SourceAlpha" operator="dilate" radius="1" result="shadowSpreadOuter1"/><feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="5.5"/><feColorMatrix in="shadowBlurOuter1" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/></filter><rect id="path-3" width="123.953" height="171.161" x="51.988" y="19.404" rx="9.689"/><filter id="filter-4" width="132.3%" height="123.4%" x="-15.3%" y="-11.7%" filterUnits="objectBoundingBox"><feMorphology in="SourceAlpha" operator="dilate" radius="1" result="shadowSpreadOuter1"/><feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="5.5"/><feColorMatrix in="shadowBlurOuter1" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/></filter><path id="path-5" d="M70.1050368,35.6666109 L159.089911,35.6666109 L159.089911,35.6666109 C163.678051,35.6666109 167.397473,39.386033 167.397473,43.9741728 L167.397473,87.717145 L167.397473,166.808436 L167.397473,166.808436 C167.397473,171.396576 163.678051,175.115998 159.089911,175.115998 L70.1050368,175.115998 L70.1050368,175.115998 C65.516897,175.115998 61.7974749,171.396576 61.7974749,166.808436 L61.7974749,43.9741728 L61.7974749,43.9741728 C61.7974749,39.386033 65.516897,35.6666109 70.1050368,35.6666109 Z"/><filter id="filter-6" width="137.9%" height="128.7%" x="-18%" y="-14.3%" filterUnits="objectBoundingBox"><feMorphology in="SourceAlpha" operator="dilate" radius="1" result="shadowSpreadOuter1"/><feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="5.5"/><feColorMatrix in="shadowBlurOuter1" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/></filter><rect id="path-7" width="92.149" height="107.187" x="70.764" y="49.853" rx="7.866"/><filter id="filter-8" width="143.4%" height="137.3%" x="-20.6%" y="-18.7%" filterUnits="objectBoundingBox"><feMorphology in="SourceAlpha" operator="dilate" radius="1" result="shadowSpreadOuter1"/><feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="5.5"/><feColorMatrix in="shadowBlurOuter1" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.102553216 0"/></filter></defs><g id="Page-3" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="b&amp;w_logo" fill-rule="nonzero"><g id="Decko-Logo-" transform="translate(7.000000, 4.000000)"><g id="g5642"><g id="svg-card-1" transform="translate(113.969540, 105.788552) scale(-1, 1) rotate(105.855860) translate(-113.969540, -105.788552)"><use fill="#000" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"/><use fill="#4D4D4D" fill-rule="evenodd" xlink:href="#path-1"/></g><g id="svg-card-2" opacity=".88" transform="translate(113.964538, 104.984820) scale(-1, 1) rotate(117.480003) translate(-113.964538, -104.984820)"><use fill="#000" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-3"/><use fill="#FFF" fill-rule="evenodd" xlink:href="#path-3"/></g><g id="svg-card-3" transform="translate(114.597474, 105.391304) scale(-1, 1) rotate(133.539993) translate(-114.597474, -105.391304)"><use fill="#000" fill-opacity="1" filter="url(#filter-6)" xlink:href="#path-5"/><use fill="#4C4C4C" fill-rule="evenodd" xlink:href="#path-5"/></g><g id="svg-card-4" opacity=".88" transform="translate(116.838368, 103.446228) scale(-1, 1) rotate(142.690002) translate(-116.838368, -103.446228)"><use fill="#000" fill-opacity="1" filter="url(#filter-8)" xlink:href="#path-7"/><use fill="#FFF" fill-rule="evenodd" xlink:href="#path-7"/></g></g></g></g></g></svg>

data/data/files/mod_carrierwave_script_asset_output/file.js

@@ -0,0 +1,2 @@
+// upload.js.coffee
+(function(){var e;decko.editors.init[".file-upload"]=function(){return decko.upload_file(this)},$.extend(decko,{upload_file:function(e){var t;return $(e).on("fileuploadsubmit",function(e,t){var r,i,a;return i=(r=$(this)).siblings(".attachment_card_name:first").attr("name"),a=r.siblings("#attachment_type_id").val(),t.formData={"card[type_id]":a,attachment_upload:i}}),t=$(e).closest("form").attr("action").indexOf("update")>-1?"card/update/"+$(e).siblings("#file_card_name").val():"card/create",$(e).fileupload({url:decko.path(t),dataType:"html",done:decko.doneFile,add:decko.chooseFile,progressall:decko.progressallFile})},chooseFile:function(e,t){var r;return t.form.find("button[type=submit]").attr("disabled",!0),r=$(this).closest(".card-editor"),$("#progress").show(),r.append('<input type="hidden" class="extra_upload_param" value="true" name="attachment_upload">'),r.append('<input type="hidden" class="extra_upload_param" value="preview_editor" name="view">'),t.submit(),r.find(".choose-file").hide(),r.find(".extra_upload_param").remove()},progressallFile:function(e,t){var r;return r=parseInt(t.loaded/t.total*100,10),$("#progress .progress-bar").css("width",r+"%")},doneFile:function(e,t){return $(this).closest(".card-editor").find(".chosen-file").replaceWith(t.result),t.form.find("button[type=submit]").attr("disabled",!1)}}),$(window).ready(function(){return $("body").on("click",".cancel-upload",function(){var e;return(e=$(this).closest(".card-editor")).find(".choose-file").show(),e.find(".chosen-file").empty(),e.find(".progress").show(),e.find("#progress .progress-bar").css("width","0%"),e.find("#progress").hide()}),$("body").on("submit","form",function(){return e(this,!0)}),$("body").on("ajax:complete","form",function(){return e(this,!1)})}),e=function(e,t){var r;if((r=$(e).find(".file-upload[type=file]"))[0])return r.prop("disabled",t)}}).call(this);

data/data/real.yml

@@ -0,0 +1,118 @@
+#---
+- :name: File
+  :type: :cardtype
+  :codename: file
+  :fields:
+    :description: |-
+      <p>
+        Upload images to these cards and include them anywhere.
+        [[http://decko.org/Image|more]]
+      </p>
+
+- :name: Image
+  :type: :cardtype
+  :codename: image
+  :fields:
+    :description: |-
+      <p>
+        File cards are for uploading and downloading files.
+        [[http://decko.org/File|more]]
+      </p>
+- :name:
+    - :image
+    - :right
+    - :default
+  :type: :image
+
+- :name: "*logo"
+  :type: :image
+  :codename: logo
+  :storage_type: :coded
+  :image: logo.svg
+  :fields:
+    :self:
+      :fields:
+        :read: Anyone
+- :name: "*favicon"
+  :type: :image
+  :codename: favicon
+  :image: favicon.png
+  :storage_type: :coded
+
+
+- :name: "*new file"
+  :type: :file
+  :codename: new_file
+  :skip: validate_file_exist
+- :name: "*new image"
+  :type: :image
+  :codename: new_image
+  :skip: validate_file_exist
+
+# TODO: move to code.  should not be editable
+# Probably not in this mod, though. Needed to come after :image for eating, but it would
+# probably make more sense to have this in the format mod in code.
+- :name:
+    - :credit
+    - :image
+  :type: :html
+  :content: |-
+    <svg style="width:18px; height:14px;" viewBox="0 0 242 220" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+      <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+      <title>b&amp;w_logo</title>
+      <desc>Created with Sketch.</desc>
+      <defs>
+          <rect id="path-1" x="35.3297422" y="10.484836" width="157.279595" height="190.607432" rx="12.491335"></rect>
+          <filter x="-12.1%" y="-10.5%" width="125.4%" height="121.0%" filterUnits="objectBoundingBox" id="filter-2">
+              <feMorphology radius="1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+              <feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+              <feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+              <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+          </filter>
+          <rect id="path-3" x="51.9878879" y="19.404077" width="123.9533" height="171.161486" rx="9.6888466"></rect>
+          <filter x="-15.3%" y="-11.7%" width="132.3%" height="123.4%" filterUnits="objectBoundingBox" id="filter-4">
+              <feMorphology radius="1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+              <feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+              <feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+              <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+          </filter>
+          <path d="M70.1050368,35.6666109 L159.089911,35.6666109 L159.089911,35.6666109 C163.678051,35.6666109 167.397473,39.386033 167.397473,43.9741728 L167.397473,87.717145 L167.397473,166.808436 L167.397473,166.808436 C167.397473,171.396576 163.678051,175.115998 159.089911,175.115998 L70.1050368,175.115998 L70.1050368,175.115998 C65.516897,175.115998 61.7974749,171.396576 61.7974749,166.808436 L61.7974749,43.9741728 L61.7974749,43.9741728 C61.7974749,39.386033 65.516897,35.6666109 70.1050368,35.6666109 Z" id="path-5"></path>
+          <filter x="-18.0%" y="-14.3%" width="137.9%" height="128.7%" filterUnits="objectBoundingBox" id="filter-6">
+              <feMorphology radius="1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+              <feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+              <feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+              <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+          </filter>
+          <rect id="path-7" x="70.7637805" y="49.8525134" width="92.149175" height="107.18743" rx="7.8659801"></rect>
+          <filter x="-20.6%" y="-18.7%" width="143.4%" height="137.3%" filterUnits="objectBoundingBox" id="filter-8">
+              <feMorphology radius="1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+              <feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+              <feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+              <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.102553216 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+          </filter>
+      </defs>
+      <g id="Page-3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+          <g id="b&amp;w_logo" fill-rule="nonzero">
+              <g id="Decko-Logo-" transform="translate(7.000000, 4.000000)">
+                  <g id="g5642">
+                      <g id="svg-card-1" transform="translate(113.969540, 105.788552) scale(-1, 1) rotate(105.855860) translate(-113.969540, -105.788552) ">
+                          <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+                          <use fill="#4D4D4D" fill-rule="evenodd" xlink:href="#path-1"></use>
+                      </g>
+                      <g id="svg-card-2" opacity="0.879999995" transform="translate(113.964538, 104.984820) scale(-1, 1) rotate(117.480003) translate(-113.964538, -104.984820) ">
+                          <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-3"></use>
+                          <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-3"></use>
+                      </g>
+                      <g id="svg-card-3" transform="translate(114.597474, 105.391304) scale(-1, 1) rotate(133.539993) translate(-114.597474, -105.391304) ">
+                          <use fill="black" fill-opacity="1" filter="url(#filter-6)" xlink:href="#path-5"></use>
+                          <use fill="#4C4C4C" fill-rule="evenodd" xlink:href="#path-5"></use>
+                      </g>
+                      <g id="svg-card-4" opacity="0.879999995" transform="translate(116.838368, 103.446228) scale(-1, 1) rotate(142.690002) translate(-116.838368, -103.446228) ">
+                          <use fill="black" fill-opacity="1" filter="url(#filter-8)" xlink:href="#path-7"></use>
+                          <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-7"></use>
+                      </g>
+                  </g>
+              </g>
+          </g>
+      </g>
+    </svg>

data/lib/card/mod/carrierwave.rb

@@ -0,0 +1,6 @@
+Cardio::Railtie.config.tap do |config|
+  config.files_web_path = "files"
+  config.file_storage = :local
+  config.file_buckets = {}
+  config.file_default_bucket = nil
+end

data/lib/carrier_wave/card_mount.rb

@@ -81,11 +81,11 @@ module CarrierWave
 
         def assign_file file
           db_column = _mounter(:#{column}).serialization_column
-          send(:"\#{db_column}_will_change!") # unless attribute_is_changing? db_column
+          send(:"\#{db_column}_will_change!") unless duplicate?
           if web?
             self.content = file
           else
-            send(:"#{column}_will_change!")
+            send(:"#{column}_will_change!") unless duplicate?
             yield
           end
         end

data/lib/carrier_wave/test_file.rb

@@ -0,0 +1,8 @@
+module CarrierWave
+  # Helper module for making test files in carrierwave available to tests
+  module TestFile
+    def self.path filename
+      Cardio::Mod.fetch("carrierwave").subpath "data", "files", filename
+    end
+  end
+end

data/locales/en.yml

@@ -11,3 +11,9 @@ en:
   carrierwave_replace_item: Replace %{attachment_name}...
   carrierwave_unknown_storage_type: unknown storage type %{new_storage_type}
   carrierwave_url_is_missing: url is missing
+
+  #  carrierwave_task_move_files_link_text: "Move Files"
+  #  carrierwave_task_move_files_description: "Move Files!"
+
+  carrierwave_task_delete_upload_tmp_files_link_text: "Delete upload tmp files"
+  carrierwave_task_delete_upload_tmp_files_description: "Delete upload tmp files!"

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

@@ -46,24 +46,59 @@ 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
+def storage_changed?
+  (storage_type != current.storage_type) ||
+    (bucket != current.bucket) ||
+    (mod != current.mod)
 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
+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
 
-def valid_storage_type_list
-  CarrierWave::FileCardUploader::STORAGE_TYPES
+private
+
+def storage_type_from_config
+  storage = Cardio.config.file_storage
+  # valid_storage_type(storage) && configured_storage_type(storage) && storage
+  valid_storage_type(storage) && storage
 end
 
-def invalid_storage_type! type
+# FIXME: storage type should really be validated at load time:
+
+def valid_storage_type storage_type
+  return true if storage_type.in? CarrierWave::FileCardUploader::STORAGE_TYPES
+
   raise Card::Error, t(:carrierwave_error_invalid_storage_type, type: type)
 end
 
+# TODO: finish this idea:
+# def configured_storage_type storage_type
+#   case storage_type
+#   when :local
+#     # require existent files directory with write permissions
+#   when :cloud
+#     unless Cardio.config.deck_host
+#       raise Card::Error, t(:carrierwave_error_host_required)
+#     end
+#   end
+#   storage_type
+# end
+
 def storage_type_from_content
   @storage_type_from_content ||=
     case content
@@ -79,27 +114,3 @@ def storage_type_from_content
       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.rb

@@ -1,3 +1,5 @@
+Card.action_specific_attributes << :duplicate_file
+
 attr_writer :empty_ok
 
 def self.included host_class
@@ -21,7 +23,7 @@ event :save_original_filename, :prepare_to_store, on: :save, when: :file_ready_t
   @current_action.update! comment: original_filename
 end
 
-event :validate_file_exist, :validate, on: :create do
+event :validate_file_exist, :validate, on: :create, skip: :allowed do
   return if empty_ok?
 
   if web?
@@ -80,10 +82,21 @@ 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 @attaching
+  self.content = nil if @attaching && !duplicate?
   super
 end
 
+# FIXME: this is weak duplicate detection and currently only catches duplicate
+# updates to coded cards.  Tried #read but wasn't getting the same value on both
+# files even when they were definitely duplicates.
+def duplicate?
+  real? &&
+    storage_type == :coded &&
+    (old = attachment.file) &&
+    (new = set_specific[attachment_name]) &&
+    old.size == new.size
+end
+
 def delete_files_for_action action
   with_selected_action_id(action.id) do
     attachment.file.delete

data/set/all/file_utils.rb

@@ -1,8 +1,10 @@
+# TODO: move to lib
+# eg, create new Card::File class in lib/card/file
 module ClassMethods
-  def update_all_storage_locations
-    Card.search(type_id: ["in", Card::FileID, Card::ImageID])
-        .each(&:update_storage_location!)
-  end
+  # def update_all_storage_locations
+  #   Card.search(type_id: ["in", Card::FileID, Card::ImageID])
+  #       .each(&:update_storage_location!)
+  # end
 
   def delete_tmp_files_of_cached_uploads
     cards_with_disposable_attachments do |card, action|

data/set/self/admin.rb

@@ -1,22 +1,8 @@
-basket[:tasks] += [
-  {
-    name: :update_file_storage_locations,
-    execute_policy: -> { Card.update_all_storage_locations },
-    stats: {
-      title: "cards with attachment",
-      count: -> { Card.count_cards_with_attachment }
-      # link_text: "update storage locations",
-      # task: "update_file_storage_locations"
-    }
-  },
-  {
-    name: :delete_upload_tmp_files,
-    execute_policy: -> { Card.delete_tmp_files_of_cached_uploads },
-    stats: {
-      title: "tmp files of canceled uploads",
-      count: -> { ::Card.draft_actions_with_attachment },
-      link_text: "delete tmp files",
-      task: "delete_tmp_files_of_cached_uploads"
-    }
-  }
-]
+basket[:tasks][:delete_upload_tmp_files] = {
+  mod: :carrierwave,
+  execute_policy: -> { Card.delete_tmp_files_of_cached_uploads }
+}
+
+# { name: :move_files,
+#   mod: :carrierwave,
+#   execute_policy: -> { Card.update_all_storage_locations } },

data/set/self/search.rb

@@ -0,0 +1,8 @@
+format :json do
+  view :image_complete, cache: :never do
+    complete_or_match_search(start_only: false,
+                             additional_cql: { type: :image }).map do |item|
+      { id: item, href: item.url_key, text: goto_item_label(item) }
+    end
+  end
+end

data/set/type/file/preview_editor.haml

@@ -1,19 +1,15 @@
 .chosen-file
   %input{ name: cached_upload_card_name, type: "hidden", value: card.selected_action_id }
-  %table.table.table-striped{ role: "presentation" }
-    %tbody.files
-      %tr.template-download.fade.show
-        %td
-          %span.preview
-            = preview
-        %td
-          %p.name
-            = card.original_filename
-        %td
-          %span.size
-            = number_to_human_size card.attachment.size
-        %td.float-right
-          %button.btn.btn-danger.delete.cancel-upload{ "data-type": "DELETE" }
-            = icon_tag :delete
-            %span
-              = preview_editor_delete_text
+  .d-flex
+    = preview
+    .d-flex.flex-column.justify-content-between.ml-2.w-100
+      %div
+        %p.name
+          = card.original_filename
+        %span.size
+          = number_to_human_size card.attachment.size
+      .align-self-end
+        %button.btn.btn-danger.delete.cancel-upload{ "data-type": "DELETE" }
+          = icon_tag :delete
+          %span
+            = preview_editor_delete_text

data/set/type/image/html_views.rb

@@ -3,7 +3,7 @@ format :html do
 
   # core HTML image view.
   view :core do
-    return card.attachment.read if card.svg?
+    return card.attachment.read.html_safe if svg?
 
     with_valid_source do |source|
       image_tag source, alt: card.name
@@ -76,4 +76,8 @@ format :html do
       Card::Content::Diff.render_added_chunk _render_core
     end
   end
+
+  def goto_autocomplete_icon
+    render :core, size: :small
+  end
 end

data/set/type/image.rb

@@ -12,6 +12,7 @@ end
 
 format do
   include File::Format
+  delegate :svg?, to: :card
 
   view :one_line_content do
     _render_core size: :icon
@@ -32,10 +33,12 @@ format do
 
   def selected_version
     size = determine_image_size
-    if size && size != :original
-      card.image.versions[size]
+    image = card.image
+
+    if size && size != :original && !svg?
+      image.versions[size]
     else
-      card.image
+      image
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.1
+        version: 1.105.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.1
+        version: 1.105.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -54,34 +54,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: ssrf_filter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: card-mod-history
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
 description: ''
 email:
 - info@decko.org
@@ -89,12 +103,31 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- assets/script/upload.js.coffee
+- assets/style/file.scss
+- data/files/favicon.png
+- data/files/favicon/image-icon.png
+- data/files/favicon/image-large.png
+- data/files/favicon/image-medium.png
+- data/files/favicon/image-original.png
+- data/files/favicon/image-small.png
+- data/files/file1.txt
+- data/files/file2.txt
+- data/files/file3.txt
+- data/files/logo.svg
+- data/files/logo/image-original.svg
+- data/files/mao2.jpg
+- data/files/mod_carrierwave_script_asset_output/file.js
+- data/files/rails.gif
+- data/real.yml
 - init/early/carrierwave.rb
 - init/early/mini_magick.rb
+- lib/card/mod/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
+- lib/carrier_wave/test_file.rb
 - locales/de.yml
 - locales/en.yml
 - set/abstract/attachment.rb
@@ -110,6 +143,7 @@ files:
 - set/self/favicon.rb
 - set/self/new_file.rb
 - set/self/new_image.rb
+- set/self/search.rb
 - set/type/file.rb
 - set/type/file/core.haml
 - set/type/file/file_chooser.haml
@@ -126,6 +160,7 @@ metadata:
   wiki_uri: https://decko.org
   documentation_url: http://docs.decko.org/
   card-mod: carrierwave
+  card-mod-group: gem-defaults
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -141,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: File and Image handling