card 1.15.1 → 1.15.2

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

@@ -1,7 +1,7 @@
 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 
+  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
@@ -11,8 +11,8 @@ RuleSQL = %{
 
 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 
+  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};
 }
@@ -34,7 +34,7 @@ def is_user_rule?
   (r = right( :skip_modules=>true ))                         &&
    r.type_id == Card::SettingID                              &&
   (set = self[0..-3, :skip_modules=>true])                   &&
-   set.type_id == Card::SetID                                && 
+   set.type_id == Card::SetID                                &&
   (user = self[-2, :skip_modules=>true] )                    &&
   (user.type_id == Card::UserID  || user.codename == 'all' )
 end
@@ -52,15 +52,15 @@ end
 
 def rule_card_id setting_code, options={}
   fallback = options.delete( :fallback )
-  
-  if Card::Setting.user_specific? setting_code 
+
+  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}+#{Card[:all].id}"
       setting_code = "#{setting_code}+#{user_id}"
     end
   end
-  
+
   rule_set_keys.each do |rule_set_key|
     rule_id = self.class.rule_cache["#{rule_set_key}+#{setting_code}"]
     rule_id ||= fallback && self.class.rule_cache["#{rule_set_key}+#{fallback}"]
@@ -74,9 +74,9 @@ def related_sets
 
   sets = []
   sets << ["#{name}+*type",  Card::TypeSet.label( name) ] if known? && type_id==Card::CardtypeID
-  sets << ["#{name}+*self",  Card::SelfSet.label( name) ] 
+  #sets << ["#{name}+*self",  Card::SelfSet.label( name) ]
   sets << ["#{name}+*right", Card::RightSet.label(name) ] if known? && cardname.simple?
-    
+
 #      Card.search(:type=>'Set',:left=>{:right=>name},:right=>'*type plus right',:return=>'name').each do |set_name|
 #        sets<< set_name
 #      end
@@ -86,7 +86,7 @@ end
 
 
 module ClassMethods
-  
+
   # User-specific rule use the pattern
   # user+set+setting
   def user_rule_sql user_id=nil
@@ -97,33 +97,33 @@ module ClassMethods
       end
 
     %{
-      select 
-        user_rules.id as rule_id, 
-        settings.id   as setting_id, 
-        sets.id       as set_id, 
-        sets.left_id  as anchor_id, 
+      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 
+      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 
+      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 sets.trash       is false
         and   settings.type_id  = #{Card::SettingID}            and settings.trash   is false
         and   ( #{user_restriction} or users.codename = 'all' ) and users.trash      is false
         and                                                         user_sets.trash  is false
         and                                                         user_rules.trash is false;
-    } 
+    }
   end
-  
-  
+
+
   def setting name
     Auth.as_bot do
       card=Card[name] and !card.db_content.strip.empty? and card.db_content
     end
   end
-  
+
   def path_setting name #shouldn't this be in location helper?
     name ||= '/'
     return name if name =~ /^(http|mailto)/
@@ -136,14 +136,14 @@ module ClassMethods
 
   def cache_key row
     setting_code = Card::Codename[ row['setting_id'].to_i ] or return false
-    
+
     anchor_id = row['anchor_id']
     set_class_id = anchor_id.nil? ? row['set_id'] : row['set_tag_id']
     set_class_code = Card::Codename[ set_class_id.to_i ] or return false
-    
+
     key_base = [ 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)
@@ -151,7 +151,7 @@ module ClassMethods
       end
     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']
@@ -159,7 +159,7 @@ module ClassMethods
       end
     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)
@@ -171,7 +171,7 @@ module ClassMethods
   def cached_rule_keys_for user_id
     rule_keys_cache[user_id] || []
   end
-  
+
   def all_user_ids_with_rule_for set_card, setting_code
     key = if (l=set_card.left) and (r=set_card.right)
         set_class_code = Card::Codename[ r.id ]
@@ -186,20 +186,20 @@ module ClassMethods
     else
       user_ids
     end
-    
+
   end
-  
+
   def user_rule_cards user_name, setting_code
     Card.search :right=>{:codename=>setting_code}, :left=>{:left=>{:type_id=>SetID}, :right=>user_name}
   end
-  
+
   def rule_cache
-    Card.cache.read('RULES') || begin        
+    Card.cache.read('RULES') || begin
       rule_hash = {}
       all_rule_keys_with_id do |key,rule_id|
         rule_hash[key] = rule_id
       end
-      
+
       user_ids_hash = {}
       rule_keys_hash = {}
       all_user_rule_keys_with_id_and_user_id do |key, rule_id, user_id|
