card 1.15.4 → 1.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dc15d9c2c0968a351432221cb47274d695515c9
-  data.tar.gz: 006311ea9e42182b47adc6e3a1ed434e47239c54
+  metadata.gz: 6aac9bc9a4a0c51d23aa1a1618373dba3c070b5b
+  data.tar.gz: 9526abccf7afcc74f2b8663dc8b902af7e744efe
 SHA512:
-  metadata.gz: 897cf06f078a5deef931ec1b38d70c1690b3f97943f58987789e33c1dbea8a9d46b89c53d123196b35cb00b8b05d7c92c2fa3c8b6d6718de1863ee7f2276f217
-  data.tar.gz: a9e1cd1a88f3da9b79b9b3b011d48e5ea64650b4e5f35945e263cd5bdc8fc14563c6f463c5acaed93f30d03a46bd01b0345e8bb076f5423845b31cc8bfa538fa
+  metadata.gz: cf0f29ab1c1a45f3a3f5ae3e5d086ab07f90af258260d1294a9bcbd25ce9c28cef2fbd427863574e0d52f6ecfc3ded650f8720161da07a9aee0d977ccc8b7b3c
+  data.tar.gz: f8a18bf5ea522c43003bbf54b96ec59dc97f794c1ace83fa80002e0c55bc3fc49ce6e6ac2cce1cefe19903986181465d7541842b00ad94d755c3b0a2d037614a

data/VERSION

@@ -1 +1 @@
-1.15.4
+1.15.5

data/config/initializers/recaptcha.rb

@@ -3,5 +3,5 @@ Recaptcha.configure do |config|
   config.public_key  = Cardio.config.recaptcha_public_key  || nil
   config.private_key = Cardio.config.recaptcha_private_key || nil
   config.proxy       = Cardio.config.recaptcha_proxy       || nil
-  config.api_version = 'v1'
+  config.api_version = 'v1' if config.respond_to?(:api_version=)
 end

data/db/migrate_core_cards/20141208162106_add_ace_script.rb

@@ -2,10 +2,8 @@
 
 class AddAceScript < Card::CoreMigration
   def up
-    all_script = Card[:all].fetch :trait=>:script
-    all_script.add_item "script: ace"
-    all_script.save!
-    
+    Card[:all].fetch(:trait=>:script).add_item!  "script: ace"
+
     Card.create! :name=>"script: ace",:codename=>"script_ace",:type=>"JavaScript"
 
   end

data/db/migrate_core_cards/20150508212032_menu_compatibility.rb

@@ -7,8 +7,7 @@ class MenuCompatibility < Card::CoreMigration
     bootswatch_shared = Card[:bootswatch_shared]
     Card.search(:type_id=>Card::SkinID) do |skin|
       if skin.item_cards.find { |item_card| item_card.codename.to_s == 'style_bootstrap_compatible'}
-        skin.add_item bootswatch_shared.name
-        skin.save!
+        skin.add_item! bootswatch_shared.name
       end
     end
 

data/db/migrate_core_cards/20150605115802_add_performance_log_card.rb

@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+
+class AddPerformanceLogCard < Card::CoreMigration
+  def up
+    Card.create! :name=>'*performance log', :type_code=>:pointer, :codename=>:performance_log
+  end
+end

data/lib/card/content.rb

@@ -179,6 +179,12 @@ class Card
         end.gsub(/<\!--.*?-->/, '')
       end
 
+      if Card.config.space_last_in_multispace
+        def clean_with_space_last! string, tags = ALLOWED_TAGS
+          clean_without_space_last!(string, tags).gsub(/(?:^|\b) ((?:&nbsp;)+)/, '\1 ')
+        end
+        alias_method_chain :clean!, :space_last
+      end
       def truncatewords_with_closing_tags(input, words = 25, truncate_string = "...")
         if input.nil? then return end
         wordlist = input.to_s.split

data/lib/card/log.rb

@@ -45,7 +45,7 @@ class Card::Log
     # config.performance_logger = {
     #     :min_time => 100,                              # show only method calls that are slower than 100ms
     #     :max_depth => 3,                               # show nested method calls only up to depth 3
-    #     :details=> true                                # show method arguments and sql
+    #     :details=> true,                                # show method arguments and sql
     #     :methods => [:event, :search, :fetch, :view],  # choose methods to log
     # }
     #
@@ -79,7 +79,7 @@ class Card::Log
                               }
 
     SPECIAL_METHODS     = [:search, :view, :event]  # these methods have already a Wagn.with_logging block
-                                                        # we don't have to monkey patch them, only turn the logging on with adding the symbol to the methods hash
+                                                    # we don't have to monkey patch them, only turn the logging on with adding the symbol to the methods hash
 
 
 
@@ -91,14 +91,31 @@ class Card::Log
 
 
     class << self
+      def params_to_config args
+        args[:details] = args[:details] == 'true' ? true : false
+        args[:max_depth] &&= args[:max_depth].to_i
+        args[:min_time]  &&= args[:min_time].to_i
+        args[:output]    &&= args[:output].to_sym
+        if args[:methods]
+          if args[:methods].kind_of?(String) && args[:methods].match(/^\[.+\]$/)
+            args[:methods] = JSON.parse(args[:methods]).map(&:to_sym)
+          elsif args[:methods].kind_of?(Array)
+            args[:methods].map!(&:to_sym)
+          end
+        end
+        args
+      end
+
       def load_config args
