card 1.15.2 → 1.15.3

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

@@ -5,7 +5,7 @@ require_dependency File.expand_path( '../reference', __FILE__ )
 module Card::Chunk
   class Include < Reference
     cattr_reader :options
-    @@options = ::Set.new [ :inc_name, :inc_syntax, :view, :items, :type, :size, :title, :hide, :show, :structure ]
+    @@options = ::Set.new [ :inc_name, :inc_syntax, :view, :items, :type, :size, :title, :hide, :show, :structure, :params ]
     attr_reader :options
 
     Card::Chunk.register_class self, {

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

@@ -17,7 +17,7 @@ module ClassMethods
     search spec.merge(:return=>'count')
   end
 
-  def find_each(options = {}) 
+  def find_each(options = {})
     #this is a copy from rails (3.2.16) and is needed because this is performed by a relation (ActiveRecord::Relation)
     find_in_batches(options) do |records|
       records.each { |record| yield record }
@@ -63,10 +63,10 @@ def extended_item_cards context = nil
   items = self.item_cards(args.merge(:context=>context))
   extended_list = []
   already_extended = ::Set.new # avoid loops
-  
+
   while items.size > 0
     item = items.shift
-    if already_extended.include? item 
+    if already_extended.include? item
       next
     elsif item.item_cards == [item]  # no further level of items
       extended_list << item
@@ -103,16 +103,28 @@ def contextual_content context_card, format_args={}, view_args={}
 end
 
 format do
-  
+
   def item_links(args={})
     raw(render_core).split /[,\n]/
   end
-  
+
+  def item_view args
+    args[:item] || (@inclusion_opts && @inclusion_opts[:view]) || default_item_view
+  end
+
+  def item_args args
+    i_args = { :view => item_view(args)}
+    if type = card.item_type
+      i_args[:type] = type
+    end
+    i_args
+  end
+
   def search_params
     @search_params ||= begin
       p = default_search_params.clone
-    
-      if focal? 
+
+      if focal?
         p[:offset] = params[:offset] if params[:offset]
         p[:limit]  = params[:limit]  if params[:limit]
         p.merge! params[:wql]        if params[:wql]
@@ -144,3 +156,74 @@ format do
   end
 end
 
+format :html do
+  view :tabs do |args|
+    tab_buttons = ''
+    tab_panes = ''
+    card.item_names.each_with_index do |item, index|
+      active_tab = (index == 0)
+      id = "#{card.cardname.safe_key}-#{item.to_name.safe_key}"
+      i_args = item_args(args)
+      if @inclusion_opts
+        slot_args = @inclusion_opts.clone
+        slot_args.delete(:view)
+        i_args.merge!(:slot=>slot_args)
+      end
+      url = page_path(item.to_name, i_args)
+      tab_buttons += tab_button( "##{id}", item, active_tab, 'data-url'=>url.html_safe, :class=>(active_tab ? nil : 'load'))
+      tab_content = active_tab ? nest(Card.fetch(item, :new=>{}), item_args(args)) : ''
+      tab_panes += tab_pane( id, tab_content, active_tab )
+    end
+    tab_panel tab_buttons, tab_panes, args[:tab_type]
+  end
+  def default_tab_args args
+    args[:tab_type] ||= 'tabs'
+  end
+
+  view :pills, :view=>:tabs
+  def default_pill_args args
+    args[:tab_type] ||= 'pills'
+  end
+
+  view :tabs_static do |args|
+    tab_buttons = ''
+    tab_panes = ''
+    card.item_cards.each_with_index do |item, index|
+      id = "#{card.cardname.safe_key}-#{item.cardname.safe_key}"
+      tab_buttons += tab_button( "##{id}", item.name, index == 0 )
+      tab_content = nest item, item_args(args)
+      tab_panes += tab_pane( id, tab_content, index == 0 )
+    end
+    tab_panel tab_buttons, tab_panes, args[:tab_type]
+  end
+  def default_tab_static_args args
+    args[:tab_type] ||= 'tabs'
+  end
+
+  view :pills_static, :view=>:tabs
+  def default_tab_static_args args
+    args[:tab_type] ||= 'pills'
+  end
+
+  def tab_panel tab_buttons, tab_panes, tab_type='tabs'
+    wrap_with :div, :role=>"tabpanel" do
+      [
+        content_tag(:ul, tab_buttons.html_safe, :class=>"nav nav-#{tab_type}", :role=>"tablist"),
+        content_tag(:div, tab_panes.html_safe, :class=>'tab-content')
+      ]
+    end
+  end
+
+  def tab_button target, text, active=false, link_attr={}
+    link = link_to text, target, link_attr.merge('role'=>'tab','data-toggle'=>'tab')
+    li_args = { :role => :presentation }
+    li_args[:class] = 'active' if active
+    content_tag :li, link, li_args
+  end
+
+  def tab_pane id, content, active=false
+    div_args = {:role => :tabpanel, :id=>id, :class=>"tab-pane #{'active' if active}"}
+    content_tag :div, content.html_safe, div_args
+  end
+end
+

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

@@ -23,7 +23,7 @@ describe Card::Set::All::Collection do
       expect(c.extended_list).to eq(["I'm here to be referenced to"])
     end
   end
-  
+
   describe "#extended_item_cards" do
     it "returns the 'leaf cards' of a tree of pointer cards" do
       Card::Auth.as_bot do
@@ -33,7 +33,7 @@ describe Card::Set::All::Collection do
       expect(c.extended_item_cards).to eq([Card.fetch("Z"),Card.fetch("A")],)
     end
   end
-  
+
   describe "#extended_item_contents" do
     it "returns the content of the 'leaf cards' of a tree of pointer cards" do
       Card::Auth.as_bot do
@@ -54,7 +54,7 @@ describe Card::Set::All::Collection do
 
     it "returns content even when context card is hard templated" do #why the heck is this good?  -efm
       context_card = Card["A"] # refers to 'Z'
-      
+
       Card::Auth.as_bot do
         Card.create! :name => "A+*self+*structure", :content => "Banana"
       end
@@ -62,4 +62,38 @@ describe Card::Set::All::Collection do
       expect(c.contextual_content( context_card )).to eq("AlphaBeta")
     end
   end
+
+  describe 'tabs view' do
+    it 'renders tab panel' do
+      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'
+      assert_view_select tabs, 'div[role=tabpanel]' do
+        assert_select 'div.tab-pane#tempo_rary-a  span.card-title', '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 item views' do
+      tabs = render_content '{{Fruit+*type+*create|tabs|name}}'
+      assert_view_select tabs, 'div[role=tabpanel]' do
+        assert_select 'div.tab-pane#fruit-Xtype-Xcreate-anyone', 'Anyone'
+      end
+    end
+
+    it 'handles item params' do
+      tabs = render_content '{{Fruit+*type+*create|tabs|name;structure:Home}}'
+      path = "/Anyone?#{ {:view=>:name,:slot=>{:structure=>'Home'}}.to_param}"
+      assert_view_select tabs, 'div[role=tabpanel]' do
+        assert_select "li > a[data-toggle=tab][data-url=#{path}]"
+      end
+    end
+
+  end
 end

data/mod/01_history/lib/card/act.rb

@@ -4,25 +4,25 @@ class Card
     before_save :set_actor
     has_many :actions, :foreign_key=>:card_act_id, :inverse_of=> :act, :order => :id, :class_name=> "Card::Action"
     belongs_to :actor, class_name: "Card"
-    belongs_to :card    
+    belongs_to :card
     def set_actor
       self.actor_id ||= Auth.current_id
     end
-    
+
     def self.delete_actionless
       Card::Act.where(
         "id NOT IN (?)",
         Card::Action.pluck("card_act_id"),
       ).delete_all
     end
-    
+
     def self.find_all_with_actions_on card_ids, args={}
       sql = 'card_actions.card_id IN (:card_ids) AND ( (draft is not true) '
       sql << ( args[:with_drafts] ? 'OR actor_id = :current_user_id)' : ')' )
       vars = {:card_ids => card_ids, :current_user_id=>Card::Auth.current_id }
       Card::Act.joins(:actions).where( sql, vars ).uniq.order(:id).reverse_order
     end
-    
+
     # def actor
     #   Card[ actor_id ]
     # end
@@ -30,31 +30,35 @@ class Card
     # def card
  #      Card[ card_id ]
  #    end
-    
+
     def action_on card_id
-      actions.where( "card_id = #{card.id} and draft is not true" ).first
+      actions.where( "card_id = #{card_id} and draft is not true" ).first
+    end
+
+    def main_action
+      action_on(card_id) || actions.first
     end
-        
+
     def elapsed_time
       DateTime.new(acted_at).distance_of_time_in_words_to_now
     end
-    
+
     def relevant_drafts_for card
       drafts.select do |action|
         card.included_card_ids.include?(action.card_id) || (card == action.card)
       end
     end
-    
+
     def relevant_actions_for card, with_drafts=false
       actions.select do |action|
         card.included_card_ids.include?(action.card_id) || (card == action.card)
       end
     end
-    
+
   private
     def timestamp_attributes_for_create
       super << :acted_at
     end
-    
+
   end
 end

data/mod/01_history/lib/card/action.rb

@@ -1,40 +1,40 @@
 # -*- encoding : utf-8 -*-
 
 class Card
-  
+
   class Action < ActiveRecord::Base
     belongs_to :card
-    belongs_to :act,  :foreign_key=>:card_act_id, :inverse_of=>:actions 
+    belongs_to :act,  :foreign_key=>:card_act_id, :inverse_of=>:actions
     has_many   :changes, :foreign_key=>:card_action_id, :inverse_of=>:action, :dependent=>:delete_all
-    
+
     belongs_to :super_action, :class_name=> "Action", :inverse_of=>:sub_actions
     has_many   :sub_actions,  :class_name=> "Action", :inverse_of=>:super_action
-    
+
     scope :created_by, lambda { |actor_id| joins(:act).where('card_acts.actor_id = ?', actor_id) }
-    
-    # replace with enum if we start using rails 4 
+
+    # replace with enum if we start using rails 4
     TYPE = [:create, :update, :delete]
-    
+
     class << self
       def cache
         Card::Cache[Action]
       end
-    
+
       def fetch id
         cache.read(id.to_s) or begin
           cache.write id.to_s, Action.find(id.to_i)
         end
       end
-      
-    
+
+
       def delete_cardless
         Card::Action.where( Card.where( :id=>arel_table[:card_id] ).exists.not ).delete_all
       end
-    
-      def delete_old 
+
+      def delete_old
         Card.find_each do |card|
           card.delete_old_actions
-        end    
+        end
         Card::Act.delete_actionless
       end
     end
@@ -70,7 +70,7 @@ class Card
         :old_cardtype => old_values[:cardtype]
       }
     end
-    
+
     def new_values
       @new_values ||= {
         :content  => new_value_for(:db_content),
@@ -78,29 +78,29 @@ class Card
         :cardtype => ( typecard = Card[new_value_for(:type_id).to_i] and typecard.name.capitalize )
       }
     end
-    
+
     def old_values
       @old_values ||= {
         :content  => last_value_for(:db_content),
         :name     => last_value_for(:name),
-        :cardtype => ( value = last_value_for(:type_id) and 
+        :cardtype => ( value = last_value_for(:type_id) and
                        typecard = Card.find(value) and  typecard.name.capitalize )
       }
     end
-    
+
     def last_value_for field
        ch = self.card.last_change_on(field, :before=>self) and ch.value
     end
-    
+
     def new_value_for(field)
        ch = changes.find_by_field(field) and ch.value
     end
-    def change_for(field) 
+    def change_for(field)
       field_integer = ( field.is_a?(Integer) ? field : Card::TRACKED_FIELDS.index(field.to_s) )
       changes.where 'card_changes.field = ?', field_integer
     end
-    
-    
+
+
     def new_type?
       new_value_for(:type_id)
     end
@@ -110,66 +110,66 @@ class Card
     def new_name?
       new_value_for(:name)
     end
-    
-    
+
+
     def action_type=(value)
       write_attribute(:action_type, TYPE.index(value))
     end
-    
+
     def action_type
       TYPE[read_attribute(:action_type)]
     end
-    
+
     def set_act
       self.set_act ||= self.acts.last
     end
-    
-    def revision_nr 
+
+    def revision_nr
       self.card.actions.index_of(self)
     end
-    
+
     def red?
       content_diff_builder.red?
     end
-    
+
     def green?
       content_diff_builder.green?
     end
-    
-    
+
+
     # def diff
     #   @diff ||= { :cardtype=>type_diff, :content=>content_diff, :name=>name_diff}
     # end
-      
-  
+
+
     def name_diff opts={}
       if new_name?
         Card::Diff.complete old_values[:name], new_values[:name], opts
       end
     end
-  
+
     def cardtype_diff opts={}
       if new_type?
         Card::Diff.complete old_values[:cardtype], new_values[:cardtype], opts
       end
     end
-  
+
     def content_diff diff_type=:expanded, opts=nil
       if new_content?
         if diff_type == :summary
           content_diff_builder(opts).summary
         else
-          content_diff_builder(opts).complete 
+          content_diff_builder(opts).complete
         end
       end
     end
-    
+
     def content_diff_builder opts=nil
       @content_diff_builder ||= begin
         Card::Diff::DiffBuilder.new(old_values[:content], new_values[:content], opts || card.diff_args)
       end
     end
-    
+
   end
 end