card 1.20.0 → 1.20.1

data/mod/account/spec/set/right/account_spec.rb

@@ -170,9 +170,23 @@ describe Card::Set::Right::Account do
   end
 
   describe "#send_change_notice" do
-    it "send multipart email" do
-      skip
-      #      pending
+    subject(:mail) do
+      Card[:follower_notification_email].format.render_mail(
+        context:       Card.fetch("A", look_in_trash: true),
+        to:            "joe@user.com",
+        follower:      Card["Joe User"],
+        followed_set:  Card[:all],
+        follow_option: Card[:always]
+      )
+    end
+
+    it "works for deleted card" do
+      delete "A"
+      expect(mail.subject).to eq 'Joe User deleted "A"'
+    end
+
+    it "sends multipart email" do
+      expect(mail.content_type).to include("multipart/alternative")
     end
 
     context "denied access" do

data/mod/admin/set/self/admin.rb

@@ -8,8 +8,6 @@ event :admin_tasks, :initialize, on: :update do
   case task.to_sym
   when :clear_cache          then Card::Cache.reset_all
   when :repair_references    then Card::Reference.repair_all
-#  when :clear_view_cache     then Card::View.reset
-  when :delete_old_revisions then Card::Action.delete_old
   when :repair_permissions   then Card.repair_all_permissions
   when :clear_solid_cache    then Card.clear_solid_cache
   when :clear_machine_cache  then Card.reset_all_machines

data/mod/admin/spec/set/self/admin_spec.rb

@@ -23,17 +23,20 @@ describe Card::Set::Self::Admin do
       end
     end
 
-    it "triggers deleting old revisions (with right params)" do
-      Card::Auth.as_bot do
-        a = Card["A"]
-        a.update_attributes! content: "a new day"
-        a.update_attributes! content: "another day"
-        expect(a.actions.count).to eq(3)
-        Card::Env.params[:task] = :delete_old_revisions
-        @admin.update_attributes({})
-        expect(a.actions.count).to eq(1)
-      end
-    end
+    # NOTE: I removed this functionality for now, because I don't think we
+    # should have web access to admin functions that can incur actual data loss.
+
+    # it "triggers deleting old revisions (with right params)" do
+    #   Card::Auth.as_bot do
+    #     a = Card["A"]
+    #     a.update_attributes! content: "a new day"
+    #     a.update_attributes! content: "another day"
+    #     expect(a.actions.count).to eq(3)
+    #     Card::Env.params[:task] = :delete_old_revisions
+    #     @admin.update_attributes({})
+    #     expect(a.actions.count).to eq(1)
+    #   end
+    # end
 
     #     it 'is trigger reference repair' do
     #       Card::Auth.as_bot do

data/mod/bootstrap/set/all/bootstrap/helper.rb

@@ -1,6 +1,7 @@
 format :html do
   def glyphicon icon_type, extra_class=""
-    wrap_with :span, "", "aria-hidden" => true,
+    wrap_with :span, "",
+              "aria-hidden" => true,
               class: "glyphicon glyphicon-#{icon_type} #{extra_class}"
   end
 
@@ -25,50 +26,47 @@ format :html do
   end
 
   def dropdown_list items, extra_css_class=nil, active=nil
-    item_list =
+    wrap_with :ul, class: "dropdown-menu #{extra_css_class}", role: "menu" do
       case items
       when Array
-        items.map.with_index do |item, index|
-          "<li #{'class=\'active\'' if index == active}>#{item}</li>" if item
-        end.compact.join "\n"
+        items.map.with_index { |item, i| dropdown_list_item item, i, active }
       when Hash
-        items.map do |key, item|
-          "<li #{'class=\'active\'' if key == active}>#{item}</li>" if item
-        end.compact.join "\n"
+        items.map { |key, item| dropdown_list_item item, key, active }
       else
