card 1.16.10 → 1.16.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ffc60ca121686905da93e8d2689061d3280c975
-  data.tar.gz: 29aa48d586a15e9016e4629ff5f7dde792d9d000
+  metadata.gz: 87ac13203770cb0105dca6d10755c9f442425230
+  data.tar.gz: 4f27287e05a9cb4ed93e0dd18a64585d47b9f044
 SHA512:
-  metadata.gz: 01618a961f3ade1621804f6f395125c12b1e4cc9c224f2b63f5b4d27dce4bb437a3c639aded2b43e8dd776ae67e31a5a40a898751ef4eaedb72b39b0efe74576
-  data.tar.gz: b03556e07938200a5672dae4d4173f2f8c6cffba4157eec963326fa566ab179018990fad69f70a1b1f212d160f675e61fc92af2bccea6bdee87a593b8475150b
+  metadata.gz: 94d18bfbd1b5ffc9ae65f3cc503006571569b9a2b483bfe2b412b7d73d760e121d34dacd23e36bd21930e03145e943e9e29863f8fedbe96884d6b204e4ce5a0b
+  data.tar.gz: 6d01d13ce7cd4e0c3e0a88414ee9f384e1ce9641189a54bcf0e032dae75f3decfb2371a7e3bba8e77a3546cb026bbdbc0a8998b5a48e53162e8b44eb7c6e3581

data/VERSION

@@ -1 +1 @@
-1.16.10
+1.16.11

data/db/migrate/20151105225559_more_space_for_db_content.rb

@@ -0,0 +1,6 @@
+class MoreSpaceForDbContent < ActiveRecord::Migration
+  def change
+    change_column :cards, :db_content, :text, limit: 1.megabyte
+    change_column :card_changes, :value, :text, limit: 1.megabyte
+  end
+end

data/db/migrate_core_cards/20150708224756_add_list_cards.rb

@@ -4,19 +4,26 @@ class AddListCards < Card::CoreMigration
   def up
     create_card! name: 'List', codename: :list,
                  type_code: :cardtype
+
     create_card! name: 'Listed by', codename: :listed_by,
                  type_code: :cardtype
-    create_card! name: '*cached count', codename: :cached_count,
-                 subcards: {
-                    '+*right+*update'=>'[[Administrator]]',
-                    '+*right+*create'=>'[[Administrator]]',
-                    '+*right+*delete'=>'[[Administrator]]'
-                  }
-    create_card! name: '*cached content', codename: :cached_content,
-                 subcards: {
-                   '+*right+*update'=>'[[Administrator]]',
-                   '+*right+*create'=>'[[Administrator]]',
-                   '+*right+*delete'=>'[[Administrator]]'
-                 }
+
+    create_or_update name: '*cached count',
+                     codename: :cached_count,
+                     rename_if_conflict: false,
+                     subcards: {
+                       '+*right+*update' => '[[Administrator]]',
+                       '+*right+*create' => '[[Administrator]]',
+                       '+*right+*delete' => '[[Administrator]]'
+                     }
+
+    create_or_update name: '*cached content',
+                     codename: :cached_content,
+                     rename_if_conflict: false,
+                     subcards: {
+                       '+*right+*update' => '[[Administrator]]',
+                       '+*right+*create' => '[[Administrator]]',
+                       '+*right+*delete' => '[[Administrator]]'
+                     }
   end
 end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150724210803) do
+ActiveRecord::Schema.define(version: 20151105225559) do
 
   create_table "card_actions", force: :cascade do |t|
     t.integer "card_id",         limit: 4
@@ -38,7 +38,7 @@ ActiveRecord::Schema.define(version: 20150724210803) do
   create_table "card_changes", force: :cascade do |t|
     t.integer "card_action_id", limit: 4
     t.integer "field",          limit: 4
-    t.text    "value",          limit: 65535
+    t.text    "value",          limit: 16777215
   end
 
   add_index "card_changes", ["card_action_id"], name: "card_changes_card_action_id_index", using: :btree
@@ -66,22 +66,22 @@ ActiveRecord::Schema.define(version: 20150724210803) do
   add_index "card_revisions", ["creator_id"], name: "revisions_created_by_index", using: :btree
 
   create_table "cards", force: :cascade do |t|
-    t.string   "name",                limit: 255,   null: false
-    t.string   "key",                 limit: 255,   null: false
+    t.string   "name",                limit: 255,      null: false
+    t.string   "key",                 limit: 255,      null: false
     t.string   "codename",            limit: 255
     t.integer  "left_id",             limit: 4
     t.integer  "right_id",            limit: 4
     t.integer  "current_revision_id", limit: 4
-    t.datetime "created_at",                        null: false
-    t.datetime "updated_at",                        null: false
-    t.integer  "creator_id",          limit: 4,     null: false
-    t.integer  "updater_id",          limit: 4,     null: false
+    t.datetime "created_at",                           null: false
+    t.datetime "updated_at",                           null: false
+    t.integer  "creator_id",          limit: 4,        null: false
+    t.integer  "updater_id",          limit: 4,        null: false
     t.string   "read_rule_class",     limit: 255
     t.integer  "read_rule_id",        limit: 4
     t.integer  "references_expired",  limit: 4
-    t.boolean  "trash",                             null: false
-    t.integer  "type_id",             limit: 4,     null: false
-    t.text     "db_content",          limit: 65535
+    t.boolean  "trash",                                null: false
+    t.integer  "type_id",             limit: 4,        null: false
+    t.text     "db_content",          limit: 16777215
   end
 
   add_index "cards", ["key"], name: "cards_key_index", unique: true, using: :btree

data/db/version.txt

@@ -1 +1 @@
-20150724210803
+20151105225559

data/lib/card/active_record_helper.rb

@@ -5,7 +5,7 @@ module Card::ActiveRecordHelper
   end
 
   def create_card! args
-    create_card args.merge(rename_if_conflict: :other)
+    create_card args.reverse_merge(rename_if_conflict: :new)
   end
 
   def update_card name, args
@@ -14,7 +14,7 @@ module Card::ActiveRecordHelper
   end
 
   def update_card! args
-    update_card args.merge(resolve_name_conflict: :other)
+    update_card args.reverse_merge(rename_if_conflict: :new)
   end
 
   def create_or_update name_or_args, args=nil
@@ -23,22 +23,20 @@ module Card::ActiveRecordHelper
     if Card[name]
       update_card name, args
     else
-      create_card args.merge(:name=>name)
+      create_card args.merge(name: name)
     end
   end
 
   def create_or_update! name_or_args, args=nil
-    if args
-      args[:resolve_name_conflict] = :other
-    else
-      name_or_args[:resolve_name_conflict] = :other
-    end
-    create_or_update name_or_args, args
+    name = args ? name_or_args : name_or_args[:name]
+    args ||= {}
+    create_or_update name, args.reverse_merge(rename_if_conflict: :new)
   end
 
   def resolve_name_conflict args
-    if (rename = args.delete :rename_if_conflict)
-      args[:name] = Card.uniquify_name args[:name], rename == :other
+    rename = args.delete :rename_if_conflict
+    if rename
+      args[:name] = Card.uniquify_name args[:name], rename
     end
   end
 end

data/lib/card/cache.rb

@@ -54,11 +54,13 @@ class Card
       end
 
       def generate_cache_id
-        ((Time.now.to_f * 100).to_i).to_s + ('a'..'z').to_a[rand(26)] + ('a'..'z').to_a[rand(26)]
+        ((Time.now.to_f * 100).to_i).to_s +
+          ('a'..'z').to_a[rand(26)] +
+          ('a'..'z').to_a[rand(26)]
       end
 
       def reset_global
-        cache_by_class.each do |klass, cache|
+        cache_by_class.each do |_klass, cache|
           cache.reset hard=true
         end
         Card::Codename.reset_cache
@@ -67,9 +69,11 @@ class Card
 
       def reset_local
         cache_by_class.each do |cc, cache|
-          if Card::Cache===cache
+          if Card::Cache === cache
             cache.reset_local
-          else warn "reset class #{cc}, #{cache.class} #{caller[0..8]*"\n"} ???" end
+          else
+            warn "reset class #{cc}, #{cache.class} #{caller[0..8] * "\n"} ???"
+          end
         end
       end
 
@@ -91,20 +95,16 @@ class Card
       private
 
       def prepopulate
-        if @@prepopulating
-          @@rule_cache      ||= Card.rule_cache
-          @@read_rule_cache ||= Card.read_rule_cache
-          @@user_ids_cache  ||= Card.user_ids_cache
-          @@rule_keys_cache ||= Card.rule_keys_cache
-          Card.cache.write_local 'RULES', @@rule_cache
-          Card.cache.write_local 'READRULES', @@read_rule_cache
-          Card.cache.write_local 'USER_IDS', @@user_ids_cache
-          Card.cache.write_local 'RULE_KEYS', @@rule_keys_cache
-        end
+        return unless @@prepopulating
+        @@rule_cache ||= Card.rule_cache
+        @@user_ids_cache ||= Card.user_ids_cache
+        @@read_rule_cache ||= Card.read_rule_cache
+        @@rule_keys_cache ||= Card.rule_keys_cache
+        Card.cache.write_local 'RULES', @@rule_cache
+        Card.cache.write_local 'READRULES', @@read_rule_cache
+        Card.cache.write_local 'USER_IDS', @@user_ids_cache
+        Card.cache.write_local 'RULE_KEYS', @@rule_keys_cache
       end
-
-
-
     end
 
     attr_reader :prefix, :store, :klass
@@ -179,7 +179,7 @@ class Card
 
     def delete key
       @store.delete(@prefix + key) if @store
-      @local.delete key
+      delete_local key
     end
 
     def delete_local key

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

@@ -210,10 +210,9 @@ module ClassMethods
   end
 
   def write_to_local_cache card
-    if Card.cache
-      Card.cache.write_local card.key, card
-      Card.cache.write_local "~#{card.id}", card.key if card.id && card.id != 0
-    end
+    return unless Card.cache
+    Card.cache.write_local card.key, card
+    Card.cache.write_local "~#{card.id}", card.key if card.id && card.id != 0
   end
 
   def expand_mark mark, opts
@@ -242,7 +241,7 @@ module ClassMethods
     end
   end
 
-  def fullname_from_name name, new_opts = {}
+  def fullname_from_name name, new_opts={}
     if new_opts && supercard = new_opts[:supercard]
       name.to_name.to_absolute_name supercard.name
     else
@@ -253,16 +252,17 @@ end
 
 # ~~~~~~~~~~ Instance ~~~~~~~~~~~~~
 
-def fetch opts = {}
-  if traits = opts.delete(:trait)
-    traits = Array.wrap traits
-    traits.inject(self) do |card, trait|
-      Card.fetch card.cardname.trait(trait), opts
-    end
+def fetch opts={}
+  traits = opts.delete(:trait)
+  return unless traits
+  # should this fail as an incorrect api call?
+  traits = Array.wrap traits
+  traits.inject(self) do |card, trait|
+    Card.fetch card.cardname.trait(trait), opts
   end
 end
 
-def renew args = {}
+def renew args={}
   opts = args[:new].clone
   opts[:name] ||= cardname
   opts[:skip_modules] = args[:skip_modules]
@@ -275,7 +275,7 @@ def expire_pieces
   end
 end
 
-def expire subcards = false
+def expire subcards=false
   # Rails.logger.warn "expiring i:#{id}, #{inspect}"
   if subcards
     expire_subcards
@@ -286,7 +286,7 @@ def expire subcards = false
   Card.cache.delete "~#{id}" if id
 end
 
-def refresh force = false
+def refresh force=false
   if force || self.frozen? || self.readonly?
     fresh_card = self.class.find id
     fresh_card.include_set_modules
@@ -308,4 +308,3 @@ def rename_from_mark mark
   return unless mark && mark.to_s != name
   self.name = mark.to_s
 end
-

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

@@ -1,18 +1,20 @@
 require 'uuid'
 
 module ClassMethods
-  def uniquify_name name, rename=false
-    return name unless Card[name]
+  def uniquify_name name, rename=:new
+    return name unless Card.exists?(name)
     uniq_name = "#{name} 1"
-    while Card[uniq_name]
+    while Card.exists?(uniq_name)
       uniq_name.next!
     end
-    return uniq_name unless rename
-
-    Card[name].update_attributes! name: uniq_name,
-                                  update_referencers: true
-    # name conflict resolved; original name can be used
-    name
+    if rename == :old
+      # name conflict resolved; original name can be used
+      Card[name].update_attributes! name: uniq_name,
+                                    update_referencers: true
+      name
+    else
+      uniq_name
+    end
   end
 end
 
