wagn 1.13.0.pre2 → 1.13.0

data/{mods/standard/sets → mod/standard/set}/type/user.rb

@@ -4,25 +4,6 @@ include Basic
 attr_accessor :email
 
 format :html do
-  #FIXME - should perms check permission to create account?
-  view :new do |args|
-    args.merge!(
-      :title=>'Invite', 
-      :optional_help=>:show, 
-      :optional_menu=>:never 
-    )
-    args[:hidden].merge! :card => { :type_id => card.type_id }
-    frame_and_form :create, args do
-      %{
-        #{ _render_name_fieldset :help=>'usually first and last name'   }
-        #{# _render_email_fieldset                                       
-        }
-        #{# _render_invitation_field                                     
-        }
-      }
-    end
-  end
-
 
   view :setup, :tags=>:unknown_ok, :perms=>lambda { |r| Auth.needs_setup? } do |args|
     args.merge!( {
@@ -30,7 +11,7 @@ format :html do
       :optional_help=>:show,
       :optional_menu=>:never, 
       :help_text=>'To get started, set up an account.',
-      :buttons => button_tag( 'Submit' ),
+      :buttons => button_tag( 'Set up', :disable_with=>'Setting up' ),
       :hidden => { 
         :success => "REDIRECT: #{ Card.path_setting '/' }",
         'card[type_id]' => Card.default_accounted_type_id,
@@ -52,7 +33,16 @@ format :html do
   end
 end
 
+=begin
+def ok_to_create
+  unless Auth.needs_setup?
+    deny_because "You cannot create a #{type_name} directly; you must create a #{Card[:signup].name} first"
+  end
+end
+=end
+
 event :setup_as_bot, :before=>:check_permissions, :on=>:create, :when=>proc{ |c| Card::Env.params[:setup] } do
+  # is this still needed, even with the #ok_to_create call?
   abort :failure unless Auth.needs_setup?
   Auth.as_bot
 end  

data/spec/controllers/card_controller_spec.rb

@@ -239,10 +239,7 @@ describe CardController do
     context 'css' do
       before do
         @all_style = Card[ "#{ Card[:all].name }+#{ Card[:style].name }" ]
-        @all_style.update_machine_output
-        Card::Auth.as_bot do
-          @all_style.fetch(:trait => :machine_output).delete!
-        end
+        @all_style.reset_machine_output!
       end
       
       it 'should create missing machine output file' do

data/spec/{mods → mod}/standard/lib/machine_spec.rb

@@ -14,12 +14,16 @@ end
 
 
 shared_examples_for 'machine' do |filetype|
-  context "when created" do
+  context "machine is run" do
+    before do
+      machine.update_machine_output
+    end
+    
     it 'has +machine_input card' do
-      machine.machine_input_card.should_not be_nil
+      machine.machine_input_card.real?.should be_true 
     end
     it 'has +machine_output card' do
-      machine.machine_output_card.should_not be_nil
+      machine.machine_output_card.real?.should be_true
     end
     it "generates #{filetype} file" do 
       expect(machine.machine_output_path).to match(/\.#{filetype}$/)
@@ -32,8 +36,12 @@ shared_examples_for 'content machine' do |filetype|
     let(:machine) { machine_card }
   end
   
+  
   context '+machine_input card' do
     it "points to self" do
+      Card::Auth.as_bot do
+        machine_card.update_input_card
+      end
       expect(machine_card.input_item_cards).to eq([machine_card])
     end
   end
@@ -112,6 +120,12 @@ We build the following structure:
   end
   
   describe '+machine_input card' do
+    before do
+      Card::Auth.as_bot do
+        subject.update_input_card
+      end
+    end
+    
     it "contains items of all levels" do
       subject.machine_input_card.item_cards.map(&:id).sort.should == @expected_items.map(&:id).sort
     end

data/spec/mod/standard/set/all/event_viz_spec.rb

@@ -0,0 +1,9 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::All::EventViz do
+  describe '#events' do
+    it "should have at least twenty events" do
+      Card['A'].events( :update ).split("\n").length.should > 20
+    end
+  end
+end

data/spec/{mods/standard/sets → mod/standard/set}/right/account_spec.rb

@@ -81,7 +81,7 @@ describe Card::Set::Right::Account do
     it 'should not work if token is wrong' do
       Card::Env.params[:reset_token] = @token + 'xxx'
       @account.save
-      @account.errors[:abort].first.should =~ /token_not_found/
+      @account.errors[:abort].first.should =~ /incorrect_token/
     end  
     
   end

data/spec/{mods/standard/sets → mod/standard/set}/type/signup_spec.rb

@@ -51,7 +51,9 @@ describe Card::Set::Type::Signup do
     end
     
     it 'should create an authenticable token' do
-      Card::Auth.authenticate_by_token(@token).should == @signup.id
+      @account.token.should == @token
+      @account.authenticate_by_token(@token).should == @signup.id
+      @account.fetch(:trait=> :token).should_not be_present
     end
     
     it 'should notify someone' do
@@ -112,19 +114,56 @@ describe Card::Set::Type::Signup do
       ActionMailer::Base.deliveries.last.to.should == ['signups@wagn.org']
     end
     
-    context 'approval' do
-      before do
-        Card::Env.params[:approve] = true
+    
+    context 'approval with token' do
+      
+      it 'should create token' do
+        Card::Env.params[:approve_token] = true
         Card::Auth.as :joe_admin
+        
+        @signup = Card.fetch @signup.id
+        @signup.save!
+        @signup.account.token.should be_present
       end
       
+    end
+    
+    context 'approval without token' do
+      
       it 'should create token' do
+        Card::Env.params[:approve_without_token] = true
+        Card::Auth.as :joe_admin
+        
         @signup = Card.fetch @signup.id
         @signup.save!
-        @signup.account.token.should be_present
+        @signup.account.token.should_not be_present
+        @signup.type_id.should == Card::UserID
+        @signup.account.status.should == 'active'
       end
     end
 
   end
+  
+  
+  context 'invitation' 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'
+        @signup = Card.create! :name=>'Big Bad Wolf', :type_id=>Card::SignupID, '+*account'=>{ '+*email'=>'wolf@wagn.org'}
+      end
+      @account = @signup.account
+    end
+    
+    it 'should create all the necessary cards, but no password' do
+      @signup.type_id.should == Card::SignupID
+      @account.email.should == 'wolf@wagn.org'
+      @account.status.should == 'pending'
+      @account.salt.should_not == ''
+      @account.token.should be_present
+      @account.password.should_not be_present
+    end
+    
+  end
 
 end