card 1.15.6 → 1.15.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 037c264a997bff49bd3d368d9458febbb5d6ece7
-  data.tar.gz: 1afa8313419cbcf43f2e9ec169316599823d75bd
+  metadata.gz: a6b60af27233d8dff99d74a78a0a2af92e3d4678
+  data.tar.gz: 6b8cd33ddbc834023b0d61c9612440cb43a683be
 SHA512:
-  metadata.gz: 8a40b8b9f7f1133204503eb815fec178a4f586a1e90f38782edf14e0d355c7ebb4f0d336618bb7f02773fb4e75e56682e90a00cc467f456a46dbd482212d7cc1
-  data.tar.gz: f4e1f2c2f5ba5121248126faada05e74ec862ad98c5d27c436721b3ef030271bf49350ffc5bf579ac20dbb08028097b68a6069cb10e27f59f3b76b64fdec91ae
+  metadata.gz: da1d81537ed7136d0e230240b43766bc1afe5d797e4fdb1901053ac4b512985b79cd842cf2e7a51706818db00e27e35e728d240c6fa1d771ee5347a801babf8a
+  data.tar.gz: 0a476b7978c770089694190eb831e41d9195c2e9812ddb74fd54a7a433c43e4aa056438f7ecc8b1f6170fae42d356fdf215d5bed52c553b3410a10807b46fa38

data/VERSION

@@ -1 +1 @@
-1.15.6
+1.15.7

data/mod/01_core/chunk/link.rb

@@ -4,6 +4,7 @@ require_dependency File.expand_path( '../reference', __FILE__ )
 
 module Card::Chunk
   class Link < Reference
+    attr_reader :link_text
     word = /\s*([^\]\|]+)\s*/
     # Groups: $1, [$2]: [[$1]] or [[$1|$2]] or $3, $4: [$3][$4]
     Card::Chunk.register_class self, {
@@ -20,18 +21,18 @@ module Card::Chunk
           [ raw_syntax, nil ]
         end
       end
-      
+
       @link_text = objectify @link_text
       if target =~ /\/|mailto:/
         @explicit_link = objectify target
       else
         @name = target
-      end  
+      end
     end
 
     def divider_index string
       #there's probably a better way to do the following.  point is to find the first pipe that's not inside an inclusion
-      
+
       if string.index '|'
         string_copy = "#{string}" # had to do this to create new string?!
         string.scan /\{\{[^\}]*\}\}/ do |incl|
@@ -55,7 +56,7 @@ module Card::Chunk
 
     def render_link
       @link_text = render_obj @link_text
-      
+
       if @explicit_link
         @explicit_link = render_obj @explicit_link
         format.web_link @explicit_link, :text=> @link_text
@@ -80,7 +81,7 @@ module Card::Chunk
       else
         @link_text = new_name if old_name.to_name == @link_text
       end
-      
+
       @text = @link_text.nil? ? "[[#{referee_name.to_s}]]" : "[[#{referee_name.to_s}|#{@link_text}]]"
     end
   end

data/mod/01_core/set/all/collection.rb

@@ -175,38 +175,55 @@ format do
       end
     end
   end
+
+
+  def each_nest args={}
+    Card::Content.new(card.content, card).find_chunks( Card::Chunk::Reference ).each do |chunk|
+      yield(chunk.referee_name.to_s, nest_args(args,chunk))
+    end
+  end
+
+  def map_nests args={}, &block
+    result = []
+    each_nest args do |name, n_args|
+      result << block.call(name, n_args)
+    end
+    result
+  end
+
+  # process args for links and nests
+  def nest_args args, chunk=nil
+    r_args = item_args(args)
+    if @inclusion_opts
+      r_args.merge! @inclusion_opts.clone
+    end
+    if chunk.kind_of? Card::Chunk::Include
+      r_args.merge!(chunk.options)
+    elsif chunk.kind_of? Card::Chunk::Link
+      r_args.reverse_merge!(:view=>:link)
+      r_args.reverse_merge!(:title=>chunk.link_text) if chunk.link_text
+    end
+    r_args
+  end
+
 end
 
+
 format :html do
   view :tabs do |args|
     tab_buttons = ''
     tab_panes = ''
-    Card::Content.new(card.content, card).find_chunks( Card::Chunk::Reference ).each_with_index do |item, index|
-      active_tab = (index == 0)
-      id = "#{card.cardname.safe_key}-#{item.referee_name.safe_key}"
-      i_args = item_args(args)
-      if @inclusion_opts
-        slot_args = @inclusion_opts.clone
-        slot_args.delete(:view)
-        if item.kind_of? Card::Chunk::Include
-          slot_args.merge!(item.options)
-        end
-        i_args.merge!(:slot=>slot_args)
-      end
-      url = page_path(item.referee_name, i_args)
-      tab_name = (item.respond_to?(:options) && item.options[:title]) || item.name
+    active_tab = true
+    each_nest(:item=>:content) do |name, nest_args|
+      id         = "#{card.cardname.safe_key}-#{name.to_name.safe_key}"
+      url        = nest_path name, nest_args
+      tab_name   = nest_args[:title] || name
       tab_buttons += tab_button( "##{id}", tab_name, active_tab, 'data-url'=>url.html_safe, :class=>(active_tab ? nil : 'load'))
-      tab_content =
-        if active_tab
-          if item.kind_of? Card::Chunk::Include
-            item.process_chunk { |options| prepare_nest options }
-          else
-            nest(Card.fetch(item, :new=>{}), i_args)
-          end
-        else
-          ''
-        end
+
+      # only render the first active tab, other tabs get loaded via ajax
+      tab_content = active_tab ? nest(Card.fetch(name, :new=>{}), nest_args) : ''
       tab_panes += tab_pane( id, tab_content, active_tab )
+      active_tab = false
     end
     tab_panel tab_buttons, tab_panes, args[:tab_type]
   end
@@ -214,6 +231,16 @@ format :html do
     args[:tab_type] ||= 'tabs'
   end
 
+
+  # create a path for a nest with respect ot the inclusion options
+  def nest_path name, nest_args
+    path_args = {}
+    path_args[:view] = nest_args[:view]
+    path_args[:slot] = nest_args.clone
+    path_args[:slot].delete(:view)
+    page_path(name, path_args)
+  end
+
   view :pills, :view=>:tabs
   def default_pills_args args
     args[:tab_type] ||= 'pills'

data/mod/01_core/spec/set/all/collection_spec.rb

@@ -63,23 +63,52 @@ describe Card::Set::All::Collection do
     end
   end
 
+  describe '#map_nests' do
+    before do
+      Card::Auth.as_bot do
+        @list = Card.create! :name=>'mixed list', :content=>"[[A]]\n{{B}}\n[[C|link C]]\n{{D|name;title:nest D}}"
+      end
+    end
+    it 'handles links and nest arguments' do
+      result = @list.format.map_nests do |name,args|
+        [name, args]
+      end
+      expect(result).to eq [
+        ['A', {:view=>:closed}],
+        ['B', {:view=>:closed, :inc_name=>"B", :inc_syntax=>"B"}],
+        ['C', {:view=>:closed, :title=>'link C'}],
+        ['D', {:view=>"name", :title=>"nest D", :inc_name=>"D", :inc_syntax=>"D|name;title:nest D"}]
+      ]
+    end
+  end
+
   describe 'tabs view' do
     it 'renders tab panel' do
-      tabs = render_card :tabs, :content=>"[[A]]\n[[B]]\n[C]", :type=>'pointer'
+      tabs = render_card :tabs, :content=>"[[A]]\n[[B]]\n[[C]]", :type=>'pointer'
       assert_view_select tabs, 'div[role=tabpanel]' do
         assert_select 'li > a[data-toggle=tab]'
       end
     end
 
     it 'loads only the first tab pane' do
