card 1.16.15 → 1.17.0

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

@@ -24,7 +24,7 @@ def assign_attributes args={}
 end
 
 def assign_set_specific_attributes
-  return unless @set_specific && @set_specific.present?
+  return unless @set_specific.present?
   @set_specific.each_pair do |name, value|
     send "#{name}=", value
   end
@@ -68,7 +68,7 @@ event :set_content, before: :store, on: :save do
   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
+  reset_patterns_if_rule true
 end
 
 # FIXME: the following don't really belong here, but they have to come after
@@ -104,11 +104,6 @@ event :update_ruled_cards, after: :store do
                   item_card.update_read_rule
                 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
@@ -119,10 +114,10 @@ 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|
-          in_set[w.key]
-        end.each(&:update_read_rule)
+      if !new_card?
+        Card.search(read_rule_id: self.id) do |card|
+          card.update_read_rule unless in_set[card.key]
+        end
       end
     end
   end
@@ -133,27 +128,23 @@ event :process_read_rule_update_queue, after: :store do
   @read_rule_update_queue = []
 end
 
-#  set_callback :store, :after, :process_read_rule_update_queue, prepend: true
-
 event :expire_related, after: :store do
   subcards.keys.each do |key|
-    Card.cache.delete_local key
+    Card.cache.soft.delete key
   end
   expire true
 
-  if self.is_structure?
+  if is_structure?
     structuree_names.each do |name|
       Card.expire name, true
     end
   end
+end
 
-  # FIXME: really shouldn't be instantiating all the following bastards.
-  # Just need the key.
-  # fix in id_cache branch
-  dependents.each       { |c| c.expire(true) }
-  # self.referencers.each      { |c| c.expire(true) }
+event :expire_related_names, before: :expire_related, changed: :name do
+  # FIXME: look for opportunities to avoid instantiating the following
+  descendants.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
 
 

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

@@ -31,7 +31,10 @@ event :validate_delete, before: :approve, on: :delete do
     errors.add :delete, "#{name} is is a system card. (#{codename})"
   end
 
-  undeletable_all_rules_tags = %w{ default style layout create read update delete }
+  undeletable_all_rules_tags =
+    %w{ default style layout create read update delete }
+  # FIXME: HACK! should be configured in the rule
+
   if junction? && (l = left) && l.codename == 'all' &&
      undeletable_all_rules_tags.member?(right.codename)
     errors.add :delete, "#{name} is an indestructible rule"

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

@@ -4,23 +4,27 @@ class Card; module Set; module All; module Type; extend Card::Set
 
 module ClassMethods
   def default_type_id
-    @@default_type_id ||= Card[:all].fetch( trait: :default ).type_id
+    @@default_type_id ||= Card[:all].fetch(trait: :default).type_id
   end
 end
 
 def type_card
   return if type_id.nil?
-  Card.fetch type_id.to_i, skip_modules: true
+  Card.quick_fetch type_id.to_i
 end
 
 def type_code
-  Card::Codename[ type_id.to_i ]
+  Card::Codename[type_id.to_i]
 end
 
 def type_name
   type_card.try :name
 end
 
+def type_name_or_default
+  type_card.try(:name) || Card.quick_fetch(Card.default_type_id).name
+end
+
 def type_cardname
   type_card.try :cardname
 end
@@ -30,42 +34,40 @@ def type= type_name
 end
 
 def get_type_id_from_structure
-  if name && (t = template)
-    reset_patterns # still necessary even with new template handling?
-    t.type_id
-  end
+  return unless name && (t = template)
+  reset_patterns # still necessary even with new template handling?
+  t.type_id
 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 * ', ' }"
+  if (c = dup) && c.action == :create && !c.valid?
+    errors.add :type, "of #{ name } can't be changed; errors creating new " \
+                      "#{ type_id }: #{ c.errors.full_messages * ', ' }"
   end
 end
 
 event :validate_type, before: :approve, changed: :type_id do
   if !type_name
-    errors.add :type, "No such type"
+    errors.add :type, 'No such type'
   end
 
-  if rt = structure and rt.assigns_type? and type_id!=rt.type_id
-    errors.add :type, "can't be changed because #{name} is hard templated to #{rt.type_name}"
+  if (rt = structure) && rt.assigns_type? && type_id != rt.type_id
+    errors.add :type, "can't be changed because #{name} is hard templated " \
+                      "to #{rt.type_name}"
   end
 end
 
 event :reset_type_specific_fields, after: :store do
+  wql = { left: { left_id: type_id },
+          right: { codename: 'type_plus_right' }
+        }
+  wql_comment = "sets with a type_plus_right rule for #{name}"
+
   Auth.as_bot do
-    Card.search left: { left_id: type_id }, right: {codename: 'type_plus_right'} do |set_card|
-      set_card.reset_set_patterns
-    end
+    Card.search(wql, wql_comment).each &:reset_set_patterns
   end
 end
 
-#    Card.search left_plus: [ type_name, right_plus: {codename: 'type_plus_right'}] do |right_anchor|
-#      Card["#{lef}"]
-#      set_card.reset_set_patterns
-#    end
-
-
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/type.rb ~~~~~~~~~~~
 end;end;end;end;

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

@@ -3,7 +3,6 @@ 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
-
   def empty_trash
     Card.delete_trashed_files
     Card.where(trash: true).delete_all
@@ -13,25 +12,39 @@ module ClassMethods
     Card.delete_tmp_files_of_cached_uploads
   end
 
-  def delete_trashed_files #deletes any file not associated with a real card.
-    dir = Card.paths['files'].existent.first
-    trashed_card_sql = %{ select id from cards where trash is true }
-    trashed_card_ids = Card.connection.select_all( trashed_card_sql ).map( &:values ).flatten.map &:to_i
-    file_ids = Dir.entries( dir )[2..-1].map( &:to_i )
+  # deletes any file not associated with a real card.
+  def delete_trashed_files
+    trashed_card_ids = all_trashed_card_ids
+    file_ids = all_file_ids
     file_ids.each do |file_id|
       if trashed_card_ids.member?(file_id)
-        raise Card::Error, "Narrowly averted deleting current file" if Card.exists?(file_id) #double check!
+        if Card.exists?(file_id) # double check!
+          fail Card::Error, 'Narrowly averted deleting current file'
+        end
         FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
       end
     end
   end
 
+  def all_file_ids
+    dir = Card.paths['files'].existent.first
+    Dir.entries(dir)[2..-1].map(&:to_i)
+  end
+
+  def all_trashed_card_ids
+    trashed_card_sql = %{ select id from cards where trash is true }
+    sql_results = Card.connection.select_all(trashed_card_sql)
+    sql_results.map(&:values).flatten.map(&:to_i)
+  end
+
   def delete_tmp_files_of_cached_uploads
     actions = Card::Action.find_by_sql "SELECT * FROM card_actions
       INNER JOIN cards ON card_actions.card_id = cards.id
-      WHERE cards.type_id IN (#{Card::FileID}, #{Card::ImageID}) AND card_actions.draft = true"
+      WHERE cards.type_id IN (#{Card::FileID}, #{Card::ImageID})
+      AND card_actions.draft = true"
     actions.each do |action|
-      if older_than_five_days? action.created_at && card = action.card # we don't want to delete uploads in progress
+      if older_than_five_days?(action.created_at) && (card = action.card)
+        # we don't want to delete uploads in progress
         card.delete_files_for_action action
       end
     end
@@ -42,31 +55,31 @@ module ClassMethods
     attribs.each do |row|
       result = begin
         merge row['name'], row, opts
-#      rescue => e
-#        Rails.logger.info "merge_list problem: #{ e.message }"
-#        false
       end
       unmerged.push row unless result == true
     end
 
     if unmerged.empty?
-      Rails.logger.info "successfully merged all!"
+      Rails.logger.info 'successfully merged all!'
     else
       unmerged_json = JSON.pretty_generate unmerged
-      if output_file = opts[:output_file]
-        ::File.open output_file, 'w' do |f|
-          f.write unmerged_json
-        end
-      else
-        Rails.logger.info "failed to merge:\n\n#{ unmerged_json }"
-      end
+      report_unmerged_json unmerged_json, opts[:output_file]
     end
     unmerged
   end
 
+  def report_unmerged_json unmerged_json, output_file
+    if output_file
+      ::File.open output_file, 'w' do |f|
+        f.write unmerged_json
+      end
+    else
+      Rails.logger.info "failed to merge:\n\n#{unmerged_json}"
+    end
+  end
 
   def merge name, attribs={}, opts={}
-    puts "merging #{ name }"
+    puts "merging #{name}"
     card = fetch name, new: {}
 
     if opts[:pristine] && !card.pristine?
@@ -77,59 +90,60 @@ module ClassMethods
     end
   end
 
+  def older_than_five_days? time
+    Time.now - time > 432000
+  end
 end
 
 def debug_type
-  "#{type_code||'no code'}:#{type_id}"
+  "#{type_code || 'no code'}:#{type_id}"
 end
 
 def to_s
-  "#<#{self.class.name}[#{debug_type}]#{self.attributes['name']}>"
+  "#<#{self.class.name}[#{debug_type}]#{attributes['name']}>"
 end
 
 def inspect
-  "#<#{self.class.name}" + "##{id}" +
-  "###{object_id}" + #"l#{left_id}r#{right_id}" +
-  "[#{debug_type}]" + "(#{self.name})" + #"#{object_id}" +
-  #(errors.any? ? '*Errors*' : 'noE') +
-  (errors.any? ? "<E*#{errors.full_messages*', '}*>" : '') +
-  #"{#{references_expired==1 ? 'Exp' : "noEx"}:" +
-  "{#{trash&&'trash:'||''}#{new_card? &&'new:'||''}#{frozen? ? 'Fz' : readonly? ? 'RdO' : ''}" +
-  "#{@virtual &&'virtual:'||''}#{@set_mods_loaded&&'I'||'!loaded' }:#{references_expired.inspect}}" +
-  '>'
+  tags = []
+  tags << 'trash'    if trash
+  tags << 'new'      if new_card?
+  tags << 'frozen'   if frozen?
+  tags << 'readonly' if readonly?
+  tags << 'virtual'  if @virtual
+  tags << 'set_mods_loaded' if @set_mods_loaded
+
+  error_messages = errors.any? ? "<E*#{errors.full_messages * ', '}*>" : ''
+
+  "#<Card##{id}[#{debug_type}](#{name})#{error_messages}{#{tags * ','}}"
 end
 
 format :html do
-  view :views_by_format do |args|
-    format_views = self.class.ancestors.each_with_object({}) do |format_class, hash|
-      views =
-        format_class.instance_methods.map do |method|
-          if method.to_s.match /^_view_(.+)$/
-            "<li>#{$1}</li>"
-          end
-        end.compact.join "\n"
-      if views.present?
-        format_class.name.match /^Card(::Set)?::(.+?)$/ #::(\w+Format)
-        hash[$2] = views
+  view :views_by_format do
+    format_views =
+      self.class.ancestors.each_with_object({}) do |format_class, hash|
+        views =
+          format_class.instance_methods.map do |method|
+            if method.to_s.match(/^_view_(.+)$/)
+              "<li>#{$1}</li>"
+            end
+          end.compact.join "\n"
+        if views.present?
+          format_class.name.match(/^Card(::Set)?::(.+?)$/) #::(\w+Format)
+          hash[$2] = views
+        end
       end
-    end
     accordion_group format_views
   end
 
-  view :views_by_name do |args|
+  view :views_by_name do
     views = methods.map do |method|
-      if method.to_s.match /^_view_(.+)$/
+      if method.to_s.match(/^_view_(.+)$/)
         $1
       end
     end.compact.sort
-    "<ul>
-    #{ wrap_each_with :li, views }
-    </ul>"
+    "<ul>#{wrap_each_with :li, views}</ul>"
   end
 
-
-
-
   def accordion_group list, collapse_id=card.cardname.safe_key
     accordions = ''
     index = 1
@@ -137,31 +151,34 @@ format :html do
       accordions << accordion(title, content, "#{collapse_id}-#{index}")
       index += 1
     end
-    content_tag :div, accordions.html_safe, class: "panel-group", id: "accordion-#{collapse_id}", role: "tablist", 'aria-multiselectable'=>"true"
+    content_tag :div, accordions.html_safe, class: 'panel-group',
+                                            id: "accordion-#{collapse_id}",
+                                            role: 'tablist',
+                                            'aria-multiselectable' => 'true'
   end
 
   def accordion title, content, collapse_id=card.cardname.safe_key
     panel_body =
       case content
-      when Hash
-        accordion_group accordion(content, collapse_id)
-      when Array
-        content.join "\n"
-      else
-        content
+      when Hash  then accordion_group accordion(content, collapse_id)
+      when Array then content.join "\n"
+      else            content
       end
     %{
       <div class="panel panel-default">
         <div class="panel-heading" role="tab" id="heading-#{collapse_id}">
           <h4 class="panel-title">
-            <a data-toggle="collapse" data-parent="#accordion-#{collapse_id}" href="##{collapse_id}" aria-expanded="true" aria-controls="#{collapse_id}">
-              #{ title }
+            <a data-toggle="collapse" data-parent="#accordion-#{collapse_id}" \
+              href="##{collapse_id}" aria-expanded="true" \
+              aria-controls="#{collapse_id}">
+              #{title}
             </a>
           </h4>
         </div>
-        <div id="#{collapse_id}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading-#{collapse_id}">
+        <div id="#{collapse_id}" class="panel-collapse collapse" \
+          role="tabpanel" aria-labelledby="heading-#{collapse_id}">
           <div class="panel-body">
-            #{ panel_body }
+            #{panel_body}
           </div>
         </div>
       </div>
@@ -170,6 +187,5 @@ format :html do
 end
 
 
-
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/utils.rb ~~~~~~~~~~~
 end;end;end;end;

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

@@ -4,10 +4,9 @@ class Card; module Set; module All; module Actions; extend Card::Set
 # -*- encoding : utf-8 -*-
 
 def select_action_by_params params
-  if (action = find_action_by_params(params))
-    run_callbacks :select_action do
-      self.selected_action_id = action.id
-    end
+  return unless (action = find_action_by_params(params))
+  run_callbacks :select_action do
+    self.selected_action_id = action.id
   end
 end
 
@@ -15,28 +14,32 @@ def find_action_by_params args
   if args[:rev]
     nth_action args[:rev]
   elsif Integer === args[:rev_id] || args[:rev_id] =~ /^\d+$/
-    if action = Action.fetch(args[:rev_id]) and action.card_id == id
+    if (action = Action.fetch(args[:rev_id])) && action.card_id == id
       action
     end
-  elsif args[:rev_id]  # revision id is probalby a mod (e.g. if you request files/:logo/05_standard.png)
+  # revision id is probalby a mod (e.g. if you request
+  # files/:logo/05_standard.png)
+  elsif args[:rev_id]
     last_action
   end
 end
 
 def nth_action index
   index = index.to_i
-  if id and index > 0
-    Action.where("draft is not true AND card_id = #{id}").order(:id).limit(1).offset(index-1).first
-  end
+  return unless id && index > 0
+  Action.where("draft is not true AND card_id = #{id}")
+    .order(:id).limit(1).offset(index - 1).first
 end
 
 def revision action
-  # a "revision" refers to the state of all tracked fields at the time of a given action
+  # a "revision" refers to the state of all tracked fields
+  # at the time of a given action
   if action.is_a? Integer
     action = Card::Action.fetch(action)
   end
-  action and Card::TRACKED_FIELDS.inject({}) do |attr_changes, field|
-    last_change = action.card_changes.find_by_field_name(field) || last_change_on(field, not_after: action)
+  action && Card::TRACKED_FIELDS.inject({}) do |attr_changes, field|
+    last_change = action.card_changes.find_by_field_name(field) ||
+                  last_change_on(field, not_after: action)
     attr_changes[field.to_sym] = (last_change ? last_change.value : self[field])
     attr_changes
   end
@@ -45,15 +48,16 @@ end
 def delete_old_actions
   Card::TRACKED_FIELDS.each do |field|
     # assign previous changes on each tracked field to the last action
-    if (la = last_action) && !la.change_for(field).present? and (last_change = last_change_on(field))
-      last_change = Card::Change.find(last_change.id)   # last_change comes as readonly record
+    if (la = last_action) && !la.change_for(field).present? &&
+       (last_change = last_change_on field)
+      # last_change comes as readonly record
+      last_change = Card::Change.find(last_change.id)
       last_change.update_attributes!(card_action_id: last_action_id)
     end
   end
-  actions.where('id != ?', last_action_id ).delete_all
+  actions.where('id != ?', last_action_id).delete_all
 end
 
 
-
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/01_history/set/all/actions.rb ~~~~~~~~~~~
 end;end;end;end;