card 1.20.4 → 1.21.0

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

@@ -28,7 +28,7 @@ describe Card::Set::All::Name do
   end
 
   describe "codename" do
-    before :each do
+    before do
       @card = Card["a"]
     end
 

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

@@ -171,7 +171,7 @@ describe Card::Set::All::Permissions do
       end
       c = Card.new(name: "Home+Heart")
       expect(c.who_can(:read)).to eq([Card::AnyoneSignedInID])
-      expect(c.permission_rule_id_and_class(:read).first).to eq(@perm_card.id)
+      expect(c.permission_rule_id(:read)).to eq(@perm_card.id)
       c.save
       expect(c.read_rule_id).to eq(@perm_card.id)
     end
@@ -183,7 +183,7 @@ describe Card::Set::All::Permissions do
       end
       c = Card.new(name: "Home+Heart")
       expect(c.who_can(:read)).to eq([Card::AnyoneID])
-      expect(c.permission_rule_id_and_class(:read).first).to(
+      expect(c.permission_rule_id(:read)).to(
         eq(Card.fetch("*all+*read").id)
       )
       c.save
@@ -226,7 +226,7 @@ describe Card::Set::All::Permissions do
       Card::Auth.as_bot do
         # Card::Auth.cache.reset
         @u1, @u2, @u3, @r1, @r2, @r3, @c1, @c2, @c3 =
-          %w(u1 u2 u3 r1 r2 r3 c1 c2 c3).map { |x| Card[x] }
+          %w[u1 u2 u3 r1 r2 r3 c1 c2 c3].map { |x| Card[x] }
       end
     end
 
@@ -398,12 +398,12 @@ describe Card::Set::All::Permissions do
 
       Card::Auth.as(@u1) do
         expect(Card.search(content: "WeirdWord").map(&:name).sort).to(
-          eq %w(c1 c2 c3)
+          eq %w[c1 c2 c3]
         )
       end
       Card::Auth.as(@u2) do
         expect(Card.search(content: "WeirdWord").map(&:name).sort).to(
-          eq %w(c2 c3)
+          eq %w[c2 c3]
         )
       end
     end
@@ -422,14 +422,14 @@ describe Card::Set::All::Permissions do
 
       Card::Auth.as(@u1) do
         expect(Card.search(content: "WeirdWord").map(&:name).sort).to(
-          eq(%w(c1 c2 c3))
+          eq(%w[c1 c2 c3])
         )
       end
       # for Card::Auth.as to be effective, you can't have a logged in user
       Card::Auth.current_id = nil
       Card::Auth.as(@u2) do
         expect(Card.search(content: "WeirdWord").map(&:name).sort).to(
-          eq(%w(c2 c3))
+          eq(%w[c2 c3])
         )
       end
     end

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

@@ -8,11 +8,11 @@ describe Card do
   context "when there is a general toc rule of 2" do
     before do
       Card::Auth.as_bot do
-        Card.create! name: "Basic+*type+*table of contents", content: "2"
+        described_class.create! name: "Basic+*type+*table of contents", content: "2"
       end
-      expect(@c1 = Card["Onne Heading"]).to be
-      expect(@c2 = Card["Twwo Heading"]).to be
-      expect(@c3 = Card["Three Heading"]).to be
+      expect(@c1 = described_class["Onne Heading"]).to be
+      expect(@c2 = described_class["Twwo Heading"]).to be
+      expect(@c3 = described_class["Three Heading"]).to be
       expect(@c1.type_id).to eq(Card::BasicID)
       expect(@rule_card = @c1.rule_card(:table_of_contents)).to be
     end
@@ -44,11 +44,11 @@ describe Card do
 
     describe ".related_sets" do
       it "has 1 set (right) for a simple card" do
-        sets = Card["A"].related_sets.map { |s| s[0] }
+        sets = described_class["A"].related_sets.map { |s| s[0] }
         expect(sets).to eq(["A+*right"])
       end
       it "has 2 sets (type, and right) for a cardtype card" do
-        sets = Card["Cardtype A"].related_sets.map { |s| s[0] }
+        sets = described_class["Cardtype A"].related_sets.map { |s| s[0] }
         expect(sets).to eq(["Cardtype A+*type", "Cardtype A+*right"])
       end
       # it "shows type plus right sets when they exist" do
@@ -67,7 +67,7 @@ describe Card do
       #     'Cardtype A+*right', 'Basic+Cardtype A+*type plus right']
       # end
       it "is empty for a non-simple card" do
-        sets = Card["A+B"].related_sets.map { |s| s[0] }
+        sets = described_class["A+B"].related_sets.map { |s| s[0] }
         expect(sets).to eq([])
       end
     end
@@ -81,8 +81,8 @@ describe Card do
 
   context "when I change the general toc setting to 1" do
     before do
-      expect(@c1 = Card["Onne Heading"]).to be
-      expect(@c2 = Card["Twwo Heading"]).to be
+      expect(@c1 = described_class["Onne Heading"]).to be
+      expect(@c2 = described_class["Twwo Heading"]).to be
       expect(@c1.type_id).to eq(Card::BasicID)
       expect(@rule_card = @c1.rule_card(:table_of_contents)).to be
       @rule_card.content = "1"
@@ -113,12 +113,12 @@ describe Card do
   context "when I use CardtypeE cards" do
     before do
       Card::Auth.as_bot do
-        @c1 = Card.create name: "toc1", type: "CardtypeE",
-                          content: Card["Onne Heading"].content
-        @c2 = Card.create name: "toc2", type: "CardtypeE",
-                          content: Card["Twwo Heading"].content
-        @c3 = Card.create name: "toc3", type: "CardtypeE",
-                          content: Card["Three Heading"].content
+        @c1 = described_class.create name: "toc1", type: "CardtypeE",
+                                     content: described_class["Onne Heading"].content
+        @c2 = described_class.create name: "toc2", type: "CardtypeE",
+                                     content: described_class["Twwo Heading"].content
+        @c3 = described_class.create name: "toc3", type: "CardtypeE",
+                                     content: described_class["Three Heading"].content
       end
       expect(@c1.type_name).to eq("Cardtype E")
       @rule_card = @c1.rule_card(:table_of_contents)
@@ -170,11 +170,11 @@ describe Card do
   context "when I create a new rule" do
     before do
       Card::Auth.as_bot do
-        Card.create! name: "Basic+*type+*table of contents", content: "2"
-        @c1 = Card.create! name: "toc1", type: "CardtypeE",
-                           content: Card["Onne Heading"].content
-        @c2 = Card.create! name: "toc2", content: Card["Twwo Heading"].content
-        @c3 = Card.create! name: "toc3", content: Card["Three Heading"].content
+        described_class.create! name: "Basic+*type+*table of contents", content: "2"
+        @c1 = described_class.create! name: "toc1", type: "CardtypeE",
+                                      content: described_class["Onne Heading"].content
+        @c2 = described_class.create! name: "toc2", content: described_class["Twwo Heading"].content
+        @c3 = described_class.create! name: "toc3", content: described_class["Three Heading"].content
         expect(@c1.type_name).to eq("Cardtype E")
         @rule_card = @c1.rule_card(:table_of_contents)
 
@@ -182,16 +182,16 @@ describe Card do
         expect(@c2).to be
         expect(@c3).to be
         expect(@rule_card.name).to eq("*all+*table of contents")
-        if (c = Card["CardtypeE+*type+*table of content"])
+        if (c = described_class["CardtypeE+*type+*table of content"])
           c.content = "2"
           c.save!
         else
-          Card.create! name: "CardtypeE+*type+*table of content", content: "2"
+          described_class.create! name: "CardtypeE+*type+*table of content", content: "2"
         end
       end
     end
     it "takes on new setting value" do
-      c = Card["toc1"]
+      c = described_class["toc1"]
       expect(c.rule_card(:table_of_contents).name)
         .to eq("CardtypeE+*type+*table of content")
       expect(c.rule(:table_of_contents)).to eq("2")
@@ -214,11 +214,11 @@ describe Card do
 
   context "when I change the general toc setting to 1" do
     before do
-      expect(@c1 = Card["Onne Heading"]).to be
+      expect(@c1 = described_class["Onne Heading"]).to be
       # FIXME: CardtypeE should inherit from *default => Basic
       # @c2 = Card.create name: 'toc2', type: "CardtypeE",
       #                   content: Card['Twwo Heading'].content
-      expect(@c2 = Card["Twwo Heading"]).to be
+      expect(@c2 = described_class["Twwo Heading"]).to be
       expect(@c1.type_id).to eq(Card::BasicID)
       expect(@rule_card = @c1.rule_card(:table_of_contents)).to be
       @rule_card.content = "1"

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

@@ -39,6 +39,7 @@ describe Card::Set::All::Rules do
         Card.create name: "*all+*help", content: "edit any kind of card"
       end
       subject { Card.new(type: "Book").rule(:add_help, fallback: :help) }
+
       it "retrieves default setting" do
         expect(subject).to eq("edit any kind of card")
       end
@@ -58,7 +59,7 @@ describe Card::Set::All::Rules do
 
   describe "#setting_codenames_by_group" do
     before do
-      @pointer_settings = [:options, :options_label, :input]
+      @pointer_settings = %i[options options_label input]
     end
     it "doesn't fail on nonexistent trunks" do
       codenames = Card.new(name: "foob+*right").setting_codenames_by_group
@@ -73,12 +74,6 @@ describe Card::Set::All::Rules do
       expect(snbg.keys.first).to be_a Symbol
       expect(snbg.keys.member?(:pointer)).not_to be_truthy
     end
-
-    it "returns pointer-specific setting names for pointer card" do
-      c = Card.fetch "Fruit+*type+*create+*self", new: {}
-      snbg = c.setting_codenames_by_group
-      expect(snbg[:pointer]).to eq(@pointer_settings)
-    end
   end
 
   describe "user specific rules" do

data/mod/developer/set/all/event_viz.rb

@@ -1,4 +1,4 @@
-require_dependency 'active_support/callbacks_ext'
+require_dependency "active_support/callbacks_ext"
 
 # the events method is a developer's tool for visualizing the event order
 # for a given card.

data/mod/developer/set/right/debug.rb

@@ -49,7 +49,7 @@ format :html do
     db_card    = Card.find_by_key(subject.key)
     return unless cache_card && db_card
     table(
-      [:name, :updated_at, :updater_id, :content, :inspect].map do |field|
+      %i[name updated_at updater_id content inspect].map do |field|
         [field.to_s,
          h(cache_card.send(field)),
          h(db_card.send(field))]

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

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Card
   # An "act" is a group of recorded {Card::Action actions} on {Card cards}.
   # Together, {Act acts}, {Action actions}, and {Change changes} comprise a

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

@@ -1,4 +1,4 @@
-#require_dependency File.expand_path("../../action/action_renderer", __FILE__)
+# require_dependency File.expand_path("../../action/action_renderer", __FILE__)
 
 class Card
   class Act
@@ -6,6 +6,7 @@ class Card
       def initialize format, act, args
         @format = format
         @act = act
+        @act_card = act.card
         @args = args
         @card = @format.card
         @context = @args[:act_context]
@@ -13,7 +14,7 @@ class Card
 
       include ::Bootstrapper
 
-      def method_missing(method_name, *args, &block)
+      def method_missing method_name, *args, &block
         if block_given?
           @format.send(method_name, *args, &block)
         else
@@ -26,29 +27,30 @@ class Card
       end
 
       def render
+        return "" unless @act_card
         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
+        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
       end
 
       def absolute_title
-        accordion_expand_link(@act.card.name)
+        accordion_expand_link(@act_card.name)
       end
 
       def details
@@ -59,7 +61,7 @@ class Card
       end
 
       def summary
-        [:create, :update, :delete, :draft].map do |type|
+        %i[create update delete draft].map do |type|
           next unless count_types[type] > 0
           "#{@format.action_icon type} #{count_types[type]}"
         end.compact.join " | "
@@ -68,17 +70,18 @@ class Card
       def act_links
         [
           link_to_history,
-          (link_to_act_card unless @act.card.trash)
+          (link_to_act_card unless @act_card.trash)
         ].compact.join " "
       end
 
       def link_to_act_card
-        link_to_card @act.card, glyphicon("new-window")
+        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 }
+        link_to_card @act_card, glyphicon("time"),
+                     path: { view: :history, look_in_trash: true },
+                     rel: "nofollow"
       end
 
       def approved_actions
@@ -175,7 +178,7 @@ class Card
 
       def previous_action
         # TODO: optimize
-        actions.select { |action| action.card.last_action_id != action.id }
+        actions.reject { |action| action.card.last_action_id == action.id }
       end
 
       def show_or_hide_changes_link

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

@@ -22,4 +22,3 @@ class Card
     end
   end
 end
-

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

@@ -29,6 +29,7 @@ class Card
         end
 
         def current_act?
+          return unless @format.card.last_act && @act
           @act.id == @format.card.last_act.id
         end
 

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

@@ -37,7 +37,7 @@ class Card
                        }
 
     # these are the three possible values for action_type