-        items
-      end
-    %(
-      <ul class="dropdown-menu #{extra_css_class}" role="menu">
-        #{item_list}
-      </ul>
-    )
+        [items]
+      end.compact.join "\n"
+    end
+  end
+
+  def dropdown_list_item item, active_test, active
+    return unless item
+    "<li #{'class=\'active\'' if active_test == active}>#{item}</li>"
   end
 
   def separator
     '<li role="separator" class="divider"></li>'
   end
 
-  def split_button button, args={}
-    items = yield
-    args[:situation] ||= "primary"
-
+  def split_button main_button, active_item
     wrap_with :div, class: "btn-group" do
       [
-        button,
-        button_tag(situation: args[:situation],
-                   class: "dropdown-toggle", "data-toggle" => "dropdown",
-                   "aria-haspopup" => "true", "aria-expanded" => "false") do
-          <<-HTML
-            <span class="caret"></span>
-            <span class="sr-only">Toggle Dropdown</span>
-          HTML
-        end,
-        dropdown_list(items, nil, args[:active_item])
+        main_button,
+        split_button_toggle,
+        dropdown_list(yield, nil, active_item)
       ]
     end
   end
 
+  def split_button_toggle
+    button_tag(situation: "primary",
+               class: "dropdown-toggle",
+               "data-toggle" => "dropdown",
+               "aria-haspopup" => "true",
+               "aria-expanded" => "false") do
+      '<span class="caret"></span><span class="sr-only">Toggle Dropdown</span>'
+    end
+  end
+
   def list_group content_or_options=nil, options={}
     options = content_or_options if block_given?
     content = block_given? ? yield : content_or_options

data/mod/carrierwave/set/type/file.rb

@@ -93,7 +93,7 @@ format :html do
     ""
   end
 
-  view :preview_editor, tags: :unknown_ok do |args|
+  view :preview_editor, tags: :unknown_ok, cache: :never do |args|
     cached_upload_card_name = Card::Env.params[:attachment_upload]
     cached_upload_card_name.gsub!(/\[\w+\]$/, "[action_id_of_cached_upload]")
     <<-HTML

data/mod/carrierwave/set/type/image.rb

@@ -16,10 +16,14 @@ format do
 
   def source_url
     return card.raw_content if card.web?
+    selected_version.url
+  end
+
+  def selected_version
     if voo.size == :original
-      card.image.url
+      card.image
     else
-      card.image.versions[voo.size.to_sym].url
+      card.image.versions[voo.size.to_sym]
     end
   end
 
@@ -34,12 +38,11 @@ format do
       when voo.size           then voo.size.to_sym
       when main?              then :large
       else                         :medium
-    end
+      end
     voo.size = :original if voo.size == :full
   end
 end
 
-
 format :html do
   include File::HtmlFormat
 
@@ -54,7 +57,7 @@ format :html do
   end
 
   def preview
-    return unless card.new_card? && !card.preliminary_upload?
+    return if card.new_card? && !card.preliminary_upload?
     voo.size = :medium
     wrap_with :div, class: "attachment-preview",
                     id: "#{card.attachment.filename}-preview" do
@@ -62,7 +65,7 @@ format :html do
     end
   end
 
-  def show_action_content_toggle? action, view_type
+  def show_action_content_toggle? _action, _view_type
     true
   end
 
@@ -87,6 +90,15 @@ format :html do
   end
 end
 
+format :email_html do
+  view :core do
+    url_generator = voo.closest_live_option(:inline_attachment_url)
+    path = selected_version.path
+    return _render_source unless url_generator && ::File.exist?(path)
+    image_tag url_generator.call(path)
+  end
+end
+
 format :css do
   view :core do
     render_source

data/mod/core/set/all/collection.rb

@@ -79,6 +79,18 @@ def insert_item index, name
   self.content = new_names.join "\n"
 end
 