@@ -120,23 +122,32 @@ def left_or_new args={}
 end
 
 def children
-  Card.search((simple? ? :part : :left) => name).to_a
+  children_names.map { |name| Card[name] }
 end
 
-def dependents
-  return [] if new_card?
+def children_names parent_name=nil
+  # eg, A+B is a child of A and B
+  parent_name ||= name
+  field = parent_name.to_name.simple? ? :part : :left
+  Card.search field => parent_name, return: :name
+end
 
-  if @dependents.nil?
-    @dependents =
-      Auth.as_bot do
-        deps = children
-        deps.inject(deps) do |array, card|
-          array + card.dependents
-        end
-      end
-    # Rails.logger.warn "dependents[#{inspect}] #{@dependents.inspect}"
+def descendant_names parent_name=nil
+  return [] if new_card?
+  parent_name ||= name
+  Auth.as_bot do
+    deps = children_names parent_name
+    deps.inject(deps) do |array, childname|
+      array + descendant_names(childname)
+    end
   end
-  @dependents
+end
+
+def descendants
+  # children and children's children
+  # NOTE - set modules are not loaded
+  # -- should only be used for name manipulations
+  @descendants ||= descendant_names.map { |name| Card.quick_fetch name }
 end
 
 def repair_key
@@ -154,7 +165,7 @@ def repair_key
     saved ||= (self.cardname = current_key) && self.save!
 
     if saved
-      dependents.each(&:repair_key)
+      descendants.each(&:repair_key)
     else
       Rails.logger.debug "FAILED TO REPAIR BROKEN KEY: #{key}"
       self.name = "BROKEN KEY: #{name}"
@@ -275,28 +286,25 @@ event :cascade_name_changes, after: :store, on: :update, changed: :name do
   self.update_referencers = false if update_referencers == 'false'
   Card::Reference.update_on_rename self, name, self.update_referencers
 
-  deps = dependents
-  # warn "-------------------#{name_was}---- CASCADE #{self.name} -> deps: " \
-  #      " #{deps.map(&:name)*', '} -----------------------"
-
-  @dependents = nil # reset
+  des = descendants
+  @descendants = nil # reset
 
-  deps.each do |dep|
+  des.each do |de|
     # here we specifically want NOT to invoke recursive cascades on these
     # cards, have to go this low level to avoid callbacks.
-    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::Reference.update_on_rename dep, newname, update_referencers
+    Rails.logger.info "cascading name: #{de.name}"
+    Card.expire de.name # old name
+    newname = de.cardname.replace_part name_was, name
+    Card.where(id: de.id).update_all name: newname.to_s, key: newname.key
+    Card::Reference.update_on_rename de, newname, update_referencers
     Card.expire newname
   end
-  execute_referencers_update(deps) if update_referencers
+  execute_referencers_update(des) if update_referencers
 end
 
-def execute_referencers_update dependents
+def execute_referencers_update descendants
   Auth.as_bot do
-    [name_referencers(name_was) + dependents.map(&:referencers)]
+    [name_referencers(name_was) + descendants.map(&:referencers)]
       .flatten.uniq.each do |card|
       # FIXME:  using 'name_referencers' instead of plain 'referencers' for self
       # because there are cases where trunk and tag
@@ -307,7 +315,7 @@ def execute_referencers_update dependents
       # so at this time X is still including Y, which does not exist.
       # therefore #referencers doesn't find it, but name_referencers(old_name)
       # does.
-      # some even more complicated scenario probably breaks on the dependents,
+      # some even more complicated scenario probably breaks on the descendants,
       # so this probably needs a more thoughtful refactor
       # aligning the dependent saving with the name cascading
 

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

@@ -6,7 +6,7 @@ end
 
 def extended_referencers
   # FIXME .. we really just need a number here.
-  (dependents + [self]).map(&:referencers).flatten.uniq
+  (descendants + [self]).map(&:referencers).flatten.uniq
 end
 
 

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

@@ -67,4 +67,4 @@ event :store_subcards, after: :store do
   # eg. <user> creates <user+*account> creates <user+*account+*status>
   # <user> changes <user+*account+*status> in event activate_account
   Card.write_to_local_cache self
-end
+end