card 1.99.4 → 1.99.5

data/tmpsets/set/{mod019-carrierwave → mod015-carrierwave}/abstract/attachment/storage_type.rb

@@ -1,14 +1,10 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; class Abstract; module Attachment;
-# Set: Abstract (Attachment, StorageType)
-#
-module StorageType;
-extend Card::Set
-def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/carrierwave/set/abstract/attachment/storage_type.rb"; end
+class Card; module Set; class Abstract; module Attachment; module StorageType; extend Card::Set
+# ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/carrierwave/set/abstract/attachment/storage_type.rb ~~
 attr_writer :bucket, :storage_type
 
 event :storage_type_change, :store,
-      on: :update, when: :storage_type_changed? do
+      on: :update, when: proc { |c| c.storage_type_changed? } do
   # carrierwave stores file if @cache_id is not nil
   attachment.cache_stored_file!
   # attachment.retrieve_from_cache!(attachment.cache_name)
@@ -21,52 +17,51 @@ event :storage_type_change, :store,
   write_identifier
 end
 
-event :validate_storage_type, :validate, on: :save do
+event :validate_storage_type, :validate,
+      on: :save do
   if will_become_coded?
-    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?
+    unless mod || @new_mod
+      errors.add :storage_type, "mod argument needed to save card as coded"
+    end
+    if codename.blank?
+      errors.add :storage_type, "codename needed for storage type coded"
+    end
   end
   unless known_storage_type? will_be_stored_as
-    errors.add :storage_type, tr(
-      :unknown_storage_type,
-      new_storage_type: @new_storage_type
-    )
+    errors.add :storage_type, "unknown storage type: #{@new_storage_type}"
   end
 end
 
-event :validate_storage_type_update, :validate, on: :update 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
-  if cloud? && storage_type_changed? && !attachment_is_changing?
-    errors.add :storage_type, tr(:moving_files_is_not_supported)
+event :validate_storage_type_update, :validate,
+      on: :update do
+  if cloud? && storage_type_changed?
+    errors.add :storage_type, "moving files from cloud elsewhere "\
+                              "is not supported"
   end
 end
 
-event :lose_coded_status_on_update, :initialize, on: :update, when: :coded? do
-  # unless explicit
+event :loose_coded_status_on_update, :initialize,
+      on: :update, when: proc { |c| c.coded? } do
   return if @new_mod
   @new_storage_type ||= storage_type_from_config
 end
 
-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 :update_public_link_on_create, :integrate, on: :create, when: :local? do
+event :update_public_link_on_create, :integrate,
+      on: :create,
+      when: proc { |c| c.local? } do
   update_public_link
 end
 
-event :remove_public_link_on_delete, :integrate, on: :delete, when: :local? do
+event :remove_public_link_on_delete, :integrate,
+      on: :delete,
+      when: proc { |c| c.local? } do
   remove_public_links
 end
 
-event :update_public_link, after: :update_read_rule, when: :local? do
+event :update_public_link, after: :update_read_rule,
+                           when: proc { |c| c.local? } do
   return if content.blank?
-  if who_can(:read).include? Card::AnyoneID
+  if who_can(:read).include? Card[:anyone].id
     create_public_links
   else
     remove_public_links
@@ -98,14 +93,6 @@ def will_be_stored_as
   @new_storage_type || storage_type
 end
 
-def change_bucket_if_read_only?
-  cloud? && bucket_config[:read_only] && attachment_is_changing?
-end
-
-def read_only?
-  web? || (cloud? && bucket_config[:read_only])
-end
-
 def cloud?
   storage_type == :cloud
 end
@@ -159,17 +146,8 @@ end
 
 def bucket
   @bucket ||= cloud? &&
-              (new_card_bucket || bucket_from_content || bucket_from_config)
-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
-  # options hash:
-  #   Card.create file: file_handle, bucket: "my_bucket"
-  set_specific[:bucket] || set_specific["bucket"] || bucket_from_config
+              ((new_card? && bucket_from_config) || bucket_from_content ||
+                bucket_from_config)
 end
 
 def bucket_config
@@ -195,16 +173,13 @@ def ensure_bucket_config
   unless config.present?
     raise Card::Error, "couldn't find configuration for bucket #{bucket}"
   end
-  unless config[:credentials]
-    raise Card::Error, "couldn't find credentials for bucket #{bucket}"
-  end
   config
 end
 
 def load_bucket_config_from_env config
   config ||= {}
   CarrierWave::FileCardUploader::CONFIG_OPTIONS.each do |key|
