card 1.17.3 → 1.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0761ae5ad975f7da3a5a1fb311af162763f2a499
-  data.tar.gz: 9c1da842848e3cb3e4bc8bd970cc4833672ef1ec
+  metadata.gz: 71d8c48249e77df2b401a40899bb6174cbafa0bc
+  data.tar.gz: 2214e2225cad7712ff1d7f93b32b812f392d15d0
 SHA512:
-  metadata.gz: fc4501bfb58f3f77921f2efba3361c36bb6b1353f891c9949e2a2ef518535c714c07b9310c43db054d1314bb4104c0b6b3cbb8131b33ce43f05d7b0f6dcaafe5
-  data.tar.gz: e36ada3b20b49e0fc72b7e1478daed3dd7b2fc5e37ffb1eb610ebb8f12932e31e44d03bca318b3994ec5fda1dbec76ddbde8ad7a49b4171adcc9b1d36011ada8
+  metadata.gz: e77682bdebca32646c7dc1866d56e57b1aaca3496fcceaf028ba842313a1c667d0d178e6cda84213fbce9982abe12c016d1f78ecaf01954f75a4801114bfd052
+  data.tar.gz: 0d1db3905c69508ba95f54f75f5c61f3ee660f3ccca2f19cb48f22d6f14f5c71730e3bde023ad909fc951e357b3f12f19f5518caeaca36b63caf52d3d6b252fa

data/VERSION

@@ -1 +1 @@
-1.17.3
+1.17.4

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

@@ -1,45 +1,82 @@
-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
-  join cards sets     on rules.left_id  = sets.id
-  join cards settings on rules.right_id = settings.id
-  where sets.type_id     = #{Card::SetID }    and sets.trash     is false
-  and   settings.type_id = #{Card::SettingID} and settings.trash is false
-  and                                             rules.trash    is false
-  and   (settings.codename != 'follow' or rules.db_content != '');
-}
-
-ReadRuleSQL = %{
-  select refs.referee_id as party_id, read_rules.id as read_rule_id
-  from cards read_rules
-  join card_references refs on refs.referer_id    = read_rules.id
-  join cards sets           on read_rules.left_id = sets.id
-  where read_rules.right_id = #{Card::ReadID} and read_rules.trash is false and sets.type_id = #{Card::SetID};
-}
+# frozen_string_literal: true
+
+RULE_SQL = %(
+  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
+  JOIN cards sets     ON rules.left_id  = sets.id
+  JOIN cards settings ON rules.right_id = settings.id
+  WHERE     sets.type_id = #{Card::SetID}
+    AND settings.type_id = #{Card::SettingID}
+    AND (settings.codename != 'follow' OR rules.db_content != '')
+    AND    rules.trash is false
+    AND     sets.trash is false
+    AND settings.trash is false;
+).freeze
+
+# FIXME: "follow" hardcoded above
+
+READ_RULE_SQL = %(
+  SELECT
+    refs.referee_id AS party_id,
+    read_rules.id   AS read_rule_id
+  FROM cards read_rules
+  JOIN card_references refs ON refs.referer_id    = read_rules.id
+  JOIN cards sets           ON read_rules.left_id = sets.id
+  WHERE read_rules.right_id = #{Card::ReadID}
+    AND       sets.type_id  = #{Card::SetID}
+    AND read_rules.trash is false
+    AND       sets.trash is false;
+).freeze
+
+PREFERENCE_SQL = %(
+  SELECT
+    preferences.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,
+    users.id       AS user_id
+  FROM cards preferences
+  JOIN cards user_sets ON preferences.left_id  = user_sets.id
+  JOIN cards settings  ON preferences.right_id = settings.id
+  JOIN cards users     ON user_sets.right_id   = users.id
+  JOIN cards sets      ON user_sets.left_id    = sets.id
+  WHERE sets.type_id     = #{Card::SetID}
+    AND settings.type_id = #{Card::SettingID}
+    AND (%s or users.codename = 'all')
+    AND sets.trash        is false
+    AND settings.trash    is false
+    AND users.trash       is false
+    AND user_sets.trash   is false
+    AND preferences.trash is false;
+).freeze
 
 def is_rule?
-  is_standard_rule? || is_user_rule?
+  is_standard_rule? || is_preference?
 end
 
 def is_standard_rule?
