card 1.16.6 → 1.16.7

data/mod/01_core/set/all/content.rb

@@ -48,13 +48,13 @@ def clear_drafts
   end
 end
 
-event :save_draft, :before=>:store, :on=>:update, :when=>proc{ |c| Env.params['draft'] == 'true' } do
+event :save_draft, before: :store, on: :update, when: proc{ |c| Env.params['draft'] == 'true' } do
   save_content_draft content
   abort :success
 end
 
 
-event :set_default_content, :on=>:create, :before=>:approve do
+event :set_default_content, on: :create, before: :approve do
   if !db_content_changed? && template && template.db_content.present?
     self.db_content = template.db_content
   end

data/mod/01_core/set/all/fetch.rb

@@ -20,7 +20,7 @@ module ClassMethods
   #     :skip_virtual               Real cards only
   #     :skip_modules               Don't load Set modules
   #     :look_in_trash              Return trashed card objects
-  #     :new => {  card opts }      Return a new card when not found
+  #     new: {  card opts }      Return a new card when not found
   #
   def fetch mark, opts={}
     if String === mark
@@ -68,21 +68,21 @@ module ClassMethods
   end
 
   def fetch_id mark #should optimize this.  what if mark is int?  or codename?
-    card = fetch mark, :skip_virtual=>true, :skip_modules=>true
+    card = fetch mark, skip_virtual: true, skip_modules: true
     card and card.id
   end
 
   def [](mark)
-    fetch mark, :skip_virtual=>true
+    fetch mark, skip_virtual: true
   end
 
   def exists? mark
-    card = fetch mark, :skip_virtual=>true, :skip_modules=>true
+    card = fetch mark, skip_virtual: true, skip_modules: true
     card.present?
   end
 
   def known? mark
-    card = fetch mark, :skip_modules=>true
+    card = fetch mark, skip_modules: true
     card.present?
   end
 
@@ -170,7 +170,7 @@ module ClassMethods
   end
 
   def new_for_cache name, opts
-    new_args = { :name=>name, :skip_modules=>true }
+    new_args = { name: name, skip_modules: true }
     new_args[:type_id] = -1 unless clean_cache_opts? opts
     # The -1 type_id allows us to skip all the type lookup and flag the need for
     # reinitialization later.  *** It should NEVER be seen elsewhere ***

data/mod/01_core/set/all/initialize.rb

@@ -16,9 +16,9 @@ def initialize args={}
 
   args.delete('type_id') if args['type_id'] == 0 # can come in as 0, '', or nil
   @type_args = {
-    :type      => args.delete('type'     ),
-    :type_code => args.delete('type_code'),
-    :type_id   => args[       'type_id'  ]
+    type:      args.delete('type'     ),
+    type_code: args.delete('type_code'),
+    type_id:   args[       'type_id'  ]
   }
 
   args['db_content'] = args.delete('content') if args['content']
@@ -50,6 +50,6 @@ def include_set_modules
 end
 
 
-event :initialize_success_object, :before=>:handle do
+event :initialize_success_object, before: :handle do
   Env[:success] = Success.new(cardname, Env.params[:success])
 end

data/mod/01_core/set/all/location_history.rb

@@ -1,10 +1,10 @@
-event :discard_deleted_locations, :after=>:store, :on=>:delete do
+event :discard_deleted_locations, after: :store, on: :delete do
   Env.discard_locations_for self
   if success.target == self
     success.target = :previous
   end
 end
 
-event :save_current_location, :before=>:show, :on=>:read do
+event :save_current_location, before: :show, on: :read do
   Env.save_location self
 end

data/mod/01_core/set/all/name.rb

@@ -83,7 +83,7 @@ def tag *args
 end
 
 def left_or_new args={}
-  left args or Card.new args.merge(:name=>cardname.left)
+  left args or Card.new args.merge(name: cardname.left)
 end
 
 def children
@@ -134,17 +134,17 @@ rescue
 end
 
 
-event :permit_codename, :before=>:approve, :on=>:update, :changed=>:codename do
+event :permit_codename, before: :approve, on: :update, changed: :codename do
   errors.add :codename, 'only admins can set codename' unless Auth.always_ok?
 end
 
-event :validate_unique_codename, :after=>:permit_codename do
+event :validate_unique_codename, after: :permit_codename do
   if codename.present? and errors.empty? and Card.find_by_codename(codename).present?
     errors.add :codename, "codename #{codename} already in use"
   end
 end
 
