wagn 1.13.0 → 1.14.0.pre1

data/lib/wagn/location.rb

@@ -41,6 +41,15 @@ module Wagn::Location
   def url_key_for_location(location)
     location.match( /\/([^\/]*$)/ ) ? $1 : nil
   end
+  
+  def save_interrupted_action uri
+    uri = path(uri) if Hash === uri
+    session[:interrupted_action] = uri
+  end
+  
+  def interrupted_action
+    session.delete :interrupted_action
+  end
 
    # -----------( urls and redirects from application.rb) ----------------
 

data/lib/wagn/migration.rb

@@ -0,0 +1,96 @@
+# -*- encoding : utf-8 -*-
+
+class Wagn::Migration < ActiveRecord::Migration
+  def self.card_migration_paths
+    Wagn.paths['db/migrate_cards'].to_a
+  end
+  
+  def self.deck_card_migration_paths
+    Wagn.paths['db/migrate_deck_cards'].to_a
+  end
+  
+  def self.schema_mode type
+    new_suffix = case type.to_s 
+    when /card/ then '_cards'
+    when /deck/ then '_deck_cards'
+    else ''
+    end
+    original_suffix = ActiveRecord::Base.table_name_suffix
+    ActiveRecord::Base.table_name_suffix = new_suffix
+    yield
+    ActiveRecord::Base.table_name_suffix = original_suffix
+  end
+  
+  def contentedly &block
+    Wagn::Cache.reset_global
+    Wagn::Migration.schema_mode '' do
+      Card::Auth.as_bot do
+        ActiveRecord::Base.transaction do
+          begin
+            yield
+          ensure
+            Wagn::Cache.reset_global
+          end
+        end
+      end
+    end
+  end
+  
+  def import_json filename, root=Wagn::Migration.deck_card_migration_paths.first
+    Wagn.config.action_mailer.perform_deliveries = false
+    raw_json = File.read File.join(root , 'data', filename )
+    json = JSON.parse raw_json
+    Card.merge_list json["card"]["value"], :output_file=>File.join(root,"unmerged_#{ filename }")
+  end
+  
+  def import_json_to_core filename
+    import_json filename, Wagn::Migration.card_migration_paths.first
+  end
+  
+  # Execute this migration in the named direction
+  # copied from ActiveRecord to wrap "up" in "contentendly"
+  def migrate(direction)
+    return unless respond_to?(direction)
+
+    case direction
+    when :up   then announce "migrating"
+    when :down then announce "reverting"
+    end
+
+    time   = nil
+    ActiveRecord::Base.connection_pool.with_connection do |conn|
+      @connection = conn
+      if respond_to?(:change)
+        if direction == :down
+          recorder = CommandRecorder.new(@connection)
+          suppress_messages do
+            @connection = recorder
+            change
+          end
+          @connection = conn
+          time = Benchmark.measure {
+            self.revert {
+              recorder.inverse.each do |cmd, args|
+                send(cmd, *args)
+              end
+            }
+          }
+        else
+          time = Benchmark.measure { change }
+        end
+      else
+        time = Benchmark.measure { contentedly { send(direction) } }
+      end
+      @connection = nil
+    end
+
+    case direction
+    when :up   then announce "migrated (%.4fs)" % time.real; write
+    when :down then announce "reverted (%.4fs)" % time.real; write
+    end
+  end
+  
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/lib/wagn/mods_spec_helper.rb

@@ -5,11 +5,19 @@ ENV["RAILS_ENV"] = 'test'
 
 
 Spork.prefork do
+  require File.expand_path( '../simplecov_helper.rb', __FILE__ )
+  
   if ENV["RAILS_ROOT"]
     require File.join( ENV["RAILS_ROOT"], '/config/environment')
   else
     require File.expand_path( '../../config/environment', __FILE__ )
   end
+
+  if defined?(Bundler)
+    Bundler.require(:test)   # if simplecov is activated in the Gemfile, it has to be required here
+  end
+  
+
   
   require 'rspec/rails'
   
@@ -21,14 +29,13 @@ Spork.prefork do
   JOE_USER_ID = Card['joe_user'].id
 
   RSpec.configure do |config|
-
-    config.include RSpec::Rails::Matchers::RoutingMatchers, :example_group => {
+    config.include RSpec::Rails::Matchers::RoutingMatchers,  {
       :file_path => /\bspec\/controllers\//
     }
-
-    format_index = ARGV.find_index {|arg| arg =~ /--format/ }
-    formatter = format_index ? ARGV[ format_index + 1 ] : 'documentation'
-    config.add_formatter formatter
+    config.infer_spec_type_from_file_location!
+    # format_index = ARGV.find_index {|arg| arg =~ /--format/ }
+    # formatter = format_index ? ARGV[ format_index + 1 ] : 'documentation'
+    # config.add_formatter formatter
     
     #config.include CustomMatchers
     #config.include ControllerMacros, :type=>:controllers
@@ -59,6 +66,7 @@ Spork.each_run do
   # This code will be run each time you run your specs.
 end
 
-require 'wagn/wagn_spec_helper'
-RSpec::Core::ExampleGroup.send :include, Wagn::WagnSpecHelper
+require 'wagn/spec_helper'
+RSpec::Core::ExampleGroup.send :include, Wagn::SpecHelper
+
 

data/lib/wagn/simplecov_helper.rb

@@ -0,0 +1,61 @@
+def wagn_simplecov_filters
+  add_filter 'spec/'
+  add_filter '/config/'
+  add_filter '/tasks/'
+	
+	# filter all wagn mods
+  add_filter do |src_file|
+    src_file.filename =~ /tmp\// and not
+    /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
+  end
+	
+	# add group for each deck mod
+  Dir['mod/*'].map{ |path| path.sub('mod/','') }.each do |mod|
+    add_group mod.capitalize do |src_file|
+      src_file.filename =~ /mod\/#{mod}\// or 
+        (
+          src_file.filename =~ /tmp\// and
+          /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/#{mod}/**/#{m[1]}"].present? } 
+        )
+    end
+  end
+
+  add_group 'Sets' do |src_file|
+    src_file.filename =~ /tmp\/set\// and
+    /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
+  end
+  add_group 'Set patterns' do |src_file|
+    src_file.filename =~ /tmp\/set_pattern\// and
+    /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
+  end
+  add_group 'Formats' do |src_file|
+    src_file.filename =~ /mod\/[^\/]+\/formats/
+  end
+  add_group 'Chunks' do |src_file|
+    src_file.filename =~ /mod\/[^\/]+\/chunks/
+  end
+end
+
+def wagn_core_dev_simplecov_filters
+  filters.clear # This will remove the :root_filter that comes via simplecov's defaults
+  add_filter do |src|
+    !(src.filename =~ /^#{SimpleCov.root}/) unless src.filename =~ /wagn/
+  end    
+  
+  add_filter '/spec/'
+  add_filter '/features/'
+  add_filter '/config/'
+  add_filter '/tasks/'
+  add_filter '/generators/'
+  add_filter 'lib/wagn'
+
+  add_group 'Card', 'lib/card'  
+  add_group 'Set Patterns', 'tmp/set_pattern/'
+  add_group 'Sets',         'tmp/set/'
+  add_group 'Formats' do |src_file|
+    src_file.filename =~ /mod\/[^\/]+\/format/
+  end
+  add_group 'Chunks' do |src_file|
+    src_file.filename =~ /mod\/[^\/]+\/chunk/
+  end
+end

data/lib/wagn/{wagn_spec_helper.rb → spec_helper.rb}

@@ -1,4 +1,4 @@
-module Wagn::WagnSpecHelper
+module Wagn::SpecHelper
 
   include ActionDispatch::Assertions::SelectorAssertions
   #~~~~~~~~~  HELPER METHODS ~~~~~~~~~~~~~~~#
@@ -31,12 +31,20 @@ module Wagn::WagnSpecHelper
   end
 
   def render_content content, format_args={}
+    render_content_with_args( content, format_args )
+  end
+  
+  def render_content_with_args content, format_args={}, view_args={}
     @card ||= Card.new :name=>"Tempo Rary 2"
     @card.content = content
-    @card.format(format_args)._render :core
+    @card.format(format_args)._render :core, view_args
   end
 
   def render_card view, card_args={}, format_args={}
+    render_card_with_args view, card_args, format_args
+  end
+  
+  def render_card_with_args view, card_args={}, format_args={}, view_args={}
     card = begin
       if card_args[:name]
         Card.fetch card_args[:name], :new=>card_args
@@ -44,6 +52,6 @@ module Wagn::WagnSpecHelper
         Card.new card_args.merge( :name=> 'Tempo Rary' )
       end
     end
-    card.format(format_args)._render(view)
+    card.format(format_args)._render(view, view_args)
   end
 end

data/lib/wagn/tasks/test.rake

@@ -69,7 +69,7 @@ namespace :test do
       # which dumps with slashes that syck can't understand (also !!null stuff)
 
     sql = "SELECT * FROM %s"
-    tables = %w{ cards card_revisions card_references }
+    tables = %w{ cards card_acts card_actions card_changes card_references }
     ActiveRecord::Base.establish_connection
     tables.each do |table_name|
       i = "000"

data/lib/wagn/tasks/wagn.rake

@@ -1,5 +1,5 @@
 
-WAGN_BOOTSTRAP_TABLES = %w{ cards card_revisions card_references }
+WAGN_BOOTSTRAP_TABLES = %w{ cards card_actions card_acts card_changes card_references }
 
 namespace :wagn do
   desc "create a wagn database from scratch"
@@ -72,20 +72,28 @@ namespace :wagn do
       Rake::Task['wagn:migrate:stamp'].invoke ''
     end
     
-    puts 'migrating cards'
+    puts 'migrating core cards'
     Wagn::Cache.reset_global
     Rake::Task['wagn:migrate:cards'].execute #not invoke because we don't want to reload environment
     if stamp
       Rake::Task['wagn:migrate:stamp'].reenable
       Rake::Task['wagn:migrate:stamp'].invoke '_cards'
     end
+    
+    puts 'migrating deck cards'
+    Rake::Task['wagn:migrate:deck_cards'].execute #not invoke because we don't want to reload environment
+    if stamp
+      Rake::Task['wagn:migrate:stamp'].reenable
+      Rake::Task['wagn:migrate:stamp'].invoke '_deck'
+    end
+    
     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
+    Wagn::Migration.schema_mode :card do
+      ActiveRecord::Schema.assume_migrated_upto_version Wagn::Version.schema(:cards), Wagn::Migration.card_migration_paths
     end
   end
 
@@ -96,11 +104,28 @@ namespace :wagn do
       Wagn::Cache.reset_global
       ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
       Wagn.config.action_mailer.perform_deliveries = false
+      Card.reset_column_information
+       # this is needed in production mode to insure core db structures are loaded before schema_mode is set
+      
+    
+      paths = ActiveRecord::Migrator.migrations_paths = Wagn::Migration.card_migration_paths
+    
+      Wagn::Migration.schema_mode :card do
+        ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+        ActiveRecord::Migrator.migrate paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil
+      end
+    end
+    
+    desc "migrate deck cards"
+    task :deck_cards => :environment do
+      Wagn::Cache.reset_global
+      ENV['SCHEMA'] = "#{Rails.root}/db/schema.rb"
+      Wagn.config.action_mailer.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
+      paths = ActiveRecord::Migrator.migrations_paths = Wagn::Migration.deck_card_migration_paths
     
-      Wagn::MigrationHelper.schema_mode :card do
+      Wagn::Migration.schema_mode :deck do
         ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
         ActiveRecord::Migrator.migrate paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       end
@@ -112,7 +137,7 @@ namespace :wagn do
       Wagn.config.action_mailer.perform_deliveries = false
       
       stamp_file = Wagn::Version.schema_stamp_path( args[:suffix] )
-      Wagn::MigrationHelper.schema_mode args[:suffix ] do
+      Wagn::Migration.schema_mode args[:suffix ] do
         version = ActiveRecord::Migrator.current_version
         puts ">>  writing version: #{version} to #{stamp_file}"
         if file = open(stamp_file, 'w')
@@ -122,31 +147,59 @@ namespace :wagn do
     end
   end
 
+
+  namespace :emergency do
+    task :rescue_watchers => :environment do
+      follower_hash = Hash.new { |h, v| h[v] = [] } 
+      
+      Card.where("right_id" => 219).each do |watcher_list|
+        watcher_list.include_set_modules
+        if watcher_list.left
+          watching = watcher_list.left.name
+          watcher_list.item_names.each do |user|
+            follower_hash[user] << watching
+          end
+        end
+      end
+      
+      Card.search(:right=>{:codename=>"following"}).each do |following|
+        Card::Auth.as_bot do
+          following.update_attributes! :content=>''
+        end
+      end
+      
+      follower_hash.each do |user, items|
+        if card=Card.fetch(user) and card.account
+          Card::Auth.as(user) do
+            following = card.fetch :trait=>"following", :new=>{}
+            following.items = items
+          end
+        end
+      end
+    end
+  end
+  
   namespace :bootstrap do
-    desc "rid template of unneeded cards, revisions, and references"
+    desc "rid template of unneeded cards, acts, actions, changes, and references"
     task :clean => :environment do
       Wagn::Cache.reset_global
-
+      conn =  ActiveRecord::Base.connection
       # Correct time and user stamps
-      %w{ cards card_revisions }.each do |table|
-        sql =  "update #{table} set created_at=now(), creator_id=#{ Card::WagnBotID }"
-        sql +=                    ",updated_at=now(), updater_id=#{ Card::WagnBotID }" if table == 'cards'
-        ActiveRecord::Base.connection.update sql
-      end
+      card_sql =  "update cards set created_at=now(), creator_id=#{ Card::WagnBotID }"
+      card_sql +=                 ",updated_at=now(), updater_id=#{ Card::WagnBotID }"
+      conn.update card_sql
+      act_sql =  "update card_acts set acted_at=now(), actor_id=#{ Card::WagnBotID }"
+      conn.update act_sql
 
       Card::Auth.as_bot do
         # delete ignored cards
         
         if ignoramus = Card['*ignore']
           ignoramus.item_cards.each do |card|
-            if card.account #have to get rid of revisions to delete account  
-              #(could also directly delete cards "manually", but would need to delete all descendants manually, too)
-              ActiveRecord::Base.connection.delete( "delete from card_revisions where card_id = #{card.id}" )
-            end
             card.delete!
           end
         end
-        
+        Wagn::Cache.reset_global
         %w{ machine_input machine_output }.each do |codename|
           Card.search(:right=>{:codename=>codename }).each do |card|
             FileUtils.rm_rf File.join('files', card.id.to_s ), :secure=>true            
@@ -155,18 +208,25 @@ namespace :wagn do
         end
       end
 
-      ActiveRecord::Base.connection.delete( "delete from cards where trash is true" )
+      conn.delete( "delete from cards where trash is true" )
 
-      # delete unwanted rows ( will need to revise if we ever add db-level data integrity checks )
-      ActiveRecord::Base.connection.delete( "delete from card_revisions where not exists " +
-        "( select name from cards where current_revision_id = card_revisions.id )"
-      )
-      ActiveRecord::Base.connection.delete( "delete from card_references where" +
+      Card::Action.delete_cardless
+      Card::Action.delete_old
+      Card::Change.delete_actionless
+
+
+      act = Card::Act.create!(:actor_id=>Card::WagnBotID,
+       :card_id=>Card::WagnBotID)
+      Card::Action.find_each do |action|
+        action.update_attributes!(:card_act_id=>act.id)
+      end
+      Card::Act.where('id != ?',act.id).delete_all
+      conn.delete( "delete from card_references where" +
         " (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 sessions" )
+      conn.delete( "delete from sessions" )
       
       Wagn::Cache.reset_global
       
@@ -202,18 +262,24 @@ namespace :wagn do
 
     desc "copy files from template database to standard mod and update cards"
     task :copy_mod_files => :environment do
-      template_files_dir = "#{Wagn.root}/files"
-      standard_files_dir = "#{Wagn.gem_root}/mod/standard/file"
       
-      #FIXME - this should delete old revisions
+      mod_name = '05_standard'
+      template_files_dir = "#{Wagn.root}/files"
+      standard_files_dir = "#{Wagn.gem_root}/mod/#{mod_name}/file"
       
       FileUtils.remove_dir standard_files_dir, force=true
       FileUtils.cp_r template_files_dir, standard_files_dir
-      
-      # add a fourth line to the raw content of each image (or file) to identify it as a mod file
-      Card.search( :type=>['in', 'Image', 'File'], :ne=>'' ).each do |card|
-        rev = Card::Revision.find card.current_revision_id
-        rev.update_attributes :content=>rev.content + "\nstandard"        
+
+      # add a fourth line to the raw content of each image (or file) to identify it as a mod file      
+      Card::Auth.as_bot do
+        Card.search( :type=>['in', 'Image', 'File'], :ne=>'' ).each do |card|
+          unless card.db_content.split(/\n/).last == mod_name
+            new_content = card.db_content + "\n#{mod_name}"
+            card.update_column :db_content, new_content
+            card.last_action.change_for(2).first.update_column :value, new_content
+            #FIXME - should technically update the change as well...
+          end
+        end
       end
     end