+        args = params_to_config args
         @details   = args[:details]   || false
         @max_depth = args[:max_depth] || false
         @min_time  = args[:min_time]  || false
+        @output    = args[:output]    || :text
         @enabled_methods = ::Set.new
         prepare_methods_for_logging args[:methods] if args[:methods]
       end
-      
+
       def start args={}
         @@current_level = 0
         @@log = []
@@ -118,7 +135,7 @@ class Card::Log
         print_log
       end
 
-      
+
       def with_timer method, args, &block
         if args[:context]
 
@@ -152,7 +169,7 @@ class Card::Log
         end
         result
       end
-      
+
 
       def enable_method method_name
         @enabled_methods ||= ::Set.new
@@ -166,11 +183,74 @@ class Card::Log
       private
 
       def print_log
+        if @output == :card && Card[:performance_log]
+          Card[:performance_log].add_log_entry @@log.first.message, html_log
+        elsif @output == :html
+          html_log
+        else
+          text_log
+        end
+      end
+
+      def text_log
         @@log.each do |entry|
           Rails.logger.wagn entry.to_s! if entry.valid
         end
       end
 
+      def html_log
+        @html_log ||= begin
+          list = @@log.inject([]) do |tree, entry|
+            if entry.parent
+              #entry.parent.children << entry
+            else
+              tree << entry
+            end
+            tree
+          end
+
+          list_to_accordion list
+        end
+      end
+
+      def list_to_accordion list
+        list.map do |entry|
+          if entry.children && entry.children.present?
+            accordion_entry entry
+          else
+            "<li class='list-group-item'>#{simple_entry entry}</li>"
+          end
+        end.join "\n"
+      end
+
+      def simple_entry entry
+        entry.to_html
+      end
+
+      def accordion_entry entry
+        panel_body = list_to_accordion entry.children
+        collapse_id = entry.hash.to_s
+        %{
+          <div class="panel-group" id="accordion-#{collapse_id}" role="tablist" aria-multiselectable="true">
+            <div class="panel panel-default #{'panel-danger' if entry.duration > 100 }">
+              <div class="panel-heading" role="tab" id="heading-#{collapse_id}">
+                <h4 class="panel-title">
+                  <a data-toggle="collapse" data-parent="#accordion-#{collapse_id}" href="##{collapse_id}" aria-expanded="true" aria-controls="#{collapse_id}">
+                    #{ simple_entry entry }
+                  </a>
+                </h4>
+              </div>
+              <div id="#{collapse_id}" class="panel-collapse collapse #{'in' if entry.duration > 100}" role="tabpanel" aria-labelledby="heading-#{collapse_id}">
+                <div class="panel-body">
+                  #{ panel_body }
+                </div>
+              </div>
+            </div>
+          </div>
+          }
+      end
+
+
       def new_entry args
         args.delete(:details) unless @details
         level = @@current_level
@@ -194,7 +274,7 @@ class Card::Log
         @@active_entries.pop
         @@current_level -= 1
       end
-      
+
       def prepare_methods_for_logging args
         classes = hashify_and_verify_keys( args, DEFAULT_CLASS ) do |key|
           key.kind_of?(Class) || key.kind_of?(Module)
@@ -250,10 +330,11 @@ class Card::Log
       end
 
     end
-    
-    
+
+
     class Entry
-      attr_accessor :level, :valid, :context, :parent, :children_cnt, :duration
+      attr_accessor :level, :valid, :context, :parent, :children_cnt, :duration, :children
+      attr_reader :message
 
       def initialize( parent, level, args )
         @start = Time.new
@@ -266,18 +347,22 @@ class Card::Log
         @valid = true
         @parent = parent
         @children_cnt = 0
+        @children = []
         if @parent
-          @parent.add_children
+          @parent.add_children self
           #@sibling_nr = @parent.children_cnt
         end
       end
 
-      def add_children
+      def add_children child=false
         @children_cnt += 1
+        @children << child if child
       end
 
-      def delete_children
+      def delete_children child=false
         @children_cnt -= 1
+        @children.delete child if child
+
       end
 
       def has_younger_siblings?
@@ -290,7 +375,7 @@ class Card::Log
 
       def delete
         @valid = false
-        @parent.delete_children if @parent
+        @parent.delete_children(self) if @parent
       end
 
 
@@ -313,6 +398,14 @@ class Card::Log
           msg
         end
       end
+      def to_html
+        @to_html ||= begin
+          msg = "<span title='#{@details}'>"
+          msg += @message if @message
+          msg += "<span class='badge #{"badge-danger" if @duration > 100}'> %d.2ms </span>" % @duration if @duration
+          msg += '</span>'
+        end
+      end
 
       private
 
@@ -346,8 +439,8 @@ class Card::Log
       end
 
     end
-    
-    
+
+
     module BigBrother
 
       def watch_method method_name, method_type=:all, options={}
@@ -430,8 +523,8 @@ class Card::Log
       end
 
     end
-    
-    
+
+
   end
 
 end

data/lib/card/query.rb

@@ -3,7 +3,7 @@
 class Card::Query
   require_dependency 'card/query/clause'
   require_dependency 'card/query/card_clause'
-  require_dependency 'card/query/value_clause'  
+  require_dependency 'card/query/value_clause'
   require_dependency 'card/query/ref_clause'
 
   MODIFIERS = {};  %w{ conj return sort sort_as group dir limit offset }.each{|key| MODIFIERS[key.to_sym] = nil }
@@ -16,43 +16,53 @@ class Card::Query
   def initialize query
     @card_clause = CardClause.build query
   end
-  
+
   def query
     @card_clause.query
   end
-  
+
   def sql
     @sql ||= @card_clause.to_sql
   end
 
   def run
-#    puts "~~~~~~~~~~~~~~\nCARD SPEC =\n#{@card_clause.rawclause}\n\n-----\n\nSQL=\n#{sql}"
-    rows = ActiveRecord::Base.connection.select_all( sql )
     retrn = query[:return].present? ? query[:return].to_s : 'card'
-    case retrn 
-    when 'card'
-      rows.map do |row|
-        card=
-          if query[:prepend] || query[:append]
-            cardname = [query[:prepend], row['name'], query[:append]].compact.join('+')
-            Card.fetch cardname, :new=>{}
-          else
-            Card[ row['name'] ]
-          end
-        card.nil? ? Card.find_by_name_and_trash(row['name'],false).repair_key : card
+    if retrn == 'card'
+      simple_run('name').map do |name|
+        Card.fetch name, :new=>{}
+      end
+    else
+      simple_run retrn
+    end
+  end
+
+
+  def simple_run retrn
+    rows = run_sql
+
+    case retrn
+    when 'name' #common case
+      if query[:prepend] || query[:append]
+        rows.map do |row|
+          [ query[:prepend], row['name'], query[:append] ].compact * '+'
+        end
+      else
+        rows.map { |row| row['name'] }
       end
     when 'count'
       rows.first['count'].to_i
     when 'raw'
       rows
+    when /id$/
+      rows.map { |row| row[retrn].to_i }
     else
-      integer = ( retrn =~ /id$/ )
-      rows.map do |row|
-        integer ? row[retrn].to_i : row[retrn]
-      end
+      rows.map { |row| row[retrn]      }
     end
   end
 
+  def run_sql
+    ActiveRecord::Base.connection.select_all( sql )
+  end
 
 
   class SqlCond < String
@@ -71,7 +81,7 @@ class Card::Query
     def to_s
       select = fields.reject(&:blank?) * ', '
       where = conditions.reject(&:blank?) * ' and '
-      
+
       ['(SELECT', distinct, select, 'FROM', tables, joins, 'WHERE', where, group, order, limit, offset, ')'].compact * ' '
     end
   end

data/lib/cardio.rb

@@ -48,6 +48,7 @@ module Cardio
 
       config.token_expiry          = 2.days
       config.revisions_per_page    = 10
+      config.space_last_in_multispace = true
       config.closed_search_limit   = 50
     end
 

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

@@ -57,6 +57,27 @@ def include_item? item
   item_names.map{|name| name.to_name.key}.member? key
 end
 
+def add_item item
+  unless include_item? item
+    self.content="#{self.content}\n#{name}"
+  end
+end
+
+def drop_item item
+  if include_item? item
+    new_names = item_names.reject{ |i| i == item }
+    self.content = new_names.empty? ? '' : new_names.join("\n")
+  end
+end
+
+def insert_item index, name
+  new_names = item_names
+  new_names.delete(name)
+  new_names.insert(index,name)
+  self.content =  new_names.join "\n"
+end
+
+
 def extended_item_cards context = nil
   context = (context ? context.cardname : self.cardname)
   args={ :limit=>'' }
@@ -160,18 +181,31 @@ format :html do
   view :tabs do |args|
     tab_buttons = ''
     tab_panes = ''
-    card.item_names.each_with_index do |item, index|
+    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.to_name.safe_key}"
+      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.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)) : ''
+      url = page_path(item.referee_name, i_args)
+      tab_name = (item.respond_to?(:options) && item.options[:title]) || item.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
       tab_panes += tab_pane( id, tab_content, active_tab )
     end
     tab_panel tab_buttons, tab_panes, args[:tab_type]
@@ -181,7 +215,7 @@ format :html do
   end
 
   view :pills, :view=>:tabs
-  def default_pill_args args
+  def default_pills_args args
     args[:tab_type] ||= 'pills'
   end
 
@@ -196,12 +230,12 @@ format :html do
     end
     tab_panel tab_buttons, tab_panes, args[:tab_type]
   end
-  def default_tab_static_args args
+  def default_tabs_static_args args
     args[:tab_type] ||= 'tabs'
   end
 
   view :pills_static, :view=>:tabs
-  def default_tab_static_args args
+  def default_tabs_static_args args
     args[:tab_type] ||= 'pills'
   end