@@ -214,11 +214,11 @@ module ClassMethods
       write_rule_cache rule_hash
     end
   end
-  
+
   def user_rule_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
@@ -226,7 +226,7 @@ module ClassMethods
       Card.cache.read('USER_IDS')
     end
   end
-  
+
   # all keys of user-specific rules for a given user
   def rule_keys_cache
     Card.cache.read('RULE_KEYS') || begin
@@ -234,31 +234,31 @@ module ClassMethods
       Card.cache.read('RULE_KEYS')
     end
   end
-  
+
   def clear_rule_cache
     write_rule_cache nil
     write_user_ids_cache nil
     write_rule_keys_cache nil
   end
-  
+
   def clear_user_rule_cache
     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 ] ||= []
@@ -268,21 +268,21 @@ module ClassMethods
     write_rule_keys_cache rule_keys_hash
     write_rule_cache rule_hash
   end
-  
+
   def write_rule_cache hash
     Card.cache.write 'RULES', hash
   end
-  
+
   def write_user_ids_cache hash
     Card.cache.write 'USER_IDS', hash
   end
-  
+
   def write_rule_keys_cache hash
     Card.cache.write 'RULE_KEYS', hash
   end
-  
-  
-  
+
+
+
   def read_rule_cache
     Card.cache.read('READRULES') || begin
       hash = {}
@@ -294,11 +294,11 @@ module ClassMethods
       Card.cache.write 'READRULES', hash
     end
   end
-  
+
   def clear_read_rule_cache
     Card.cache.write 'READRULES', nil
   end
-=begin  
+=begin
   def default_rule setting_code, fallback=nil
     card = default_rule_card setting_code, fallback
     return card && card.content
@@ -309,7 +309,7 @@ module ClassMethods
     rule_id ||= fallback && rule_cache["all+#{fallback}"]
     Card[rule_id] if rule_id
   end
-=end  
+=end
 end
 
 

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

@@ -1,6 +1,7 @@
 def new_card?
   new_record? || !!@from_trash
 end
+alias_method :new?, :new_card?
 
 def known?
   real? || virtual?
@@ -10,6 +11,10 @@ def real?
   !new_card?
 end
 
+def unknown?
+  !known?
+end
+
 def pristine?
   # has not been edited directly by human users.  bleep blorp.
   new_card? or !actions.joins(:act).where('card_acts.actor_id != ?', Card::WagnBotID).exists?

data/mod/01_core/spec/format/html_format_spec.rb

@@ -63,7 +63,7 @@ describe Card::HtmlFormat do
       it "renders card content" do
         assert_view_select @simple_page, 'div[class="card-body panel-body card-content ALL ALL_PLUS TYPE-basic RIGHT-b TYPE_PLUS_RIGHT-basic-b SELF-a-b"]', 'AlphaBeta'
       end
- 
+
       it "renders card credit" do
         assert_view_select @simple_page, 'div[class~="SELF-Xcredit"]' do#, /Wheeled by/ do
           assert_select 'img'
@@ -81,7 +81,7 @@ describe Card::HtmlFormat do
         c = Card['*all+*layout'] and c.content = '[[tmp layout]]'
         @main_card = Card.fetch('Joe User')
         Card::Env[:main_name] = @main_card.name
-        
+
         #warn "lay #{@layout_card.inspect}, #{@main_card.inspect}"
       end
 
@@ -115,20 +115,20 @@ describe Card::HtmlFormat do
         @layout_card.content="Mainly {{_main|core}}"
         Card::Auth.as_bot { @layout_card.save }
 
-        rendered = expect(@layout_card.format.render(:layout)).to eq( 
+        rendered = expect(@layout_card.format.render(:layout)).to eq(
           %{Mainly <div id="main"><div class="CodeRay">\n  <div class="code"><pre>Mainly {{_main|core}}</pre></div>\n</div>\n</div>}
         )
           #probably better to check that it matches "Mainly" exactly twice.
       end
-      
-      
+
+
       it "should handle nested _main references" do
         Card::Auth.as_bot do
           @layout_card.content="{{outer space|core}}"
           @layout_card.save!
           Card.create :name=>"outer space", :content=>"{{_main|name}}"
         end
-        
+
         expect(@layout_card.format.render(:layout)).to eq('Joe User')
       end
     end

data/mod/01_core/spec/set/all/rules2_spec.rb

@@ -44,13 +44,13 @@ describe Card do
     end
 
     describe ".related_sets" do
-      it "should have 2 sets (self and right) for a simple card" do
+      it "has 1 set (right) for a simple card" do
         sets = Card['A'].related_sets.map { |s| s[0] }
-        expect(sets).to eq(['A+*self', 'A+*right'])
+        expect(sets).to eq(['A+*right'])
       end
-      it "should have 3 sets (self, type, and right) for a cardtype card" do
+      it "has 2 sets (type, and right) for a cardtype card" do
         sets = Card['Cardtype A'].related_sets.map { |s| s[0] }
-        expect(sets).to eq(['Cardtype A+*type', 'Cardtype A+*self', 'Cardtype A+*right'])
+        expect(sets).to eq(['Cardtype A+*type', 'Cardtype A+*right'])
       end
 #      it "should show type plus right sets when they exist" do
 #        Card::Auth.as_bot { Card.create :name=>'Basic+A+*type plus right', :content=>'' }
@@ -62,9 +62,9 @@ describe Card do
 #        sets = Card['Cardtype A'].related_sets
 #        sets.should == ['Cardtype A+*self', 'Cardtype A+*type', 'Cardtype A+*right', 'Basic+Cardtype A+*type plus right']
 #      end
-      it "should have sets for a non-simple card" do
+      it "is empty for a non-simple card" do
         sets = Card['A+B'].related_sets.map { |s| s[0] }
-        expect(sets).to eq(['A+B+*self'])
+        expect(sets).to eq([])
       end
     end
 =begin

data/mod/01_history/set/all/history.rb

@@ -95,7 +95,7 @@ end
 
 format :html do
   view :history do |args|
-    frame args.merge(:body_class=>"history-slot list-group", :content=>true, :subheader=>_render_revision_subheader ) do
+    frame args.merge(:body_class=>"history-slot list-group", :content=>true, :subheader=>revision_subheader ) do
       _render_revisions
     end
   end
@@ -109,7 +109,7 @@ format :html do
     end.join
   end
 
-  view :revision_subheader do |args|
+  def revision_subheader
     intr = card.intrusive_acts.page(params['page']).per(REVISIONS_PER_PAGE)
     render_haml :intr=>intr do
       %{
@@ -195,7 +195,7 @@ format :html do
         link_to name_changes(action, hide_diff),
                 path(:view=>:related, :related=>{:view=>"history",:name=>action.card.name}),
                 :class=>'slotter label-label-default',
-                :slotSelector=>".card-slot.card-frame",
+                'data-slot-selector'=>".card-slot.history-view",
                 :remote=>true
       end
 
@@ -275,7 +275,7 @@ format :html do
   def rollback_link action_ids
     if card.ok?(:update)
       "| " + link_to('Save as current', path(:action=>:update, :view=>:open, :action_ids=>action_ids),
-        :class=>'slotter',:slotSelector=>'.card-slot.card-frame', :remote=>true, :method=>:post, :rel=>'nofollow')
+        :class=>'slotter','data-slot-selector'=>'.card-slot.history-view', :remote=>true, :method=>:post, :rel=>'nofollow')
     end
   end
 

data/mod/02_basic_types/set/all/rss.rb

@@ -1,15 +1,16 @@
 
+
 format :rss do
-  
+
   attr_accessor :xml
-  
+
   def initialize card, args
     super
     @xml = @parent.xml if @parent
   end
 
   def show view, args
-    @xml = Builder::XmlMarkup.new
+    @xml = ::Builder::XmlMarkup.new
     view ||= :feed
     render view, args
   end
@@ -30,7 +31,7 @@ format :rss do
       @xml.error "\n\nERROR rendering RSS: #{e.inspect}\n\n #{e.backtrace}"
     end
   end
-  
+
   view :feed_item_list do |args|
     items = if card.type_id == Card::SearchTypeID  #FIXME! yuck.
       card.item_cards( search_params.merge(:default_limit => 25) )
@@ -43,12 +44,12 @@ format :rss do
       end
     end
   end
-  
-  
+
+
   view :feed_title do |args|
     Card.setting(:title) + " : " + card.name.gsub(/^\*/,'')
   end
-  
+
   view :feed_item do |args|
     @xml.title card.name
     add_name_context
@@ -62,8 +63,8 @@ format :rss do
   view :feed_description do |args| '' end
   view :comment_box      do |args| '' end
   view :menu             do |args| '' end
-    
-  
+
+
   view :open,         { :view=>:titled, :mod=>All::Base::Format }
   view :content,      { :view=>:core,   :mod=>All::Base::Format }
   view :open_content, { :view=>:core,   :mod=>All::Base::Format }