-      tabs = render_card :tabs, :content=>"[[A]]\n[[B]]\n[C]", :type=>'pointer'
+      tabs = render_card :tabs, :content=>"[[A]]\n[[B]]\n[[C]]", :type=>'pointer'
       assert_view_select tabs, 'div[role=tabpanel]' do
-        assert_select 'div.tab-pane#tempo_rary-a  span.card-title', 'A'
+        assert_select 'div.tab-pane#tempo_rary-a  .card-slot#A'
         assert_select 'li > a.load[data-toggle=tab][href=#tempo_rary-b]'
         assert_select 'div.tab-pane#tempo_rary-b', ''
       end
     end
 
+    it 'handles relative names' do
+      Card::Auth.as_bot do
+        Card.create! :name=>'G', :content=>"[[+B]]", :type=>'pointer', :subcards=>{'+B'=>'GammaBeta'}
+      end
+      tabs = Card.fetch('G').format.render_tabs
+      assert_view_select tabs, 'div[role=tabpanel]' do
+        assert_select 'div.tab-pane#g-g-b .card-content', 'GammaBeta'
+      end
+    end
+
     it 'handles item views' do
       tabs = render_content '{{Fruit+*type+*create|tabs|name}}'
       assert_view_select tabs, 'div[role=tabpanel]' do
@@ -101,5 +130,13 @@ describe Card::Set::All::Collection do
         assert_select 'div.tab-pane#tab_test-a', 'Basic'
       end
     end
+
+    it 'works with search cards' do
+      Card.create :type=>'Search', :name=>'Asearch', :content=>%{{"type":"User"}}
+      tabs=render_content("{{Asearch|tabs;item:name}}")
+      assert_view_select tabs, 'div[role=tabpanel]' do
+        assert_select 'li > a[data-toggle=tab][href=#asearch-joe_admin] span.card-title', 'Joe Admin'
+      end
+    end
   end
 end

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

@@ -91,6 +91,21 @@ format do
       end
   end
 
+  def search_result_names
+    @search_result_names ||=
+      begin
+        card.item_names search_params
+      rescue => e
+        { :error => e}
+      end
+  end
+
+  def each_nest args={}
+    search_result_names.each do |name|
+      yield(name, nest_args(args.reverse_merge!(:item=>:content)))
+    end
+  end
+
   def set_inclusion_opts args
     @inclusion_defaults = nil
     @inclusion_opts ||= {}

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

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::SearchType do
-  it "should wrap search items with correct view class" do
+  it "wraps search items with correct view class" do
     Card.create :type=>'Search', :name=>'Asearch', :content=>%{{"type":"User"}}
     c=render_content("{{Asearch|core;item:name}}")
     expect(c).to match('search-result-item item-name')
@@ -10,18 +10,20 @@ describe Card::Set::Type::SearchType do
     expect(render_content("{{Asearch|core|titled}}"   ).scan('search-result-item item-titled').size).to eq(14)
   end
 
-  it "should handle returning 'count'" do
+  it "handles returning 'count'" do
     expect(render_card(:core, :type=>'Search', :content=>%{{ "type":"User", "return":"count"}})).to eq('14')
   end
-  
-  it "should pass item args correctly" do
+
+  it "passes item args correctly" do
     Card.create!(
-      :name=>'Pointer2Searches', 
-      :type_id=>Card::PointerID, 
+      :name=>'Pointer2Searches',
+      :type_id=>Card::PointerID,
       :content=>"[[Layout+*type+by name]]\n[[PlainText+*type+by name]]"
     )
     r = render_content "{{Pointer2Searches|core|closed|hide:menu}}"
     expect(r.scan('"view":"link"').size).to eq(0)
     expect(r.scan('item-closed').size).to eq(2) #there are two of each
   end
+
+  it ''
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.15.6
+  version: 1.15.7
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname