wagn 1.13.0.pre2 → 1.13.0

data/lib/wagn/generators/wagn/templates/config/application.rb

@@ -30,7 +30,7 @@ module <%= app_const_base %>
     # config.paths['files'] = 'files'
     # where uploaded files are actually stored. (eg Image and File cards)
 
-    # config.paths['local-mods'] = 'mods'
+    # config.paths['local-mod'] = 'mod'
     # where mods are stored
 
     # config.allow_inline_styles = false

data/lib/wagn/generators/wagn/templates/config/boot.rb

@@ -1,11 +1,15 @@
 # -*- encoding : utf-8 -*-
-# comment out this line to default to development mode
-ENV['RAILS_ENV'] ||= 'production'
 
 require 'rubygems'
 
+# defaults to development mode without the following
+<% if options['mod-dev'] || options['core-dev'] -%>
+# ENV['RAILS_ENV'] ||= 'production'  
+<% else -%>
+ENV['RAILS_ENV'] ||= 'production'
+<% end -%>
+
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path("Gemfile")
 
-
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/lib/wagn/generators/wagn/wagn_generator.rb

@@ -34,7 +34,7 @@ class WagnGenerator < Rails::Generators::AppBase
       
       template "rspec", ".rspec"
     elsif options['mod-dev']
-      @spec_path = 'mods/'
+      @spec_path = 'mod/'
       @spec_helper_path = 'wagn/mods_spec_helper'
       template "rspec", ".rspec"
     end
@@ -49,8 +49,8 @@ class WagnGenerator < Rails::Generators::AppBase
 #    copy_file "README", "README.rdoc"
 #  end
   
-  def mods
-    empty_directory_with_gitkeep 'mods'
+  def mod
+    empty_directory_with_gitkeep 'mod'
   end
   
   def log
@@ -155,7 +155,7 @@ TEXT
         end
       end
     else
-      puts "Review the database configuration in config/database.yml and run 'wagn seed' to complete the installation.\nStart the server with 'wagn s'."
+      puts "Review the database configuration in config/database.yml and run 'wagn seed' to complete the installation.\nStart the server with 'wagn server'."
     end
   end
   

data/lib/wagn/mods_spec_helper.rb

@@ -3,8 +3,6 @@ require 'spork'
 
 ENV["RAILS_ENV"] = 'test'
 
-#require File.expand_path( '../../../spec/mods/standard/lib/machine_spec.rb', __FILE__ )
-#require File.expand_path( '../../../spec/mods/standard/lib/machine_input_spec.rb', __FILE__ )
 
 Spork.prefork do
   if ENV["RAILS_ROOT"]

data/lib/wagn/tasks/test.rake

@@ -90,7 +90,7 @@ namespace :test do
 
   desc "create sample data for testing"
   task :populate_template_database => :environment do
-    load 'test/seed.rb'
+    load "#{Wagn.gem_root}/test/seed.rb"
     SharedData.add_test_data
   end
 

data/lib/wagn/tasks/wagn.rake

@@ -40,8 +40,8 @@ namespace :wagn do
     #system 'bundle update'
     if Wagn.paths["tmp"].existent
       FileUtils.rm_rf Wagn.paths["tmp"].first, :secure=>true
-      Dir.mkdir  Wagn.paths["tmp"].first
     end
+    Dir.mkdir Wagn.paths["tmp"].first
     Rake::Task['wagn:migrate'].invoke
     # FIXME remove tmp dir / clear cache
     puts "set symlink for assets"
@@ -95,7 +95,7 @@ namespace :wagn do
     task :cards => :environment do
       Wagn::Cache.reset_global
       ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
-      Wagn.config.perform_deliveries = false
+      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
@@ -109,9 +109,9 @@ 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.perform_deliveries = false
+      Wagn.config.action_mailer.perform_deliveries = false
       
-      stamp_file = Wagn::Version.schema_stamp_path args[:suffix]
+      stamp_file = Wagn::Version.schema_stamp_path( args[:suffix] )
       Wagn::MigrationHelper.schema_mode args[:suffix ] do
         version = ActiveRecord::Migrator.current_version
         puts ">>  writing version: #{version} to #{stamp_file}"
@@ -122,36 +122,21 @@ namespace :wagn do
     end
   end
 
-  desc "copy over .htaccess files useful in production mode"
-  task :copy_htaccess do
-    access_file = File.join(Wagn.gem_root, 'config/samples/asset_htaccess')
-
-    %w{ files assets }.each do |dirname|
-      dir = File.join Rails.public_path, dirname
-      mkdir_p dir
-      cp access_file, File.join( dir, '.htaccess' )
-    end
-  end
-
-
   namespace :bootstrap do
     desc "rid template of unneeded cards, revisions, and references"
     task :clean => :environment do
       Wagn::Cache.reset_global
 
       # Correct time and user stamps
-      botid = Card::WagnBotID
-      extra_sql = {
-        :cards          =>", creator_id=#{botid}, updater_id=#{botid}",
-        :card_revisions =>", creator_id=#{botid}"
-      }
-      WAGN_BOOTSTRAP_TABLES.each do |table|
-        next if table == 'card_references'
-        ActiveRecord::Base.connection.update("update #{table} set created_at=now() #{extra_sql[table.to_sym] || ''};")
+      %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
 
-      # delete ignored cards
       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  
@@ -161,6 +146,13 @@ namespace :wagn do
             card.delete!
           end
         end
+        
+        %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            
+            card.delete!
+          end
+        end
       end
 
       ActiveRecord::Base.connection.delete( "delete from cards where trash is true" )
@@ -173,6 +165,9 @@ 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 sessions" )
+      
       Wagn::Cache.reset_global
       
     end
@@ -208,7 +203,7 @@ 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}/mods/standard/files"
+      standard_files_dir = "#{Wagn.gem_root}/mod/standard/file"
       
       #FIXME - this should delete old revisions
       

data/lib/wagn/version.rb

@@ -12,16 +12,12 @@ module Wagn
       def schema type=nil
         File.read( schema_stamp_path type ).strip
       end
-    
+
       def schema_stamp_path type
-        suffix = type.to_s =~ /card/ ? '_cards' : ''
-        File.join schema_stamp_dir, "/version#{ suffix }.txt"  
+        stamp_dir = ENV['SCHEMA_STAMP_PATH'] || File.join( Wagn.gem_root, 'config' )
+        File.join stamp_dir, "version#{ '_cards' if type.to_s =~ /card/ }.txt"  
       end
-    
-      def schema_stamp_dir
-        File.join Wagn.gem_root, 'config'
-      end
-      
+            
     end
   end
 end

data/{mods/core/formats → mod/core/format}/html_format.rb

@@ -179,7 +179,7 @@ class Card
     def process_relative_tags args
       _render_raw(args).scan( /\{\{\s*\+[^\}]*\}\}/ ).map do |inc| #fixme - wrong place for regexp!
         process_content( inc ).strip
-      end.join    
+      end.join
     end
   
   
@@ -300,7 +300,7 @@ class Card
       klasses << 'autosave' if action == :update
       html[:class] = klasses.join ' '
     
-      html[:recaptcha] ||= 'on' if Card::Env.recaptcha_on? && Card.toggle( card.rule(:captcha) )
+      html[:recaptcha] ||= 'on' if card.recaptcha_on?
       html.delete :recaptcha if html[:recaptcha] == :off
     
       { :url=>url, :remote=>true, :html=>html }

data/{mods/core/sets → mod/core/set}/all/collection.rb

@@ -47,3 +47,41 @@ def contextual_content context_card, format_args={}
     self.format(:not_current=>true)._render_raw
   )
 end
+
+format do
+  
+  def search_params
+    @search_params ||= begin
+      p = default_search_params.clone
+    
+      if focal? 
+        p[:offset] = params[:offset] if params[:offset]
+        p[:limit]  = params[:limit]  if params[:limit]
+        p.merge! params[:wql]        if params[:wql]
+      end
+      p
+    end
+  end
+
+  def default_search_params # wahh?
+    set_default_search_params
+  end
+
+  def set_default_search_params overrides={}
+    @default_search_params ||= begin
+      p = { :default_limit=> 100 }.merge overrides
+      set_search_params_variables! p
+      p
+    end
+  end
+
+  def set_search_params_variables! hash
+    hash[:vars] = params[:vars] || {}
+    params.each do |key,val|
+      case key.to_s
+      when '_wql'      ;  hash.merge! val
+      when /^\_(\w+)$/ ;  hash[:vars][$1.to_sym] = val
+      end
+    end
+  end
+end

data/{mods/core/sets → mod/core/set}/all/permissions.rb

@@ -217,14 +217,24 @@ def track_permission_errors
   result
 end
 
+
+def recaptcha_on?
+  have_recaptcha_keys? &&
+  Env[:controller]     &&
+  !Auth.signed_in?     &&
+  !Auth.needs_setup?   &&
+  !Auth.always_ok?     &&
+  Card.toggle( rule :captcha ) 
+end
+
+def have_recaptcha_keys?
+  @@have_recaptcha_keys = defined?(@@have_recaptcha_keys) ? @@have_recaptcha_keys : 
+    !!( Wagn.config.recaptcha_public_key && Wagn.config.recaptcha_private_key )
+end
+
 event :recaptcha, :before=>:approve do
-  if !@supercard                        and
-      Env.recaptcha_on?                 and
-      Card.toggle( rule :captcha )      and
-      num = Card::Env[:recaptcha_count] and
-      num < 1
-      
-    Env[:recaptcha_count] = num + 1
+  if !@supercard && !Env[:recaptcha_used] && recaptcha_on?     
+    Env[:recaptcha_used] = true
     Env[:controller].verify_recaptcha :model=>self, :attribute=>:captcha
   end
 end

data/{mods/core/sets → mod/core/set}/all/phases.rb

@@ -121,6 +121,7 @@ event :process_subcards, :after=>:approve, :on=>:save do
   
   subcards.keys.each do |sub_name|
     opts = @subcards[sub_name] || {}
+    opts = { 'content' => opts } if String===opts
     ab_name = sub_name.to_name.to_absolute_name name
     next if ab_name.key == key # don't resave self!
 

data/{mods/core/sets → mod/core/set}/all/utils.rb

@@ -34,8 +34,9 @@ module ClassMethods
     attribs.each do |row|
       result = begin
         merge row['name'], row, opts
-      rescue
-        false
+#      rescue => e
+#        Rails.logger.info "merge_list problem: #{ e.message }"
+#        false
       end
       unmerged.push row unless result == true
     end
@@ -56,6 +57,7 @@ module ClassMethods
     
   
   def merge name, attribs={}, opts={}
+    puts "merging #{ name }"
     card = fetch name, :new=>{}
     
     if opts[:pristine] && !card.pristine?