+def add_id id
+  add_item "~#{id}"
+end
+
+def drop_id id
+  drop_item "~#{id}"
+end
+
+def insert_id index, id
+  insert_item index, "~#{id}"
+end
+
 def extended_item_cards context=nil
   context = (context ? context.cardname : cardname)
   args = { limit: "" }
@@ -118,10 +130,23 @@ def extended_list context=nil
   # a collection
 end
 
+def context_card
+  @context_card || self
+end
+
+def with_context card
+  old_context = @context_card
+  @context_card = card
+  result = yield
+  @context_card = old_context
+  result
+end
+
 def contextual_content context_card, format_args={}, view_args={}
-  context_card.format(format_args).process_content(
-    format(format_args)._render_raw(view_args), view_args
-  )
+  view = view_args.delete(:view) || :core
+  with_context context_card do
+    format(format_args).render view, view_args
+  end
 end
 
 def each_chunk opts={}
@@ -171,7 +196,7 @@ format do
   end
 
   def voo_items_view
-    return unless (voo && items = voo.items)
+    return unless voo && (items = voo.items)
     items[:view]
   end
 
@@ -215,10 +240,11 @@ format do
   end
 
   def normalized_edit_fields
-    edit_fields.map do |name, options|
-      options ||= Card.quick_fetch(name).name
+    edit_fields.map do |name_or_card, options|
+      next [name_or_card, options || {}] if name_or_card.is_a?(Card)
+      options ||= Card.fetch_name name_or_card
       options = { title: options } if options.is_a?(String)
-      [card.cardname.field(name), options]
+      [card.cardname.field(name_or_card), options]
     end
   end
 

data/mod/core/set/all/fetch.rb

@@ -329,19 +329,32 @@ def cache_class_from_type cache_type
 end
 
 def register_view_cache_key cache_key
+  view_cache_keys cache_key
+  hard_write_view_cache_keys
+end
+
+def view_cache_keys new_key=nil
   @view_cache_keys ||= []
-  @view_cache_keys << cache_key
+  @view_cache_keys << new_key if new_key
+  append_missing_view_cache_keys
   @view_cache_keys.uniq!
-  hard_write_view_cache_keys
+end
+
+def append_missing_view_cache_keys
+  return unless Card.cache.hard
+  @view_cache_keys +=
+    (Card.cache.hard.read_attribute(key, :view_cache_keys) || [])
 end
 
 def hard_write_view_cache_keys
+#  puts "WRITE VIEW CACHE KEYS (#{name}): #{view_cache_keys}"
   return unless Card.cache.hard
   Card.cache.hard.write_attribute key, :view_cache_keys, @view_cache_keys
 end
 
 def expire_views
-  return unless @view_cache_keys
+#  puts "EXPIRE VIEW CACHE (#{name}): #{view_cache_keys}"
+  return unless view_cache_keys.present?
   Array.wrap(@view_cache_keys).each do |view_cache_key|
     Card::View.cache.delete view_cache_key
   end

data/mod/core/set/all/permissions.rb

@@ -224,26 +224,20 @@ def add_to_read_rule_update_queue updates
 end
 
 event :check_permissions, :validate do
-  task =
-    if @action != :delete && comment # will be obviated by new comment handling
-      :comment
-    else
-      @action
-    end
   track_permission_errors do
-    ok? task
+    ok? action_for_permission_check
   end
 end
 
+def action_for_permission_check
+  commenting? ? :comment : @action
+end
+
 def track_permission_errors
   @permission_errors = []
   result = yield
-
-  @permission_errors.each do |message|
-    errors.add :permission_denied, message
-  end
+  @permission_errors.each { |msg| errors.add :permission_denied, msg }
   @permission_errors = nil
-
   result
 end
 

data/mod/core/set/all/trash.rb

@@ -15,6 +15,7 @@ module ClassMethods
     Card.delete_trashed_files
     Card.where(trash: true).delete_all
     Card::Action.delete_cardless
+    Card::Change.delete_actionless
     Card::Reference.unmap_if_referee_missing
     Card::Reference.delete_if_referer_missing
   end