-  (r = right( skip_modules: true ))  &&
-    r.type_id == Card::SettingID     &&
-    (l = left( skip_modules: true )) &&
+  (r = right(skip_modules: true)) &&
+    r.type_id == Card::SettingID &&
+    (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.type_id == Card::SettingID                              &&
-  (set = self[0..-3, skip_modules: true])                   &&
-   set.type_id == Card::SetID                                &&
-  (user = self[-2, skip_modules: true] )                    &&
-  (user.type_id == Card::UserID  || user.codename == 'all' )
+def is_preference?
+  cardname.parts.length > 2 &&
+    (r = right(skip_modules: true)) &&
+    r.type_id == Card::SettingID &&
+    (set = self[0..-3, skip_modules: true]) &&
+    set.type_id == Card::SetID &&
+    (user = self[-2, skip_modules: true]) &&
+    (user.type_id == Card::UserID || user.codename == 'all')
 end
 
-
 def rule setting_code, options={}
   options[:skip_modules] = true
   card = rule_card setting_code, options
@@ -51,14 +88,10 @@ def rule_card setting_code, options={}
 end
 
 def rule_card_id setting_code, options={}
-  fallback = options.delete( :fallback )
+  fallback = options.delete :fallback
 
   if Card::Setting.user_specific? setting_code
-    user_id = options[:user_id] || (options[:user] and options[:user].id) || Auth.current_id
-    if user_id
-      fallback = "#{setting_code}+#{AllID}"
-      setting_code = "#{setting_code}+#{user_id}"
-    end
+    fallback, setting_code = preference_card_id_lookups setting_code, options
   end
 
   rule_set_keys.each do |rule_set_key|
@@ -69,7 +102,15 @@ def rule_card_id setting_code, options={}
   nil
 end
 
-def related_sets with_self = false
+def preference_card_id_lookups setting_code, options={}
+  user_id = options[:user_id] ||
+            (options[:user] && options[:user].id) ||
+            Auth.current_id
+  return unless user_id
+  ["#{setting_code}+#{AllID}", "#{setting_code}+#{user_id}"]
+end
+
+def related_sets with_self=false
   # refers to sets that users may configure from the current card -
   # NOT to sets to which the current card belongs
 
@@ -89,38 +130,16 @@ def related_sets with_self = false
 end
 
 module ClassMethods
-
   # User-specific rule use the pattern
   # user+set+setting
-  def user_rule_sql user_id=nil
-    user_restriction = if user_id
+  def preference_sql user_id=nil
+    user_restriction =
+      if user_id
         "users.id = #{user_id}"
       else
         "users.type_id = #{Card::UserID}"
       end
-
-    %{
-      select
-        user_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,
-        users.id      as user_id
-      from cards user_rules
-      join cards user_sets on user_rules.left_id  = user_sets.id
-      join cards settings  on user_rules.right_id = settings.id
-      join cards users     on user_sets.right_id  = users.id
-      join cards sets      on user_sets.left_id = sets.id
-      where sets.type_id     = #{Card::SetID }
-        and settings.type_id = #{Card::SettingID}
-        and (#{user_restriction} or users.codename = 'all')
-        and sets.trash       is false
-        and settings.trash   is false
-        and users.trash      is false
-        and user_sets.trash  is false
-        and user_rules.trash is false;
-    }
+    PREFERENCE_SQL % user_restriction
   end
 
   def global_setting name
@@ -129,7 +148,7 @@ module ClassMethods
     end
   end
 
-  def path_setting name #shouldn't this be in location helper?
+  def path_setting name # shouldn't this be in location helper?
     name ||= '/'
     return name if name =~ /^(http|mailto)/
     "#{Card.config.relative_url_root}#{name}"
@@ -139,38 +158,36 @@ module ClassMethods
     val.to_s.strip == '1'
   end
 
-  def cache_key row
-    setting_code = Codename[ row['setting_id'].to_i ] or return false
+  def rule_cache_key row
+    return false unless (setting_code = Codename[row['setting_id'].to_i])
 
     anchor_id = row['anchor_id']
     set_class_id = anchor_id.nil? ? row['set_id'] : row['set_tag_id']
-    set_class_code = Codename[ set_class_id.to_i ] or return false
+    return false unless (set_class_code = Codename[set_class_id.to_i])
 
-    key_base = [ anchor_id, set_class_code, setting_code].compact.map( &:to_s ) * '+'
+    [anchor_id, set_class_code, setting_code].compact.map(&:to_s) * '+'
   end
 
-  def all_rule_keys_with_id
-    ActiveRecord::Base.connection.select_all(RuleSQL).each do |row|
-      if key = cache_key(row)
-        yield(key, row['rule_id'].to_i)
-      end
+  def interpret_simple_rules
+    ActiveRecord::Base.connection.select_all(RULE_SQL).each do |row|
+      next unless (key = rule_cache_key row)
+      @rule_hash[key] = row['rule_id'].to_i
     end
   end
 
-  def all_user_rule_keys_with_id_and_user_id
-    ActiveRecord::Base.connection.select_all(user_rule_sql).each do |row|
-      if key = cache_key(row) and user_id = row['user_id']
-        yield(key, row['rule_id'].to_i, user_id.to_i)
-      end
+  def interpret_preferences
+    ActiveRecord::Base.connection.select_all(preference_sql).each do |row|
+      next unless (key = rule_cache_key row) && (user_id = row['user_id'])
+      add_preference_hash_values key, row['rule_id'].to_i, user_id.to_i
     end
   end
 
-  def all_rule_keys_with_id_for user_id
-    ActiveRecord::Base.connection.select_all(user_rule_sql(user_id)).each do |row|
-      if key = cache_key(row)
-        yield(key, row['rule_id'].to_i)
-      end
-    end
+  def add_preference_hash_values key, rule_id, user_id
+    @rule_hash[preference_key(key, user_id)] = rule_id
+    @user_ids_hash[key] ||= []
+    @user_ids_hash[key] << user_id
+    @rule_keys_hash[user_id] ||= []
+    @rule_keys_hash[user_id] << key
   end
 
   def cached_rule_keys_for user_id
@@ -194,53 +211,48 @@ module ClassMethods
     end
   end
 
-  def user_rule_cards user_name, setting_code
+  def preference_cards user_name, setting_code
     Card.search(
       { right: { codename: setting_code },
         left: { left: { type_id: SetID }, right: user_name }
-        }, "rule cards for user: #{user_name}"
+      }, "rule cards for user: #{user_name}"
     )
   end
 
   def rule_cache
     Card.cache.read('RULES') || begin
-      rule_hash = {}
-      all_rule_keys_with_id do |key,rule_id|
-        rule_hash[key] = rule_id
-      end
+      @rule_hash = {}
+      @user_ids_hash = {}
+      @rule_keys_hash = {}
 
-      user_ids_hash = {}
-      rule_keys_hash = {}
-      all_user_rule_keys_with_id_and_user_id do |key, rule_id, user_id|
-        rule_hash[ user_rule_key(key,user_id) ] = rule_id
-        user_ids_hash[key] ||= []
-        user_ids_hash[key] << user_id
-        rule_keys_hash[user_id] ||= []
-        rule_keys_hash[user_id] << key
-      end
-      write_user_ids_cache user_ids_hash
-      write_rule_keys_cache rule_keys_hash
-      write_rule_cache rule_hash
+      interpret_simple_rules
+      interpret_preferences
+
+      write_user_ids_cache @user_ids_hash
+      write_rule_keys_cache @rule_keys_hash
+      write_rule_cache @rule_hash
     end
   end
 
-  def user_rule_key key, user_id
+  def preference_key key, user_id
     "#{key}+#{user_id}"
   end
 
   # all users that have a user-specific rule for a given rule key
   def user_ids_cache
     Card.cache.read('USER_IDS') || begin
+      clear_rule_cache
       rule_cache
-      Card.cache.read('USER_IDS')
+      @user_ids_hash
     end
   end
 
   # all keys of user-specific rules for a given user
   def rule_keys_cache
     Card.cache.read('RULE_KEYS') || begin
+      clear_rule_cache
       rule_cache
-      Card.cache.read('RULE_KEYS')
+      @rule_keys_hash
     end
   end
 
@@ -250,34 +262,11 @@ module ClassMethods
     write_rule_keys_cache nil
   end
 
-  def clear_user_rule_cache
+  def clear_preference_cache
+    # FIXME: too entwined!
     clear_rule_cache
   end
 
-  def refresh_rule_cache_for_user user_id
-    rule_hash = rule_cache
-    user_ids_hash = user_ids_cache
-    rule_keys_hash = rule_keys_cache
-
-    cached_rule_keys_for(user_id).each do |key|
-      rule_hash[ user_rule_key(key, user_id) ] = nil
-      user_ids_hash[ key ].delete(user_id)
-    end
-    rule_keys_hash[ user_id ] = nil
-
-    all_rule_keys_with_id_for(user_id) do |key, rule_id|
-      rule_hash[ user_rule_key(key,user_id) ] = rule_id
-
-      user_ids_hash[ key ]      ||= []
-      user_ids_hash[ key ]      << user_id
-      rule_keys_hash[ user_id ] ||= []
-      rule_keys_hash[ user_id ] << key
-    end
-    write_user_ids_cache user_ids_hash
-    write_rule_keys_cache rule_keys_hash
-    write_rule_cache rule_hash
-  end
-
   def write_rule_cache hash
     Card.cache.write 'RULES', hash
   end
@@ -293,8 +282,8 @@ module ClassMethods
   def read_rule_cache
     Card.cache.read('READRULES') || begin
       hash = {}
-      ActiveRecord::Base.connection.select_all(
-        Card::Set::All::Rules::ReadRuleSQL
+      Card.connection.select_all(
+        Card::Set::All::Rules::READ_RULE_SQL
       ).each do |row|
         party_id = row['party_id'].to_i
         hash[party_id] ||= []

data/mod/05_email/set/all/follow.rb

@@ -20,7 +20,7 @@ event :cache_expired_for_name_change, before: :store, on: :update,
   Card.follow_caches_expired
 end
 
-event :cache_expired_for_new_user_rule,
+event :cache_expired_for_new_preference,
       before: :extend,
       when: proc { |c| c.follow_rule_card? }  do
   Card.follow_caches_expired
@@ -95,7 +95,7 @@ def follower_names
 end
 
 def follow_rule_card?
-  is_user_rule? && rule_setting_name == '*follow'
+  is_preference? && rule_setting_name == '*follow'
 end
 
 def follow_option?
@@ -236,7 +236,7 @@ end
 module ClassMethods
   def follow_caches_expired
     Card.clear_follower_ids_cache
-    Card.clear_user_rule_cache
+    Card.clear_preference_cache
   end
 
   def follower_ids_cache

data/mod/05_email/set/type_plus_right/user/follow.rb

@@ -5,7 +5,7 @@ def raw_content
   @raw_content ||= if left
       items = if left.type_id == Card::UserID
          user = left
-         follow_rules = Card.user_rule_cards left.name, 'follow'
+         follow_rules = Card.preference_cards left.name, 'follow'
          follow_rules.map {|card| "[[#{card.name}]]" }
       end.join "\n"
     else

data/mod/05_standard/set/rstar/rules.rb

@@ -11,7 +11,7 @@ def rule_set_key
 end
 
 def rule_set_name
-  if is_user_rule?
+  if is_preference?
     cardname.trunk_name.trunk_name
   else
     cardname.trunk_name
@@ -19,7 +19,7 @@ def rule_set_name
 end
 
 def rule_set
-  if is_user_rule?
+  if is_preference?
     self[0..-3]
   else
     trunk
@@ -31,7 +31,7 @@ def rule_setting_name
 end
 
 def rule_user_setting_name
-  if is_user_rule?
+  if is_preference?
     "#{rule_user_name}+#{rule_setting_name}"
   else
     rule_setting_name
@@ -39,11 +39,11 @@ def rule_user_setting_name
 end
 
 def rule_user_name
-  is_user_rule? ? cardname.trunk_name.tag : nil
+  is_preference? ? cardname.trunk_name.tag : nil
 end
 
 def rule_user
-  is_user_rule? ? self[-2] : nil
+  is_preference? ? self[-2] : nil
 end
 
 # ~~~~~~~~~~ determine the set options to which the user can apply the rule.
@@ -92,7 +92,7 @@ def set_options
 end
 
 def set_prototype
-  if is_user_rule?
+  if is_preference?
     self[0..-3].prototype
   else
     trunk.prototype

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.17.3
+  version: 1.17.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -1196,7 +1196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: an atomic, set-driven content engine
@@ -1226,4 +1226,3 @@ test_files:
 - spec/models/card/validation_spec.rb
 - spec/models/card_spec.rb
 - spec/spec_helper.rb
-has_rdoc: