card 1.16.6 → 1.16.7

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

@@ -23,7 +23,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/tmpsets/set/mod001-01_core/all/permissions.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module All; module Permissions; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/permissions.rb ~~~~~~~~~~~
 
-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
@@ -9,8 +9,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
@@ -46,7 +46,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
@@ -104,7 +104,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}")
@@ -144,7 +144,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
@@ -157,7 +157,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
@@ -174,12 +174,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
@@ -195,7 +195,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
@@ -233,10 +233,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/tmpsets/set/mod001-01_core/all/phases.rb

@@ -93,6 +93,7 @@ end
 
 
 def extend
+
   run_callbacks :extend
   run_callbacks :subsequent
 rescue =>e
@@ -122,26 +123,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
@@ -170,7 +188,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|
@@ -181,14 +199,14 @@ 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
 
 def success
-  Env[:success] ||= Card::Success.new(cardname)
+  Env.success(cardname)
 end
 
 

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

@@ -18,7 +18,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
 
@@ -32,7 +32,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
 
@@ -69,11 +69,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
@@ -91,18 +91,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
 
 
@@ -110,17 +110,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

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

@@ -2,8 +2,6 @@
 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 = %{
   select rules.id as rule_id, settings.id as setting_id, sets.id as set_id, sets.left_id as anchor_id, sets.right_id as set_tag_id
   from cards rules
@@ -28,19 +26,19 @@ ReadRuleSQL = %{
  end
 
 def is_standard_rule?
-  (r = right( :skip_modules=>true )) &&
+  (r = right( skip_modules: true )) &&
   r.type_id == Card::SettingID       &&
-  (l = left( :skip_modules=>true ))  &&
+  (l = left( skip_modules: true ))  &&
   l.type_id == Card::SetID
 end
 
 def is_user_rule?
   cardname.parts.length > 2                                  &&
-  (r = right( :skip_modules=>true ))                         &&
+  (r = right( skip_modules: true ))                         &&
    r.type_id == Card::SettingID                              &&
-  (set = self[0..-3, :skip_modules=>true])                   &&
+  (set = self[0..-3, skip_modules: true])                   &&
    set.type_id == Card::SetID                                &&
-  (user = self[-2, :skip_modules=>true] )                    &&
+  (user = self[-2, skip_modules: true] )                    &&
   (user.type_id == Card::UserID  || user.codename == 'all' )
 end
 
@@ -82,7 +80,7 @@ def related_sets with_self = false
   sets << ["#{name}+*self",  Card::SelfSet.label( name) ] if with_self
   sets << ["#{name}+*right", Card::RightSet.label(name) ] if known? && cardname.simple?
 
-#      Card.search(:type=>'Set',:left=>{:right=>name},:right=>'*type plus right',:return=>'name').each do |set_name|
+#      Card.search(type: 'Set',left: {right: name},right: '*type plus right',return: 'name').each do |set_name|
 #        sets<< set_name
 #      end
   sets
@@ -187,7 +185,7 @@ module ClassMethods
       end
     user_ids = user_ids_cache[key] || []
     if user_ids.include? AllID  # rule for all -> return all user ids
-      Card.where(:type_id=>UserID).pluck(:id)
+      Card.where(type_id: UserID).pluck(:id)
     else
       user_ids
     end
@@ -195,7 +193,7 @@ module ClassMethods
   end
 
   def user_rule_cards user_name, setting_code
-    Card.search :right=>{:codename=>setting_code}, :left=>{:left=>{:type_id=>SetID}, :right=>user_name}
+    Card.search right: {codename: setting_code}, left: {left: {type_id: SetID}, right: user_name}
   end
 
   def rule_cache

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

@@ -17,7 +17,7 @@ def template
 
     # NEW CARDS
     if new_card?
-      default = rule_card :default, :skip_modules=>true
+      default = rule_card :default, skip_modules: true
 
       dup_card = dup
       dup_card.type_id = default ? default.type_id : Card.default_type_id
@@ -57,14 +57,14 @@ def virtual?
 end
 
 def structure_rule_card
-  card = rule_card :structure, :skip_modules=>true
+  card = rule_card :structure, skip_modules: true
   card && card.db_content.strip == '_self' ? nil : card
 end
 
 def structuree_names
   if wql = structuree_spec
     Auth.as_bot do
-      Card::Query.new(wql.merge :return=>:name).run
+      Card::Query.run(wql.merge return: :name)
     end
   else
     []
@@ -77,7 +77,7 @@ end
 # I'll leave the FIXME here until the need (and/or other solution) is well documented.  -efm
 
 def expire_structuree_references
-  update_structurees :references_expired => 1
+  update_structurees references_expired: 1
 end
 
 def update_structurees args
@@ -86,8 +86,9 @@ def update_structurees args
   # by a +*type plus right+*structure rule, the override would not be respected.
   if query = structuree_spec
     Auth.as_bot do
-      Card::Query.new( query.merge(:return => :id) ).run.each_slice(100) do |id_batch|
-        Card.where( :id => id_batch ).update_all args
+      query[:return] = :id
+      Card::Query.run(query).each_slice(100) do |id_batch|
+        Card.where( id: id_batch ).update_all args
       end
     end
   end
@@ -98,7 +99,7 @@ def assigns_type?
   # for example, X+*type+*structure governs all cards of type X,
   # but the content rule does not (in fact cannot) have the type X.
   if is_structure?
-    if set_pattern = Card.fetch( cardname.trunk_name.tag_name, :skip_modules=>true )
+    if set_pattern = Card.fetch( cardname.trunk_name.tag_name, skip_modules: true )
       pattern_code = set_pattern.codename and
       set_class    = Card::SetPattern.find( pattern_code ) and
       set_class.assigns_type
@@ -121,9 +122,9 @@ def structuree_spec
   end
 end
 
-event :update_structurees_type, :after=>:store, :changed=>:type_id do
+event :update_structurees_type, after: :store, changed: :type_id do
   if assigns_type? # certain *structure templates
-    update_structurees :type_id => type_id
+    update_structurees type_id: type_id
   end
 end
 

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

@@ -44,7 +44,7 @@ end
 
 protected
 
-event :set_content, :before=>:store, :on=>:save do
+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?
   @selected_action_id = @selected_content = nil
@@ -55,7 +55,7 @@ end
 
 #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
+event :update_ruled_cards, after: :store do
   if is_rule?
 #      warn "updating ruled cards for #{name}"
     self.class.clear_rule_cache
@@ -78,7 +78,7 @@ event :update_ruled_cards, :after=>:store do
            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|
+                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
@@ -98,7 +98,7 @@ event :update_ruled_cards, :after=>:store do
 
       #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|
+        Card.where( read_rule_id: self.id, trash: false ).reject do |w|
           in_set[ w.key ]
         end.each &:update_read_rule
       end
@@ -107,14 +107,14 @@ event :update_ruled_cards, :after=>:store do
   end
 end
 
-event :process_read_rule_update_queue, :after=>:store do
+event :process_read_rule_update_queue, after: :store do
   Array.wrap(@read_rule_update_queue).each { |card| card.update_read_rule }
   @read_rule_update_queue = []
 end
 
-#  set_callback :store, :after, :process_read_rule_update_queue, :prepend=>true
+#  set_callback :store, :after, :process_read_rule_update_queue, prepend: true
 
-event :expire_related, :after=>:store do
+event :expire_related, after: :store do
   self.expire
 
   if self.is_structure?

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

@@ -1,17 +1,17 @@
 # -*- 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 ~~~~~~~~~~~
 def delete
-  update_attributes :trash => true unless new_card?
+  update_attributes trash: true unless new_card?
 end
 
 def delete!
-  update_attributes! :trash => true unless new_card?
+  update_attributes! trash: true unless new_card?
 end
 
 
-event :pull_from_trash, :before=>:store, :on=>:create do
+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
+    # 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...
@@ -23,22 +23,22 @@ event :pull_from_trash, :before=>:store, :on=>:create do
   true
 end
 
-event :validate_delete, :before=>:approve, :on=>:delete do
+event :validate_delete, before: :approve, on: :delete do
   if !codename.blank?
     errors.add :delete, "#{name} is is a system card. (#{codename})"
   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
     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."
   end
 end
 
-event :validate_delete_children, :after=>:approve, :on=>:delete do
+event :validate_delete_children, after: :approve, on: :delete do
   children.each do |child|
     child.supercard = self
     subcards[child.name]=child
@@ -52,5 +52,6 @@ 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;