card 1.16.8 → 1.16.9

data/mod/01_core/spec/set/all/tracked_attributes_spec.rb

@@ -35,19 +35,9 @@ include RenameMethods
 
 describe Card::Set::All::TrackedAttributes do
 
-  describe '#extract_subcard_args!' do
-    it "should move plus keys into subcard hash" do
-      raw_args = { 'name'=>'test', 'subcards'=>{ '+*oldway'=>{'content'=>'old'},  }, '+*newway'=>{'content'=>'new'} }
-      subcards = Card.new.extract_subcard_args! raw_args
-      expect(raw_args['subcards']).to be_nil
-      expect(subcards.keys.sort).to eq(['+*newway', '+*oldway'])
-    end
-  end
-
 
   describe 'set_name' do
 
-
     it "should handle case variants" do
       @c = Card.create! name: 'chump'
       expect(@c.name).to eq('chump')

data/mod/01_core/spec/set/all/trash_spec.rb

@@ -1,25 +1,24 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Trash do
-
-  it "certain 'all rules' should be indestructable" do
+  subject do
+    card = Card[@name]
     Card::Auth.as_bot do
-      name = '*all+*default'
-      card = Card[name]
       card.delete
-      expect(card.errors[:delete].first).to eq("#{name} is an indestructible rule")
-      expect(Card[name]).to be
     end
+    card.errors[:delete].first
+  end
+
+  it "certain 'all rules' should be indestructable" do
+    @name = '*all+*default'
+    is_expected.to eq("#{@name} is an indestructible rule")
+    expect(Card[@name]).to be
   end
 
   it 'does not delete account with edits' do
-    Card::Auth.as_bot do
-      name = 'Joe User'
-      card = Card[name]
-      card.delete
-      expect(card.errors[:delete].first).to match("Edits have been made with #{name}'s user account")
-      expect(Card[name]).to be
-    end
+    @name = 'Joe User'
+    is_expected.to match("Edits have been made with #{@name}'s user account")
+    expect(Card[@name]).to be
   end
 
   it 'deletes account without edits' do
@@ -31,4 +30,30 @@ describe Card::Set::All::Trash do
     end
   end
 
+  it 'deletes children' do
+    Card::Auth.as_bot do
+      name = 'born to die'
+      card = Card.create! name: name, '+sub' => 'a subcard'
+      expect(Card["#{name}+sub"]).to be
+      card.delete
+      expect(Card["#{name}+sub"]).not_to be
+    end
+  end
+
+  it 'deletes account of user' do
+    Card::Auth.as_bot do
+      @signup = Card.create!(
+        name: 'born to die', type_id: Card::SignupID,
+        '+*account' => { '+*email' => 'wolf@wagn.org', '+*password' => 'wolf' }
+      )
+      @signup.update_attributes!({})
+    end
+    Card::Cache.reset_global
+
+    Card::Auth.as_bot do
+      expect(Card.search :right=>'*account').not_to be_empty
+      Card['born to die'].delete!
+    end
+    expect(Card['born to die+*account']).not_to be
+  end
 end

data/mod/01_core/spec/set/all/type_spec.rb

@@ -1,25 +1,6 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Type do
-
-  describe 'get_type_id (#new)' do
-    it "should accept cardtype name and casespace variant as type" do
-      expect(Card.new( type: 'Phrase'   ).type_id).to eq(Card::PhraseID)
-      expect(Card.new( type: 'PHRASE'   ).type_id).to eq(Card::PhraseID)
-      expect(Card.new( type: 'phrase'   ).type_id).to eq(Card::PhraseID)
-      expect(Card.new( type: 'phrase??' ).type_id).to eq(Card::PhraseID)
-    end
-
-    it 'should accept type_code' do
-      expect(Card.new( type_code: 'phrase'   ).type_id).to eq(Card::PhraseID)
-      expect(Card.new( type_code: :phrase    ).type_id).to eq(Card::PhraseID)
-    end
-
-    it 'should accept type_id' do
-      expect(Card.new( type_id: Card::PhraseID   ).type_code).to eq(:phrase)
-    end
-  end
-
   describe 'card with wagneered type' do
     before do
       Card::Auth.as_bot do

data/mod/01_history/set/all/content_history.rb

@@ -88,11 +88,13 @@ def last_action
 end
 
 def last_content_action
-  l_c = last_change_on(:db_content) and l_c.action
+  l_c = last_change_on :db_content
+  l_c && l_c.action
 end
 
 def last_content_action_id
-  l_c = last_change_on(:db_content) and l_c.card_action_id
+  l_c = last_change_on :db_content
+  l_c && l_c.card_action_id
 end
 
 def last_actor
@@ -100,7 +102,7 @@ def last_actor
 end
 
 def last_act
-  if action = last_action
+  if (action = last_action)
     last_act_on_self = acts.last
     if last_act_on_self and ( action.act==last_act_on_self || last_act_on_self.acted_at>action.act.acted_at )
       last_act_on_self

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

@@ -4,23 +4,35 @@ def history?
   true
 end
 
-# must be called on all actions and before :set_name, :process_subcards and :validate_delete_children
-event :assign_act,  before: :prepare, when: proc {|c| c.history? || c.respond_to?(:attachment) }  do
-  @current_act = (@supercard && @supercard.current_act) || Card::Act.create(ip_address: Env.ip)
+# must be called on all actions and before :set_name, :process_subcards and
+# :validate_delete_children
+event :assign_act,
+      before: :prepare,
+      when: proc { |c| c.history? || c.respond_to?(:attachment) }  do
+  @current_act = (@supercard && @supercard.current_act) ||
+                 Card::Act.create(ip_address: Env.ip)
 end
 
 event :assign_action, after: :assign_act do
-  @current_action = Card::Action.create(card_act_id: @current_act.id, action_type: @action, draft: (Env.params['draft'] == 'true') )
-  if (@supercard and @supercard !=self)
+  @current_action = Card::Action.create(
+    card_act_id: @current_act.id, action_type: @action,
+    draft: (Env.params['draft'] == 'true')
+  )
+  if @supercard && @supercard != self
     @current_action.super_action = @supercard.current_action
   end
 end
 
-
 # stores changes in the changes table and assigns them to the current action
 # removes the action if there are no changes
-event :finalize_action, after: :stored, when: proc {|c| (c.history? || c.respond_to?(:attachment)) && c.current_action} do
-  @changed_fields = Card::TRACKED_FIELDS.select{ |f| changed_attributes.member? f }
+event :finalize_action,
+      after: :stored,
+      when: proc { |c|
+        (c.history? || c.respond_to?(:attachment)) && c.current_action
+      } do
+  @changed_fields = Card::TRACKED_FIELDS.select do |f|
+    changed_attributes.member? f
+  end
   if @changed_fields.present?
     @changed_fields.each{ |f| Card::Change.create field: f, value: self[f], card_action_id: @current_action.id }
     @current_action.update_attributes! card_id: id
@@ -30,7 +42,9 @@ event :finalize_action, after: :stored, when: proc {|c| (c.history? || c.respond
   end
 end
 
-event :finalize_act, after: :finalize_action, when: proc {|c| !c.supercard } do
+event :finalize_act,
+      after: :finalize_action,
+      when: proc { |c| !c.supercard } do
   if @current_act.actions(true).empty?
     @current_act.delete
     @current_act = nil
@@ -39,9 +53,10 @@ event :finalize_act, after: :finalize_action, when: proc {|c| !c.supercard } do
   end
 end
 
-
-event :rollback_actions, before: :approve, on: :update, when: proc{ |c| c.rollback_request? } do
-  revision = { subcards: {}}
+event :rollback_actions,
+      before: :approve, on: :update,
+      when: proc { |c| c.rollback_request? } do
+  revision = { subcards: {} }
   rollback_actions = Env.params['action_ids'].map do |a_id|
     Action.fetch(a_id) || nil
   end
@@ -62,18 +77,20 @@ event :rollback_actions, before: :approve, on: :update, when: proc{ |c| c.rollba
 end
 
 def rollback_request?
-  history? && Env && Env.params['action_ids'] && Env.params['action_ids'].class == Array
+  history? && Env && Env.params['action_ids'] &&
+    Env.params['action_ids'].class == Array
 end
 
-# alternative approach to handle act and action that doesn't change the database in the beginning
-# stopped working with Rails 4
+# alternative approach to handle act and action that doesn't change the
+# database in the beginning stopped working with Rails 4
 # def build_act_and_action
 #   @current_act = if @supercard
 #     @supercard.current_act || @supercard.acts.build(ip_address: Env.ip)
 #   else
 #     acts.build(ip_address: Env.ip)
 #   end
-#   @current_action = actions(true).build(action_type: @action, draft: (Env.params['draft'] == 'true') )
+#   @current_action = actions(true).build(action_type: @action, draft:
+#   (Env.params['draft'] == 'true') )
 #   @current_action.act = @current_act
 #
 #   if (@supercard and @supercard !=self)
@@ -81,27 +98,35 @@ end
 #   end
 # end
 
-
-def intrusive_family_acts args={}   # all acts with actions on self and on cards that are descendants of self and included in self
+# all acts with actions on self and on cards that are descendants of self and
+# included in self
+def intrusive_family_acts args={}
   @intrusive_family_acts ||= begin
-    Act.find_all_with_actions_on( (included_descendant_card_ids << id), args)
+    Act.find_all_with_actions_on((included_descendant_card_ids << id), args)
   end
 end
 
-def intrusive_acts  args={with_drafts: true} # all acts with actions on self and on cards included in self
+# all acts with actions on self and on cards included in self
+def intrusive_acts  args={ with_drafts: true }
   @intrusive_acts ||= begin
-    Act.find_all_with_actions_on( (included_card_ids << id), args)
+    Act.find_all_with_actions_on((included_card_ids << id), args)
   end
 end
 
 def current_rev_nr
   @current_rev_nr ||= begin
-    intrusive_acts.first.actions.last.draft ? @intrusive_acts.size - 1 : @intrusive_acts.size
+    if intrusive_acts.first.actions.last.draft
+      @intrusive_acts.size - 1
+    else
+      @intrusive_acts.size
+    end
   end
 end
 
 def included_card_ids
-  Card::Reference.select(:referee_id).where( ref_type: 'I', referer_id: id ).pluck('referee_id').compact.uniq
+  Card::Reference.select(:referee_id).where(
+    ref_type: 'I', referer_id: id
+  ).pluck('referee_id').compact.uniq
 end
 
 def descendant_card_ids parent_ids=[id]
@@ -119,7 +144,7 @@ end
 
 format :html do
   view :history do |args|
-    frame args.merge(body_class: "history-slot list-group", content: true) do
+    frame args.merge(body_class: 'history-slot list-group', content: true) do
       [
         history_legend,
         _render_revisions
@@ -132,10 +157,10 @@ format :html do
 
   view :revisions do |args|
     page = params['page'] || 1
-    count = card.intrusive_acts.size+1-(page.to_i-1)*REVISIONS_PER_PAGE
+    count = card.intrusive_acts.size + 1 - (page.to_i - 1) * REVISIONS_PER_PAGE
     card.intrusive_acts.page(page).per(REVISIONS_PER_PAGE).map do |act|
       count -= 1
-      render_act_summary args.merge(act: act,rev_nr: count)
+      render_act_summary args.merge(act: act, rev_nr: count)
     end.join
   end
 
@@ -149,11 +174,11 @@ format :html do
   %div.history-legend
     %span.glyphicon.glyphicon-plus-sign.diff-green
     %span
-      = Card::Diff.render_added_chunk("Added")
+      = Card::Diff.render_added_chunk('Added')
       |
     %span.glyphicon.glyphicon-minus-sign.diff-red
     %span
-      = Card::Diff.render_deleted_chunk("Deleted")
+      = Card::Diff.render_deleted_chunk('Deleted')
       HAML
     end
   end
@@ -167,11 +192,13 @@ format :html do
   end
 
   def render_act act_view, args
-    act = (params['act_id'] and Card::Act.find(params['act_id'])) || args[:act]
+    act = (params['act_id'] && Card::Act.find(params['act_id'])) || args[:act]
     rev_nr = params['rev_nr'] || args[:rev_nr]
-    current_rev_nr = params['current_rev_nr'] || args[:current_rev_nr] || card.current_rev_nr
-    hide_diff = (params["hide_diff"]=="true") || args[:hide_diff]
-    wrap( args.merge(slot_class: "revision-#{act.id} history-slot list-group-item") ) do
+    current_rev_nr = params['current_rev_nr'] || args[:current_rev_nr] ||
+                     card.current_rev_nr
+    hide_diff = (params['hide_diff'] == ' true') || args[:hide_diff]
+    args[:slot_class] = "revision-#{act.id} history-slot list-group-item"
+    wrap(args) do
       render_haml card: card, act: act, act_view: act_view,
                   current_rev_nr: current_rev_nr, rev_nr: rev_nr,
                   hide_diff: hide_diff do
@@ -182,7 +209,7 @@ format :html do
       = "##{rev_nr}"
     .title
       .actor
-        = link_to act.actor.name, card_url( act.actor.cardname.url_key )
+        = link_to act.actor.name, card_url(act.actor.cardname.url_key)
       .time.timeago
         = time_ago_in_words(act.acted_at)
         ago
@@ -215,33 +242,15 @@ HAML
     render_action :expanded, args
   end
 
+
   def render_action action_view, args
     action = args[:action] || card.last_action
-    hide_diff = Env.params["hide_diff"]=="true" || args[:hide_diff]
-    name_diff =
-      if action.card == card
-        name_changes(action, hide_diff)
-      else
-        link_to name_changes(action, hide_diff),
-                path(view: :related, related: {view: "history",name: action.card.name}),
-                class: 'slotter label label-default',
-                'data-slot-selector'=>".card-slot.history-view",
-                remote: true
-      end
-
-    type_diff =
-        action.new_type? &&
-        type_changes(action, hide_diff)
-
-    content_diff =
-        action.new_content? &&
-        action.card.format.render_content_changes(action: action, diff_type: action_view, hide_diff: hide_diff)
-
+    hide_diff = Env.params['hide_diff'] == 'true' || args[:hide_diff]
     render_haml action: action,
                 action_view: action_view,
-                name_diff: name_diff,
-                type_diff: type_diff,
-                content_diff: content_diff do
+                name_diff: name_diff(action, hide_diff),
+                type_diff: type_diff(action, hide_diff),
+                content_diff: content_diff(action, action_view, hide_diff) do
       <<-HAML
 .action
   .summary
@@ -261,27 +270,48 @@ HAML
     end
   end
 
-  def wrap_diff field, content
-    if content.present?
-      %{
-         <span class="#{field}-diff">
-         #{content}
-         </span>
-      }
+  def name_diff action, hide_diff
+    if action.card == card
+      name_changes(action, hide_diff)
     else
-      ''
+      link_path = path(
+        view: :related,
+        related: { view: 'history', name: action.card.name }
+      )
+      link_to name_changes(action, hide_diff), link_path,
+              class: 'slotter label label-default',
+              'data-slot-selector' => '.card-slot.history-view',
+              remote: true
     end
   end
 
+  def type_diff action, hide_diff
+    action.new_type? && type_changes(action, hide_diff)
+  end
+
+  def content_diff action, action_view, hide_diff
+    action.new_content? && action.card.format.render_content_changes(
+      action: action, diff_type: action_view, hide_diff: hide_diff
+    )
+  end
+
+  def wrap_diff field, content
+    return '' unless content.present?
+    %{
+       <span class="#{field}-diff">
+       #{content}
+       </span>
+    }
+  end
 
   def name_changes action, hide_diff=false
-    old_name = (name = action.old_values[:name] and showname(name).to_s)
+    old_name = (name = action.old_values[:name]) && showname(name).to_s
     if action.new_name?
       new_name = showname(action.new_values[:name]).to_s
       if hide_diff
         new_name
       else
-        Card::Diff.complete(old_name,new_name)
+        Card::Diff.complete(old_name, new_name)
       end
     else
       old_name
@@ -293,7 +323,6 @@ HAML
     "(#{change})"
   end
 
-
   view :content_changes do |args|
     if args[:hide_diff]
       args[:action].new_values[:content]
@@ -303,33 +332,39 @@ HAML
   end
 
   def rollback_link actions
-    not_current = actions.select { |action| action.card.last_action_id != action.id }
-    if card.ok?(:update) && not_current.present?
-      "| " + link_to('Save as current', path(action: :update, view: :open, action_ids: not_current),
-        class: 'slotter','data-slot-selector'=>'.card-slot.history-view', remote: true, method: :post, rel: 'nofollow')
-    end
+    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_to(
+      'Save as current', link_path,
+      class: 'slotter', 'data-slot-selector' => '.card-slot.history-view',
+      remote: true, method: :post, rel: 'nofollow'
+    )
   end
 
   def fold_or_unfold_link args
-    if (args[:act_view] == :expanded)
-      toggled_view = :act_summary
-    else
-      toggled_view = :act_expanded
-    end
+    toggled_view = args[:act_view] == :expanded ? :act_summary : :act_expanded
+    arrow_dir = args[:act_view] == :expanded ? 'arrow-down' : 'arrow-right'
     link_to '', args.merge(view: toggled_view),
-              class: "slotter revision-#{args[:act_id]} #{ args[:act_view]==:expanded ? "arrow-down" : "arrow-right"}",
+              class: "slotter revision-#{args[:act_id]} #{arrow_dir}",
               remote: true
   end
 
   def show_or_hide_changes_link hide_diff, args
-    "| " +  view_link( (hide_diff ? "Show" : "Hide") + " changes", :act_expanded,
+    text = (hide_diff ? 'Show' : 'Hide') + ' changes'
+    '| ' + view_link(
+      text, :act_expanded,
       path_opts: args.merge(hide_diff: !hide_diff),
-      class: 'slotter', remote: true )
+      class: 'slotter', remote: true
+    )
   end
 end
 
 def diff_args
-  {format: :text}
+  { format: :text }
 end
 
-
+def has_edits?
+  Card::Act.where(actor_id: id).where('card_id IS NOT NULL').present?
+end