card 1.15.7 → 1.16.0

data/mod/06_bootstrap/lib/stylesheets/bootstrap_cards.scss

@@ -218,4 +218,10 @@ body.mceContentBody {
   content:'';
 }
 
+/*---------- Modal Window -------------------------------------- */
 
+.modal-menu .close{
+  font-size: 16px;
+  margin-left: 10px;
+  
+}

data/mod/06_bootstrap/set/all/bootstrap/form.rb

@@ -3,24 +3,24 @@ format :html do
     bootstrapify_button( block_given? ? content_or_options : options )
     super(content_or_options, options, &block)
   end
-  
+
   def bootstrapify_button options
     situation = options.delete(:situation) || 'default'
     options[:class] = [ options[:class], 'btn', "btn-#{situation}" ].compact*' '
   end
-  
+
   def type_field args={}
     args[:class] ||= ''
     args[:class] += ' form-control'
     super(args)
   end
-  
+
   def bootstrap_options options
     options[:class] ||= ''
     options[:class] += ' form-control'
     options
   end
-  
+
   FIELD_HELPERS = %w{hidden_field color_field date_field datetime_field datetime_local_field
     email_field month_field number_field password_field phone_field
     range_field search_field telephone_field text_area text_field time_field
@@ -32,5 +32,4 @@ format :html do
       form.send(method_name, name, bootstrap_options(options) )
     end
   end
-  
 end

data/mod/06_bootstrap/set/all/bootstrap/helper.rb

@@ -0,0 +1,145 @@
+format :html do
+  def glyphicon icon_type, extra_class=''
+    content_tag(:span, '', :class=>"glyphicon glyphicon-#{icon_type} #{extra_class}", 'aria-hidden'=>true)
+  end
+
+  def button_link link_text, target, html_args={}
+    html_args[:class] ||= ''
+    btn_type = html_args[:btn_type] || 'primary'
+    html_args[:class] +=  " btn btn-#{btn_type}"
+    smart_link link_text, target, html_args.merge(:type=>'button')
+  end
+
+  def dropdown_button name, opts={}
+    %{
+      <div class="btn-group" role="group">
+        <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" title="#{name}" aria-expanded="false" aria-haspopup="true">
+          #{glyphicon opts[:icon] if opts[:icon]} #{name}
+          <span class="caret"></span>
+        </button>
+        #{ dropdown_list yield, opts[:class], opts[:active] }
+      </div>
+    }
+  end
+
+  def dropdown_list items, extra_css_class=nil, active=nil
+    item_list =
+      case items
+      when Array
+        items.map.with_index do |item,index|
+          if item
+            "<li #{'class=\'active\'' if index == active}>#{item}</li>"
+          end
+        end.compact.join "\n"
+      when Hash
+        items.map do |key,item|
+          if item
+            "<li #{'class=\'active\'' if key == active}>#{item}</li>"
+          end
+        end.compact.join "\n"
+      else
+        items
+      end
+    %{
+      <ul class="dropdown-menu #{extra_css_class}" role="menu">
+        #{item_list}
+      </ul>
+    }
+  end
+
+  def separator
+    '<li role="separator" class="divider"></li>'
+  end
+
+  def breadcrumb items
+    content_tag :ol, :class=>'breadcrumb' do
+      items.map do |item|
+        content_tag :li, item
+      end
+    end
+  end
+
+  # Options
+  # :header => { :content=>String, :brand=>( String | {:name=>, :href=>} ) }
+  def navbar id, opts={}
+    nav_opts = opts[:navbar_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, 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]),
+        content_tag(:div, output(yield).html_safe, :class=>"collapse navbar-collapse", :id=>"navbar-collapse-#{id}"),
+      ]
+    end
+  end
+
+  def navbar_header id, content='', opts={}
+    brand = if opts[:brand]
+              if opts[:brand].kind_of? String
+                "<a class='navbar-brand' href='#'>#{opts[:brand]}</a>"
+              else
+                link = opts[:brand][:href] || '#'
+                "<a class='navbar-brand' href='#{link}#'>#{opts[:brand][:name]}</a>"
+              end
+            end
+    wrap_with :div, :class=>'navbar-header' do
+      [
+        (navbar_toggle(id, opts[:toggle]) unless opts[:toggle] == :hide),
+        brand,
+        (content if content)
+      ]
+    end
+  end
+
+  def navbar_toggle id, content=nil, css_class=''
+    content ||= %{
+                  <span class="icon-bar"></span>
+                  <span class="icon-bar"></span>
+                  <span class="icon-bar"></span>
+                }
+    %{
+      <button type="button" class="navbar-toggle collapsed #{css_class}" data-toggle="collapse" data-target="#navbar-collapse-#{id}">
+        <span class="sr-only">Toggle navigation</span>
+        #{content}
+      </button>
+    }
+  end
+
+  def split_button button, args={}
+    items = yield
+    args[:situation] ||= 'primary'
+
+    wrap_with :div, :class=>'btn-group' do
+      [
+        button,
+        button_tag(:situation=>args[:situation], :class=>'dropdown-toggle', 'data-toggle'=>'dropdown', 'aria-haspopup'=>'true', 'aria-expanded'=>'false') do
+          %{
+            <span class="caret"></span>
+            <span class="sr-only">Toggle Dropdown</span>
+          }
+        end,
+        dropdown_list(items, nil, args[:active_item])
+      ]
+    end
+  end
+
+  def list_tag content_or_options = nil, options = {}, &block
+    options = content_or_options if block_given?
+    content = block_given? ? yield : content_or_options
+    content = [content] unless content.kind_of? Array
+    item_options = options.delete(:items) || {}
+    wrap_with :ul, options  do
+      content.map do |item|
+        content_tag :li, item, item_options
+      end.join "\n"
+    end
+  end
+
+end

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

