wagn 1.12.13 → 1.13.0.pre

data/lib/wagn/migration_helper.rb

@@ -16,7 +16,7 @@ module Wagn::MigrationHelper
   def contentedly &block
     Wagn::Cache.reset_global
     Wagn::MigrationHelper.schema_mode '' do
-      Account.as_bot do
+      Card::Auth.as_bot do
         ActiveRecord::Base.transaction do
           begin
             yield
@@ -28,4 +28,7 @@ module Wagn::MigrationHelper
     end
   end
   
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
 end

data/lib/{tasks → wagn/tasks}/test.rake

@@ -56,6 +56,9 @@ namespace :test do
     # go ahead and load the fixtures into the test database
     puts ">> preparing test database"
     puts `env RELOAD_TEST_DATA=true rake db:test:prepare --trace`
+    
+    Rake::Task['wagn:assume_card_migrations'].invoke
+    
   end
 
 
@@ -66,9 +69,9 @@ namespace :test do
       # which dumps with slashes that syck can't understand (also !!null stuff)
 
     sql = "SELECT * FROM %s"
-    skip_tables = ["schema_info","schema_migrations","schema_migrations_cards","sessions"]
+    tables = %w{ cards card_revisions card_references }
     ActiveRecord::Base.establish_connection
-    (ActiveRecord::Base.connection.tables - skip_tables).each do |table_name|
+    tables.each do |table_name|
       i = "000"
       File.open("#{Wagn.gem_root}/test/fixtures/#{table_name}.yml", 'w') do |file|
         data = ActiveRecord::Base.connection.select_all(sql % table_name)

data/lib/{tasks → wagn/tasks}/wagn.rake

@@ -1,4 +1,5 @@
-WAGN_BOOTSTRAP_TABLES = %w{ cards card_revisions card_references users }
+
+WAGN_BOOTSTRAP_TABLES = %w{ cards card_revisions card_references }
 
 namespace :wagn do
   desc "create a wagn database from scratch"
@@ -19,10 +20,8 @@ namespace :wagn do
     puts "loading schema"
     Rake::Task['db:schema:load'].invoke
     
-    # inserts existing card migrations into schema_migrations_cards to avoid re-migrating
-    Wagn::MigrationHelper.schema_mode :card do
-      ActiveRecord::Schema.assume_migrated_upto_version Wagn::Version.schema(:cards), Wagn::MigrationHelper.card_migration_paths
-    end
+    puts "update card_migrations"
+    Rake::Task['wagn:assume_card_migrations'].invoke
     
     if Rails.env == 'test'
       puts "loading test fixtures"
@@ -31,12 +30,18 @@ namespace :wagn do
       puts "loading bootstrap"
       Rake::Task['wagn:bootstrap:load'].invoke
     end
+    
+    puts "set symlink for assets"
+    Rake::Task['wagn:update_assets_symlink'].invoke
   end
   
   desc "update wagn gems and database"
   task :update do
-    system 'bundle update'
+    #system 'bundle update'
     Rake::Task['wagn:migrate'].invoke
+    # FIXME remove tmp dir / clear cache
+    puts "set symlink for assets"
+    Rake::Task['wagn:update_assets_symlink'].invoke
   end
   
   desc "reset cache"
@@ -44,6 +49,12 @@ namespace :wagn do
     Wagn::Cache.reset_global
   end
 
+  desc "set symlink for assets"
+  task :update_assets_symlink do
+    unless Rails.root.to_s == Wagn.gem_root
+      FileUtils.ln_s( Wagn.paths['gem-assets'].first, File.join(Rails.public_path, "assets") )
+    end
+  end
 
   desc "migrate structure and cards"
   task :migrate =>:environment do
@@ -67,13 +78,20 @@ namespace :wagn do
     Wagn::Cache.reset_global
   end
 
+  desc 'insert existing card migrations into schema_migrations_cards to avoid re-migrating'
+  task :assume_card_migrations do
+    Wagn::MigrationHelper.schema_mode :card do
+      ActiveRecord::Schema.assume_migrated_upto_version Wagn::Version.schema(:cards), Wagn::MigrationHelper.card_migration_paths
+    end
+  end
+
   namespace :migrate do
 
     desc "migrate cards"
     task :cards => :environment do
       Wagn::Cache.reset_global
       ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
