card 1.19.6 → 1.20.0

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

@@ -29,11 +29,11 @@ module RenameMethods
   end
 end
 
-describe Card::Set::All::TrackedAttributes do
+describe Card::Set::All::AssignAttributes do
   include RenameMethods
 
   describe "set_name" do
-    it "should handle case variants" do
+    it "handles case variants" do
       @c = Card.create! name: "chump"
       expect(@c.name).to eq("chump")
       @c.name = "Chump"
@@ -41,7 +41,7 @@ describe Card::Set::All::TrackedAttributes do
       expect(@c.name).to eq("Chump")
     end
 
-    it "should handle changing from plus card to simple" do
+    it "handles changing from plus card to simple" do
       c = Card.create! name: "four+five"
       c.name = "nine"
       c.save!
@@ -144,7 +144,7 @@ describe Card::Set::All::TrackedAttributes do
       @t = card "T"
       @t.name = "A+B"
       assert !@t.save, "save should fail"
-      assert @t.errors[:name], "should have errors on key"
+      assert @t.errors[:name], "has errors on key"
     end
 
     it "test_used_as_tag" do
@@ -209,7 +209,7 @@ describe Card::Set::All::TrackedAttributes do
       end
     end
 
-    it "should handle plus cards that have children" do
+    it "handles plus cards that have children" do
       Card::Auth.as_bot do
         Card.create name: "a+b+c+d"
         ab = Card["a+b"]
@@ -259,7 +259,7 @@ describe Card::Set::All::TrackedAttributes do
         assert_equal "[[/new/{{_self|name}}|new]]", Card["Buttah"].content
       end
 
-      it "should rename card without updating references" do
+      it "renames card without updating references" do
         c = Card["Dairy"]
         c.update_attributes name: "Newt", update_referers: false
         assert_equal "[[/new/{{_self|name}}|new]]", Card["Newt"].content

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

@@ -9,19 +9,19 @@ describe Card::Set::All::Type do
       @hat = Card.new type: "Hat"
     end
 
-    it "should have a type_name" do
+    it "has a type_name" do
       expect(@hat.type_name).to eq("Hat")
     end
 
-    it "should not have a type_code" do
+    it "does not have a type_code" do
       expect(@hat.type_code).to eq(nil)
     end
 
-    it "should have a type_id" do
+    it "has a type_id" do
       expect(@hat.type_id).to eq(@type.id)
     end
 
-    it "should have a type_card" do
+    it "has a type_card" do
       expect(@hat.type_card).to eq(@type)
     end
   end
@@ -36,7 +36,7 @@ describe Card::Set::All::Type do
       end
     end
 
-    it "should clear cache of structured nested card after saving" do
+    it "clears cache of structured nested card after saving" do
       pending "need new mechanism to replace #reset_type_specific_fields"
       Card::Auth.as_bot do
         expect(Card.fetch("t1+results", new: {}).type_name).to eq("Basic")

data/mod/developer/spec/set/all/event_viz_spec.rb

@@ -2,7 +2,7 @@
 
 # describe Card::Set::All::EventViz do
 #   describe '#events' do
-#     it "should have at least twenty events" do
+#     it "has at least twenty events" do
 #       expect(Card['A'].events( :update ).split("\n").length).to be > 20
 #     end
 #   end

data/mod/developer/spec/set/right/debug_spec.rb

@@ -2,7 +2,7 @@
 
 describe Card::Set::Right::Debug do
   context "core view" do
-    it "should have a table" do
+    it "has a table" do
       Card::Auth.as_bot do
         @core = render_card :core, name: "A+*debug"
         assert_view_select @core, "table"

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

@@ -1,4 +1,4 @@
 format :email_html do
-  view :missing        do |_args| "" end
-  view :closed_missing do |_args| "" end
+  view(:missing) { "" }
+  view(:closed_missing) { "" }
 end

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

@@ -76,14 +76,17 @@ event :only_notify_on_web_requests, :initialize,
   @silent_change = true
 end
 
-
 def notable_change?
   !silent_change? && current_act_card? &&
     Card::Auth.current_id != WagnBotID && followable?
 end
 
 def current_act_card?
-  current_act && current_act.card_id == id
+  return false unless current_act
+  current_act.card_id.nil? || current_act.card_id == id
+  # FIXME: currently card_id is nil for deleted acts (at least
+  # in the store phase when it's tested).  This nil test was needed
+  # to make this work.
 end
 
 event :notify_followers_after_save, :integrate_with_delay,
@@ -95,10 +98,12 @@ end
 # but we can't pass the follower_stash through the ActiveJob queue.
 # We have to deal with the notifications in the integrate phase instead of the
 # integrate_with_delay phase
-event :stash_followers, :store, on: :delete do
+event :stash_followers, :store,
+      on: :delete, when: proc { |ca| ca.notable_change? } do
   act_card.follower_stash ||= FollowerStash.new
   act_card.follower_stash.add_affected_card self
 end
+
 event :notify_followers_after_delete, :integrate,
       on: :delete, when: proc { |ca| ca.notable_change? } do
   notify_followers

data/mod/email/set/right/bcc.rb

@@ -10,15 +10,15 @@ format do
 end
 
 format :html do
-  view :pointer_items do |args|
+  def pointer_items args
     card.item_names(context: :raw).map do |iname|
       wrap_item iname, args
-    end.join ", "
+    end
   end
 end
 
 format :email_text do
-  view :email_addresses do |args|
+  view :email_addresses, cache: :never do |args|
     context = args[:context] || self
     card.item_names(context: context.cardname).map do |item_name|
       # note that context is processed twice here because pointers absolutize

data/mod/email/set/right/follow.rb

@@ -17,7 +17,7 @@ format :html do
     args[:condition] ||= Env.params[:condition] || "*always"
   end
 
-  view :follow_item, tags: :unknown_ok do |args|
+  view :follow_item, tags: :unknown_ok, cache: :never do |args|
     if card.new_card? || !card.include_item?(args[:condition])
       button_view = :add_follow_rule_button
       form_opts = { add_item: args[:condition] }
@@ -65,10 +65,10 @@ format :html do
                     class: "btn update-follow-link", "data-card_key" => key
   end
 
-  view :follow_status_delete_options do
+  view :follow_status_delete_options, cache: :never do
     wrap_with(:ul, class: "delete-list list-group") do
       card.item_names.map do |option|
-        content_tag :li, class: "list-group-item" do
+        wrap_with :li, class: "list-group-item" do
           condition = option == "*never" ? "*always" : option
           subformat(card).render_follow_item condition: condition
         end
@@ -76,7 +76,7 @@ format :html do
     end
   end
 
-  view :delete_follow_rule_button do |_args|
+  view :delete_follow_rule_button do
     button_tag(
       type: :submit,
       class: "btn-xs btn-item-delete btn-primary", "aria-label" => "Left Align"
@@ -85,7 +85,7 @@ format :html do
     end
   end
 
-  view :add_follow_rule_button do |_args|
+  view :add_follow_rule_button do
     button_tag(
       type: :submit,
       class: "btn-xs btn-item-add", "aria-label" => "Left Align"

data/mod/email/set/right/following.rb

@@ -10,7 +10,7 @@ format :html do
     else
       fname = "#{card.cardname.left}+#{Card[:followers].name}"
       fcard = Card.fetch fname
-      nest fcard, view: :titled, item: :link
+      nest fcard, view: :titled, items: { view: :link }
     end
   end
 

data/mod/email/set/self/follow_defaults.rb

@@ -30,18 +30,37 @@ event :update_follow_rules, :finalize,
 end
 
 format :html do
-  view :edit, perms: :update, tags: :unknown_ok do |args|
-    frame_and_form :update, args do
+  view :edit, perms: :update, tags: :unknown_ok do
+    frame_and_form :update do
       [
-        _optional_render(:content_formgroup, args),
-        _optional_render(:confirm_update_all, args),
-        _optional_render(:button_formgroup,   args)
+        _optional_render_content_formgroup,
+        _optional_render_confirm_update_all,
+        _optional_render_edit_buttons
       ]
     end
   end
 
+  view :edit_buttons do
+    button_formgroup do
+      [submit_and_update_button, simple_submit_button, cancel_to_edit_button]
+    end
+  end
+
+  def submit_and_update_button
+    submit_button text: "Submit and update all users",
+                  disable_with: "Updating", class: "follow-updater"
+  end
+
+  def simple_submit_button
+    button_tag "Submit", class: "follow"
+  end
+
+  def cancel_to_edit_button
+    cancel_button href: path(view: :edit, id: card.id)
+  end
+
   view :confirm_update_all do |args|
-    wrap args do
+    wrap do
       alert "info" do
         %(
           <h1>Are you sure you want to change the default follow rules?</h1>
@@ -54,15 +73,7 @@ format :html do
 
   def default_edit_args args
     args[:hidden] ||= {}
-    args[:hidden].reverse_merge!(
-      success: "_self",
-      card:    { update_all_users: false }
-    )
-    args[:buttons] = %(
-      #{submit_button text: 'Submit and update all users',
-                      disable_with: 'Updating', class: 'follow-updater'}
-      #{button_tag 'Submit', class: 'follow'}
-      #{cancel_button href: path(view: :edit, id: card.id)}
-    )
+    args[:hidden].reverse_merge!(success: "_self",
+                                 card: { update_all_users: false })
   end
 end

data/mod/email/set/type/email_template.rb

@@ -79,7 +79,7 @@ def email_config args={}
 end
 
 format do
-  view :mail, perms: :none do |args|
+  view :mail, perms: :none, cache: :never do |args|
     args = card.email_config(args)
     text_message = args.delete(:text_message)
     html_message = args.delete(:html_message)

data/mod/email/set/type_plus_right/user/follow.rb

@@ -105,7 +105,7 @@ format :html do
     res
   end
 
-  view :following_list do |_args|
+  view :following_list, cache: :never do |_args|
     if !Auth.signed_in? || Auth.current_id != card.left.id
       hide_buttons = [:delete_follow_rule_button, :add_follow_rule_button]
     end
@@ -116,7 +116,7 @@ format :html do
         Card.set_patterns.select { |p| sets[p] }.reverse.map do |set_pattern|
           sets[set_pattern].map do |rule|
             rule[:options].map do |option|
-              content_tag :li, class: "list-group-item" do
+              wrap_with :li, class: "list-group-item" do
                 subformat(rule[:card]).render_follow_item condition: option,
                                                           hide: hide_buttons
               end
@@ -127,7 +127,7 @@ format :html do
     end
   end
 
-  view :ignoring_list do |_args|
+  view :ignoring_list, cache: :never do |_args|
     ignore_list = []
     card.known_item_cards.each do |follow_rule|
       follow_rule.item_cards.each do |follow_option|
@@ -141,7 +141,7 @@ format :html do
     wrap_with :div, class: "pointer-list-editor" do
       wrap_with :ul, class: "delete-list list-group" do
         ignore_list.map do |rule_card|
-          content_tag :li, class: "list-group-item" do
+          wrap_with :li, class: "list-group-item" do
             subformat(rule_card).render_follow_item condition: never,
                                                     hide: hide_buttons
           end
@@ -150,17 +150,18 @@ format :html do
     end
   end
 
-  view :pointer_items, tags: :unknown_ok do |args|
-    super(args.merge(item: :link))
+  def pointer_items args
+    voo.items[:view] ||= :link
+    super(args)
   end
 
   view :errors, perms: :none do |args|
     if card.errors.any?
       if card.errors.find { |attrib, _msg| attrib == :permission_denied }
         Env.save_interrupted_action(request.env["REQUEST_URI"])
-        title = "Problems with #{card.name}"
-        frame args.merge(panel_class: "panel panel-warning",
-                         title: title, hide: "menu") do
+        voo.title = "Problems with #{card.name}"
+        class_up "card-frame", "panel panel-warning"
+        frame do
           "Please #{link_to_card :signin, 'sign in'}" # " #{to_task}"
         end
       else

data/mod/history/lib/card/act.rb

@@ -88,6 +88,10 @@ class Card
       action_on(card_id) || actions.first
     end
 
+    def draft?
+      main_action.draft
+    end
+
     # time (in words) since act took place
     # @return [String]
     def elapsed_time

data/mod/history/lib/card/act/act_renderer.rb

@@ -0,0 +1,194 @@
+#require_dependency File.expand_path("../../action/action_renderer", __FILE__)
+
+class Card
+  class Act
+    class ActRenderer
+      def initialize format, act, args
+        @format = format
+        @act = act
+        @args = args
+        @card = @format.card
+        @context = @args[:act_context]
+      end
+
+      include ::Bootstrapper
+
+      def method_missing(method_name, *args, &block)
+        if block_given?
+          @format.send(method_name, *args, &block)
+        else
+          @format.send(method_name, *args)
+        end
+      end
+
+      def respond_to_missing? method_name, _include_private=false
+        @format.respond_to? method_name
+      end
+
+      def render
+        act_accordion
+      end
+
+      def header
+        #::Bootstrap.new(self).render do
+        #::Boo.bs do
+          bs_layout do
+            row 10, 2 do
+              column do
+                html title
+                tag(:span, "text-muted") { summary }
+              end
+              column act_links, class: "text-right"
+            end
+            row 12 do
+              column subtitle
+            end
+          end
+        #end
+      end
+
+      def absolute_title
+        accordion_expand_link(@act.card.name)
+      end
+
+      def details
+        approved_actions[0..20].map do |action|
+          Action::ActionRenderer.new(@format, action, action_header?,
+                                     :summary).render
+        end.join
+      end
+
+      def summary
+        [:create, :update, :delete, :draft].map do |type|
+          next unless count_types[type] > 0
+          "#{@format.action_icon type} #{count_types[type]}"
+        end.compact.join " | "
+      end
+
+      def act_links
+        [
+          link_to_history,
+          (link_to_act_card unless @act.card.trash)
+        ].compact.join " "
+      end
+
+      def link_to_act_card
+        link_to_card @act.card, glyphicon("new-window")
+      end
+
+      def link_to_history
+        link_to_card @act.card, glyphicon("time"), path: { view: :history,
+                                                           look_in_trash: true }
+      end
+
+      def approved_actions
+        @approved_actions ||= actions.select { |a| a.card && a.card.ok?(:read) }
+        # FIXME: should not need to test for presence of card here.
+      end
+
+      def action_header?
+        true
+        # @action_header ||= approved_actions.size != 1 ||
+        #                   approved_actions[0].card_id != @format.card.id
+      end
+
+      def count_types
+        @count_types ||=
+          approved_actions.each_with_object(
+            Hash.new { |h, k| h[k] = 0 }
+          ) do |action, type_cnt|
+            type_cnt[action.action_type] += 1
+          end
+      end
+
+      def edited_ago
+        "#{time_ago_in_words(@act.acted_at)} ago"
+      end
+
+      def collapse_id
+        "act-id-#{@act.id}"
+      end
+
+      def accordion_expand_link text
+        <<-HTML
+          <a>
+            #{text}
+          </a>
+        HTML
+      end
+
+      # TODO: change accordion API in bootstrap/helper.rb so that it can be used
+      #   here. The problem is that here we have extra links in the title
+      #   that are not supposed to expand the accordion
+      def act_accordion
+        context = @act.main_action.draft ? :warning : :default
+        <<-HTML
+        <div class="panel panel-#{context}">
+          #{act_accordion_panel}
+        </div>
+        HTML
+      end
+
+      def accordion_expand_options
+        {
+          "data-toggle" => "collapse",
+          "data-parent" => "#accordion-#{collapse_id}",
+          "data-target" => ".#{collapse_id}",
+          "aria-expanded" => true,
+          "aria-controls" => collapse_id
+        }
+      end
+
+      def act_panel_options
+        { class: "panel-heading", role: "tab", id: "heading-#{collapse_id}" }
+      end
+
+      def act_accordion_panel
+        act_accordion_heading + act_accordion_body
+      end
+
+      def act_accordion_heading
+        wrap_with :div, act_panel_options.merge(accordion_expand_options) do
+          wrap_with :h4, header, class: "panel-title"
+        end
+      end
+
+      def act_accordion_body
+        wrap_with :div, id: collapse_id,
+                        class: "panel-collapse collapse #{collapse_id}" do
+          wrap_with :div, details, class: "panel-body"
+        end
+      end
+
+      def rollback_link
+        return unless card.ok? :update
+        return unless (prior = previous_action)
+        wrap_with :div, class: "act-link collapse #{collapse_id}" do
+          link_to "Save as current",
+                  class: "slotter", remote: true,
+                  method: :post,    rel: "nofollow",
+                  "data-slot-selector" => ".card-slot.history-view",
+                  path: { action: :update, action_ids: prior,
+                          view: :open,     look_in_trash: true }
+        end
+      end
+
+      def previous_action
+        # TODO: optimize
+        actions.select { |action| action.card.last_action_id != action.id }
+      end
+
+      def show_or_hide_changes_link
+        wrap_with :div, class: "act-link" do
+          @format.link_to_view(
+            :act, "#{@args[:hide_diff] ? 'Show' : 'Hide'} changes",
+            class: "slotter",
+            path: { act_id:      @args[:act].id,      act_seq: @args[:act_seq],
+                    hide_diff:  !@args[:hide_diff],   action_view: :expanded,
+                    act_context: @args[:act_context], look_in_trash: true }
+          )
+        end
+      end
+    end
+  end
+end