@@ -1,64 +1,5 @@
 format :html do
 
-  def glyphicon icon_type, extra_class=''
-    content_tag(:span, '', :class=>"glyphicon glyphicon-#{icon_type} #{extra_class}", 'aria-hidden'=>true)
-  end
-
-
-  # Options
-  # :header => { :content=>String, :brand=>( String | {:name=>, :href=>} ) }
-  def navbar id, opts={}
-    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, 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]),
-        content_tag(:div, output(yield).html_safe, :class=>"collapse navbar-collapse", :id=>"navbar-collapse-#{id}"),
-      ]
-    end
-  end
-
-  def navbar_header id, content='', opts={}
-    brand = if opts[:brand]
-              if opts[:brand].kind_of? String
-                "<a class='navbar-brand' href='#'>#{opts[:brand]}</a>"
-              else
-                link = opts[:brand][:href] || '#'
-                "<a class='navbar-brand' href='#{link}#'>#{opts[:brand][:name]}</a>"
-              end
-            end
-    wrap_with :div, :class=>'navbar-header' do
-      [
-        (navbar_toggle(id, opts[:toggle]) unless opts[:toggle] == :hide),
-        brand,
-        (content if content)
-      ]
-    end
-  end
-
-  def navbar_toggle id, content=nil, css_class=''
-    content ||= %{
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                }
-    %{
-      <button type="button" class="navbar-toggle collapsed #{css_class}" data-toggle="collapse" data-target="#navbar-collapse-#{id}">
-        <span class="sr-only">Toggle navigation</span>
-        #{content}
-      </button>
-    }
-  end
-
-
   view :closed do |args|
     args.merge! :body_class=>'closed-content'
     super args

data/spec/lib/card/action_spec.rb

@@ -8,7 +8,7 @@ describe Card::Action do
       a.update_attributes!(:content=>"New content")
       a.delete_old_actions
       expect(a.actions.count).to eq(1)
-      expect(a.actions.last.new_values[:name]).to eq("New A")
+      expect(a.actions(true).last.new_values[:name]).to eq("New A")
     end
   end
 end

data/spec/lib/card/log_spec.rb

@@ -40,24 +40,24 @@ describe Card::Log::Performance do
   end
 
   def expect_logger_to_receive_once message
