card 1.16.9 → 1.16.10

data/tmpsets/set/mod001-01_core/all/references.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module References; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/references.rb ~~~~~~~~~~~
+class Card; module Set; module All; module References; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/references.rb ~~~~~~~~~~~
 
 def name_referencers link_name=nil
   link_name = link_name.nil? ? key : link_name.to_name.key

data/tmpsets/set/mod001-01_core/all/rules.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module Rules; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/rules.rb ~~~~~~~~~~~
+class Card; module Set; module All; module Rules; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/rules.rb ~~~~~~~~~~~
 
 
 RuleSQL = %{

data/tmpsets/set/mod001-01_core/all/states.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module States; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/states.rb ~~~~~~~~~~~
+class Card; module Set; module All; module States; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/states.rb ~~~~~~~~~~~
 def new_card?
   new_record? ||   # not yet in db (from ActiveRecord)
   !!@from_trash    # in process of restoration from trash, not yet "re-created"

data/tmpsets/set/mod001-01_core/all/templating.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module Templating; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/templating.rb ~~~~~~~~~~~
+class Card; module Set; module All; module Templating; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/templating.rb ~~~~~~~~~~~
 
 def is_template?
   cardname.trait_name? :structure, :default

data/tmpsets/set/mod001-01_core/all/tracked_attributes.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module TrackedAttributes; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/tracked_attributes.rb ~~~~~~~~~~~
-#fixme -this is called by both initialize and update_attributes.  really should be optimized for new!
+class Card; module Set; module All; module TrackedAttributes; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/tracked_attributes.rb ~~~~~~~~~~~
 def assign_attributes args={}
   if args
     args = args.stringify_keys
@@ -10,127 +10,152 @@ def assign_attributes args={}
       @set_specific[key] = args.delete(key) if args[key]
     end
 
-    if newtype = args.delete('type')
-      args['type_id'] = Card.fetch_id newtype
-    end
-    @subcards = extract_subcard_args! args
+    new_type_id = extract_type_id! args unless args.delete('skip_type_lookup')
+    subcard_args = extract_subcard_args! args
+    args['type_id'] = new_type_id if new_type_id
     reset_patterns
   end
   params = ActionController::Parameters.new(args)
   params.permit!
   super params
+  return unless args && subcard_args.present?
+  # name= must come before process subcards
+  subcards.add subcard_args
 end
 
 def assign_set_specific_attributes
-  if @set_specific && @set_specific.present?
-    @set_specific.each_pair do |name, value|
-      self.send "#{name}=", value
-    end
+  return unless @set_specific && @set_specific.present?
+  @set_specific.each_pair do |name, value|
+    send "#{name}=", value
   end
 end
 
-def extract_subcard_args! args={}
-  extracted_subcards = args.delete('subcards') || {}
+protected
+
+def extract_subcard_args! args
+  subcards = args.delete('subcards') || {}
   args.keys.each do |key|
     if key =~ /^\+/
-      val = args.delete key
-      val = { 'content' => val } if String === val
-      extracted_subcards[key] = val
+      subcards[key] = args.delete(key)
     end
   end
-  extracted_subcards
+  subcards
 end
 
+def extract_type_id! args={}
+  type_id =
+    case
+    when args['type_id']
+      id = args.delete('type_id').to_i
+      # type_id can come in as 0,'' or nil
+      id == 0 ? nil : id
+    when args['type_code']
+      Card.fetch_id args.delete('type_code').to_sym
+    when args['type']
+      Card.fetch_id args.delete('type')
+    else
+      return nil
+    end
 
-protected
+  if !type_id
+    errors.add :type, "#{args[:type] || args[:type_code]} is not a known type."
+  end
+  type_id
+end
 
 event :set_content, before: :store, on: :save do
-  self.db_content = content || '' #necessary?
-  self.db_content = Card::Content.clean! self.db_content if clean_html?
+  self.db_content = content || '' # necessary?
+  self.db_content = Card::Content.clean!(db_content) if clean_html?
   @selected_action_id = @selected_content = nil
   clear_drafts
   reset_patterns_if_rule saving=true
 end
 
-
-#fixme - the following don't really belong here, but they have to come after the reference stuff.  we need to organize a bit!
+# FIXME: the following don't really belong here, but they have to come after
+# the reference stuff.  we need to organize a bit!
 
 event :update_ruled_cards, after: :store do
   if is_rule?
-#      warn "updating ruled cards for #{name}"
+    # warn "updating ruled cards for #{name}"
     self.class.clear_rule_cache
     set = rule_set
     set.reset_set_patterns
 
-    if right_id==Card::ReadID and (name_changed? or trash_changed?)
+    if right_id == Card::ReadID && (name_changed? || trash_changed?)
       self.class.clear_read_rule_cache
       Card.cache.reset # maybe be more surgical, just Auth.user related
-      expire #probably shouldn't be necessary,
-      # but was sometimes getting cached version when card should be in the trash.
-      # could be related to other bugs?
+      expire # probably shouldn't be necessary,
+      # but was sometimes getting cached version when card should be in the
+      # trash.  could be related to other bugs?
       in_set = {}
-      if !(self.trash)
-        if class_id = (set and set_class=set.tag and set_class.id)
+      if !trash && set && (set_class = set.tag)
+        if (class_id =  set_class.id)
           rule_class_ids = set_patterns.map &:pattern_id
-          #warn "rule_class_id #{class_id}, #{rule_class_ids.inspect}"
-
-          #first update all cards in set that aren't governed by narrower rule
-           Auth.as_bot do
-             cur_index = rule_class_ids.index Card[read_rule_class].id
-             if rule_class_index = rule_class_ids.index( class_id )
-                set.item_cards(limit: 0).each do |item_card|
-                  in_set[item_card.key] = true
-                  next if cur_index < rule_class_index
-                  if cur_index >= rule_class_index
-                    item_card.update_read_rule
-                  end
+          # warn "rule_class_id #{class_id}, #{rule_class_ids.inspect}"
+
+          # first update all cards in set that aren't governed by narrower rule
+          Auth.as_bot do
+            cur_index = rule_class_ids.index Card[read_rule_class].id
+            if (rule_class_index = rule_class_ids.index(class_id))
+              set.item_cards(limit: 0).each do |item_card|
+                in_set[item_card.key] = true
+                next if cur_index < rule_class_index
+                if cur_index >= rule_class_index
+                  item_card.update_read_rule
                 end
-             # elsif rule_class_index = rule_class_ids.index( 0 )
- #               in_set[trunk.key] = true
- #               #warn "self rule update: #{trunk.inspect}, #{rule_class_index}, #{cur_index}"
- #   trunk.update_read_rule if cur_index > rule_class_index
-             else warn "No current rule index #{class_id}, #{rule_class_ids.inspect}"
-             end
+              end
+            # elsif rule_class_index = rule_class_ids.index( 0 )
+            #   in_set[trunk.key] = true
+            #   #warn "self rule update: #{trunk.inspect}, #{rule_class_index},
+            #   #{cur_index}"
+            #   trunk.update_read_rule if cur_index > rule_class_index
+            else warn "No current rule index #{class_id}, " \
+                      "#{rule_class_ids.inspect}"
+            end
           end
 
         end
       end
 
-      #then find all cards with me as read_rule_id that were not just updated and regenerate their read_rules
+      # then find all cards with me as read_rule_id that were not just updated
+      # and regenerate their read_rules
       if !new_record?
-        Card.where( read_rule_id: self.id, trash: false ).reject do |w|
-          in_set[ w.key ]
-        end.each &:update_read_rule
+        Card.where(read_rule_id: self.id, trash: false).reject do |w|
+          in_set[w.key]
+        end.each(&:update_read_rule)
       end
     end
-
   end
 end
 
 event :process_read_rule_update_queue, after: :store do
-  Array.wrap(@read_rule_update_queue).each { |card| card.update_read_rule }
+  Array.wrap(@read_rule_update_queue).each(&:update_read_rule)
   @read_rule_update_queue = []
 end
 
 #  set_callback :store, :after, :process_read_rule_update_queue, prepend: true
 
 event :expire_related, after: :store do
-  self.expire
+  subcards.keys.each do |key|
+    Card.cache.delete_local key
+  end
+  expire true
 
   if self.is_structure?
-    self.structuree_names.each do |name|
-      Card.expire name
+    structuree_names.each do |name|
+      Card.expire name, true
     end
   end
-  # FIXME really shouldn't be instantiating all the following bastards.  Just need the key.
+
+  # FIXME: really shouldn't be instantiating all the following bastards.
+  # Just need the key.
   # fix in id_cache branch
-  self.dependents.each       { |c| c.expire }
-  # self.referencers.each      { |c| c.expire }
-  self.name_referencers.each { |c| c.expire }
+  dependents.each       { |c| c.expire(true) }
+  # self.referencers.each      { |c| c.expire(true) }
+  name_referencers.each { |c| c.expire(true) }
   # FIXME: this will need review when we do the new defaults/templating system
 end
 
 
-
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/tracked_attributes.rb ~~~~~~~~~~~
 end;end;end;end;

data/tmpsets/set/mod001-01_core/all/trash.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module Trash; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/trash.rb ~~~~~~~~~~~
+class Card; module Set; module All; module Trash; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/trash.rb ~~~~~~~~~~~
 def delete
   update_attributes trash: true unless new_card?
 end
@@ -8,13 +9,15 @@ def delete!
   update_attributes! trash: true unless new_card?
 end
 
-
 event :pull_from_trash, before: :store, on: :create do
-  if trashed_card = Card.find_by_key_and_trash(key, true)
-    # a. (Rails way) tried Card.where(key: 'wagn_bot').select(:id), but it wouldn't work.  This #select
-    #    generally breaks on cards. I think our initialization process screws with something
-    # b. (Wagn way) we could get card directly from fetch if we add :include_trashed (eg).
-    #    likely low ROI, but would be nice to have interface to retrieve cards from trash...
+  if (trashed_card = Card.find_by_key_and_trash(key, true))
+    # a. (Rails way) tried Card.where(key: 'wagn_bot').select(:id), but it
+    # wouldn't work.  This #select generally breaks on cards. I think our
+    # initialization process screws with something
+    # b. (Wagn way) we could get card directly from fetch if we add
+    # :include_trashed (eg).
+    #    likely low ROI, but would be nice to have interface to retrieve cards
+    #    from trash...m
     self.id = trashed_card.id
     @from_trash = true
     @new_record = false
@@ -29,20 +32,21 @@ event :validate_delete, before: :approve, on: :delete do
   end
 
   undeletable_all_rules_tags = %w{ default style layout create read update delete }
-  if junction? and l=left and l.codename == 'all' and undeletable_all_rules_tags.member? right.codename
+  if junction? && (l = left) && l.codename == 'all' &&
+     undeletable_all_rules_tags.member?(right.codename)
     errors.add :delete, "#{name} is an indestructible rule"
   end
 
-  if account && Card::Act.find_by_actor_id( self.id )
-    errors.add :delete, "Edits have been made with #{name}'s user account.\nDeleting this card would mess up our history."
+  if account && self.has_edits?
+    errors.add :delete, "Edits have been made with #{name}'s user account.\n" \
+                        'Deleting this card would mess up our history.'
   end
 end
 
 event :validate_delete_children, after: :approve, on: :delete do
   children.each do |child|
-    child.supercard = self
-    subcards[child.name]=child
     child.trash = true
+    add_subcard child
     unless child.valid?
       child.errors.each do |field, message|
         errors.add field, "can't delete #{child.name}: #{message}"
@@ -52,6 +56,5 @@ event :validate_delete_children, after: :approve, on: :delete do
 end
 
 
-
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/trash.rb ~~~~~~~~~~~
 end;end;end;end;

data/tmpsets/set/mod001-01_core/all/type.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module Type; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/type.rb ~~~~~~~~~~~
+class Card; module Set; module All; module Type; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/type.rb ~~~~~~~~~~~
 
 module ClassMethods
   def default_type_id
@@ -28,34 +29,13 @@ def type= type_name
   self.type_id = Card.fetch_id type_name
 end
 
-def get_type_id args={}
-  return if args[:type_id] # type_id was set explicitly.  no need to set again.
-
-  type_id = case
-    when args[:type_code]
-      if code=args[:type_code]
-        Card::Codename[code] || ( c=Card[code] and c.id)
-      end
-    when args[:type]
-      Card.fetch_id args[:type]
-    else :noop
-    end
-
-  case type_id
-  when :noop
-  when false, nil
-    errors.add :type, "#{args[:type] || args[:type_code]} is not a known type."
-  else
-    return type_id
-  end
-
-  if name && t=template
-    reset_patterns #still necessary even with new template handling?
+def get_type_id_from_structure
+  if name && (t = template)
+    reset_patterns # still necessary even with new template handling?
     t.type_id
   end
 end
 
-
 event :validate_type_change, before: :approve, on: :update, changed: :type_id do
   if c = dup and c.action == :create and !c.valid?
     errors.add :type, "of #{ name } can't be changed; errors creating new #{ type_id }: #{ c.errors.full_messages * ', ' }"

data/tmpsets/set/mod001-01_core/all/utils.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module Utils; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/utils.rb ~~~~~~~~~~~
+class Card; module Set; module All; module Utils; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/utils.rb ~~~~~~~~~~~
 
 module ClassMethods
 

data/tmpsets/set/mod001-01_core/all/view_cache.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module ViewCache; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/view_cache.rb ~~~~~~~~~~~
+class Card; module Set; module All; module ViewCache; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/view_cache.rb ~~~~~~~~~~~
 event :clear_view_cache, after: :store do
   Card::ViewCache.reset
 end

data/tmpsets/set/mod002-01_history/all/actions.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module Actions; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_history/set/all/actions.rb ~~~~~~~~~~~
+class Card; module Set; module All; module Actions; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_history/set/all/actions.rb ~~~~~~~~~~~
 # -*- encoding : utf-8 -*-
 
 def select_action_by_params params

data/tmpsets/set/mod002-01_history/all/content_history.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module ContentHistory; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_history/set/all/content_history.rb ~~~~~~~~~~~
+class Card; module Set; module All; module ContentHistory; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_history/set/all/content_history.rb ~~~~~~~~~~~
 
 # if these aren't in a nested module, the methods just overwrite the base methods,
 # but we need a distict module so that super will be able to refer to the base methods.
@@ -90,11 +91,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
@@ -102,7 +105,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/tmpsets/set/mod002-01_history/all/history.rb

@@ -1,28 +1,41 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module History; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_history/set/all/history.rb ~~~~~~~~~~~
+class Card; module Set; module All; module History; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_history/set/all/history.rb ~~~~~~~~~~~
 REVISIONS_PER_PAGE = Card.config.revisions_per_page
 
 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
@@ -32,7 +45,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
@@ -41,9 +56,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
@@ -64,18 +80,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)
@@ -83,27 +101,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]
@@ -121,7 +147,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
@@ -134,10 +160,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
 
@@ -151,11 +177,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
@@ -169,11 +195,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
@@ -184,7 +212,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
@@ -217,33 +245,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
@@ -263,27 +273,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
@@ -295,7 +326,6 @@ HAML
     "(#{change})"
   end
 
-
   view :content_changes do |args|
     if args[:hide_diff]
       args[:action].new_values[:content]
@@ -305,36 +335,42 @@ 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
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/01_history/set/all/history.rb ~~~~~~~~~~~