Merge remote branch 'wagn/master'

.gitignore

@@ -16,6 +16,7 @@ public/image
 public/javascripts/inline-console.js
 public_scripts
 public/stylesheets/local.css
+script/local
 script/performance/*.session
 test/unit/tmp_test.rb
 tmp/*

app/controllers/admin_controller.rb

@@ -13,7 +13,7 @@ def setup
       if @user.errors.empty?
         @user.roles = [Role[:admin]]
         self.current_user = @user
-        User.cache.delete :no_logins
+        User.cache.delete 'no_logins'
         flash[:notice] = "You're good to go!"
         redirect_to '/'
       else

app/controllers/card_controller.rb

@@ -302,27 +302,6 @@ def related
     @current = params[:attribute] || @items.first.to_key
   end
 
-  #------------------( views )
-
-  #  I don't think these are used any more.  If they are, they shouldn't be!
-  #
-  #[:open_missing, :closed_missing].each do |method|
-  #  define_method( method ) do
-  #    load_card
-  #    params[:view] = method
-  #    if id = params[:replace]
-  #      render_update_slot do |page, target|
-  #        target.update render_to_string(:action=>'show')
-  #      end
-  #    else
-  #      render_show
-  #    end
-  #  end
-  #end
-
-
-
-
   #-------- ( MISFIT METHODS )
   def watch
     watchers = Card.fetch_or_new( @card.name + "+*watchers", :skip_virtual=>true, :type => 'Pointer' )

lib/wagn/cache.rb

@@ -111,10 +111,7 @@ def system_prefix=(system_prefix)
     def read key
       return @local[key] unless @store
       fetch_local(key) do
-        #        Marshal.load(@store.read(@prefix + key))
-        res = @store.read(@prefix + key)
-#        Rails.logger.info "Looking up #{key} in #{@store}.   result = #{res.inspect}"
-#        res
+        @store.read(@prefix + key)
       end
     end
 

lib/wagn/model/permissions.rb

@@ -247,7 +247,8 @@ def update_ruled_cards
       # (though maybe not as a tracked_attribute for performance reasons?)
       # AND need to make sure @changed gets wiped after save (probably last in the sequence)
 
-      User.cache.reset #
+      User.cache.reset
+      System.cache.reset
       Wagn::Cache.expire_card self.key #probably shouldn't be necessary, 
       # but was sometimes getting cached version when card should be in the trash.
       # could be related to other bugs?