wagn 1.13.0.pre → 1.13.0.pre1

data/lib/wagn/tasks/db.rake

@@ -29,6 +29,7 @@ unless Rake::TaskManager.methods.include?(:redefine_task)
   end
 end
 
+
 namespace :db do  
   namespace :fixtures do
     desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
@@ -36,7 +37,7 @@ namespace :db do
       require 'active_record/fixtures'
       ActiveRecord::Base.establish_connection(::Rails.env.to_sym)
       (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Wagn.gem_root.to_s, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-        ActiveRecord::Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*'))
+        ActiveRecord::Fixtures.create_fixtures(File.join(Wagn.gem_root.to_s, 'test', 'fixtures'), File.basename(fixture_file, '.*'))
       end
     end
   end

data/lib/wagn/tasks/wagn.rake

@@ -38,6 +38,10 @@ namespace :wagn do
   desc "update wagn gems and database"
   task :update 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
     Rake::Task['wagn:migrate'].invoke
     # FIXME remove tmp dir / clear cache
     puts "set symlink for assets"
@@ -51,7 +55,7 @@ namespace :wagn do
 
   desc "set symlink for assets"
   task :update_assets_symlink do
-    unless Rails.root.to_s == Wagn.gem_root
+    if Rails.root.to_s != Wagn.gem_root and not File.exists? File.join(Rails.public_path, "assets")
       FileUtils.ln_s( Wagn.paths['gem-assets'].first, File.join(Rails.public_path, "assets") )
     end
   end

data/lib/wagn/wagn_spec_helper.rb

@@ -0,0 +1,49 @@
+module Wagn::WagnSpecHelper
+
+  include ActionDispatch::Assertions::SelectorAssertions
+  #~~~~~~~~~  HELPER METHODS ~~~~~~~~~~~~~~~#
+  
+  def login_as user
+    Card::Auth.current_id = (uc=Card[user.to_s] and uc.id)
+    if @request
+      @request.session[:user] = Card::Auth.current_id
+    end
+    #warn "(ath)login_as #{user.inspect}, #{Card::Auth.current_id}, #{@request.session[:user]}"
+  end
+  
+  def newcard name, content=""
+    #FIXME - misleading name; sounds like it doesn't save.
+    Card.create! :name=>name, :content=>content
+  end
+
+  def assert_view_select(view_html, *args, &block)
+    node = HTML::Document.new(view_html).root
+    if block_given?
+      assert_select node, *args, &block
+    else
+      assert_select node, *args
+    end
+  end
+
+  def render_editor(type)
+    card = Card.create(:name=>"my favority #{type} + #{rand(4)}", :type=>type)
+    card.format.render(:edit)
+  end
+
+  def render_content content, format_args={}
+    @card ||= Card.new :name=>"Tempo Rary 2"
+    @card.content = content
+    @card.format(format_args)._render :core
+  end
+
+  def render_card view, card_args={}, format_args={}
+    card = begin
+      if card_args[:name]
+        Card.fetch card_args[:name], :new=>card_args
+      else
+        Card.new card_args.merge( :name=> 'Tempo Rary' )
+      end
+    end
+    card.format(format_args)._render(view)
+  end
+end

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

@@ -1,10 +1,10 @@
 ::Card.error_codes[:conflict] = [:conflict, 409]
 
 def content
-  if new_card?
-    template ? template.content : ''
-  else
+  if !new_card?
     current_revision.content
+  elsif template && template.content.present?
+    template.content
   end
 end
 

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

@@ -106,11 +106,10 @@ end
 event :process_subcards, :after=>:approve, :on=>:save do
   
   subcards.keys.each do |sub_name|
-    opts = @subcards[sub_name]
+    opts = @subcards[sub_name] || {}
     ab_name = sub_name.to_name.to_absolute_name name
     next if ab_name.key == key # don't resave self!
 
-
     opts = opts.stringify_keys
     opts['subcards'] = extract_subcard_args! opts
 

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

@@ -75,7 +75,7 @@ def attachment_link(rev_id) # create filesystem links to previous revision
 end
 
 def before_post_attach
-  Rails.logger.info "bpa called for #{name}"
+#  Rails.logger.info "bpa called for #{name}"
   at=self.attach
   at.instance_write :file_name, at.original_filename
 

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

@@ -18,17 +18,17 @@ view( :comment_box, :denial=>:blank, :tags=>:unknown_ok, :perms=>lambda { |r| r.
   
   
   %{<div class="comment-box nodblclick"> #{
-    card_form :update do |f|
+    card_form :update do
       %{
         #{ hidden_field_tag( 'card[name]', card.name ) if card.new_card? 
         # FIXME wish we had more generalized solution for names.  without this, nonexistent cards will often take left's linkname.  (needs test)
         }
-        #{ f.text_area :comment, :rows=>3 }
+        #{ form.text_area :comment, :rows=>3 }
         <div class="comment-buttons">
           #{
             unless Auth.signed_in?
               card.comment_author= (session[:comment_author] || params[:comment_author] || "Anonymous") #ENGLISH
-              %{<label>My Name is:</label> #{ f.text_field :comment_author }}
+              %{<label>My Name is:</label> #{ form.text_field :comment_author }}
             end
           }
           <input type="submit" value="Comment"/>

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

@@ -195,7 +195,7 @@ format :html do
     end
     
     args[:buttons] ||= %{
-      #{ submit_tag 'Submit', :class=>'create-submit-button', :disable_with=>'Submitting' }
+      #{ button_tag 'Submit', :class=>'create-submit-button', :disable_with=>'Submitting' }
       #{ button_tag 'Cancel', :type=>'button', :class=>"create-cancel-button #{cancel[:class]}", :href=>cancel[:href] }
     }
     
@@ -215,7 +215,7 @@ format :html do
     args[:optional_help] = :show
     
     args[:buttons] = %{
-      #{ submit_tag 'Submit', :class=>'submit-button' }
+      #{ button_tag 'Submit', :class=>'submit-button' }
       #{ button_tag 'Cancel', :class=>'cancel-button slotter', :href=>path, :type=>'button' }
     }
   end
@@ -256,8 +256,8 @@ format :html do
       :card     => { :update_referencers => false }
     )
     args[:buttons] = %{
-      #{ submit_tag 'Rename and Update', :class=>'renamer-updater' }
-      #{ submit_tag 'Rename', :class=>'renamer' }
+      #{ button_tag 'Rename and Update', :class=>'renamer-updater' }
+      #{ button_tag 'Rename', :class=>'renamer' }
       #{ button_tag 'Cancel', :class=>'slotter', :type=>'button', :href=>path(:view=>:edit, :id=>card.id)}
     }
     
@@ -278,7 +278,7 @@ format :html do
     args[:variety] = :edit #YUCK!
     args[:hidden] ||= { :view=>:edit }
     args[:buttons] = %{
-      #{ submit_tag 'Submit', :disable_with=>'Submitting' }
+      #{ button_tag 'Submit', :disable_with=>'Submitting' }
       #{ button_tag 'Cancel', :href=>path(:view=>:edit), :type=>'button', :class=>'slotter' }      
     }    
   end
@@ -406,8 +406,7 @@ format :html do
     text = if args[:help_text]
       args[:help_text]
     else
-      setting = card.new_card? ? :add_help : :help
-      setting = [ :add_help, { :fallback => :help } ] if setting == :add_help
+      setting = card.new_card? ? [ :add_help, { :fallback => :help } ] : :help
 
       if help_card = card.rule_card( *setting ) and help_card.ok? :read
         with_inclusion_mode :normal do

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

@@ -52,7 +52,11 @@ event :set_default_status, :on=>:create, :before=>:process_subcards do
   subcards["+#{Card[:status].name}"] = { :content => default_status }
 end
 
-event :generate_confirmation_token, :on=>:create, :before=>:process_subcards do
+def confirm_ok?
+  Card.new( :type_id=>Card.default_accounted_type_id ).ok? :create
+end
+
+event :generate_confirmation_token, :on=>:create, :before=>:process_subcards, :when=>proc{ |c| c.confirm_ok? } do
   subcards["+#{Card[:token].name}"] = {:content => generate_token }
 end
 
@@ -82,16 +86,21 @@ def has_reset_token?
   @env_token = Env.params[:reset_token]
 end
 
-event :send_new_account_confirmation_email, :on=>:create, :after=>:extend do
+event :reset_token do
+  Auth.as_bot do
+    token_card.update_attributes! :content => generate_token
+  end
+end
+  
+
+event :send_account_confirmation_email, :on=>:create, :after=>:extend do
   if self.email.present?
     Mailer.confirmation_email( self ).deliver
   end
 end
 
 event :send_reset_password_token do
-  Auth.as_bot do
-    token_card.update_attributes! :content => generate_token
-  end
+  reset_token
   Mailer.password_reset(self).deliver
 end
 

data/mods/standard/sets/rstar/rules.rb

@@ -1,3 +1,4 @@
+
 format :html do
 
   view :closed_rule, :tags=>:unknown_ok do |args|
@@ -39,6 +40,7 @@ format :html do
     setting_name = card.cardname.tag
     current_rule ||= Card.new :name=> "*all+#{setting_name}" #FIXME use codename
     set_selected = false
+    edit_mode = !params[:success] && card.ok?( ( card.new_card? ? :create : :update ) )
 
     #~~~~~~ handle reloading due to type change
     if params[:type_reload] && card_args=params[:card]
@@ -49,11 +51,10 @@ format :html do
         current_rule.assign_attributes card_args
         current_rule.include_set_modules
       end
-
       set_selected = card_args[:name].to_name.left_name.to_s
+      edit_mode = true
     end
 
-    edit_mode = !params[:success] && card.ok?( ( card.new_card? ? :create : :update ) )
     
     opts = {
       :open_rule    => card,
@@ -188,14 +189,26 @@ format :html do
               %{<span class="rule-delete-section">#{ button_tag 'Delete', b_args }</span>}
             end
            }
-           #{ submit_tag 'Submit', :class=>'rule-submit-button' }
+           #{ button_tag 'Submit', :class=>'rule-submit-button' }
            #{ button_tag 'Cancel', :class=>'rule-cancel-button slotter', :type=>'button',
-                :href=>path( :view=>( card.new_card? ? :closed_rule : :open_rule ), :card=>open_rule, :item=>:view_rule ) }
+                :href=>path( :view=>( card.new_card? ? :closed_rule : :open_rule ), :success=>true ) }
         </div>
       }
     end
   end
 
+=begin
+  view :edit_rule2 do |args|
+    card_form :update do
+      [
+        _optional_render( :type_fieldset,    args ),
+        _optional_render( :content_fieldset, args ),
+        _optional_render( :set_fieldset,     args ),
+        _optional_render( :button_fieldset,  args )
+      ]
+    end
+  end
+=end
 
   private
 

data/mods/standard/sets/self/signin.rb

@@ -13,7 +13,7 @@ format :html do
   
   
   view :core do |args|
-    args[:buttons] = submit_tag 'Sign in'
+    args[:buttons] = button_tag 'Sign in'
     if Card.new(:type_id=>Card::SignupID).ok? :create
       args[:buttons] += link_to( '...or sign up!', wagn_path("account/signup"))
     end
@@ -43,7 +43,7 @@ format :html do
     args.merge!( {
       :title=>'Forgot Password',
       :optional_help=>:hide,
-      :buttons => submit_tag( 'Reset my password' ),
+      :buttons => button_tag( 'Reset my password' ),
       :structure => true,      
       :hidden => { 
         :reset_password => true,

data/mods/standard/sets/type/pointer.rb

@@ -147,8 +147,6 @@ end
 
 
 event :standardize_items, :before=>:approve, :on=>:save do
-  Rails.logger.info "create.rb standardize_items base"
-  
   if updates.for? :content
     self.content = item_names(:context=>:raw).map { |name| "[[#{name}]]" }.join "\n"
   end
@@ -172,7 +170,7 @@ end
 
 def item_names args={}
   context = args[:context] || self.cardname
-  self.raw_content.split(/\n+/).map do |line|
+  self.raw_content.to_s.split(/\n+/).map do |line|
     item_name = line.gsub /\[\[|\]\]/, ''
     if context == :raw
       item_name

data/mods/standard/sets/type/scss.rb

@@ -14,7 +14,7 @@ def compressed_css input
   end
 end 
 
-machine_input do 
+machine_input do
    compressed_css format(:format => :css)._render_core
 end
 

data/mods/standard/sets/type/signup.rb

@@ -5,7 +5,7 @@ format :html do
     #FIXME - make more use of standard new view
     args.merge!(
       :optional_help => :show, #, :optional_menu=>:never
-      :buttons => submit_tag( 'Submit' ),
+      :buttons => button_tag( 'Submit' ),
       :hidden => {
         :success => (card.rule(:thanks) || '_self'),
         'card[type_id]' => card.type_id
@@ -26,11 +26,30 @@ format :html do
 
 
   view :core do |args|
-    #ENGLISH
-    process_content(_render_raw) +
-    if (card.new_card?); '' else
-      %{<div class="invite-links"><strong>#{card.name}</strong> requested an account on #{format_date(card.created_at) }</div>}
+    headings, links = [], []
+    if !card.new_card? #necessary?
+      headings << %(<strong>#{ card.name }</strong> requested an account on #{ format_date card.created_at })
+      if account = card.account
+        if account.token
+          headings << "An activation token has been sent for this account"
+        else
+          if account.confirm_ok?
+            links << link_to( "Approve #{card.name}", wagn_path("/update/~#{card.id}?approve=true") )
+          end
+          if card.ok? :delete
+            links << link_to( "Deny #{card.name}", wagn_path("/delete/~#{card.id}") )
+          end
+          headings << links * '' if links.any?
+        end
+      else
+        headings << "ERROR: signup card missing account"
+      end
     end
+    %{<div class="invite-links">
+        #{ headings.map { |h| "<div>#{h}</div>"} * "\n" }
+      </div>
+      #{ process_content render_raw }    
+    }
   end
 end
 
@@ -56,12 +75,16 @@ def has_token?
 end
 
 
+event :approve_account, :on=>:update, :before=>:process_subcards, :when=>proc {|c| Env.params[:approve] } do
+  account.reset_token
+  account.send_account_confirmation_email
+end
+
+
 event :resend_activation_token do
-  Auth.as_bot do
-    token_card = Auth.find_token_card @env_token
-    token_card.update_attributes! :content => generate_token
-    token_card.left.send_new_account_confirmation_email
-  end
+  account = Auth.find_token_card( @env_token ).left
+  account.reset_token
+  account.send_account_confirmation_email
   Env.params[:success] = {
     :id => '_self',
     :view => 'message',
@@ -88,5 +111,3 @@ event :signup_notifications, :after=>:extend, :on=>:create, :when=>send_signup_n
   Mailer.signup_alert(self).deliver
 end
 
-
-

data/mods/standard/sets/type/user.rb

@@ -30,7 +30,7 @@ format :html do
       :optional_help=>:show,
       :optional_menu=>:never, 
       :help_text=>'To get started, set up an account.',
-      :buttons => submit_tag( 'Submit' ),
+      :buttons => button_tag( 'Submit' ),
       :hidden => { 
         :success => "REDIRECT: #{ Card.path_setting '/' }",
         'card[type_id]' => Card.default_accounted_type_id,

data/spec/javascripts/support/jasmine_runner.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+#-*- encoding : utf-8 -*-
 $:.unshift(ENV['JASMINE_GEM_PATH']) if ENV['JASMINE_GEM_PATH'] # for gem testing purposes
 
 require 'rubygems'

data/spec/mods/standard/sets/all/base_spec.rb

@@ -22,6 +22,10 @@ describe Card::Set::All::Base do
     it "core" do
       render_card(:core, :name=>'A+B').should == "AlphaBeta"
     end
+    
+    it 'core for new card' do
+      Card.new.format._render_core.should == ''
+    end
   
     describe 'array' do
       it "of search items" do

data/spec/mods/standard/sets/type/signup_spec.rb

@@ -8,7 +8,7 @@ describe Card::Set::Type::Signup do
   end
   
   
-  context 'request form' do
+  context 'signup form form' do
     before do
       card = Card.new :type_id=>Card::SignupID
       @form = card.format.render_new
@@ -29,17 +29,17 @@ describe Card::Set::Type::Signup do
       
       Card::Auth.as_bot do
         Card.create! :name=>'User+*type+*create', :content=>'[[Anyone]]'
-        Card.create! :name=>'*request+*to', :content=>'request@wagn.org'
+        Card.create! :name=>'*request+*to', :content=>'signups@wagn.org'
       end
-      @request = Card.create! :name=>'Big Bad Wolf', :type_id=>Card::SignupID, '+*account'=>{ 
+      @signup = Card.create! :name=>'Big Bad Wolf', :type_id=>Card::SignupID, '+*account'=>{ 
         '+*email'=>'wolf@wagn.org', '+*password'=>'wolf'
       }
-      @account = @request.account
+      @account = @signup.account
       @token = @account.token
     end
     
     it 'should create all the necessary cards' do
-      @request.type_id.should == Card::SignupID
+      @signup.type_id.should == Card::SignupID
       @account.email.should == 'wolf@wagn.org'
       @account.status.should == 'pending'
       @account.salt.should_not == ''
@@ -51,19 +51,19 @@ describe Card::Set::Type::Signup do
     end
     
     it 'should create an authenticable token' do
-      Card::Auth.authenticate_by_token(@token).should == @request.id
+      Card::Auth.authenticate_by_token(@token).should == @signup.id
     end
     
     it 'should notify someone' do
-      ActionMailer::Base.deliveries.last.to.should == ['request@wagn.org']
+      ActionMailer::Base.deliveries.last.to.should == ['signups@wagn.org']
     end
     
     it 'should be activated by an update' do
       Card::Env.params[:token] = @token
-      @request.update_attributes({})
-      #puts @request.errors.full_messages * "\n"
-      @request.errors.should be_empty
-      @request.type_id.should == Card::UserID
+      @signup.update_attributes({})
+      #puts @signup.errors.full_messages * "\n"
+      @signup.errors.should be_empty
+      @signup.type_id.should == Card::UserID
       @account.status.should == 'active'
       Card[ @account.name ].active?.should be_true
     end
@@ -73,7 +73,7 @@ describe Card::Set::Type::Signup do
       @account.token_card.expire
       Card::Env.params[:token] = @token
       
-      result = @request.update_attributes!({})
+      result = @signup.update_attributes!({})
       result.should == true                 # successfully completes save
       @account.token.should_not == @token   # token gets updated
       success = Card::Env.params[:success]
@@ -84,10 +84,47 @@ describe Card::Set::Type::Signup do
 
 
   context 'signup (with approval)' do
+    before do
+      # NOTE: by default Anonymous does not have permission to create User cards.
+      Card::Auth.as_bot do
+        Card.create! :name=>'*request+*to', :content=>'signups@wagn.org'
+      end
+      @signup = Card.create! :name=>'Big Bad Wolf', :type_id=>Card::SignupID, '+*account'=>{ 
+        '+*email'=>'wolf@wagn.org', '+*password'=>'wolf'
+      }
+      @account = @signup.account
+    end
+    
+    
+    it 'should create all the necessary cards, but no token' do
+      @signup.type_id.should == Card::SignupID
+      @account.email.should == 'wolf@wagn.org'
+      @account.status.should == 'pending'
+      @account.salt.should_not == ''
+      @account.password.length.should > 10 #encrypted
+    end
+    
+    it 'should not create a token' do
+      @account.token.should_not be_present
+    end
+    
+    it 'should notify someone' do
+      ActionMailer::Base.deliveries.last.to.should == ['signups@wagn.org']
+    end
+    
+    context 'approval' do
+      before do
+        Card::Env.params[:approve] = true
+        Card::Auth.as :joe_admin
+      end
+      
+      it 'should create token' do
+        @signup = Card.fetch @signup.id
+        @signup.save!
+        @signup.account.token.should be_present
+      end
+    end
 
   end
-  
-  
- 
 
 end