card 1.16.3 → 1.16.4

data/mod/05_standard/set/right/account.rb

@@ -94,11 +94,11 @@ event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_r
   case ( result = authenticate_by_token @env_token )
   when Integer
     Auth.signin result
-    Env.params[:success] = edit_password_success_args
+    success << edit_password_success_args
     abort :success
   when :token_expired
     send_reset_password_token
-    Env.params[:success] = {
+    success << {
       :id => '_self',
       :view => 'message',
       :message => "Sorry, this token has expired. Please check your email for a new password reset link."

data/mod/05_standard/set/self/signin.rb

@@ -30,7 +30,6 @@ format :html do
 
   view :core do |args|
     account = card.fetch :trait=>:account, :new=>{}
-
     form_args = {
       :hidden => { :success=>"REDIRECT: #{interrupted_action || '*previous'}" },
       :recaptcha => :off

data/mod/05_standard/set/type/file.rb

@@ -1,7 +1,4 @@
-include Abstract::Attachment
-
-set_specific_attributes :file, :remote_file_url
-mount_uploader :file, FileUploader
+attachment :file, :uploader=>FileUploader
 
 format do
   view :source do |args|
@@ -66,29 +63,61 @@ format :html do
   end
 
   view :editor do |args|
-    #Rails.logger.debug "editor for file #{card.inspect}"
     file_chooser args
   end
 
-  def file_chooser args, db_column=:file
-    preview =
-      if !card.new_card?
-        content_tag :div, _render_core(args).html_safe,
-          :class=>'attachment-preview', :id=>"#{card.attachment.filename}-preview"
-      end
 
+  def preview  args
+    ''
+  end
+
+  view :preview_editor, :tags=>:unknown_ok do |args|
+    <<-HTML
+      <div class="chosen-file">
+        <input type="hidden" name="cached_upload" value="#{card.selected_action_id}">
+        <table role="presentation" class="table table-striped"><tbody class="files">
+          <tr class="template-download fade in">
+            <td>
+              <span class="preview">
+                #{preview(args)}
+              </span>
+            </td>
+            <td>
+              <p class="name">
+                #{card.original_filename}
+              </p>
+            </td>
+            <td>
+              <span class="size">#{number_to_human_size(card.attachment.size)}</span>
+            </td>
+            <td class="pull-right">
+              <button class="btn btn-danger delete cancel-upload" data-type="DELETE">
+                <i class="glyphicon glyphicon-trash"></i>
+                <span>Delete</span>
+              </button>
+            </td>
+          </tr></tbody>
+        </table>
+      </div>
+    HTML
+  end
+
+  def file_chooser args
     <<-HTML
       <div class="choose-file">
-        #{preview}
-        <div>#{file_field db_column, :class=>'file-upload slotter'}</div>
+        #{preview(args)}
+        <span class="btn btn-success fileinput-button">
+            <i class="glyphicon glyphicon-cloud-upload"></i>
+            <span>
+                #{@slot_view == :edit ? 'Replace' : 'Add'} #{card.attachment_name}...
+            </span>
+             #{file_field card.attachment_name, :class=>'file-upload slotter'}
+        </span>
       </div>
-      <div class="chosen-file" style="display:none">
-        <div>
-          <label>File chosen:</label>
-          <span class="chosen-filename"></span>
-        </div>
-        <div><a class="cancel-upload">Unchoose</a></div>
+      <div id="progress" class="progress" style="display: none;">
+        <div class="progress-bar progress-bar-success" style="width: 0%;"></div>
       </div>
+      <div class="chosen-file"></div>
     HTML
   end
 

data/mod/05_standard/set/type/image.rb

@@ -1,7 +1,4 @@
-include Abstract::Attachment
-set_specific_attributes :image, :remote_image_url
-mount_uploader :image, ImageUploader
-
+attachment :image, :uploader=>ImageUploader
 
 format do
 
@@ -31,28 +28,28 @@ end
 format :html do
   include File::HtmlFormat
 
-
-  view :editor do |args|
-    file_chooser args, :image
-  end
-
-
   view :core do |args|
     handle_source args do |source|
       source == 'missing' ? "<!-- image missing #{@card.name} -->" : image_tag(source)
     end
   end
 
+  def preview args
+    if !card.new_card? || card.preliminary_upload?
+      content_tag( :div, _render_core(args.merge(:size=>:medium)).html_safe,
+          :class=>'attachment-preview', :id=>"#{card.attachment.filename}-preview")
+    end
+  end
 
   view :content_changes do |args|
     out = ''
     size = args[:diff_type]==:summary ? :icon : :medium
     if !args[:hide_diff] and args[:action] and last_change = card.last_change_on(:db_content,:before=>args[:action])
       card.selected_action_id=last_change.card_action_id
-      out << Card::Diff.render_added_chunk(_render_core(:size=>size))
+      out << Card::Diff.render_deleted_chunk(_render_core(:size=>size))
     end
     card.selected_action_id=args[:action].id
-    out <<  Card::Diff.render_deleted_chunk(_render_core(:size=>size))
+    out <<  Card::Diff.render_added_chunk(_render_core(:size=>size))
     out
   end
 

data/mod/05_standard/spec/chunk/include_spec.rb

@@ -7,16 +7,16 @@ describe Card::Chunk::Include, "Inclusion" do
       @class= Card::Chunk::Include
     end
 
-    it "should ignore invisible comments" do
+    it "ignores invisible comments" do
       expect(render_content("{{## now you see nothing}}")).to eq('')
     end
 
-    it "should handle visible comments" do
+    it "handles visible comments" do
       expect(render_content("{{# now you see me}}")).to eq('<!-- # now you see me -->')
       expect(render_content("{{# -->}}")).to eq('<!-- # --&gt; -->')
     end
 
-    it "should handle empty inclusions" do
+    it "handles empty inclusions" do
       instance = @class.new( @class.full_match( '{{ }}' ) , nil )
       expect(instance.name).to eq('')
       expect(instance.options[:inc_syntax]).to eq(' ')
@@ -26,25 +26,25 @@ describe Card::Chunk::Include, "Inclusion" do
 
     end
 
-    it "should handle no pipes" do
+    it "handles no pipes" do
       instance = @class.new( @class.full_match( '{{toy}}') , nil )
       expect(instance.name).to eq('toy')
       expect(instance.options[:inc_name]).to eq('toy')
       expect(instance.options.key?(:view)).to eq(false)
     end
 
-    it "should strip the name" do
+    it "strips the name" do
       expect(@class.new( @class.full_match( '{{ toy }}') , nil ).name).to eq('toy')
     end
 
-    it 'should strip html tags' do
+    it 'strips html tags' do
       expect(@class.new( @class.full_match( '{{ <span>toy</span> }}') , nil ).name).to eq('toy')
       instance = @class.new( @class.full_match( '{{ <span>toy|open</span> }}') , nil )
       expect(instance.name).to eq('toy')
       expect(instance.options[:view]).to eq('open')
     end
 
-    it "should handle single pipe" do
+    it "handles single pipe" do
       options = @class.new( @class.full_match('{{toy|view:link;hide:me}}'), nil ).options
       expect(options[:inc_name]).to eq('toy')
       expect(options[:view]).to eq('link')
@@ -52,7 +52,7 @@ describe Card::Chunk::Include, "Inclusion" do
       expect(options.key?(:items)).to eq(false)
     end
 
-    it "should handle multiple pipes" do
+    it "handles multiple pipes" do
       options = @class.new( @class.full_match('{{box|open|closed}}'), nil ).options
       expect(options[:inc_name]).to eq('box')
       expect(options[:view]).to eq('open')
@@ -60,31 +60,32 @@ describe Card::Chunk::Include, "Inclusion" do
       expect(options[:items].key?(:items)).to eq(false)
     end
 
-    it "should handle multiple pipes with blank lists" do
+    it "handles multiple pipes with blank lists" do
       options = @class.new( @class.full_match('{{box||closed}}'), nil ).options
       expect(options[:inc_name]).to eq('box')
       expect(options[:view]).to eq(nil)
       expect(options[:items][:view]).to eq('closed')
     end
 
-    it "should treat :item as view of next level" do
+    it "treats :item as view of next level" do
       options = @class.new( @class.full_match('{{toy|link;item:name}}'), nil ).options
       expect(options[:inc_name]).to eq('toy')
       expect(options[:view]).to eq('link')
       expect(options[:items][:view]).to eq('name')
     end
+
   end
 
   context "rendering" do
 
-    it "should handle absolute names" do
+    it "handles absolute names" do
       alpha = newcard 'Alpha', "Pooey"
       beta = newcard 'Beta', "{{Alpha}}"
       result = beta.format.render_core
       assert_view_select result, 'div[class~="card-content"]', "Pooey"
     end
 
-    it "should handle simple relative names" do
+    it "handles simple relative names" do
       alpha = newcard 'Alpha', "{{#{Card::Name.joint}Beta}}"
       beta = newcard 'Beta'
       alpha_beta = Card.create :name=>"#{alpha.name}#{Card::Name.joint}Beta", :content=>"Woot"

data/mod/05_standard/spec/chunk/query_reference_spec.rb

@@ -0,0 +1,50 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Chunk::QueryReference, "QueryReference" do
+
+  context "syntax parsing" do
+    before do
+      @class= Card::Chunk::QueryReference
+    end
+
+    let :query_refs do
+       content = Card::Content.new @content, Card.new(:type=>'Search')
+       content.find_chunks(Card::Chunk::QueryReference)
+    end
+
+    subject { query_refs.first.name }
+
+    it "handles simple search" do
+      @content = '{"name":"Waldo"}'
+      is_expected.to eq 'Waldo'
+    end
+
+    it "handles operators" do
+      @content = '{"name":["eq","Waldo"]}'
+      is_expected.to eq 'Waldo'
+    end
+
+    it "handles multiple values for operators" do
+      @content = '{"name":["in","Where","Waldo"]}'
+      expect(query_refs[1].name).to eq 'Waldo'
+    end
+
+    it "handles plus attributes" do
+      @content = '{"right_plus":["Waldo",{"content":"here"}]}'
+      is_expected.to eq  'Waldo'
+    end
+
+    it "handles nested query structures" do
+      @content = '{"any":{"content":"Where", "right_plus":["is",{"name":"Waldo"}]}}'
+      expect(query_refs[0].name).to eq 'Where'
+      expect(query_refs[1].name).to eq 'is'
+      expect(query_refs[2].name).to eq 'Waldo'
+    end
+
+    it "handles contextual names" do
+      @content =  '{"name":"_+Waldo"}'
+      is_expected.to eq '_+Waldo'
+    end
+  end
+
+end

data/mod/05_standard/spec/set/right/account_spec.rb

@@ -1,35 +1,35 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::Account do
-  
+
   describe '#create' do
     context "valid user" do
       #note - much of this is tested in account_request_spec
       before do
         Card::Auth.as_bot do
-          @user_card = Card.create! :name=>'TmpUser', :type_id=>Card::UserID, '+*account'=>{ 
+          @user_card = Card.create! :name=>'TmpUser', :type_id=>Card::UserID, '+*account'=>{
             '+*email'=>'tmpuser@wagn.org', '+*password'=>'tmp_pass'
           }
         end
-      
+
       end
-      
+
       it 'should create an authenticable password' do
         expect(Card::Auth.password_authenticated?( @user_card.account, 'tmp_pass')).to be_truthy
       end
     end
-    
+
     it "should check accountability of 'accounted' card" do
       @unaccountable = Card.create :name=>'BasicUnaccountable', '+*account'=>{ '+*email'=>'tmpuser@wagn.org', '+*password'=>'tmp_pass' }
       expect(@unaccountable.errors['+*account'].first).to eq('not allowed on this card')
     end
-    
+
     it "should require email" do
       @no_email = Card.create :name=>'TmpUser', :type_id=>Card::UserID, '+*account'=>{ '+*password'=>'tmp_pass' }
       expect(@no_email.errors['+*account'].first).to match(/email required/)
     end
   end
-  
+
   describe '#send_account_verification_email' do
     before do
       @email = 'joe@user.com'
@@ -77,10 +77,10 @@ describe Card::Set::Right::Account do
       expect(@mail.parts[0].body.raw_source).to include("valid for #{Card.config.token_expiry / 1.day } days")
     end
   end
-  
-  
-  
-  
+
+
+
+
   describe '#update_attributes' do
     before :each do
       @user_card = Card::Auth[ 'joe@user.com' ]
@@ -90,14 +90,14 @@ describe Card::Set::Right::Account do
       @user_card.account.password_card.update_attributes!(:content => 'new password')
       assert_equal @user_card.id, Card::Auth.authenticate('joe@user.com', 'new password')
     end
-  
+
     it 'should not rehash password when updating email' do
       @user_card.account.email_card.update_attributes!(:content => 'joe2@user.com')
       assert_equal @user_card.id, Card::Auth.authenticate('joe2@user.com', 'joe_pass')
     end
   end
-  
-  
+
+
   describe '#reset_password' do
     before :each do
       @email = 'joe@user.com'
@@ -116,33 +116,32 @@ describe Card::Set::Right::Account do
       expect(@account.fetch(:trait => :token)).to be_nil
       expect(@account.save).to be_falsey
     end
-  
+
     it 'should not work if token is expired' do
       @account.token_card.update_column :updated_at, 3.days.ago.strftime("%F %T")
       @account.token_card.expire
-      
+
       result = @account.save
       expect(result).to eq(true)                 # successfully completes save
       expect(@account.token).not_to eq(@token)   # token gets updated
-      success = Card::Env.params[:success]
-      expect(success[:message]).to match(/expired/) # user notified of expired token
+      expect(@account.success.message).to match(/expired/) # user notified of expired token
     end
-    
+
     it 'should not work if token is wrong' do
       Card::Env.params[:reset_token] = @token + 'xxx'
       @account.save
       expect(@account.errors[:abort].first).to match(/incorrect_token/)
-    end  
-    
+    end
+
   end
-  
-  
+
+
   describe '#send_change_notice' do
     it 'send multipart email' do
       skip
 #      pending
     end
-    
+
     context 'denied access' do
       it 'excludes protected subcards' do
         skip
@@ -152,7 +151,7 @@ describe Card::Set::Right::Account do
         a = Card.fetch "A"
         a.update_attributes( :content=> "new content", :subcards=>{'+B'=>{:content=>'hidden content'}})
       end
-      
+
       it 'sends no email if changes not visible' do
         skip
       end

data/mod/05_standard/spec/set/type/file_spec.rb

@@ -21,7 +21,7 @@ describe Card::Set::Type::File do
       expect(subject.last_action.comment).to eq "file1.txt"
     end
 
-    it "has correct originalf filename" do
+    it "has correct original filename" do
       expect(subject.original_filename).to eq "file1.txt"
     end
 

data/spec/lib/card/reference_spec.rb

@@ -169,6 +169,20 @@ describe Card::Reference do
     expect(Card['search with references'].referees.map(&:name).sort).to eq ["A","B","X","Y"]
   end
 
+  it "handles contextual names in Basic cards" do
+    card = Card.create :type=>'Basic', :name=>'basic with references',
+      :content=>'{{_+A}}'
+    Card['A'].update_attributes! :name=>'AAA', :update_referencers=>true
+    expect(Card['basic with references'].content).to eq '{{_+AAA}}'
+  end
+
+  it "handles contextual names in Search cards" do
+    card = Card.create :type=>'Search', :name=>'search with references',
+      :content=>'{"name":"_+A"}'
+    Card['A'].update_attributes! :name=>'AAA', :update_referencers=>true
+    expect(Card['search with references'].content).to eq '{"name":"_+AAA"}'
+  end
+
   it "should handle commented inclusion" do
     c = Card.create :name=>'inclusion comment test', :content=>'{{## hi mom }}'
     expect(c.errors.any?).to be_falsey