card 1.17.2 → 1.17.3

data/db/seed/test/seed.rb

@@ -50,7 +50,7 @@ class SharedData
     #above still necessary?  try commenting out above and 'Sign up' below
     Card::Auth.current_id = Card::WagnBotID # need to reset after creating sign up, which changes current_id for extend phase
 
-    no_samples = %( user sign_up set number list listed_by )
+    no_samples = %( user sign_up set number list listed_by file image )
     Card::Auth.createable_types.each do |type|
       next if no_samples.include? type.to_name.key
       Card.create! type: type, name: "Sample #{type}"
@@ -97,6 +97,8 @@ class SharedData
     Card.create! type_code: 'cardtype', name: "Cardtype E", codename: 'cardtype_e'
     Card.create! type_code: 'cardtype', name: "Cardtype F", codename: 'cardtype_f'
 
+    Card::Codename.reset_cache
+
     Card.create! name: 'basicname', content: 'basiccontent'
     Card.create! type_code: 'cardtype_a', name: "type-a-card", content: 'type_a_content'
     Card.create! type_code: 'cardtype_b', name: "type-b-card", content: 'type_b_content'

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

@@ -2,6 +2,22 @@
 Card.error_codes.merge! permission_denied: [:denial, 403],
                         captcha: [:errors, 449]
 
+module ClassMethods
+  def repair_all_permissions
+    Card.where(
+      '(read_rule_class is null or read_rule_id is null) and trash is false'
+    ).each do |broken_card|
+      broken_card.include_set_modules
+      broken_card.repair_permissions!
+    end
+  end
+end
+
+def repair_permissions!
+  rule_id, rule_class = permission_rule_id_and_class :read
+  update_columns read_rule_id: rule_id, read_rule_class: rule_class
+end
+
 # ok? and ok! are public facing methods to approve one action at a time
 #
 #   fetching: if the optional :trait parameter is supplied, it is passed

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

@@ -13,13 +13,13 @@ module ClassMethods
   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|
-      if trashed_card_ids.member?(file_id)
-        if Card.exists?(file_id) # double check!
-          fail Card::Error, 'Narrowly averted deleting current file'
-        end
-        FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
+      next unless trashed_card_ids.member?(file_id)
+      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
 

data/mod/04_settings/set/abstract/permission.rb

@@ -1,3 +1,4 @@
+
 def standardize_items
   # noop to override default behavior, which wouldn't let '_left' through and would therefore break
 end

data/mod/05_standard/set/self/all.rb

@@ -9,6 +9,7 @@ event :admin_tasks, on: :update, before: :approve do
       when :clear_view_cache     then Card::ViewCache.reset
       when :delete_old_revisions then Card::Action.delete_old
       when :delete_old_sessions  then Card.delete_old_sessions
+      when :repair_permissions   then Card.repair_all_permissions
       end
       Env.params[:success] = Card[:stats].name
       abort :success

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.17.2
+  version: 1.17.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname