card 1.16.1 → 1.16.2

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

@@ -1,8 +1,10 @@
+include Abstract::Attachment
+set_specific_attributes :image, :remote_image_url
+mount_uploader :image, ImageUploader
 
-include File
 
 format do
-  
+
   include File::Format
 
   view :closed_content do |args|
@@ -12,12 +14,16 @@ format do
   view :source do |args|
     style = case
       when @mode==:closed ;  :icon
-      when args[:size]    ;  args[:size]
+      when args[:size]    ;  args[:size].to_sym
       when main?          ;  :large
       else                ;  :medium
       end
     style = :original if style.to_sym == :full
-    card.attach.url style
+    if style == :original
+      card.image.url
+    else
+      card.image.versions[style].url
+    end
   end
 
 end
@@ -25,6 +31,12 @@ 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)
@@ -50,7 +62,7 @@ format :css do
   view :core do |args|
     render_source
   end
-  
+
   view :content do |args|  #why is this necessary?
     render_core
   end
@@ -62,6 +74,10 @@ format :file do
   view :style do |args|  #should this be in model?
     ['', 'full'].member?( args[:style].to_s ) ? :original : args[:style]
   end
-    
+
+  def selected_file_version
+    style = _render_style(:style=>params[:size]).to_sym
+    (style && style != :original) ? card.attachment.versions[style] : card.attachment
+  end
 end
 

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

@@ -145,6 +145,9 @@ format do
     content_tag :li, content_tag(:span, '...')
   end
 
+  def chunk_list
+    :query
+  end
 end
 
 
@@ -176,7 +179,7 @@ end
 
 format :rss do
   def raw_feed_items
-    search_params.merge!(:default_limit => 25) 
+    search_params.merge!(:default_limit => 25)
     search_results
   end
 end
@@ -280,4 +283,3 @@ format :html do
 
 end
 
-

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

@@ -4,11 +4,13 @@ def history?
   false
 end
 
-event :store_in_session, :before=>:standardize_items, :on=>:save do
-  if db_content_changed?
-    Env.session[key] = db_content
-    self.db_content = ''
-  end
+def followable?
+  false
+end
+
+event :store_in_session, :before=>:approve, :on=>:save, :changed=>:content do
+  Env.session[key] = db_content
+  self.db_content = ''
 end
 
 event :delete_in_session, :after=>:approve, :on=>:delete do

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

@@ -12,12 +12,14 @@ format :html do
   end
 
   def with_label_and_navbars args
-    output [
+    wrap do
+      [
         _optional_render(:set_label,   args, :show),
         _optional_render(:rule_navbar, args, :hide),
         _optional_render(:set_navbar,  args, :hide),
         yield
       ]
+    end
   end
 
   view :all_rules do |args|

data/mod/05_standard/spec/set/all/history_spec.rb

@@ -152,7 +152,7 @@ describe Card::Set::All::History do
           expect(act.card).to eq(@card)
         end
         it 'adds action for subcard' do
-          @card.update_attributes :subcards=>{"+right"=>{:content=>"New content", :content=>"New Content"}}
+          @card.update_attributes :subcards=>{"+right"=>{:content=>"New Content"}}
           act = @card.acts.last
           expect(act.actions.count).to eq(1)
           expect(act.actions.last.action_type).to eq(:update)

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

@@ -4,15 +4,15 @@ describe Card::Set::Type::Cardtype do
   describe 'add_button view' do
     it 'creates link with correct path' do
       add_link = render_content "{{Basic|add_button}}"
-      assert_view_select add_link, 'a[href=/new/Basic]', 'Add Basic'
+      assert_view_select add_link, 'a[href="/new/Basic"]', 'Add Basic'
     end
     it 'handles title argument' do
       add_link = render_content "{{Basic|add_button;title: custom link text}}"
-      assert_view_select add_link, 'a[href=/new/Basic]', 'custom link text'
+      assert_view_select add_link, 'a[href="/new/Basic"]', 'custom link text'
     end
     it 'handles params' do
       add_link = render_content "{{Basic|add_button;params:_project=_self}}"
-      assert_view_select add_link, 'a[href=/new/Basic?_project=Tempo+Rary+2]'
+      assert_view_select add_link, 'a[href="/new/Basic?_project=Tempo+Rary+2"]'
     end
   end
 end

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

@@ -1,5 +1,89 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::File do
-  # SPECSTUB
+
+  context "new file card" do
+    before do
+      Card::Auth.as_bot do
+        Card.create :name => "file card", :type_code=>'file', :file=>File.new( File.join FIXTURES_PATH, 'file1.txt' )
+      end
+    end
+    subject { Card['file card'] }
+    it "stores correct identifier (<card id>/<action id>.<ext>)" do
+      expect(subject.content).to eq "~#{subject.id}/#{subject.last_action_id}.txt"
+    end
+
+    it "stores file" do
+      expect(subject.file.read.strip).to eq "file1"
+    end
+
+    it "saves original file name as action comment" do
+      expect(subject.last_action.comment).to eq "file1.txt"
+    end
+
+    it "has correct originalf filename" do
+      expect(subject.original_filename).to eq "file1.txt"
+    end
+
+    it "has correct url" do
+      expect(subject.file.url).to eq "/files/~#{subject.id}/#{subject.last_action_id}.txt"
+    end
+
+    describe '#mod_file?' do
+      it 'returns false' do
+        expect(subject.mod_file?).to be_falsey
+      end
+    end
+
+    describe 'view: source' do
+      it 'renders url' do
+        expect(subject.format.render(:source)).to eq("/files/~#{subject.id}/#{subject.last_action_id}.txt")
+      end
+    end
+
+    context "updated file card" do
+      before do
+        subject.update_attributes! :file=>File.new( File.join FIXTURES_PATH, 'file2.txt' )
+      end
+      it "updates file" do
+        expect(subject.file.read.strip).to eq "file2"
+      end
+
+      it "updates original file name" do
+        expect(subject.original_filename).to eq "file2.txt"
+      end
+
+      it "updates url" do
+        expect(subject.file.url).to eq "/files/~#{subject.id}/#{subject.last_action_id}.txt"
+      end
+    end
+
+    context 'subcards' do
+      it 'handles file subcards' do
+        Card.create! :name=>'new card with file', :subcards=>{'+my file'=>{:content=>'ignore content', :type_id=>Card::FileID, :file=> File.open(File.join(FIXTURES_PATH, 'file1.txt'))}}
+        expect(Card['new card with file+my file'].file.file.read.strip).to eq 'file1'
+      end
+
+    end
+  end
+
+  it 'handles urls' do
+    url = 'http://wagn.org/files/bruce_logo-large-122798.png'
+    Card.create! :name=>'url test', :type_id=>Card::FileID, :remote_file_url=> url
+    expect(Card['url test'].file.size).to be > 0
+    expect(Card['url test'].file.url).to match /\.png$/
+  end
+
+  context "mod file" do
+    subject { Card[:logo] }
+    describe "#mod_file?" do
+      it "returns the mod name" do
+        expect(subject.mod_file?).to eq('05_standard')
+      end
+    end
+
+    it "has correct url " do
+      expect(subject.content).to eq ":#{subject.codename}/05_standard.png"
+    end
+  end
 end

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

@@ -1,16 +1,100 @@
-# -*- encoding : utf-8 -*-
+# -*- encoding : utf-8 -*-require "image_spec"
+
 
 describe Card::Set::Type::Image do
-  it "should have special editor" do
+  it "has special editor" do
     assert_view_select render_editor('Image'), 'div[class="choose-file"]' do
       assert_select 'input[class~="file-upload slotter"]'
     end
   end
 
-  it "should handle size argument in inclusion syntax" do
-    image_card = Card.create! :name => "TestImage", :type=>"Image", :content => %{TestImage.jpg\nimage/jpeg\n12345}
+  it "handles size argument in inclusion syntax" do
+    image_card = Card.create! :name => "TestImage", :type=>"Image", :content => '~12345/TestImage.jpg'
     including_card = Card.new :name => 'Image1', :content => "{{TestImage | core; size:small }}"
     rendered = including_card.format._render :core
-    assert_view_select rendered, 'img[src=?]', "/files/TestImage-small-#{image_card.last_content_action_id}.jpg"
+    assert_view_select rendered, 'img[src=?]', "/files/~#{image_card.id}/#{image_card.last_content_action_id}-small.jpg"
+  end
+
+
+  context "newly created image card" do
+    before do
+      Card::Auth.as_bot do
+        Card.create! :name => "image card", :type=>'image', :image=>File.new( File.join FIXTURES_PATH, 'mao2.jpg' )
+      end
+    end
+    subject { Card['image card'] }
+    it "stores correct identifier" do
+      expect(subject.content).to eq "~#{subject.id}/#{subject.last_action_id}.jpg"
+    end
+
+    it "stores image" do
+      expect(subject.image.size).to eq 7202
+    end
+
+    it "stores small size" do
+      expect(subject.image.small.size).to be < 6000
+      expect(subject.image.small.size).to be > 0
+    end
+
+    it "stores icon size" do
+      expect(subject.image.icon.size).to be < 3000
+      expect(subject.image.icon.size).to be > 0
+    end
+
+    it "saves original file name as action comment" do
+      expect(subject.last_action.comment).to eq "mao2.jpg"
+    end
+
+    it "has correct original filename" do
+      expect(subject.original_filename).to eq "mao2.jpg"
+    end
+
+    it "has correct url" do
+      expect(subject.image.url).to eq "/files/~#{subject.id}/#{subject.last_action_id}-original.jpg"
+    end
+
+
+    describe 'view: source' do
+      it 'renders url' do
+        expect(subject.format.render(:source)).to eq("/files/~#{subject.id}/#{subject.last_action_id}-medium.jpg")
+      end
+    end
+
+
+    describe 'view: act_expanded' do
+      it 'gets image url' do
+        act_summary = subject.format.render(:act_expanded, :act=>subject.last_act)
+        current_url = subject.image.versions[:medium].url
+        expect(act_summary).to match /#{Regexp.quote current_url}/
+      end
+    end
+
+
+    context "updated file card" do
+      before do
+        subject.update_attributes! :image=>File.new( File.join FIXTURES_PATH, 'rails.gif' )
+      end
+      it "updates file" do
+        expect(subject.image.size).to eq 8533
+      end
+
+      it "updates original file name" do
+        expect(subject.image.original_filename).to eq "rails.gif"
+      end
+
+      it "updates url" do
+        expect(subject.image.url).to eq "/files/~#{subject.id}/#{subject.last_action_id}-original.gif"
+      end
+    end
+  end
+
+  describe '*logo mod image' do
+    it 'exists' do
+      expect(Card[:logo].image.size).to be > 0
+    end
+    it 'has correct url' do
+      expect(Card[:logo].image.url).to eq "/files/:logo/image-original.png"
+    end
   end
+
 end

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

@@ -30,8 +30,23 @@ describe Card::Set::Type::SearchType do
         :name=>"PointerToSearches",
         :type_id=>Card::PointerID,
     )
-    
+
     pointer_card.update_attributes! :type_id=>Card::SearchTypeID,:content=>%{{"type":"User"}}
     expect(pointer_card.content).to eq(%{{"type":"User"}})
   end
+
+  context 'references' do
+    before do
+      Card.create :type=>'Search', :name=>'search with references', :content=>'{"name":"Y"}'
+    end
+    subject do
+      Card['search with references']
+    end
+
+    it 'updates query if referee changed' do
+      Card['Y'].update_attributes! :name=>'YYY', :update_referencers => true
+      expect(subject.content).to eq '{"name":"YYY"}'
+    end
+
+  end
 end