card 1.19.0 → 1.19.1

data/mod/{standard → carrierwave}/spec/set/type/image_spec.rb

@@ -114,14 +114,14 @@ describe Card::Set::Type::Image do
           image: File.new(File.join(FIXTURES_PATH, "rails.gif"))
         )
       end
-      expect(subject.mod_file?).to be_falsey
+      expect(subject.coded?).to be_falsey
       expect(subject.image.url)
         .to eq "/files/~#{subject.id}/#{subject.last_action_id}-original.gif"
     end
 
-    describe "#mod_file?" do
-      it "returns the mod name" do
-        expect(subject.mod_file?).to eq("standard")
+    describe "#coded?" do
+      it "returns true" do
+        expect(subject.coded?).to be_truthy
       end
     end
 
@@ -132,4 +132,22 @@ describe Card::Set::Type::Image do
       end
     end
   end
+
+  describe "#delete_files_for_action" do
+    subject do
+      Card::Auth.as_bot do
+        Card.create! name: "image card", type: "image",
+                     image: File.new(File.join(FIXTURES_PATH, "mao2.jpg"))
+      end
+    end
+    it "deletes all versions" do
+      path = subject.image.path
+      small_path = subject.image.small.path
+      medium_path = subject.image.medium.path
+      subject.delete_files_for_action(subject.last_action)
+      expect(File.exist?(small_path)).to be_falsey
+      expect(File.exist?(medium_path)).to be_falsey
+      expect(File.exist?(path)).to be_falsey
+    end
+  end
 end

data/mod/core/set/abstract/code_file.rb

@@ -25,9 +25,9 @@ end
 def source_files
   case type_id
   when CoffeeScriptID then "#{codename}.js.coffee"
-  when JavaScriptID then "#{codename}.js"
-  when CssID then "#{codename}.css"
-  when ScssID then "#{codename}.scss"
+  when JavaScriptID   then "#{codename}.js"
+  when CssID          then "#{codename}.css"
+  when ScssID         then "#{codename}.scss"
   end
 end
 

data/mod/core/set/all/debug.rb

@@ -0,0 +1,23 @@
+def to_s
+  "#<#{self.class.name}[#{debug_type}]#{attributes['name']}>"
+end
+
+def 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
+
+private
+
+def debug_type
+  "#{type_code || ''}:#{type_id}"
+end

data/mod/core/set/all/name.rb

@@ -53,11 +53,11 @@ def update_subcard_names cardname
     # and self is a subcard as well that changed from +B to A+B then
     # +C should change to A+B+C. #replace_part doesn't work in this case
     # because the old name +B is not a part of +C
-    # name_to_replace =
     name_to_replace =
       if subcard.cardname.junction? &&
          subcard.cardname.parts.first.empty? &&
          cardname.parts.first.present?
+        # replace the empty part
         "".to_name
       else
         name

data/mod/core/set/all/permissions.rb

@@ -184,28 +184,38 @@ event :set_field_read_rules,
   end
 end
 
-def update_read_rule
-  Card.record_timestamps = false
-  reset_patterns # why is this needed?
-  rcard_id, rclass = permission_rule_id_and_class :read
-  # these two are just to make sure vals are correct on current object
-  self.read_rule_id = rcard_id
-  self.read_rule_class = rclass
-  Card.where(id: id).update_all read_rule_id: rcard_id, read_rule_class: rclass
-  expire_hard
-
-  # currently doing a brute force search for every card that may be impacted.
-  # may want to optimize(?)
+# currently doing a brute force search for every card that may be impacted.
+# may want to optimize(?)
+def update_field_read_rules
   Auth.as_bot do
     fields.each do |field|
       field.update_read_rule if field.rule(:read) == "_left"
     end
   end
+end
 
+def without_timestamps
+  Card.record_timestamps = false
+  yield
 ensure
   Card.record_timestamps = true
 end
 
+event :update_read_rule do
+  without_timestamps do
+    reset_patterns # why is this needed?
+    rcard_id, rclass = permission_rule_id_and_class :read
+    # these two are just to make sure vals are correct on current object
+    self.read_rule_id = rcard_id
+    self.read_rule_class = rclass
+    Card.where(id: id).update_all read_rule_id: rcard_id,
+                                  read_rule_class: rclass
+    expire_hard
+
+    update_field_read_rules
+  end
+end
+
 def add_to_read_rule_update_queue updates
   @read_rule_update_queue = Array.wrap(@read_rule_update_queue).concat updates
 end

data/mod/core/set/all/tracked_attributes.rb

@@ -69,79 +69,3 @@ event :set_content, :store, on: :save do
   clear_drafts
   reset_patterns_if_rule 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!
-
-event :update_ruled_cards, :finalize do
-  if is_rule?
-    # warn "updating ruled cards for #{name}"
-    self.class.clear_rule_cache
-    set = rule_set
-
-    if right_id == Card::ReadID && (name_changed? || trash_changed?)
-      update_read_ruled_cards set
-    end
-  end
-end
-
-def update_read_rules_of_set_members_not_governed_by_narrower_rules set
-  return {} if trash || !set || !(set_class = set.tag) ||
-               !(class_id = set_class.id)
-  in_set = {}
-  rule_class_ids = set_patterns.map(&:pattern_id)
-  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
-        item_card.update_read_rule if cur_index >= rule_class_index
-      end
-    else
-      warn "No current rule index #{class_id}, #{rule_class_ids.inspect}"
-    end
-  end
-  in_set
-end
-
-def update_read_ruled_cards set
-  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?
-
-  updated = update_read_rules_of_set_members_not_governed_by_narrower_rules set
-
-  # then find all cards with me as read_rule_id that were not just updated
-  # and regenerate their read_rules
-  return if new_card?
-  Card.search(read_rule_id: id) do |card|
-    card.update_read_rule unless updated[card.key]
-  end
-end
-
-event :process_read_rule_update_queue, :finalize do
-  Array.wrap(@read_rule_update_queue).each(&:update_read_rule)
-  @read_rule_update_queue = []
-end
-
-event :expire_related, :finalize do
-  subcards.keys.each do |key|
-    Card.cache.soft.delete key
-  end
-  expire # FIXME: where do we put this. Here it deletes @stage
-  reset_patterns
-  if is_structure?
-    structuree_names.each do |name|
-      Card.expire name
-    end
-  end
-end
-
-event :expire_related_names, before: :expire_related, changed: :name do
-  # FIXME: look for opportunities to avoid instantiating the following
-  descendants.each(&:expire)
-  name_referers.each(&:expire)
-end

data/mod/core/set/all/trash.rb

@@ -1,3 +1,53 @@
+Self::Admin.add_to_basket(
+  :tasks,
+  name: :empty_trash,
+  execute_policy: -> { Card.empty_trash },
+  stats: {
+    title: "trashed cards",
+    count: -> { Card.where(trash: true) },
+    link_text: "delete all",
+    task: "empty_trash"
+  }
+)
+
+module ClassMethods
+  def empty_trash
+    Card.delete_trashed_files
+    Card.where(trash: true).delete_all
+    Card::Action.delete_cardless
+    Card::Reference.unmap_if_referee_missing
+    Card::Reference.delete_if_referer_missing
+  end
+
+  # deletes any file not associated with a real card.
+  def delete_trashed_files
+    dir = Cardio.paths["files"].existent.first
+    # TODO: handle cloud files
+    return unless dir
+
+    trashed_card_ids = all_trashed_card_ids
+    file_ids = all_file_ids
+    file_ids.each do |file_id|
+      next unless trashed_card_ids.member?(file_id)
+      if Card.exists?(file_id) # double check!
+        raise Card::Error, "Narrowly averted deleting current file"
+      end
+      FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
+    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
+end
+
 def delete
   update_attributes trash: true unless new_card?
 end

data/mod/core/set/all/update_read_rules.rb

@@ -0,0 +1,84 @@
+
+# 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, :finalize do
+  if is_rule?
+    # warn "updating ruled cards for #{name}"
+    self.class.clear_rule_cache
+    set = rule_set
+
+    if right_id == Card::ReadID && (name_changed? || trash_changed?)
+      update_read_ruled_cards set
+    end
+  end
+end
+
+def update_read_rules_not_overridden_by_narrower_rules cur_index,
+                                                       rule_class_index, set
+  set.item_cards(limit: 0).each_with_object(::Set.new) do |item_card, in_set|
+    in_set << item_card.key
+    next if cur_index < rule_class_index
+    item_card.update_read_rule
+  end
+end
+
+def update_read_rules_of_set_members set
+  return ::Set.new if trash || !(class_id = id_of_set_class(set))
+  rule_class_ids = set_patterns.map(&:pattern_id)
+  Auth.as_bot do
+    if (rule_class_index = rule_class_ids.index(class_id))
+      cur_index = rule_class_ids.index Card[read_rule_class].id
+      update_read_rules_not_overridden_by_narrower_rules cur_index,
+                                                         rule_class_index, set
+    else
+      warn "No current rule index #{class_id}, #{rule_class_ids.inspect}"
+      ::Set.new
+    end
+  end
+end
+
+def id_of_set_class set
+  set && (set_class = set.tag) && set_class.id
+end
+
+def update_read_ruled_cards set
+  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?
+
+  updated = update_read_rules_of_set_members set
+
+  # then find all cards with me as read_rule_id that were not just updated
+  # and regenerate their read_rules
+  return if new_card?
+  Card.search(read_rule_id: id) do |card|
+    card.update_read_rule unless updated.include?(card.key)
+  end
+end
+
+event :process_read_rule_update_queue, :finalize do
+  Array.wrap(@read_rule_update_queue).each(&:update_read_rule)
+  @read_rule_update_queue = []
+end
+
+event :expire_related, :finalize do
+  subcards.keys.each do |key|
+    Card.cache.soft.delete key
+  end
+  expire # FIXME: where do we put this. Here it deletes @stage
+  reset_patterns
+  if is_structure?
+    structuree_names.each do |name|
+      Card.expire name
+    end
+  end
+end
+
+event :expire_related_names, before: :expire_related, changed: :name do
+  # FIXME: look for opportunities to avoid instantiating the following
+  descendants.each(&:expire)
+  name_referers.each(&:expire)
+end

data/mod/core/set/all/utils.rb

@@ -1,27 +1,4 @@
 module ClassMethods
-  def empty_trash
-    Card.delete_trashed_files
-    Card.where(trash: true).delete_all
-    Card::Action.delete_cardless
-    Card::Reference.unmap_if_referee_missing
-    Card::Reference.delete_if_referer_missing
-    Card.delete_tmp_files_of_cached_uploads
-  end
-
-  # 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
-    dir = Cardio.paths["files"].existent.first
-    file_ids.each do |file_id|
-      next unless trashed_card_ids.member?(file_id)
-      if Card.exists?(file_id) # double check!
-        raise Card::Error, "Narrowly averted deleting current file"
-      end
-      FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
-    end
-  end
-
   def delete_tmp_files id=nil
     dir = Cardio.paths["files"].existent.first + "/tmp"
     dir += "/#{id}" if id
@@ -30,31 +7,6 @@ module ClassMethods
     Rails.logger.info "failed to remove tmp files"
   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"
-    actions.each do |action|
-      # 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
-  end
-
   def merge_list attribs, opts={}
     unmerged = []
     attribs.each do |row|
@@ -84,7 +36,7 @@ module ClassMethods
   end
 
   def merge name, attribs={}, opts={}
-    # puts "merging #{name}"
+    puts "merging #{name}"
     card = fetch name, new: {}
     [:image, :file].each do |attach|
       next unless attribs[attach] && attribs[attach].is_a?(String)
@@ -97,33 +49,7 @@ module ClassMethods
     end
   end
 
-  def older_than_five_days? time
-    Time.now - time > 432_000
-  end
-
   def seed_test_db
     system "env RAILS_ENV=test bundle exec rake db:fixtures:load"
   end
 end
-
-def debug_type
-  "#{type_code || ''}:#{type_id}"
-end
-
-def to_s
-  "#<#{self.class.name}[#{debug_type}]#{attributes['name']}>"
-end
-
-def 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