-    allow(Rails.logger).to receive(:wagn).with(/((?!#{message}).)*/ )
-    expect(Rails.logger).to receive(:wagn).once.with(message)
+    allow(Rails.logger).to receive(:info).with(/((?!#{message}).)*/ )
+    expect(Rails.logger).to receive(:info).once.with(message)
     with_logging { yield }
   end
 
 
   def expect_logger_to_receive message
-    allow(Rails.logger).to receive(:wagn)
+    allow(Rails.logger).to receive(:info)
     Array.wrap(message).each do |msg|
-      expect(Rails.logger).to receive(:wagn).with(msg)
+      expect(Rails.logger).to receive(:info).with(msg)
     end
     with_logging { yield }
   end
 
   def expect_logger_not_to_receive message
-    allow(Rails.logger).to receive(:wagn)
+    allow(Rails.logger).to receive(:info)
     Array.wrap(message).each do |msg|
-      expect(Rails.logger).not_to receive(:wagn).with(msg)
+      expect(Rails.logger).not_to receive(:info).with(msg)
     end
     with_logging { yield }
   end
@@ -94,7 +94,7 @@ describe Card::Log::Performance do
     it 'handles instance method type' do
       class Card
         def test a, b
-          Rails.logger.wagn("orignal method is still alive")
+          Rails.logger.info("orignal method is still alive")
         end
         def self.test a, b; end
       end

data/spec/models/card/cardtype_spec.rb

@@ -56,7 +56,7 @@ describe "Card (Cardtype)" do
   end
 
   it "cardtype" do
-    Card.find(:all).each do |card|
+    Card.all.each do |card|
       assert !card.type_card.nil?
     end
   end

data/spec/spec_helper.rb

@@ -122,7 +122,7 @@ end
 
 RSpec::Core::ExampleGroup.send :include, Card::SpecHelper
 
-class ActiveSupport::BufferedLogger
+class ActiveSupport::Logger
   def rspec msg
     Thread.current['logger-output'] << msg
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.15.7
+  version: 1.16.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -27,6 +27,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.3
+- !ruby/object:Gem::Dependency
+  name: activerecord-session_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -47,14 +61,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +287,12 @@ files:
 - 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/20150601133433_add_recent_setting_session_card.rb
 - db/migrate_core_cards/20150605115802_add_performance_log_card.rb
+- db/migrate_core_cards/20150610171702_add_debugger_session_card.rb
+- db/migrate_core_cards/20150611203506_rails_inflection_updates.rb
+- db/migrate_core_cards/20150627205133_fix_script_bootstrap_card_type.rb
+- db/migrate_core_cards/20150702130543_remove_edit_toolbar_pinned.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
@@ -339,6 +358,8 @@ files:
 - db/seed/test/fixtures/card_changes.yml
 - db/seed/test/fixtures/card_references.yml
 - db/seed/test/fixtures/cards.yml
+- db/seed/test/fixtures/file1.txt
+- db/seed/test/fixtures/file2.txt
 - db/seed/test/fixtures/mao2.jpg
 - db/seed/test/fixtures/rails.gif
 - db/seed/test/seed.rb
@@ -373,6 +394,7 @@ files:
 - lib/card/simplecov_helper.rb
 - lib/card/spec_helper.rb
 - lib/card/version.rb
+- lib/card/view_cache.rb
 - lib/card/view_name.rb
 - lib/cardio.rb
 - lib/generators/card.rb
@@ -397,6 +419,7 @@ files:
 - mod/01_core/format/text_format.rb
 - mod/01_core/layout/blank.html
 - mod/01_core/layout/default.html
+- mod/01_core/layout/modal.html
 - mod/01_core/layout/noside.html
 - mod/01_core/layout/pre.html
 - mod/01_core/layout/simple.html
@@ -419,6 +442,7 @@ files:
 - mod/01_core/set/all/trash.rb
 - mod/01_core/set/all/type.rb
 - mod/01_core/set/all/utils.rb
+- mod/01_core/set/all/view_cache.rb
 - mod/01_core/set_pattern/01_all.rb
 - mod/01_core/set_pattern/02_all_plus.rb
 - mod/01_core/set_pattern/03_type.rb
@@ -472,6 +496,7 @@ files:
 - mod/02_basic_types/set/all/json.rb
 - mod/02_basic_types/set/all/rss.rb
 - mod/02_basic_types/set/all/text.rb
+- mod/02_basic_types/set/type/html.rb
 - mod/02_basic_types/set/type/plain_text.rb
 - mod/02_basic_types/set/type/pointer.rb
 - mod/02_basic_types/spec/set/all/all_css_spec.rb
@@ -544,7 +569,6 @@ files:
 - mod/04_settings/set/self/add_help.rb
 - mod/04_settings/set/self/autoname.rb
 - mod/04_settings/set/self/captcha.rb
-- mod/04_settings/set/self/comment.rb
 - mod/04_settings/set/self/create.rb
 - mod/04_settings/set/self/default.rb
 - mod/04_settings/set/self/delete.rb
@@ -664,7 +688,6 @@ files:
 - mod/05_standard/set/type/cardtype.rb
 - mod/05_standard/set/type/date.rb
 - mod/05_standard/set/type/file.rb
-- mod/05_standard/set/type/html.rb
 - mod/05_standard/set/type/image.rb
 - mod/05_standard/set/type/layout_type.rb
 - mod/05_standard/set/type/number.rb
@@ -890,6 +913,7 @@ files:
 - mod/06_bootstrap/lib/stylesheets/bootstrap_cards.scss
 - mod/06_bootstrap/lib/stylesheets/smartmenu.css
 - mod/06_bootstrap/set/all/bootstrap/form.rb
+- mod/06_bootstrap/set/all/bootstrap/helper.rb
 - mod/06_bootstrap/set/all/bootstrap/wrapper.rb
 - mod/06_bootstrap/set/all/rich_bootstrap.rb
 - mod/06_bootstrap/set/self/bootstrap_cards.rb
@@ -969,3 +993,4 @@ test_files:
 - spec/models/card/validation_spec.rb
 - spec/models/card_spec.rb
 - spec/spec_helper.rb
+has_rdoc: