card 1.19.2 → 1.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c530f9f078a90e9de4c239d7f5222e670b10b98a
-  data.tar.gz: 735604a8c31fe1247d23e3bbc5c90d495c83593a
+  metadata.gz: 057086042ff26905bb50428aa1e697887464f1ed
+  data.tar.gz: 159c9cd1236f61f566ed10a4b132e84aadc3c369
 SHA512:
-  metadata.gz: 43e1f744865904f81aec258a25a0f823693b2b8b418491e451594a18f345fb4b79e796ece4ca46e4c9ac604c9622646faf137801353348802d7b5c790d14e270
-  data.tar.gz: 6224a80edc261e7b8636dce40fdb1357ee1d94e08c4fc32208587f6470b413c4e3af370156bfb1d9553159a5872245cc10cf1fb304d94d7413d50da90c8a4969
+  metadata.gz: 7d9330f1f0e0e30a5bf642e80695ec4b460534e04c34843b9f316b154eb72aa56f3feb1d47b639bee6a55568e2e8fef3d14e1391eb8a406656aa86e2f26702ef
+  data.tar.gz: cf1908a395f06b908b57f9dbbfcf67ef0d734ee51f30a93272725ddfe27d583256e326a416a149fd91ac4db5fc971eb0da1c8a1c957b38ccb9d6855094426062

data/VERSION

@@ -1 +1 @@
-1.19.2
+1.19.3

data/lib/card/content/diff.rb

@@ -13,11 +13,11 @@ class Card
         end
 
         def render_added_chunk text
-          "<ins class='diffins diff-green'>#{text}</ins>"
+          "<ins class='diffins diff-added'>#{text}</ins>"
         end
 
         def render_deleted_chunk text, _count=true
-          "<del class='diffdel diff-red'>#{text}</del>"
+          "<del class='diffdel diff-deleted'>#{text}</del>"
         end
       end
 

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

@@ -1,29 +1,50 @@
 format :html do
+  view :core do |_args|
+    rows = trashed_cards.map { |tc| trash_table_row(tc) }
+    output [
+      restored,
+      (empty_trash_link if rows.present?),
+      table(rows, header: ["card", "deleted", "by", ""])
+    ]
+  end
+
   def trashed_cards
-    Card.where(trash: true)
+    Card.where(trash: true).order(updated_at: :desc)
   end
 
-  view :core do |_args|
-    rows =
-      trashed_cards.map do |card|
-        [card.name, Card[card.updater_id].name, put_back_link(card)]
-      end
-    output [
-      (content_tag(:p, empty_trash_link) if rows.present?),
-      table(rows, header: ["card", "deleted by", ""])
+  def trash_table_row card
+    [
+      card.name,
+      "#{time_ago_in_words(card.updated_at)} ago",
+      Card[card.updater_id].name,
+      restore_link(card)
     ]
   end
 
+  def restored
+    return unless (res_id = Env.params[:restore]) &&
+                  (res_card = Card[res_id.to_i])
+    alert :success, dismissible: true do
+      content_tag(:h5, "restored") + subformat(res_card).render_closed
+    end
+  end
+
   def empty_trash_link
-    card_link :admin, path_opts: { action: :update, task: :empty_trash,
-                                   success: { id: "~#{card.id}" } },
-                      text: "empty trash"
+    button =
+      button_link "empty trash",
+                  { card: :admin, action: :update,
+                    task: :empty_trash, success: { id: "~#{card.id}" } },
+                  btn_type: :default,
+                  "data-confirm" => "Are you sure you want to delete all "\
+                                    "cards in the trash"
+    content_tag :p, button
   end
 
-  def put_back_link card
-    before_delete = card.actions[-2]
-    link_path = path action: :update, view: :open, action_ids: [before_delete],
-                     success: { id: card.name }
-    link_to "put back", link_path, method: :post, rel: "nofollow"
+  def restore_link trashed_card
+    before_delete = trashed_card.actions[-2]
+    link_path = path action: :update, view: :open, restore: trashed_card.id,
+                     action_ids: [before_delete]
+    link_to "restore", link_path, method: :post, rel: "nofollow",
+                                  remote: true, class: "slotter"
   end
 end

data/mod/carrierwave/lib/carrier_wave/image_card_uploader.rb

@@ -20,10 +20,10 @@ module CarrierWave
       process resize_to_fit: [75, 75]
     end
     version :medium, if: :create_versions? do
-      process resize_to_fit: [200, 200]
+      process resize_to_limit: [200, 200]
     end
     version :large, if: :create_versions? do
-      process resize_to_fit: [500, 500]
+      process resize_to_limit: [500, 500]
     end
 
     # version :small_square, if: :create_versions?,

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

@@ -179,7 +179,7 @@ module ClassMethods
       Card.new opts
     else
       mark = args[:id] || opts[:name]
-      Card.fetch mark, new: opts
+      Card.fetch mark, look_in_trash: args[:look_in_trash], new: opts
     end
   end
 

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

@@ -68,9 +68,15 @@ def silent_change
 end
 
 def silent_change?
-  silent_change || !Card::Env[:controller]
+  silent_change
 end
 
+event :only_notify_on_web_requests, :initialize,
+      when: proc { !Card::Env[:controller] } do
+  @silent_change = true
+end
+
+
 def notable_change?
   !silent_change? && current_act_card? &&
     Card::Auth.current_id != WagnBotID && followable?

data/mod/history/lib/card/action/differ.rb

@@ -36,6 +36,14 @@ class Card
         content_diff_object.green?
       end
 
+      def raw_view content=nil
+        original_content = card.db_content
+        card.db_content = content || value(:db_content)
+        card.format.render_raw
+      ensure
+        card.db_content = original_content
+      end
+
       private
 
       def diff_object field, opts
@@ -45,20 +53,11 @@ class Card
       def content_diff_object opts=nil
         @diff ||= begin
           diff_args = opts || card.include_set_modules.diff_args
-          previous = raw_view previous_value(:content), diff_args[:format]
-          current = raw_view value(:content), diff_args[:format]
-
+          previous = raw_view previous_value(:content)
+          current = raw_view
           Card::Content::Diff.new previous, current, diff_args
         end
       end
-
-      def raw_view content, format=:text
-        original_content = card.db_content
-        card.db_content = content
-        card.format(format).render_raw
-      ensure
-        card.db_content = original_content
-      end
     end
   end
 end

data/mod/history/set/all/history.rb

@@ -164,13 +164,17 @@ format :html do
           %span.slotter
             = paginate intr, remote: true, theme: 'twitter-bootstrap-3'
           %div.history-legend
-            %span.glyphicon.glyphicon-plus-sign.diff-green
+            = glyphicon "plus-sign", "added-mark"
             %span
               = Card::Content::Diff.render_added_chunk('Added')
               |
-            %span.glyphicon.glyphicon-minus-sign.diff-red
+            = glyphicon "minus-sign", "deleted-mark"
             %span
-              = Card::Content::Diff.render_deleted_chunk('Deleted')
+              = Card::Content::Diff.render_deleted_chunk('Removed')
+              |
+            = glyphicon "trash", "deleted-mark"
+            %span
+              card deleted
       HAML
     end
   end
@@ -265,7 +269,7 @@ format :html do
   def view_action action_view, args
     action = args[:action] || card.last_action
     hide_diff = args[:hide_diff] || hide_diff?
-
+    return trashed_view(action) if action.action_type == :delete
     render_haml action: action,
                 action_view: action_view,
                 name_diff: name_diff(action, hide_diff),
@@ -275,8 +279,8 @@ format :html do
         .action
           .summary
             %span.ampel
-              = glyphicon 'minus-sign', (action.red? ? 'diff-red' : 'diff-invisible')
-              = glyphicon 'plus-sign', (action.green? ? 'diff-green' : 'diff-invisible')
+              = glyphicon 'minus-sign', (action.red? ? 'deleted-mark' : 'diff-invisible')
+              = glyphicon 'plus-sign', (action.green? ? 'added-mark' : 'diff-invisible')
             = wrap_diff :name, name_diff
             = wrap_diff :type, type_diff
             -if content_diff
@@ -290,6 +294,18 @@ format :html do
     end
   end
 
+  def trashed_view action
+    render_haml action: action do
+      <<-HAML.strip_heredoc
+        .action
+          .summary
+            %span.ampel
+              = glyphicon 'trash', 'deleted-mark'
+            = wrap_diff :name, action.card.name, ('label label-default' if action.card != card)
+      HAML
+    end
+  end
+
   def name_diff action, hide_diff
     if action.card == card
       name_changes(action, hide_diff)
@@ -315,10 +331,10 @@ format :html do
     )
   end
 
-  def wrap_diff field, content
+  def wrap_diff field, content, extra_class=nil
     return "" unless content.present?
     %(
-       <span class="#{field}-diff">
+       <span class="#{field}-diff #{extra_class}">
        #{content}
        </span>
     )
@@ -345,7 +361,7 @@ format :html do
 
   view :content_changes do |args|
     if args[:hide_diff]
-      args[:action].value :db_content
+      args[:action].raw_view
     else
       args[:action].content_diff(args[:diff_type])
     end
@@ -357,7 +373,8 @@ format :html do
       act_seq:     args[:act_seq],
       hide_diff:   args[:hide_diff],
       act_context: args[:act_context],
-      action_view: (args[:action_view] == :expanded ? :summary : :expanded)
+      action_view: (args[:action_view] == :expanded ? :summary : :expanded),
+      look_in_trash: true
     }
     arrow_dir = args[:action_view] == :expanded ? "arrow-down" : "arrow-right"
     view_link "", :act, path_opts: path_opts,
@@ -368,7 +385,8 @@ format :html do
     not_current =
       actions.select { |action| action.card.last_action_id != action.id }
     return unless card.ok?(:update) && not_current.present?
-    link_path = path action: :update, view: :open, action_ids: not_current
+    link_path = path action: :update, view: :open, action_ids: not_current,
+                     look_in_trash: true
     link = link_to(
       "Save as current", link_path,
       class: "slotter", "data-slot-selector" => ".card-slot.history-view",
@@ -384,7 +402,8 @@ format :html do
       act_seq: args[:act_seq],
       hide_diff: !args[:hide_diff],
       action_view: :expanded,
-      act_context: args[:act_context]
+      act_context: args[:act_context],
+      look_in_trash: true
     }
     link = view_link("#{toggle} changes", :act,
                      path_opts: path_opts, class: "slotter", remote: true)

data/mod/machines/lib/stylesheets/style_cards.scss

@@ -623,14 +623,22 @@ $act-gray:  #b7b7b7;
   }
 }
 
-.diff-red {
+.deleted-mark {
+  color: $diff-red;
+}
+
+.added-mark {
+  color: $diff-green;
+}
+
+.diff-deleted {
   text-decoration: line-through;
   color: $diff-red;
   img {
     border: 2px solid $diff-red;
   }
 }
-.diff-green {
+.diff-added {
   color: $diff-green;
   img {
     margin: 0px 4px 0px 4px;

data/mod/standard/spec/set/all/history_spec.rb

@@ -16,9 +16,9 @@ describe Card::Set::All::History do
       end
 
       it "should have a summary" do
-        assert_view_select subject, 'del[class="diffdel diff-red"]',
+        assert_view_select subject, 'del[class="diffdel diff-deleted"]',
                            text: "chicken"
-        assert_view_select subject, 'ins[class="diffins diff-green"]',
+        assert_view_select subject, 'ins[class="diffins diff-added"]',
                            text: "chick"
       end
     end

data/spec/lib/card/diff_spec.rb

@@ -5,11 +5,11 @@ require "card/content/diff"
 
 describe Card::Content::Diff do
   def del text
-    "<del class='diffdel diff-red'>#{text}</del>"
+    "<del class='diffdel diff-deleted'>#{text}</del>"
   end
 
   def ins text
-    "<ins class='diffins diff-green'>#{text}</ins>"
+    "<ins class='diffins diff-added'>#{text}</ins>"
   end
 
   def tag text

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.19.2
+  version: 1.19.3
 platform: ruby
 authors:
 - Ethan McCutchen