-    next if key.in? %i[attributes credentials]
+    next if key.in? [:attributes, :credentials]
     replace_with_env_variable config, key
   end
   config[:credentials] ||= {}
@@ -237,7 +212,7 @@ end
 
 def bucket_from_config
   Cardio.config.file_default_bucket ||
-    (Cardio.config.file_buckets&.keys&.first)
+    (Cardio.config.file_buckets && Cardio.config.file_buckets.keys.first)
 end
 
 def storage_type
@@ -280,7 +255,7 @@ def update_storage_attributes
 end
 
 def storage_type_changed?
-  @new_bucket || (@new_storage_type && @new_storage_type != storage_type) || @new_mod
+  @new_bucket || @new_storage_type || @new_mod
 end
 
 def bucket= value
@@ -293,7 +268,7 @@ end
 
 def storage_type= value
   known_storage_type? value
-  if @action == :update #&& storage_type != value
+  if @action == :update
     # 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
@@ -303,7 +278,7 @@ def storage_type= value
 end
 
 def mod= value
-  if @action == :update && mod != value
+  if @action == :update
     @new_mod = value.to_s
   else
     @mod = value.to_s
@@ -313,7 +288,7 @@ end
 def with_storage_options opts={}
   old_values = {}
   validate_temporary_storage_type_change opts[:storage_type]
-  %i[storage_type mod bucket].each do |opt_name|
+  [: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]
@@ -335,9 +310,8 @@ 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)
+    raise Error, "unknown storage type: #{new_storage_type}"
   end
-
   if new_storage_type == :coded && codename.blank?
     raise Error, "codename needed for storage type :coded"
   end
@@ -346,5 +320,7 @@ end
 def known_storage_type? type=storage_type
   type.in? CarrierWave::FileCardUploader::STORAGE_TYPES
 end
+
+
+# ~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/carrierwave/set/abstract/attachment/storage_type.rb ~~
 end;end;end;end;end;
-# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/carrierwave/set/abstract/attachment/storage_type.rb ~~

data/tmpsets/set/{mod019-carrierwave → mod015-carrierwave}/abstract/attachment/upload_cache.rb

@@ -1,27 +1,19 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; class Abstract; module Attachment;
-# Set: Abstract (Attachment, UploadCache)
-#
+class Card; module Set; class Abstract; module Attachment; module UploadCache; extend Card::Set
+# ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/carrierwave/set/abstract/attachment/upload_cache.rb ~~
 # action id of the cached upload
-module UploadCache;
-extend Card::Set
-def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/carrierwave/set/abstract/attachment/upload_cache.rb"; end
 attr_accessor :action_id_of_cached_upload
 
-def actionable?
-  super || preliminary_upload?
-end
-
-event :prepare_attachment, :prepare_to_validate, on: :save, when: :preliminary_upload? do
+event :upload_attachment, :prepare_to_validate,
+      on: :save, when: proc { |c| c.preliminary_upload? } do
   save_original_filename  # save original filename as comment in action
   write_identifier        # set db_content
   # (needs original filename to determine extension)
   store_attachment!
-  store_card_changes
-  # finalize_action         # create Card::Change entry for db_content
+  finalize_action         # create Card::Change entry for db_content
 
   card_id = new_card? ? upload_cache_card.id : id
-  @current_action.update! draft: true, card_id: card_id
+  @current_action.update_attributes! draft: true, card_id: card_id
   success << {
     target: (new_card? ? upload_cache_card : self),
     type: type_name,
@@ -32,7 +24,8 @@ event :prepare_attachment, :prepare_to_validate, on: :save, when: :preliminary_u
 end
 
 event :assign_attachment_on_create, :initialize,
-      after: :assign_action, on: :create, when: :save_preliminary_upload? do
+      after: :assign_action, on: :create,
+      when: proc { |c| c.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
@@ -40,7 +33,8 @@ event :assign_attachment_on_create, :initialize,
 end
 
 event :assign_attachment_on_update, :initialize,
-      after: :assign_action, on: :update, when: :save_preliminary_upload? do
+      after: :assign_action, on: :update,
+      when:  proc { |c| c.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
@@ -49,25 +43,19 @@ end
 def assign_attachment file, original_filename
   send "#{attachment_name}=", file
   write_identifier
-  @current_action&.update! comment: original_filename
+  @current_action.update_attributes! comment: original_filename
 end
 
 event :delete_cached_upload_file_on_create, :integrate,
-      on: :create, when: :save_preliminary_upload? do
+      on: :create, when: proc { |c| c.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
-
-# at some point uploaded files of canceled file card creation
-# should be deleted. We do this when ever an new file is created.
-event :clear_draft_files, :integrate_with_delay,
-      on: :create do
   Card.delete_tmp_files_of_cached_uploads
 end
 
 event :delete_cached_upload_file_on_update, :integrate,
-      on: :update, when: :save_preliminary_upload? do
+      on: :update, when: proc { |c| c.save_preliminary_upload? } do
   return unless  (action = Card::Action.fetch(@action_id_of_cached_upload))
   delete_files_for_action action
   action.delete
@@ -75,8 +63,7 @@ end
 
 # used for uploads for new cards until the new card is created
 def upload_cache_card
-  cache_card_codename = "new_#{attachment_name}"
-  @upload_cache_card ||= Card::Codename.card(cache_card_codename) { Card[:new_file] }
+  @upload_cache_card ||= Card["new_#{attachment_name}".to_sym]
 end
 
 def preliminary_upload?
@@ -91,5 +78,7 @@ end
 def tmp_upload_dir _action_id=nil
   "#{files_base_dir}/#{upload_cache_card.id}"
 end
+
+
+# ~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/carrierwave/set/abstract/attachment/upload_cache.rb ~~
 end;end;end;end;end;
-# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/carrierwave/set/abstract/attachment/upload_cache.rb ~~

data/tmpsets/set/{mod019-carrierwave → mod015-carrierwave}/all/file_utils.rb

@@ -1,10 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; class All
-# Set: All cards (FileUtils)
-#
-module FileUtils;
-extend Card::Set
-def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/carrierwave/set/all/file_utils.rb"; end
+class Card; module Set; class All; module FileUtils; extend Card::Set
+# ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/carrierwave/set/all/file_utils.rb ~~
 module ClassMethods
   def update_all_storage_locations
     Card.search(type_id: ["in", FileID, ImageID])
@@ -12,20 +8,11 @@ module ClassMethods
   end
 
   def delete_tmp_files_of_cached_uploads
-    cards_with_disposable_attachments do |card, action|
-      card.delete_files_for_action action
-      action.delete
-    end
-  end
-
-  def cards_with_disposable_attachments
     draft_actions_with_attachment.each do |action|
       # we don't want to delete uploads in progress
       next unless old_enough?(action.created_at) && (card = action.card)
-      # we can't delete attachments we don't have write access to
-      next if card.read_only?
-
-      yield card, action
+      card.delete_files_for_action action
+      action.delete
     end
   end
 
@@ -42,5 +29,7 @@ module ClassMethods
     )
   end
 end
+
+
+# ~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/carrierwave/set/all/file_utils.rb ~~
 end;end;end;end;
-# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/carrierwave/set/all/file_utils.rb ~~

data/tmpsets/set/{mod019-carrierwave → mod015-carrierwave}/self/admin.rb

@@ -1,19 +1,15 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; class Self
-# Set: The card "Admin"
-#
-module Admin;
-extend Card::Set
-def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/carrierwave/set/self/admin.rb"; end
+class Card; module Set; class Self; module Admin; extend Card::Set
+# ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/carrierwave/set/self/admin.rb ~~
 add_to_basket(
   :tasks,
   name: :update_file_storage_locations,
   execute_policy: -> { Card.update_all_storage_locations },
   stats: {
     title: "cards with attachment",
-    count: -> { Card.search(type_id: ["in", FileID, ImageID], return: :count) }
-    # link_text: "update storage locations",
-    # task: "update_file_storage_locations"
+    count: -> { Card.search(type_id: ["in", FileID, ImageID], return: :count) },
+    link_text: "update storage locations",
+    task: "update_file_storage_locations"
   }
 )
 
@@ -28,5 +24,7 @@ add_to_basket(
     task: "delete_tmp_files_of_cached_uploads"
   }
 )
+
+
+# ~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/carrierwave/set/self/admin.rb ~~
 end;end;end;end;
-# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/carrierwave/set/self/admin.rb ~~

data/tmpsets/set/mod015-carrierwave/type/file.rb

@@ -0,0 +1,158 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Type; module File; extend Card::Set
+# ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/carrierwave/set/type/file.rb ~~
+attachment :file, uploader: CarrierWave::FileCardUploader
+
+module SelectedAction
+  def select_action_by_params params
+    # skip action table lookups for current revision
+    rev_id = params[:rev_id]
+    super unless rev_id && rev_id == last_content_action_id
+  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
+end
+include SelectedAction
+
+format do
+  view :source do |_args|
+    card.attachment.url
+  end
+
+  view :core do |args|
+    handle_source args do |source|
+      card_url source
+    end
+  end
+
+  def handle_source args
+    source = _render_source args
+    source ? yield(source) : ""
+  rescue
+    "File Error"
+  end
+end
+
+format :file do
+  # returns send_file args.  not in love with this...
+  view :core do |_args|
+    # this means we only support known formats.  dislike.
+    attachment_format = card.attachment_format(params[:format])
+    return _render_not_found unless attachment_format
+    return card.format(:html).render_core(args) if card.remote_storage?
+
+    if params[:explicit_file] && (r = controller.response)
+      r.headers["Expires"] = 1.year.from_now.httpdate
+      # currently using default "private", because proxy servers could block
+      # needed permission checks
+      # r.headers["Cache-Control"] = "public"
+    end
+
+    # formerly supported redirecting to correct file format
+    # elsif ![format, 'file'].member? params[:format]
+    #   path = request.fullpath.sub( /\.#{params[:format]}\b/, '.' + format )
+    #   return redirect_to(path) #card.attachment.url(style) )
+    file = selected_file_version
+    [file.path,
+     {
+       type: file.content_type,
+       filename:  "#{card.cardname.safe_key}#{file.extension}",
+       x_sendfile: true,
+       disposition: (params[:format] == "file" ? "attachment" : "inline")
+     }]
+  end
+
+  def selected_file_version
+    card.attachment
+  end
+end
+
+format :html do
+  view :core do |args|
+    handle_source args do |source|
+      "<a href=\"#{source}\">Download #{showname args[:title]}</a>"
+    end
+  end
+
+  view :editor do |args|
+    if card.web? || card.no_upload?
+      return text_field(:content, class: "card-content")
+    end
+    file_chooser args
+  end
+
+  def preview  _args
+    ""
+  end
+
+  view :preview_editor, tags: :unknown_ok do |args|
+    cached_upload_card_name = Card::Env.params[:attachment_upload]
+    cached_upload_card_name.gsub!(/\[\w+\]$/, "[action_id_of_cached_upload]")
+    <<-HTML
+      <div class="chosen-file">
+        <input type="hidden" name="#{cached_upload_card_name}"
+                             value="#{card.selected_action_id}">
+        <table role="presentation" class="table table-striped">
+          <tbody class="files">
+            <tr class="template-download fade in">
+              <td>
+                <span class="preview">
+                  #{preview(args)}
+                </span>
+              </td>
+              <td>
+                <p class="name">
+                  #{card.original_filename}
+                </p>
+              </td>
+              <td>
+                <span class="size">
+                  #{number_to_human_size(card.attachment.size)}
+                </span>
+              </td>
+              <td class="pull-right">
+                <button class="btn btn-danger delete cancel-upload"
+                        data-type="DELETE">
+                  <i class="glyphicon glyphicon-trash"></i>
+                  <span>Delete</span>
+                </button>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    HTML
+  end
+
+  def file_chooser args
+    <<-HTML
+      <div class="choose-file">
+        #{preview(args)}
+        <span class="btn btn-success fileinput-button">
+            <i class="glyphicon glyphicon-cloud-upload"></i>
+            <span>
+                #{card.new_card? ? 'Add' : 'Replace'} #{card.attachment_name}...
+            </span>
+             <input class="file-upload slotter form-control" type="file"
+                name="card[#{card.type_code}]" id="card_#{card.type_code}">
+             #{hidden_field_tag 'attachment_type_id', card.type_id}
+             #{hidden_field card.attachment_name, class: 'attachment_card_name',
+                                                  value: ''}
+             #{hidden_field_tag 'file_card_name', card.cardname.url_key}
+        </span>
+      </div>
+      <div id="progress" class="progress" style="display: none;">
+        <div class="progress-bar progress-bar-success" style="width: 0%;"></div>
+      </div>
+      <div class="chosen-file"></div>
+    HTML
+  end
+end
+
+
+# ~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/carrierwave/set/type/file.rb ~~
+end;end;end;end;