wagn 1.12.9 → 1.12.10

data/lib/generators/wagn/templates/Gemfile

@@ -3,3 +3,5 @@ source 'http://rubygems.org'
 gem 'wagn'
 
 <%= database_gemfile_entry -%>
+
+#gem 'wagn-dev', :group=>'development'

data/lib/tasks/wagn.rake

@@ -33,11 +33,10 @@ namespace :wagn do
     end
   end
   
-  
-  
-  desc "install wagn configuration files"
-  task :install do
-    puts "wagn:install is deprecated in favor of 'wagn new'"
+  desc "update wagn gems and database"
+  task :update do
+    system 'bundle update'
+    Rake::Task['wagn:migrate'].invoke
   end
   
   desc "reset cache"
@@ -74,7 +73,7 @@ namespace :wagn do
     task :cards => :environment do
       Wagn::Cache.reset_global
       ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
-      ENV['WAGN_MIGRATION'] = 'true'
+      Wagn.config.send_emails = 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,8 +86,8 @@ 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['WAGN_MIGRATION'] = 'true'
       ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
+      Wagn.config.send_emails = false
       
       stamp_file = Wagn::Version.schema_stamp_path args[:suffix]
       Wagn::MigrationHelper.schema_mode args[:suffix ] do

data/lib/wagn/all.rb

@@ -1,5 +1,12 @@
 require 'rails/all'
-require 'wagn/application'
+
+if Rails.env.development?
+  begin
+    require 'wagn/dev'
+  rescue
+    Rails.logger.info "WARNING: the gem wagn-dev is strongly recommended when running wagn in development mode!"
+  end
+end
 
 require 'recaptcha'
 require 'airbrake'
@@ -13,4 +20,6 @@ require 'paperclip'
 # require 'xmlscan'
 # require 'rubyzip'
 require 'coderay'
-require 'sass'
+require 'sass'
+
+require 'wagn/application'

data/lib/wagn/application.rb

@@ -45,6 +45,7 @@ module Wagn
         config.recaptcha_private_key = nil
         config.recaptcha_proxy       = nil
         
+        config.send_emails           = !ENV['WAGN_MIGRATION']
         config.email_defaults        = nil
         config.override_host         = nil
         config.override_protocol     = nil

data/mods/core/formats/html_format.rb

@@ -15,7 +15,6 @@ class Card::HtmlFormat < Card::Format
     :normal => { :view => :content }
   }
   
-  
   def get_inclusion_defaults
     INCLUSION_DEFAULTS[@mode] || {}
   end
@@ -33,8 +32,8 @@ class Card::HtmlFormat < Card::Format
   end
 
   def commentable? view, args
-    self.class.tagged view, :comment and 
-    args[:show] =~ /comment_box/     and
+    self.class.tagged view, :comment      and 
+    show_view? :comment_box, args, :hide and #developer or wagneer has overridden default
     ok? :comment
   end
 
@@ -85,19 +84,19 @@ class Card::HtmlFormat < Card::Format
     JSON( options_hash )
   end
 
-  def wrap view, args = {}
+  def wrap args = {}
     classes = [
       ( 'card-slot' unless args[:no_slot] ),
-      "#{view}-view",
+      "#{ @current_view }-view",
       ( args[:slot_class] if args[:slot_class] ),
       ( "STRUCTURE-#{args[:structure].to_name.key}" if args[:structure]),
       card.safe_set_keys
     ].compact
     
     div = %{<div id="#{card.cardname.url_key}" data-card-id="#{card.id}" data-card-name="#{h card.name}" style="#{h args[:style]}" class="#{classes*' '}" } +
-      %{data-slot='#{html_escape_except_quotes slot_options( args )}'>#{yield}</div>}
+      %{data-slot='#{html_escape_except_quotes slot_options( args )}'>#{ output yield }</div>}
 
-    if params[:debug] == 'slot' && !tagged(view, :no_wrap_comments )
+    if params[:debug] == 'slot' && !tagged( @current_view, :no_wrap_comments )
       name = h card.name
       space = '  ' * @depth
       %{<!--\n\n#{ space }BEGIN SLOT: #{ name }\n\n-->#{ div }<!--\n\n#{space}END SLOT: #{ name }\n\n-->}
@@ -115,16 +114,33 @@ class Card::HtmlFormat < Card::Format
     end
   end
     
-  def wrap_frame view, args={}
-    wrap view, args.merge(:slot_class=>'card-frame') do
+  def frame args={}
+    wrap args.merge(:slot_class=>'card-frame') do
       %{
         #{ _render_header args }
         #{ %{ <div class="card-subheader">#{ args[:subheader] }</div> } if args[:subheader] }
-        #{ _render_help args if args[:show_help] }
-        #{ wrap_body args do yield args end }
+        #{ _optional_render :help, args, :hide }
+        #{ wrap_body args do output( yield args ) end }
       }
     end
   end
+  
+  def frame_and_form action, args={}, form_opts={}
+    form_opts[:hidden] = args.delete(:hidden)
+    frame args do
+      card_form action, form_opts do
+        output( yield args )
+      end
+    end
+  end
+  
+  def output content
+    case content
+    when String; content
+    when Array ; content.compact.join "\n"
+    end
+  end  
+
 
   def wrap_main(content)
     return content if params[:layout]=='none'
@@ -144,18 +160,25 @@ class Card::HtmlFormat < Card::Format
 
   def edit_slot args={}
     if args[:structure] || card.structure
-      _render_raw(args).scan( /\{\{\s*\+[^\}]*\}\}/ ).map do |inc|
+      # multi-card edit mode
+      _render_raw(args).scan( /\{\{\s*\+[^\}]*\}\}/ ).map do |inc| #fixme - wrong place for regexp!
         process_content( inc ).strip
       end.join
 #        raw _render_core(args)
-    elsif label = args[:label]
-      label = '' if label == true
-      fieldset label, content_field( form, args ), :editor=>:content
     else
-      editor_wrap( :content ) { content_field form, args }
+      # single-card edit mode
+      field = content_field form, args
+      
+      if [ args[:optional_type_fieldset], args[:optional_name_fieldset] ].member? :show
+        # display content field in fieldset for consistency with other fields
+        fieldset '', field, :editor=>:content
+      else
+        editor_wrap( :content ) { field }
+      end
     end
   end
   
+  
 
   #### --------------------  additional helpers ---------------- ###
 
@@ -217,12 +240,15 @@ class Card::HtmlFormat < Card::Format
 
   def type_field args={}
     typelist = Account.createable_types
-    typelist << card.type_name if !card.new_card?
-    # current type should be an option on existing cards, regardless of create perms
+    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
+          typelist = (typelist << card.type_name).sort
+        end
+        Card[ card ? card.type_id : Card.default_type_id ].name
+      end
 
-    options = options_from_collection_for_select(
-      typelist.uniq.sort.map { |name| [ name, name ] },
-      :first, :last, Card[ card ? card.type_id : Card.default_type_id ].name )
+    options = options_from_collection_for_select typelist, :to_s, :to_s, current_type
     template.select_tag 'card[type]', options, args
   end
 
@@ -250,16 +276,34 @@ class Card::HtmlFormat < Card::Format
     @form ||= form_for_multi
   end
 
-  def card_form *opts
-    form_for( card, form_opts(*opts) ) { |form| yield form }
+  def card_form action, opts={}
+    hidden_args = opts.delete :hidden
+    form_for card, card_form_opts(action, opts) do |form|
+      @form = form
+      %{
+        #{ hidden_tags hidden_args if hidden_args }
+        #{ yield form }
+      }
+    end
   end
 
-  def form_opts url, classes='', other_html={}
-    url = path(:action=>url) if Symbol===url
-    opts = { :url=>url, :remote=>true, :html=>other_html }
-    opts[:html][:class] = classes + ' slotter'
-    opts[:html][:recaptcha] = 'on' if Wagn::Env[:recaptcha_on] && Card.toggle( card.rule(:captcha) )
-    opts
+  def card_form_opts action, html={}
+    url, action = case action
+      when Symbol ;  [ path(:action=>action) , action          ]
+      when Hash   ;  [ path(action)          , action[:action] ]
+      when String ;  [ wagn_path(action)     , nil             ] #deprecated
+      else        ;  raise Wagn::Error, "unsupported card_form action class: #{action.class}"
+      end
+      
+    klasses = Array.wrap( html[:class] )
+    klasses << 'card-form slotter'
+    klasses << 'autosave' if action == :update
+    html[:class] = klasses.join ' '
+    
+    html[:recaptcha] ||= 'on' if Wagn::Env[:recaptcha_on] && Card.toggle( card.rule(:captcha) )
+    html.delete :recaptcha if html[:recaptcha] == :off
+    
+    { :url=>url, :remote=>true, :html=>html }
   end
 
   def editor_wrap type=nil
@@ -291,6 +335,7 @@ class Card::HtmlFormat < Card::Format
   def hidden_tags hash, base=nil
     # convert hash into a collection of hidden tags
     result = ''
+    hash ||= {}
     hash.each do |key, val|
       result += if Hash === val
         hidden_tags val, key

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

@@ -52,7 +52,7 @@ def creator
 end
 
 def updater
-  Card[ updater_id || Card::AnonID ]
+  Card[ updater_id ]
 end
 
 def drafts
@@ -68,6 +68,10 @@ def clear_drafts # yuck!
   connection.execute %{delete from card_revisions where card_id=#{id} and id > #{current_revision_id} }
 end
 
+def clean_html?
+  true
+end
+
 
 event :set_default_content, :on=>:create, :before=>:approve do
   if !updates.for?(:content)

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

@@ -30,7 +30,7 @@ def ok! action, opts={}
 end
 
 def update_account_ok? #FIXME - temporary API, I think this is fixed, can we cache any of this for speed, this is accessed for each header
-  id == Account.current_id || ok?( :update, :trait=>:account )
+  id == Account.current_id or ok?( :update, :trait=>:account )
 end
 
 def who_can action
@@ -106,6 +106,16 @@ end
 
 def ok_to_create
   permit :create
+  if junction?
+    [:left, :right].each do |side|
+      part_card = send side, :new=>{}
+      if part_card && part_card.new_card? #if no card, there must be other errors
+        unless part_card.ok? :create
+          deny_because you_cant("create #{part_card.name}")
+        end
+      end
+    end
+  end
 end
 
 def ok_to_read
@@ -138,8 +148,6 @@ def ok_to_comment
 end
 
 
-
-
 event :set_read_rule, :before=>:store do
   if trash == true
     self.read_rule_id = self.read_rule_class = nil
@@ -215,4 +223,3 @@ event :recaptcha, :before=>:approve do
 end
 
 
-

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

@@ -20,12 +20,17 @@ event :pull_from_trash, :before=>:store, :on=>:create do
   self.trash = false
   true
 end
-#reset_patterns_if_rule saving=true
 
 event :validate_delete, :before=>:approve, :on=>:delete do
   if !codename.blank?
     errors.add :delete, "#{name} is is a system card. (#{codename})"
   end
+  
+  undeletable_all_rules_tags = %w{ default style layout create read update delete }
+  if junction? and left.codename == 'all' and undeletable_all_rules_tags.member? right.codename
+    errors.add :delete, "#{name} is an indestructible rule"
+  end
+  
   if account && Card::Revision.find_by_creator_id( self.id )
     errors.add :delete, "Edits have been made with #{name}'s user account.\n  Deleting this card would mess up our revision records."
   end

data/mods/standard/chunks/include.rb

@@ -22,11 +22,9 @@ module Card::Chunk
         when /^\#/   ; "<!-- #{CGI.escapeHTML in_brackets} -->"
 #        when /^\s*$/ ; '' # no name
         else
-          @options = if @opt_lists
-            @opt_lists.split('|').reverse.inject(nil) do |prev_level, level_options|
-              process_options level_options, prev_level
-            end
-          else {} end
+          @options = @opt_lists.to_s.split('|').reverse.inject(nil) do |prev_level, level_options|
+            process_options level_options, prev_level
+          end || {}
           @options.merge! :inc_name => name, :inc_syntax => in_brackets
           @name = name
         end

data/mods/standard/lib/stylesheets/functional.scss

@@ -45,6 +45,8 @@ in your skin.  Choosing (b) will mean your CSS will not be affected by automated
 .new-current-revision-id,
 .editor .revision-navigation,
 .editor .autosave-alert,
+.confirm_rename-view,
+.renamer-updater,
 .labeled-view .card-menu-link {  
   display: none
 }

data/mods/standard/lib/stylesheets/standard.scss

@@ -608,7 +608,7 @@ html>body .open-view {
 .faint {
   color: #bbc;
 }
-.cardtype {
+.VIEW-type {
   font-style: italic;
   font-size: .85em;
 }

data/mods/standard/sets/all/account.rb

@@ -10,7 +10,7 @@ end
 
 def accountable?
   Card.toggle( rule(:accountable) ) and
-  fetch( :trait=>:account, :new=>{} ).ok?( :create)
+  fetch( :trait=>:account, :new=>{} ).permitted?( :create) #don't use #ok? here because we don't want to check part permissions
 end
 
 def parties
@@ -58,36 +58,34 @@ format :html do
     message = email_params[:message] || Card.setting('*invite+*message') || ''
     
     success = Card.setting "#{ Card[:invite].name }+#{ Card[:thanks].name }"
+    args[:buttons] = %{
+      #{ submit_tag 'Invite' }
+      #{ link_to 'Cancel', previous_location }      
+    }
     
     %{
       #{ hidden_field_tag :success, "REDIRECT: #{success}" if success }
       #{ fieldset :subject, text_field( :email, :subject, :value=>subject, :size=>60 ) }
       #{ fieldset :message, text_area( :email, :message, :value=>message, :rows=>10, :cols => 60 ),
           :help => "We'll create a password and attach it to the email." }
-      <fieldset>
-        <div class="button-area">
-          #{ submit_tag 'Invite' }
-          #{ link_to 'Cancel', previous_location }
-        </div>
-      </fieldset>
+      #{ _optional_render :button_fieldset, args }
     }    
   end
   
   
   view :account, :perms=> lambda { |r| r.card.update_account_ok? } do |args|
-
-    locals = {:slot=>self, :card=>card, :account=>card.account }
-    wrap_frame :account, args do
-      card_form :update, '', 'notify-success'=>'account details updated' do |form|
-        %{
-          #{ hidden_field_tag 'success[id]', '_self' }
-          #{ hidden_field_tag 'success[view]', 'account' }
-          #{ render_account_detail }
-          <fieldset><div class="button-area">#{ submit_tag 'Save Changes' }</div></fieldset>
-        }
-      end
+    frame_and_form :update, args, 'notify-success'=>'account details updated' do
+      %{
+        #{ render_account_detail }
+        #{ _optional_render :button_fieldset, args }
+      }
     end
   end
+  
+  def default_account_args args
+    default_new_account_args args
+    args[:buttons] = submit_tag 'Save Changes'
+  end
 
 
   view :account_detail, :perms=>lambda { |r| r.card.update_account_ok? } do |args|
@@ -118,52 +116,67 @@ format :html do
   
 
   view :new_account, :perms=> lambda { |r| r.card.accountable? && !r.card.account } do |args|
-    wrap_frame :new_account, args do
-      card_form :update do |form|
-        %{
-          #{ hidden_field_tag 'success[id]', '_self'                       }
-          #{ hidden_field_tag 'success[view]', 'account'                   }
-          #{ fieldset :email, text_field( 'card[account_args]', :email )   }
-          #{ _render_invitation_field                                      }
-        }
-      end
+    frame_and_form :update, args do
+      %{
+        #{ _render_email_fieldset    }
+        #{ _render_invitation_field  }
+      }
     end
   end
   
+  def default_new_account_args args
+    args[:hidden] = { :success => { :id=>'_self', :view=>'account' } }
+  end
   
   
-  view :signin, :tags=>:unknown_ok, :perms=>:none do |args|
-    frame_args = args.merge :title=>'Sign In', :show_help=>true, :optional_menu=>:never
-    signin_core = wrap_frame :signin, frame_args do
-      form_tag wagn_path('account/signin') do
-        %{
-          #{ fieldset :email, text_field_tag( 'login', params[:login], :id=>'login_field' ) }
-          #{ fieldset :password, password_field_tag( 'password' ) }
-          <fieldset>
-            <div class="button-area">
-              #{ submit_tag 'Sign in' }
-              #{ link_to '...or sign up!', wagn_path('account/signup') if Card.new(:type_id=>Card::AccountRequestID).ok? :create }
-            </div>
-          </fieldset>
-        }
-      end
-    end
+  view :email_fieldset do |args|
+    fieldset :email, text_field( 'card[account_args]', :email ), :editor=>'content'
+  end
+  
+  
+  view :signin_and_forgot_password, :perms=>:none do |args|
     %{
-      <div id="sign-in">#{signin_core}</div>
-      <div id="forgot-password">#{_render_forgot_password}</div>
+      <div id="sign-in">#{ _render_signin args }</div>
+      <div id="forgot-password">#{ _render_forgot_password args }</div>
     }
   end
 
+  view :signin, :perms=>:none do |args|
+    args.merge!( {
+      :title=>'Sign In',
+      :optional_help=>:show,
+      :optional_menu=>:never,
+      :hidden=>{ :success=>'REDIRECT:*previous' },
+      :buttons=> submit_tag( 'Sign in' ) 
+    })
+    if Card.new(:type_id=>Card::AccountRequestID).ok? :create
+      args[:buttons] += link_to( '...or sign up!', wagn_path("new/:account_request"))
+    end
+    
+    frame_and_form 'account/signin', args, :recaptcha=>:off do
+      [
+        fieldset( :email, text_field_tag( 'login', params[:login], :id=>'login_field' ) ),
+        fieldset( :password, password_field_tag( 'password' ) ),
+        _optional_render( :button_fieldset, args )
+      ]
+    end
+  end
 
   view :forgot_password, :perms=>:none do |args|
-    frame_args = args.merge :title=>'Forgot Password', :show_help=>true, :optional_menu=>:never
-    wrap_frame :forgot_password, frame_args do
-      form_tag wagn_path('account/forgot_password') do
-        %{
-          #{ fieldset :email, text_field_tag( 'email', params[:email] ) }
-          <fieldset><div class="button-area">#{ submit_tag 'Reset my password' }</div></fieldset>
-        }
-      end
+    args.merge!( {
+      :title=>'Forgot Password',
+      :optional_help=>:show, 
+      :optional_menu=>:never,
+      :hidden => { :success => { :view=>:forgot_password }},
+      :buttons => submit_tag( 'Reset my password' )
+    } )
+    
+    frame_and_form 'account/forgot_password', args, :recaptcha=>:off,
+      'notify-success'=>"Check your email for your new temporary password" do
+      [
+        fieldset( :email, text_field_tag( 'email', params[:email] ) ),
+        _optional_render( :button_fieldset, args )
+      ]
     end
   end
 end