-event :validate_name, :before=>:approve, :on=>:save do
+event :validate_name, before: :approve, on: :save do
   cdname = name.to_name
   if name.length > 255
     errors.add :name, "is too long (255 character maximum)"
@@ -157,7 +157,7 @@ event :validate_name, :before=>:approve, :on=>:save do
       errors.add :name, "may not contain any of the following characters: #{ Card::Name.banned_array * ' ' }"
     end
     # this is to protect against using a plus card as a tag
-    if cdname.junction? and simple? and id and Auth.as_bot { Card.count_by_wql :right_id=>id } > 0
+    if cdname.junction? and simple? and id and Auth.as_bot { Card.count_by_wql right_id: id } > 0
       errors.add :name, "#{name} in use as a tag"
     end
 
@@ -175,15 +175,15 @@ event :validate_name, :before=>:approve, :on=>:save do
 end
 
 
-event :set_autoname, :before=>:validate_name, :on=>:create do
+event :set_autoname, before: :validate_name, on: :create do
   if name.blank? and autoname_card = rule_card(:autoname)
     self.name = autoname autoname_card.content
-    Auth.as_bot { autoname_card.refresh.update_attributes! :content=>name }   #fixme, should give placeholder on new, do next and save on create
+    Auth.as_bot { autoname_card.refresh.update_attributes! content: name }   #fixme, should give placeholder on new, do next and save on create
   end
 end
 
 
-event :validate_key, :after=>:validate_name, :on=>:save do
+event :validate_key, after: :validate_name, on: :save do
   if key.empty?
     errors.add :key, "cannot be blank" if errors.empty?
   elsif key != cardname.key
@@ -191,7 +191,7 @@ event :validate_key, :after=>:validate_name, :on=>:save do
   end
 end
 
-event :set_name, :before=>:store, :changed=>:name do
+event :set_name, before: :store, changed: :name do
   Card.expire name
   Card.expire name_was
   if cardname.junction?
@@ -203,7 +203,7 @@ event :set_name, :before=>:store, :changed=>:name do
       suspend_name(sidename) if old_name_in_way
       send "#{side}_id=", begin
         if !sidecard || old_name_in_way
-          Card.create! :name=>sidename, :supercard => self
+          Card.create! name: sidename, supercard: self
         else
           sidecard
         end.id
@@ -215,7 +215,7 @@ event :set_name, :before=>:store, :changed=>:name do
 end
 
 
-event :rename, :after=>:set_name, :on=>:update do
+event :rename, after: :set_name, on: :update do
   if existing_card = Card.find_by_key_and_trash(cardname.key, true) and existing_card != self
     existing_card.name = existing_card.name+'*trash'
     existing_card.rename_without_callbacks
@@ -228,11 +228,11 @@ def suspend_name(name)
   # re-creating a card with the current name, ie.  A -> A+B
   Card.expire name
   tmp_name = "tmp:" + UUID.new.generate
-  Card.where(:id=>self.id).update_all(:name=>tmp_name, :key=>tmp_name)
+  Card.where(id: self.id).update_all(name: tmp_name, key: tmp_name)
 end
 
 
-event :cascade_name_changes, :after=>:store, :on=>:update, :changed=>:name do
+event :cascade_name_changes, after: :store, on: :update, changed: :name do
   #Rails.logger.info "------------------- #{name_was} CASCADE #{self.name} -------------------------------------"
 
   self.update_referencers = false if self.update_referencers == 'false' #handle strings from cgi
@@ -248,7 +248,7 @@ event :cascade_name_changes, :after=>:store, :on=>:update, :changed=>:name do
     Rails.logger.info "cascading name: #{dep.name}"
     Card.expire dep.name #old name
     newname = dep.cardname.replace_part name_was, name
-    Card.where( :id=> dep.id ).update_all :name => newname.to_s, :key => newname.key
+    Card.where( id: dep.id ).update_all name: newname.to_s, key: newname.key
     Card::Reference.update_on_rename dep, newname, update_referencers
     Card.expire newname
   end

data/mod/01_core/set/all/pattern.rb

@@ -21,7 +21,7 @@ def reset_patterns_if_rule saving=false
 
     #this is really messy.
     if saving
-      self.add_to_read_rule_update_queue( set.item_cards :limit=>0 ) if right.id == Card::ReadID
+      self.add_to_read_rule_update_queue( set.item_cards limit: 0 ) if right.id == Card::ReadID
     end
   end
 end

data/mod/01_core/set/all/permissions.rb

@@ -1,5 +1,5 @@
 
-Card.error_codes.merge! :permission_denied=>[:denial, 403], :captcha=>[:errors,449]
+Card.error_codes.merge! permission_denied: [:denial, 403], captcha: [:errors,449]
 
 
 # ok? and ok! are public facing methods to approve one action at a time
@@ -7,8 +7,8 @@ Card.error_codes.merge! :permission_denied=>[:denial, 403], :captcha=>[:errors,4
 #   fetching: if the optional :trait parameter is supplied, it is passed
 #      to fetch and the test is perfomed on the fetched card, therefore:
 #
-#      :trait=>:account         would fetch this card plus a tag codenamed :account
-#      :trait=>:roles, :new=>{} would initialize a new card with default ({}) options.
+#      trait: :account         would fetch this card plus a tag codenamed :account
+#      trait: :roles, new: {} would initialize a new card with default ({}) options.
 
 
 def ok? action
@@ -44,7 +44,7 @@ def permission_rule_card action
 
   rcard = Auth.as_bot do
     if ['_left','[[_left]]'].member?(opcard.db_content) && self.junction?  # compound cards can inherit permissions from left parent
-      lcard = left_or_new( :skip_virtual=>true, :skip_modules=>true )
+      lcard = left_or_new( skip_virtual: true, skip_modules: true )
       if action==:create && lcard.real? && !lcard.action==:create
         action = :update
       end
@@ -102,7 +102,7 @@ def ok_to_create
   if @action_ok and junction?
     [:left, :right].each do |side|
       next if side==:left && @superleft   # left is supercard; create permissions will get checked there.
-      part_card = send side, :new=>{}
+      part_card = send side, new: {}
       if part_card && part_card.new_card? # if no card, there must be other errors
         unless part_card.ok? :create
           deny_because you_cant("create #{part_card.name}")
@@ -142,7 +142,7 @@ def ok_to_comment
 end
 
 
-event :set_read_rule, :before=>:store do
+event :set_read_rule, before: :store do
   if trash == true
     self.read_rule_id = self.read_rule_class = nil
   else
@@ -155,7 +155,7 @@ event :set_read_rule, :before=>:store do
 
     if !new_card? && type_id_changed?
       Auth.as_bot do
-        Card.search(:left=>self.name).each do |plus_card|
+        Card.search(left: self.name).each do |plus_card|
           plus_card = plus_card.refresh.update_read_rule
         end
       end
@@ -172,12 +172,12 @@ def update_read_rule
   #warn "updating read rule for #{inspect} to #{rcard.inspect}, #{rclass}"
 
   self.read_rule_class = rclass
-  Card.where(:id=>self.id).update_all(:read_rule_id=>rcard.id, :read_rule_class=>rclass)
+  Card.where(id: self.id).update_all(read_rule_id: rcard.id, read_rule_class: rclass)
   expire
 
   # currently doing a brute force search for every card that may be impacted.  may want to optimize(?)
   Auth.as_bot do
-    Card.search(:left=>self.name).each do |plus_card|
+    Card.search(left: self.name).each do |plus_card|
       if plus_card.rule(:read) == '_left'
         plus_card.update_read_rule
       end
@@ -193,7 +193,7 @@ def add_to_read_rule_update_queue updates
 end
 
 
-event :check_permissions, :after=>:approve do
+event :check_permissions, after: :approve do
   task = if @action != :delete && comment #will be obviated by new comment handling
     :comment
   else
@@ -231,10 +231,10 @@ def have_recaptcha_keys?
     !!( Card.config.recaptcha_public_key && Card.config.recaptcha_private_key )
 end
 
-event :recaptcha, :before=>:approve do
+event :recaptcha, before: :approve do
   if !@supercard && !Env[:recaptcha_used] && recaptcha_on?
     Env[:recaptcha_used] = true
-    Env[:controller].verify_recaptcha :model=>self, :attribute=>:captcha
+    Env[:controller].verify_recaptcha model: self, attribute: :captcha
   end
 end
 

data/mod/01_core/set/all/phases.rb

@@ -121,26 +121,43 @@ end
 
 
 def event_applies? opts
-  if opts[:on]
-    return false unless Array.wrap( opts[:on] ).member? @action
+  on_condition_applies?(opts[:on]) &&
+    changed_condition_applies?(opts[:changed]) &&
+    when_condition_applies?(opts[:when])
+end
+
+def on_condition_applies? action
+  if action
+    Array.wrap(action).member? @action
+  else
+    true
   end
-  if changed_field = opts[:changed]
+end
 
-    changed_field = 'db_content' if changed_field.to_sym == :content
-    return false if @action == :delete or !changes[ changed_field.to_s ]
+def changed_condition_applies? db_column
+  if db_column
+    db_column = 'db_content' if db_column.to_sym == :content
+    @action != :delete && changes[db_column.to_s]
+  else
+    true
   end
-  if opts[:when]
-    return false unless opts[:when].call self
+end
+
+def when_condition_applies? block
+  if block
+    block.call self
+  else
+    true
   end
-  true
 end
 
+
 def subcards
   @subcards ||= {}
 end
 
 
-event :process_subcards, :after=>:approve, :on=>:save do
+event :process_subcards, after: :approve, on: :save do
   subcards.keys.each do |sub_name|
     opts = @subcards[sub_name] || {}
     opts = { 'content' => opts } if String===opts
@@ -169,7 +186,7 @@ event :process_subcards, :after=>:approve, :on=>:save do
   end
 end
 
-event :approve_subcards, :after=>:process_subcards do
+event :approve_subcards, after: :process_subcards do
   subcards.each do |key, subcard|
     if !subcard.valid_subcard?
       subcard.errors.each do |field, err|
@@ -180,9 +197,9 @@ event :approve_subcards, :after=>:process_subcards do
   end
 end
 
-event :store_subcards, :after=>:store do
+event :store_subcards, after: :store do
   subcards.each do |key, sub|
-    sub.save! :validate=>false #unless @draft
+    sub.save! validate: false #unless @draft
   end
 end
 

data/mod/01_core/set/all/references.rb

@@ -16,7 +16,7 @@ def replace_references old_name, new_name
   obj_content.find_chunks( Card::Chunk::Reference ).select do |chunk|
     if old_ref_name = chunk.referee_name and new_ref_name = old_ref_name.replace_part(old_name, new_name)
       chunk.referee_name = chunk.replace_reference old_name, new_name
-      Card::Reference.where( :referee_key => old_ref_name.key ).update_all :referee_key => new_ref_name.key
+      Card::Reference.where( referee_key: old_ref_name.key ).update_all referee_key: new_ref_name.key
     end
   end
 
@@ -30,7 +30,7 @@ def update_references rendered_content = nil, refresh = false
   Card::Reference.delete_all_from self
 
   # FIXME: why not like this: references_expired = nil # do we have to make sure this is saved?
-  #Card.update( id, :references_expired=>nil )
+  #Card.update( id, references_expired: nil )
   #  or just this and save it elsewhere?
   #references_expired=nil
 
@@ -67,11 +67,11 @@ def update_references rendered_content = nil, refresh = false
               else 'P'
               end
             Card::Reference.create!(
-              :referer_id  => id,
-              :referee_id  => Card.where(:key=>name.key).pluck(:id).first,
-              :referee_key => name.key,
-              :ref_type    => ref_type,
-              :present     => 1
+              referer_id:  id,
+              referee_id:  Card.where(key: name.key).pluck(:id).first,
+              referee_key: name.key,
+              ref_type:    ref_type,
+              present:     1
             )
           end
         end
@@ -89,18 +89,18 @@ def referencers
 end
 
 def includers
-  return [] unless refs = references_from.where( :ref_type => 'I' )
+  return [] unless refs = references_from.where( ref_type: 'I' )
   refs.map(&:referer_id).map( &Card.method(:fetch) ).compact
 end
 
 def referees
   return [] unless refs = references_to
-  refs.map { |ref| Card.fetch ref.referee_key, :new=>{} }.compact
+  refs.map { |ref| Card.fetch ref.referee_key, new: {} }.compact
 end
 
 def includees
-  return [] unless refs = references_to.where( :ref_type => 'I' )
-  refs.map { |ref| Card.fetch ref.referee_key, :new=>{} }.compact
+  return [] unless refs = references_to.where( ref_type: 'I' )
+  refs.map { |ref| Card.fetch ref.referee_key, new: {} }.compact
 end
 
 
@@ -108,17 +108,17 @@ end
 protected
 
 
-event :refresh_references, :after=>:store, :on=>:save do
+event :refresh_references, after: :store, on: :save do
   self.update_references
   expire_structuree_references
 end
 
-event :refresh_references_on_create, :before=>:refresh_references, :on=>:create do
+event :refresh_references_on_create, before: :refresh_references, on: :create do
   Card::Reference.update_existing_key self
   # FIXME: bogus blank default content is set on structured cards...
 end
 
-event :refresh_references_on_delete, :after=>:store, :on=>:delete do
+event :refresh_references_on_delete, after: :store, on: :delete do
   Card::Reference.update_on_delete self
   expire_structuree_references
 end