-    TYPE_OPTIONS = [:create, :update, :delete].freeze
+    TYPE_OPTIONS = %i[create update delete].freeze
 
     after_save :expire
 

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

@@ -11,7 +11,7 @@ class Card
       end
 
       include ::Bootstrapper
-      def method_missing(method_name, *args, &block)
+      def method_missing method_name, *args, &block
         if block_given?
           @format.send(method_name, *args, &block)
         else
@@ -60,7 +60,7 @@ class Card
             path: { related: { view: "history", name: @action.card.name } },
             remote: true,
             class: "slotter",
-            #"data-slot-selector" => ".card-slot.history-view"
+            # "data-slot-selector" => ".card-slot.history-view"
           )
         end
       end

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

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Card
   # A _change_ is an alteration to a card's name, type, content, or trash state.
   # Together, {Act acts}, {Action actions}, and {Change changes} comprise a
@@ -19,7 +20,7 @@ class Card
                         inverse_of: :card_changes
 
     # lists the database fields for which changes are recorded
-    TRACKED_FIELDS = %w(name type_id db_content trash).freeze
+    TRACKED_FIELDS = %w[name type_id db_content trash].freeze
 
     class << self
       # delete all {Change changes} not associated with an {Action action}

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

@@ -32,7 +32,7 @@ format :html do
 
   def content_diff action, view_type
     diff = action.new_content? &&
-           _render_content_changes(action: action, diff_type: view_type) #, hide_diff: @hide_diff
+           _render_content_changes(action: action, diff_type: view_type) # , hide_diff: @hide_diff
     return "<i>empty</i>" unless diff.present?
     diff
   end

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

@@ -116,12 +116,15 @@ def last_act
   @last_act ||=
     if (action = last_action)
       last_act_on_self = acts.last
-      if last_act_on_self && action.act &&
-         (action.act == last_act_on_self ||
-         last_act_on_self.acted_at > action.act.acted_at)
+      act_of_last_action = action.act
+      return act_of_last_action unless last_act_on_self
+      return last_act_on_self unless act_of_last_action
+
+      return last_act_on_self if act_of_last_action == last_act_on_self
+      if last_act_on_self.acted_at > act_of_last_action.acted_at
         last_act_on_self
       else
-        action.act
+        act_of_last_action
       end
     end
 end

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

@@ -163,7 +163,7 @@ format :html do
     intrusive_acts = card.intrusive_acts
                          .page(page_from_params).per(ACTS_PER_PAGE)
     wrap_with :span, class: "slotter" do
-      paginate intrusive_acts, remote: true, theme: 'twitter-bootstrap-3'
+      paginate intrusive_acts, remote: true, theme: "twitter-bootstrap-3"
     end
   end
 
@@ -172,17 +172,17 @@ format :html do
   end
 
   def action_legend with_drafts=true
-    types = [:create, :update, :delete]
+    types = %i[create update delete]
     legend = types.map do |action_type|
-               "#{action_icon(action_type)} #{action_type}d"
-             end
+      "#{action_icon(action_type)} #{action_type}d"
+    end
     legend << "#{action_icon(:draft)} unsaved draft" if with_drafts
     "<small>Actions: #{legend.join ' | '}</small>"
   end
 
   def content_legend
-    legend = [Card::Content::Diff.render_added_chunk('Additions'),
-              Card::Content::Diff.render_deleted_chunk('Subtractions')]
+    legend = [Card::Content::Diff.render_added_chunk("Additions"),
+              Card::Content::Diff.render_deleted_chunk("Subtractions")]
     "<small>Content changes: #{legend.join ' | '}</small>"
   end