@@ -94,7 +95,8 @@ event :validate_delete, :validate, on: :delete do
   end
 end
 
-event :validate_delete_children, :prepare_to_validate, on: :delete do
+event :validate_delete_children, after: :validate_delete, on: :delete do
+  return if errors.any?
   children.each do |child|
     child.trash = true
     add_subcard child

data/mod/core/spec/set/all/collection_spec.rb

@@ -54,22 +54,23 @@ describe Card::Set::All::Collection do
   end
 
   describe "#contextual_content" do
+    let(:context_card) { Card["A"] } # refers to 'Z'
     it "processes nests relative to context card" do
-      context_card = Card["A"] # refers to 'Z'
-      c = Card.new(name: "foo", content: "{{_self+B|core}}")
+      c = create "foo", content: "{{_self+B|core}}"
       expect(c.contextual_content(context_card)).to eq("AlphaBeta")
     end
 
     # why the heck is this good?  -efm
     it "returns content even when context card is hard templated" do
-      context_card = Card["A"] # refers to 'Z'
-
-      Card::Auth.as_bot do
-        Card.create! name: "A+*self+*structure", content: "Banana"
-      end
-      c = Card.new name: "foo", content: "{{_self+B|core}}"
+      create "A+*self+*structure", content: "Banana"
+      c = create "foo", content: "{{_self+B|core}}"
       expect(c.contextual_content(context_card)).to eq("AlphaBeta")
     end
+
+    it "it doesn't use chunk list of context card" do
+      c = create "foo", content: "test@email.com", type: "HTML"
+      expect(c.contextual_content(context_card)).not_to have_tag "a"
+    end
   end
 
   describe "tabs view" do

data/mod/email/set/all/notify.rb

@@ -170,31 +170,41 @@ format do
 #{render_list_of_changes(args)})
   end
 
-  view :followed, perms: :none, closed: true do |args|
-    if args[:followed_set] &&
-       (set_card = Card.fetch(args[:followed_set])) &&
-       args[:follow_option] &&
-       (option_card = Card.fetch(args[:follow_option]))
+  def followed_set_card
+    (set_name = voo.closest_live_option(:followed_set)) && Card.fetch(set_name)
+  end
+
+  def follow_option_card
+    (option_name = voo.closest_live_option(:follow_option)) &&
+      Card.fetch(option_name)
+  end
+
+  view :followed, perms: :none, closed: true do
+    if (set_card = followed_set_card) &&
+       (option_card = follow_option_card)
       option_card.description set_card
     else
       "followed card"
     end
   end
 
-  view :follower, perms: :none, closed: true do |args|
-    args[:follower] || "follower"
+  view :follower, perms: :none, closed: true do
+    voo.closest_live_option(:follower) || "follower"
+  end
+
+  def live_follow_rule_name
+    return unless (set_card = followed_set_card) &&
+                  voo.closest_live_option(:follower)
+    set_card.follow_rule_name voo.closest_live_option(:follower)
   end
 
-  view :unfollow_url, perms: :none, closed: true do |args|
-    if args[:followed_set] && (set_card = Card.fetch(args[:followed_set])) &&
-       args[:follow_option] && args[:follower]
-      rule_name = set_card.follow_rule_name args[:follower]
-      target_name = "#{args[:follower]}+#{Card[:follow].name}"
-      update_path = page_path target_name,
-                              action: :update,
-                              card: { subcards: {
-                                rule_name => Card[:never].name
-                              } }
+  view :unfollow_url, perms: :none, closed: true do |_args|
+    if (rule_name = live_follow_rule_name)
+      target_name = "#{voo.closest_live_option :follower}+#{Card[:follow].name}"
+      update_path = page_path target_name, action: :update,
+                                           card: { subcards: {
+                                             rule_name => Card[:never].name
+                                           } }
       card_url update_path # absolutize path
     end
   end