-      Wagn.config.send_emails = false
+      Wagn.config.perform_deliveries = false
       Card # this is needed in production mode to insure core db structures are loaded before schema_mode is set
     
       paths = ActiveRecord::Migrator.migrations_paths = Wagn::MigrationHelper.card_migration_paths
@@ -87,7 +105,7 @@ namespace :wagn do
     desc 'write the version to a file (not usually called directly)' #maybe we should move this to a method? 
     task :stamp, :suffix do |t, args|
       ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
-      Wagn.config.send_emails = false
+      Wagn.config.perform_deliveries = false
       
       stamp_file = Wagn::Version.schema_stamp_path args[:suffix]
       Wagn::MigrationHelper.schema_mode args[:suffix ] do
@@ -129,7 +147,7 @@ namespace :wagn do
       end
 
       # delete ignored cards
-      Account.as_bot do
+      Card::Auth.as_bot do
         if ignoramus = Card['*ignore']
           ignoramus.item_cards.each do |card|
             if card.account #have to get rid of revisions to delete account  
@@ -151,7 +169,6 @@ namespace :wagn do
         " (referee_id is not null and not exists (select * from cards where cards.id = card_references.referee_id)) or " +
         " (           referer_id is not null and not exists (select * from cards where cards.id = card_references.referer_id));"
       )
-      ActiveRecord::Base.connection.delete( "delete from users where id > 2" ) #leave only anon and wagn bot
       Wagn::Cache.reset_global
       
     end
@@ -160,7 +177,7 @@ namespace :wagn do
     task :dump => :environment do
       Wagn::Cache.reset_global
       
-      Rake::Task['wagn:bootstrap:mod_files'].invoke
+      Rake::Task['wagn:bootstrap:copy_mod_files'].invoke
       
       YAML::ENGINE.yamler = 'syck'
       # use old engine while we're supporting ruby 1.8.7 because it can't support Psych,
@@ -185,7 +202,7 @@ namespace :wagn do
     end
 
     desc "copy files from template database to standard mod and update cards"
-    task :mod_files => :environment do
+    task :copy_mod_files => :environment do
       template_files_dir = "#{Wagn.root}/files"
       standard_files_dir = "#{Wagn.gem_root}/mods/standard/files"
       

data/mods/{standard → core}/chunks/include.rb

@@ -1,5 +1,7 @@
 # -*- encoding : utf-8 -*-
 
+require_dependency File.expand_path( '../reference', __FILE__ )
+
 module Card::Chunk
   class Include < Reference
     cattr_reader :options

data/mods/{standard → core}/chunks/link.rb

@@ -1,4 +1,7 @@
 # -*- encoding : utf-8 -*-
+
+require_dependency File.expand_path( '../reference', __FILE__ )
+
 module Card::Chunk
   class Link < Reference
     word = /\s*([^\]\|]+)\s*/

data/mods/core/formats/html_format.rb

@@ -10,7 +10,7 @@ class Card
     attr_accessor  :options_need_save, :start_time, :skip_autosave
 
     # builtin layouts allow for rescue / testing
-    LAYOUTS = Wagn::Loader.load_layouts.merge 'none' => '{{_main}}'
+    LAYOUTS = Loader.load_layouts.merge 'none' => '{{_main}}'
 
     INCLUSION_DEFAULTS = {
       :layout => { :view => :core },
@@ -39,35 +39,31 @@ class Card
       ok? :comment
     end
 
-    def get_layout_content(args)
-      Account.as_bot do
-        case
-          when (params[:layout] || args[:layout]) ;  layout_from_name args
-          when card                               ;  layout_from_card
-          else                                    ;  LAYOUTS['default']
+    def get_layout_content
+      Auth.as_bot do
+        if requested_layout = params[:layout]
+          layout_from_card_or_code requested_layout
+        else
+          layout_from_rule
         end
       end
     end
 
-    def layout_from_name args
-      lname = (params[:layout] || args[:layout]).to_s
-      lcard = Card.fetch(lname, :skip_virtual=>true, :skip_modules=>true)
-      case
-        when lcard && lcard.ok?(:read)         ; lcard.content
-        when hardcoded_layout = LAYOUTS[lname] ; hardcoded_layout
-        else  ; "<h1>Unknown layout: #{lname}</h1>Built-in Layouts: #{LAYOUTS.keys.join(', ')}"
+    def layout_from_rule
+      if rule = card.rule_card(:layout) and rule.type_id==Card::PointerID and layout_name=rule.item_names.first
+        layout_from_card_or_code layout_name
       end
     end
 
-    def layout_from_card
-      return unless rule_card = (card.rule_card(:layout) or Card.default_rule_card(:layout))
-      #return unless rule_card.is_a?(Card::Set::Type::Pointer) and  # type check throwing lots of warnings under cucumber: rule_card.type_id == Card::PointerID        and
-      return unless rule_card.type_id == Card::PointerID        and
-          layout_name=rule_card.item_names.first                and
-          !layout_name.nil?                                     and
-          lo_card = Card.fetch( layout_name, :skip_virtual => true, :skip_modules=>true ) and
-          lo_card.ok?(:read)
-      lo_card.content
+    def layout_from_card_or_code name
+      layout_card = Card.fetch name.to_s, :skip_virtual=>true, :skip_modules=>true
+      if layout_card and layout_card.ok? :read
+        layout_card.content
+      elsif hardcoded_layout = LAYOUTS[name]
+        hardcoded_layout
+      else
+        "<h1>Unknown layout: #{name}</h1>Built-in Layouts: #{LAYOUTS.keys.join(', ')}"
+      end
     end
 
     def slot_options args
@@ -128,6 +124,7 @@ class Card
     end
   
     def frame_and_form action, args={}, form_opts={}
+      form_opts.merge! args.delete(:form_opts) if args[:form_opts]
       form_opts[:hidden] = args.delete(:hidden)
       frame args do
         card_form action, form_opts do
@@ -143,14 +140,9 @@ class Card
       end
     end  
 
-
     def wrap_main(content)
       return content if params[:layout]=='none'
-      %{#{
-      if flash[:notice]
-        %{<div class="flash-notice">#{ flash[:notice] }</div>}
-      end
-      }<div id="main">#{content}</div>}
+      %{<div id="main">#{content}</div>}
     end
 
   
@@ -199,7 +191,7 @@ class Card
         <span class="render-error">
           error rendering
           #{
-            if Account.always_ok?
+            if Auth.always_ok?
               %{
                 #{ link_to_page error_cardname, nil, :class=>'render-error-link' }
                 <div class="render-error-message errors-view" style="display:none">
@@ -251,7 +243,7 @@ class Card
     end
 
     def type_field args={}
-      typelist = Account.createable_types
+      typelist = Auth.createable_types
       current_type = unless args.delete :no_current_type
           unless card.new_card? || typelist.include?( card.type_name )
             # current type should be an option on existing cards, regardless of create perms
@@ -281,7 +273,7 @@ class Card
       builder = ActionView::Base.default_form_builder
       card.name = card.name.gsub(/^#{Regexp.escape(root.card.name)}\+/, '+') if root.card.new_card?  ##FIXME -- need to match other relative inclusions.
     
-      builder.new("card[cards][#{card.relative_name}]", card, template, {}, block)
+      builder.new("card[subcards][#{card.relative_name}]", card, template, {}, block)
     end
 
     def form
@@ -312,7 +304,7 @@ class Card
       klasses << 'autosave' if action == :update
       html[:class] = klasses.join ' '
     
-      html[:recaptcha] ||= 'on' if Wagn::Env[:recaptcha_on] && Card.toggle( card.rule(:captcha) )
+      html[:recaptcha] ||= 'on' if Card::Env.recaptcha_on? && Card.toggle( card.rule(:captcha) )
       html.delete :recaptcha if html[:recaptcha] == :off
     
       { :url=>url, :remote=>true, :html=>html }
@@ -360,10 +352,10 @@ class Card
     end
 
     def main?
-      if ajax_call?
+      if Env.ajax?
         @depth == 0 && params[:is_main]
       else
-        @depth == 1 && @mainline
+        @depth == 1 && @mainline #assumes layout includes {{_main}}
       end
     end
 

data/mods/core/sets/all/active_card.rb

@@ -1,4 +1,6 @@
-# -*- encoding : utf-8 -*-
+=begin
+
+# following may be useful, but is neither tested nor in use
 
 def card_attributes
   if Card::Set.traits
@@ -15,7 +17,17 @@ def trait_var? var_name
   !instance_variable_get( var_name ).nil?
 end
 
+=end
+
 def trait_var var_name, &block
-  instance_variable_get( var_name ) ||
-    instance_variable_set( var_name, block_given? ? yield : raise("no block?") )
+  # FIXME - following optimization attempt needs to handle cache clearing!
+#  instance_variable_get var_name or begin
+#    instance_variable_set var_name, block_given? ? yield : raise("no block?")
+#  end
+  yield
 end
+
+#fixme -this needs a better home!
+def format opts={}
+  Format.new self, opts
+end

data/mods/core/sets/all/attribute_tracking.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+
 class Updates
   include Enumerable
 

data/mods/core/sets/all/collection.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 
 module ClassMethods
   
@@ -18,7 +17,7 @@ module ClassMethods
 end
 
 def item_names(args={})
-  Card::Format.new(self)._render_raw.split /[,\n]/
+  format._render_raw.split /[,\n]/
 end
 
 def item_cards(args={})  ## FIXME this is inconsistent with item_names
@@ -42,9 +41,9 @@ def extended_list context = nil
   # this could go on and on.  more elegant to recurse until you don't have a collection
 end
 
-def contextual_content(context_card=nil, format_args={})
+def contextual_content context_card, format_args={}
   format_args[:not_current] = true
-  Card::Format.new(context_card, format_args).process_content(
-    Card::Format.new(self, :not_current=>true)._render_raw
+  context_card.format(format_args).process_content(
+    self.format(:not_current=>true)._render_raw
   )
 end

data/mods/core/sets/all/fetch.rb

@@ -1,14 +1,9 @@
-# -*- encoding : utf-8 -*-
 # = Card#fetch
 #
 # A multipurpose retrieval operator that incorporates caching, "virtual" card retrieval
 
 module ClassMethods
   
-  def cache
-    Wagn::Cache[Card]
-  end
-
   # === fetch
   #
   # looks for cards in
@@ -23,89 +18,43 @@ module ClassMethods
   #     :skip_modules               Don't load Set modules
   #     :new => {  card opts }      Return a new card when not found
   #
+  
+  
+  def fetch mark, opts={}
 
-  def fetch mark, opts = {}
-#      ActiveSupport::Notifications.instrument 'wagn.fetch', :message=>"fetch #{mark}" do
+    mark = Card::Codename[mark] if Symbol === mark # id from codename
 
-    if mark.nil?
-      return if opts[:new].nil?
+    if mark.present?
+      card, mark, needs_caching = fetch_from_cache_or_db mark, opts # have existing
     else
-
-      if Symbol===mark
-        mark = Card::Codename[mark] || raise( "Missing codename for #{mark.inspect}" )
-      end
-
-      cache_key, method, val = if Integer===mark
-        [ "~#{mark}", :find_by_id_and_trash, mark ]
-      else
-        fullname = if opts[:new] && supercard = opts[:new][:supercard]
-          mark.to_name.to_absolute_name supercard.name
-        else
-          mark.to_name
-        end
-        opts[:name] = mark = fullname.to_s # this is needed to correctly fetch missing cards with different name variants in cache
-        key = fullname.key
-        [ key, :find_by_key_and_trash, key ]
-      end
-
-      #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      # lookup card
-
-      #Cache lookup
-      result = Card.cache.read cache_key if Card.cache
-      card = (result && Integer===mark) ? Card.cache.read(result) : result
-
-      unless card
-        # DB lookup
-        needs_caching = true
-        card = Card.send method, val, false
-      end
+      return unless opts[:new]
     end
 
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
     if Integer===mark
-      if card.nil?
-        Rails.logger.info "fetch of missing card_id #{mark}" # should send this to airbrake
-        return nil
-      end
+      return if card.nil? || mark.nil?
     else
-      if card && opts[:skip_virtual] && card.new_card? && opts[:new] != {}
-        return card.renew(opts)
-      end
-
-      # NEW card -- (either virtual or missing)
-      if card.nil? or ( card.type_id==-1 && ( !opts[:skip_virtual] || opts[:new]=={} ) )
-        # The -1 type_id allows us to skip all the type lookup and flag the need for
-        # reinitialization later.  *** It should NEVER be seen elsewhere ***
-        needs_caching = true
-        new_args = { :name=>mark.to_s, :skip_modules=>true }
-        new_args[:type_id] = -1 if opts[:skip_virtual] && opts[:new] != {}
-        card = new new_args
-      end
-    end
-
-    if Card.cache && needs_caching
-      Card.cache.write card.key, card
-      Card.cache.write "~#{card.id}", card.key if card.id and card.id != 0
+      return card.renew(opts) if card and card.eager_renew?(opts)
+      if !card or card.type_id==-1 && clean_cache_opts?(opts)       # new (or improved) card for cache
+        needs_caching = true  
+        card = new_for_cache mark, opts
+      end  
     end
-
+    
+    write_to_cache card if Card.cache && needs_caching
+    
     if card.new_card?
-      if opts[:new] == {}
-        #noop default case; use cache.
-      elsif !opts[:new].blank? || opts[:skip_virtual] || !card.virtual?
-        return card.renew(opts)
-      end
-      
-      if opts[:name] && opts[:name] != card.name
-        card.name = opts[:name]
+      if opts[:new]
+        return card.renew(opts) if !clean_cache_opts? opts
+      else
+        return unless !opts[:skip_virtual] && card.virtual?
       end
+      card.name = mark.to_s if mark && mark.to_s != card.name
     end
 
     card.include_set_modules unless opts[:skip_modules]
     card
   end
-
+  
   def fetch_id mark #should optimize this.  what if mark is int?  or codename?
     card = fetch mark, :skip_virtual=>true, :skip_modules=>true
     card and card.id
@@ -149,6 +98,69 @@ module ClassMethods
       Card.cache.write skey, h
     end
   end
+  
+  def cache
+    Wagn::Cache[Card]
+  end
+  
+  def fetch_from_cache cache_key
+    Card.cache.read cache_key if Card.cache
+  end
+  
+  def fullname_from_name name, new_opts={}
+    if new_opts and supercard = new_opts[:supercard]
+      name.to_name.to_absolute_name supercard.name
+    else
+      name.to_name
+    end
+  end
+  
+  def fetch_from_cache_or_db mark, opts
+    needs_caching = false  
+    mark_type = Integer===mark ? :id : :key
+    
+    if mark_type == :key
+      mark = fullname_from_name mark, opts[:new]
+      val = mark.key
+    else
+      val = mark
+    end
+    
+    card = send( "fetch_from_cache_by_#{mark_type}", val ) || begin
+      needs_caching = true
+      send "find_by_#{mark_type}_and_trash", val, false
+    end
+    
+    [ card, mark, needs_caching ]
+  end
+  
+  def fetch_from_cache_by_id id
+    if name = fetch_from_cache("~#{id}")
+      fetch_from_cache name
+    end
+  end
+    
+  def fetch_from_cache_by_key key
+    fetch_from_cache key
+  end
+
+  def new_for_cache name, opts
+    new_args = { :name=>name, :skip_modules=>true }
+    new_args[:type_id] = -1 unless clean_cache_opts? opts
+    # The -1 type_id allows us to skip all the type lookup and flag the need for
+    # reinitialization later.  *** It should NEVER be seen elsewhere ***
+    new new_args
+  end
+  
+  def clean_cache_opts? opts
+    !opts[:skip_virtual] && !opts[:new].present?
+  end
+  
+  def write_to_cache card
+    Card.cache.write card.key, card
+    Card.cache.write "~#{card.id}", card.key if card.id and card.id != 0
+  end  
+  
 
 end
 
@@ -156,17 +168,17 @@ end
 
 def fetch opts={}
   if traits = opts.delete(:trait)
-     traits = [traits] unless Array===traits
-     traits.inject(self) { |card, trait| Card.fetch( card.cardname.trait(trait), opts ) }
+    traits = [traits] unless Array===traits
+    traits.inject(self) { |card, trait| Card.fetch( card.cardname.trait(trait), opts ) }
   end
 end
 
+
 def renew args={}
-  if opts = args[:new]
-    opts[:name] ||= cardname
-    opts[:skip_modules] = args[:skip_modules]
-    Card.new opts
-  end
+  opts = args[:new].clone
+  opts[:name] ||= cardname
+  opts[:skip_modules] = args[:skip_modules]
+  Card.new opts
 end
 
 def expire_pieces
@@ -191,3 +203,9 @@ def refresh force=false
     self
   end
 end
+
+def eager_renew? opts
+  opts[:skip_virtual] && new_card? && opts[:new].present?
+end
+
+