card 1.15.2 → 1.15.3

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

@@ -0,0 +1,29 @@
+def history?
+  false
+end
+
+event :store_in_session, :after=>:approve, :on=>:create do
+  Env.session[key] = db_content
+  self.db_content = ''
+end
+
+event :update_in_session, :after=>:approve, :on=>:update do
+  if db_content_changed?
+    Env.session[key] = db_content
+    self.db_content = ''
+  end
+end
+
+event :delete_in_session, :after=>:approve, :on=>:delete do
+  Env.session[key] = nil
+  abort :success
+end
+
+def content
+  Env.session[key]
+end
+
+format :html do
+  view :editor, :mod=>PlainText::HtmlFormat
+end
+

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

@@ -22,7 +22,7 @@ format :html do
       if settings.present?
         group_name =  Card::Setting.group_names[group_key] || group.to_s
         heading_id = "heading-#{group_key}"
-        collapse_id = "collpase-#{group_key}"
+        collapse_id = "collapse-#{card.cardname.safe_key}-#{group_key}"
         output [
           (content_tag :div, :class=>'panel panel-default' do
             content_tag :div, :class=>'panel-heading', :role=>'tab', :id=>heading_id do

data/mod/05_standard/spec/set/all/rich_html/editing_spec.rb

@@ -0,0 +1,60 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::All::RichHtml::Editing do
+  before do
+    @mycard = Card['A'].format
+  end
+
+
+  def assert_active_toolbar_pill view, content, related_view=false
+    view_selector = related_view ? 'related' : view
+    assert_view_select @mycard.render(view), "div[class~='card-slot #{view_selector}-view']" do
+      assert_select 'nav[class="slotter toolbar navbar navbar-inverse"]' do
+        assert_select 'ul[class="nav navbar-nav nav-pills"]' do
+          assert_select 'li[class~="active"] > a', content
+        end
+      end
+    end
+  end
+
+  describe "edit view" do
+    it "has toolbar with active 'content' pill" do
+      assert_active_toolbar_pill :edit, 'content'
+    end
+  end
+
+  describe 'edit_type view' do
+    it "has toolbar with active 'type' pill" do
+      assert_active_toolbar_pill :edit_type, 'type'
+    end
+  end
+
+  describe 'edit_name view' do
+    it "has toolbar with active 'name' pill" do
+      assert_active_toolbar_pill :edit_name, 'name'
+    end
+  end
+
+  describe 'edit_structure view' do
+    before do
+      @mycard = Card["Iliad"].format
+    end
+    it "has toolbar with active 'rules' pill" do
+      Card::Auth.as_bot do
+        assert_active_toolbar_pill :edit_structure, 'rules', true
+      end
+    end
+  end
+
+  describe 'edit_nests view' do
+    before do
+      Card::Auth.as_bot do
+        Card.create! :name=>'Iliad+author', :content=>'Homer'
+      end
+      @mycard = Card["Iliad"].format
+    end
+    it "has toolbar with active 'nests' pill" do
+      assert_active_toolbar_pill :edit_nests, 'nests'
+    end
+  end
+end

data/mod/05_standard/spec/set/all/rich_html/form_spec.rb

@@ -1,21 +1,21 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::All::RichHtml::Form do  
+describe Card::Set::All::RichHtml::Form do
   describe "type_list" do
     before do
       @card = Card['UserForm']  # no cards with this type
     end
-    
+
     it "should get type options from type_field renderer method" do
       expect(@card.format.type_field).to match(/<option [^>]*selected/)
       tf=@card.format.type_field(:no_current_type=>true)
       expect(tf).not_to match(/<option [^>]*selected/)
-      expect(tf.scan(/<option /).length).to eq(25)
+      expect(tf.scan(/<option /).length).to eq(26)
       tf=@card.format.type_field
       expect(tf).to match(/<option [^>]*selected/)
-      expect(tf.scan(/<option /).length).to eq(25)
+      expect(tf.scan(/<option /).length).to eq(26)
     end
-    
+
     it "should get type list" do
       Card::Auth.as :anonymous do
         tf=@card.format.type_field(:no_current_type=>true)
@@ -27,7 +27,7 @@ describe Card::Set::All::RichHtml::Form do
       end
     end
   end
-  
+
   context "type and header" do
     it "should render type without no-edit class when no cards of type" do
       card = Card['UserForm']  # no cards with this type

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

@@ -1,5 +1,19 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Cardtype do
-  # SPECSTUB
+  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'
+    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'
+    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]'
+    end
+  end
 end
+

data/mod/06_bootstrap/lib/javascript/bootstrap_modal_wagn.js

@@ -0,0 +1,27 @@
+wagn.slotReady(function(slot) {
+  slot.find('.modal.fade').on('loaded.bs.modal', function(e) {
+    $(this).trigger('slotReady');
+  });
+  slot.find('[data-toggle=\'modal\']').off("click").on('click', function(e) {
+    var $_this, href, modal_selector;
+    e.preventDefault();
+    e.stopPropagation();
+    $_this = $(this);
+    href = $_this.attr('href');
+    modal_selector = $_this.data('target');
+    $(modal_selector).modal('show');
+    $.ajax({
+      url: href,
+      type: 'GET',
+      success: function(html) {
+        $(modal_selector + ' .modal-content').html(html);
+        return $(modal_selector).trigger('loaded.bs.modal');
+      },
+      error: function(jqXHR, textStatus) {
+        $(modal_selector + ' .modal-content').html(jqXHR.responseText);
+        return $(modal_selector).trigger('loaded.bs.modal');
+      }
+    });
+    return false;
+  });
+});

data/mod/06_bootstrap/set/all/rich_bootstrap.rb

@@ -8,15 +8,16 @@ format :html do
   # Options
   # :header => { :content=>String, :brand=>( String | {:name=>, :href=>} ) }
   def navbar id, opts={}
-    opts[:class] ||= ''
-    opts[:class] += " navbar navbar-#{opts.delete(:navbar_type) || 'default'}"
+    nav_opts = opts[:nav_opts] || {}
+    nav_opts[:class] ||= (opts[:class] || '')
+    nav_opts[:class] += " navbar navbar-#{opts.delete(:navbar_type) || 'default'}"
     header_opts = opts[:header] || {}
     if opts[:toggle_align] == :left
       opts[:collapsed_content] ||= ''
       opts[:collapsed_content] += navbar_toggle(id, opts[:toggle], 'pull-left navbar-link').html_safe
       opts[:toggle] = :hide
     end
-    wrap_with :nav, :class=>opts[:class] do
+    wrap_with :nav, nav_opts do
       [
         navbar_header(id, header_opts.delete(:content), header_opts.reverse_merge(:toggle=>opts[:toggle])),
         (content_tag(:div, opts[:collapsed_content].html_safe, :class=>'container-fluid') if opts[:collapsed_content]),

data/mod/06_bootstrap/set/self/bootstrap_js.rb

@@ -1,5 +1,7 @@
 view :raw do |args|
-  File.read "#{Cardio.gem_root}/mod/06_bootstrap/lib/javascript/bootstrap.js"
+  [ "bootstrap.js", "bootstrap_modal_wagn.js" ].map do |name|
+    File.read "#{Cardio.gem_root}/mod/06_bootstrap/lib/javascript/#{name}"
+  end.join("\n")
 end
 
 format(:html) { include BootstrapCards::HtmlFormat }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 1.15.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -272,6 +272,7 @@ files:
 - db/migrate_core_cards/20150331135745_new_card_menu.rb
 - db/migrate_core_cards/20150508212032_menu_compatibility.rb
 - db/migrate_core_cards/20150510031118_fix_skin_images.rb
+- db/migrate_core_cards/20150528084659_add_session_cardtype.rb
 - db/migrate_core_cards/data/1.11_help_text.json
 - db/migrate_core_cards/data/1.12_stylesheets/classic_cards.scss
 - db/migrate_core_cards/data/1.12_stylesheets/common.scss
@@ -371,6 +372,7 @@ files:
 - lib/card/simplecov_helper.rb
 - lib/card/spec_helper.rb
 - lib/card/version.rb
+- lib/card/view_name.rb
 - lib/cardio.rb
 - lib/generators/card.rb
 - lib/generators/card/format/USAGE
@@ -634,6 +636,7 @@ files:
 - mod/05_standard/set/all/rich_html/toolbar.rb
 - mod/05_standard/set/all/rich_html/wrapper.rb
 - mod/05_standard/set/right/account.rb
+- mod/05_standard/set/right/discussion.rb
 - mod/05_standard/set/right/email.rb
 - mod/05_standard/set/right/password.rb
 - mod/05_standard/set/right/salt.rb
@@ -665,6 +668,7 @@ files:
 - mod/05_standard/set/type/number.rb
 - mod/05_standard/set/type/phrase.rb
 - mod/05_standard/set/type/search_type.rb
+- mod/05_standard/set/type/session.rb
 - mod/05_standard/set/type/set.rb
 - mod/05_standard/set/type/signup.rb
 - mod/05_standard/set/type/toggle.rb
@@ -687,6 +691,7 @@ files:
 - mod/05_standard/spec/set/all/error_spec.rb
 - mod/05_standard/spec/set/all/event_viz_spec.rb
 - mod/05_standard/spec/set/all/history_spec.rb
+- mod/05_standard/spec/set/all/rich_html/editing_spec.rb
 - mod/05_standard/spec/set/all/rich_html/form_spec.rb
 - mod/05_standard/spec/set/all/rich_html/wrapper_spec.rb
 - mod/05_standard/spec/set/right/account_spec.rb
@@ -809,6 +814,7 @@ files:
 - mod/06_bootstrap/file/yeti_skin/small-image.png
 - mod/06_bootstrap/lib/javascript/bootstrap.js
 - mod/06_bootstrap/lib/javascript/bootstrap.min.js
+- mod/06_bootstrap/lib/javascript/bootstrap_modal_wagn.js
 - mod/06_bootstrap/lib/javascript/smartmenu.js
 - mod/06_bootstrap/lib/stylesheets/bootstrap/_alerts.scss
 - mod/06_bootstrap/lib/stylesheets/bootstrap/_badges.scss