card 1.16.4 → 1.16.5

data/spec/lib/card/format_spec.rb

@@ -10,24 +10,24 @@ describe Card::Format do
       expect(format.show_view?( :menu, :default_visibility=>:hide )).to be_falsey
       expect(format.show_view?( :menu, {}                          )).to be_truthy
     end
-    
+
     it "should respect developer default overrides" do
       expect(format.show_view?( :menu, :optional_menu=>:show, :default_visibility=>:hide )).to be_truthy
       expect(format.show_view?( :menu, :optional_menu=>:hide, :default_visibility=>:show )).to be_falsey
       expect(format.show_view?( :menu, :optional_menu=>:hide                             )).to be_falsey
     end
-    
+
     it "should handle args from inclusions" do
       expect(format.show_view?( :menu, :show=>'menu', :default_visibility=>:hide         )).to be_truthy
       expect(format.show_view?( :menu, :hide=>'menu, paging', :default_visibility=>:show )).to be_falsey
-      expect(format.show_view?( :menu, :show=>'menu', :optional_menu=>:hide              )).to be_truthy      
+      expect(format.show_view?( :menu, :show=>'menu', :optional_menu=>:hide              )).to be_truthy
     end
-    
+
     it "should handle hard developer overrides" do
       expect(format.show_view?( :menu, :optional_menu=>:always, :hide=>'menu' )).to be_truthy
       expect(format.show_view?( :menu, :optional_menu=>:never,  :show=>'menu' )).to be_falsey
     end
-    
+
   end
 
   describe 'format helpers and link building' do
@@ -61,11 +61,11 @@ describe Card::Format do
 
     it "should format html links" do
       cobj = Card::Content.new url_text1, html_format
-      expect(cobj.to_s).to eq "with external free link <a class=\"external-link\" href=\"http://localhost:2020/path?cgi=foo&amp;bar=baz\">http://localhost:2020/path?cgi=foo&bar=baz</a>"
+      expect(cobj.to_s).to eq "with external free link <a target=\"_blank\" class=\"external-link\" href=\"http://localhost:2020/path?cgi=foo&amp;bar=baz\">http://localhost:2020/path?cgi=foo&bar=baz</a>"
       cobj = Card::Content.new url_text2+url_text3+url_text4, html_format
       expect(cobj.to_s).to eq url_text2+url_text3+url_text4
       cobj = Card::Content.new url_text5, html_format
-      expect(cobj.to_s).to eq "external with port: <a class=\"external-link\" href=\"http://localhost:2020/path?cgi=foo+bar=baz\">http://localhost:2020/path?cgi=foo+bar=baz</a> after "
+      expect(cobj.to_s).to eq "external with port: <a target=\"_blank\" class=\"external-link\" href=\"http://localhost:2020/path?cgi=foo+bar=baz\">http://localhost:2020/path?cgi=foo+bar=baz</a> after "
     end
 
     it "formats page_path" do

data/spec/lib/card/success_spec.rb

@@ -5,8 +5,8 @@ describe Card::Success do
   let(:previous) { '/B' }
   let(:home)     { Card['Home'] }
   def success_params params
+    Card::Env.save_location Card['B']
     @success = Card::Success.new(context, params)
-    @success.stub(:previous_location) { previous }
   end
   describe '#target' do
     subject { @success.target }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.16.4
+  version: 1.16.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -291,6 +291,7 @@ files:
 - db/migrate_core_cards/20150317162412_bootstrap_themes.rb
 - db/migrate_core_cards/20150326205655_bootswatch_themes.rb
 - db/migrate_core_cards/20150331135745_new_card_menu.rb
+- db/migrate_core_cards/20150429090551_search_card_context.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
@@ -304,6 +305,7 @@ files:
 - db/migrate_core_cards/20150807205221_create_references_for_search_cards.rb
 - db/migrate_core_cards/20150824135418_update_file_history.rb
 - db/migrate_core_cards/20150903130006_attachment_upload_cards.rb
+- db/migrate_core_cards/20150910085603_remove_performance_log_card.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
@@ -390,7 +392,7 @@ files:
 - lib/card/exceptions.rb
 - lib/card/format.rb
 - lib/card/loader.rb
-- lib/card/log.rb
+- lib/card/location.rb
 - lib/card/mailer.rb
 - lib/card/migration.rb
 - lib/card/name.rb
@@ -443,6 +445,7 @@ files:
 - mod/01_core/set/all/fetch.rb
 - mod/01_core/set/all/haml.rb
 - mod/01_core/set/all/initialize.rb
+- mod/01_core/set/all/location_history.rb
 - mod/01_core/set/all/name.rb
 - mod/01_core/set/all/pattern.rb
 - mod/01_core/set/all/permissions.rb
@@ -702,7 +705,6 @@ files:
 - mod/05_standard/set/self/head.rb
 - mod/05_standard/set/self/navbox.rb
 - mod/05_standard/set/self/now.rb
-- mod/05_standard/set/self/performance_log.rb
 - mod/05_standard/set/self/recent.rb
 - mod/05_standard/set/self/search.rb
 - mod/05_standard/set/self/signin.rb
@@ -740,6 +742,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/links_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
@@ -955,7 +958,6 @@ files:
 - spec/lib/card/diff_spec.rb
 - spec/lib/card/format_spec.rb
 - spec/lib/card/loader_spec.rb
-- spec/lib/card/log_spec.rb
 - spec/lib/card/name_spec.rb
 - spec/lib/card/query_spec.rb
 - spec/lib/card/reference_spec.rb
@@ -1184,7 +1186,6 @@ test_files:
 - spec/lib/card/diff_spec.rb
 - spec/lib/card/format_spec.rb
 - spec/lib/card/loader_spec.rb
-- spec/lib/card/log_spec.rb
 - spec/lib/card/name_spec.rb
 - spec/lib/card/query_spec.rb
 - spec/lib/card/reference_spec.rb

data/lib/card/log.rb

@@ -1,545 +0,0 @@
-require 'csv'
-
-class Card::Log
-
-  class Request
-
-    def self.path
-      path = (Card.paths['request_log'] && Card.paths['request_log'].first) || File.dirname(Card.paths['log'].first)
-      filename = "#{Date.today}_#{Rails.env}.csv"
-      File.join path, filename
-    end
-
-    def self.write_log_entry controller
-      return if controller.env["REQUEST_URI"] =~ %r{^/files?/}
-
-      controller.instance_eval do
-        log = []
-        log << (Card::Env.ajax? ? "YES" : "NO")
-        log << env["REMOTE_ADDR"]
-        log << Card::Auth.current_id
-        log << card.name
-        log << action_name
-        log << params['view'] || (s = params['success'] and  s['view'])
-        log << env["REQUEST_METHOD"]
-        log << status
-        log << env["REQUEST_URI"]
-        log << DateTime.now.to_s
-        log << env['HTTP_ACCEPT_LANGUAGE'].to_s.scan(/^[a-z]{2}/).first
-        log << env["HTTP_REFERER"]
-
-        File.open(Card::Log::Request.path, "a") do |f|
-          f.write CSV.generate_line(log)
-        end
-      end
-    end
-
-  end
-
-
-  class Performance
-    # To enable logging add a performance_logger hash to your configuration
-    #
-    # Example:
-    # 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
-    #     :methods => [:event, :search, :fetch, :view],  # choose methods to log
-    #     :log_level => :info
-    # }
-    #
-    # If you give :methods a hash you can log arbitrary methods. The syntax is as follows:
-    #   class =>  method type => method name => log options
-    #
-    # Example:
-    #   Card  => {
-    #              :instance  => [ :fetch, :search ],
-    #              :singleton => { :fetch    => { :title => 'Card.fetch' } },
-    #              :all       => {
-    #                              :fetch    => {
-    #                                             :message => 2                           # use second argument passed to fetch
-    #                                             :details => :to_s                       # use return value of to_s in method context
-    #                                             :title => proc { |method_context| method_context.name }
-    #                                           },
-    #                            },
-    #            },
-    #
-    # class, method type and log options are optional.
-    # Default values are 'Card', ':all'  and { :title => method name, :message => first argument, :details=> remaining arguments }.
-    # For example [:fetch] is equivalent to Card => { :all => { :fetch  => { :message=>1, :details=>1..-1 } }
-
-    DEFAULT_CLASS           = Card
-    DEFAULT_METHOD_TYPE     = :all
-    DEFAULT_LOG_LEVEL       = :info
-    DEFAULT_METHOD_OPTIONS  = {
-                                :title   => :method_name,
-                                :message => 1,
-                                :details => 1..-1,
-                                :context => nil
-                              }
-
-    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
-
-
-
-    TAB_SIZE = 3
-    @@log = []
-    @@context_entries = []
-    @@active_entries = []
-    @@current_level = 0
-
-
-    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
-        @log_level = args[:log_level] || DEFAULT_LOG_LEVEL
-        @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 = []
-        @@context_entries = []
-        @@active_entries = []
-        @@first_entry = new_entry(args)
-      end
-
-      def stop
-        while (entry = @@context_entries.pop) do
-          finish_entry entry
-        end
-        if @@first_entry
-          @@first_entry.save_duration
-          finish_entry @@first_entry
-        end
-        print_log
-      end
-
-
-      def with_timer method, args, &block
-        if args[:context]
-
-          # if the previous context was created by an entry on the same level
-          # then finish the current context if it's a different context
-          if @@context_entries.last && @@current_level == @@context_entries.last.level+1 &&
-                                       args[:context] != @@context_entries.last.context
-            finish_entry @@context_entries.pop
-          end
-
-          # start new context if it's different from the parent context
-          if  @@context_entries.empty? || args[:context] != @@context_entries.last.context
-            @@context_entries << new_entry( :title=>'process', :message=>args[:context], :context=>args[:context] )
-          end
-        end
-
-        timer = new_entry args.merge(:method=>method )
-        begin
-          result = block.call
-        ensure
-          timer.save_duration
-          finish_entry timer
-
-          # finish all deeper nested contexts
-          while @@context_entries.last && @@context_entries.last.level >= @@current_level
-            finish_entry @@context_entries.pop
-          end
-          # we don't know whether the next entry will belong to the same context or will start a new one
-          # so we save the time
-          @@context_entries.last.save_duration if @@context_entries.last
-        end
-        result
-      end
-
-
-      def enable_method method_name
-        @enabled_methods ||= ::Set.new
-        @enabled_methods << method_name
-      end
-
-      def enabled_method? method_name
-        @enabled_methods && @enabled_methods.include?(method_name)
-      end
-
-      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.send @log_level, 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
-
-        last_entry = @@active_entries.last
-        parent = if last_entry
-            last_entry.level == level ? last_entry.parent : last_entry
-          end
-
-        @@log << Card::Log::Performance::Entry.new(parent, level, args )
-        @@current_level += 1
-        @@active_entries << @@log.last
-
-        @@log.last
-      end
-
-      def finish_entry entry
-        if (@max_depth && entry.level > @max_depth) || (@min_time && entry.duration < @min_time)
-          entry.delete
-        end
-        @@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)
-        end
-
-        classes.each do |klass, method_types|
-          klass.extend BigBrother  # add watch methods
-
-          method_types = hashify_and_verify_keys( method_types, DEFAULT_METHOD_TYPE ) do |key|
-            [:all, :instance, :singleton].include? key
-          end
-
-          method_types.each do |method_type, methods|
-            methods = hashify_and_verify_keys methods
-            methods.each do |method_name, options|
-              klass.watch_method  method_name, method_type, DEFAULT_METHOD_OPTIONS.merge(options)
-            end
-          end
-
-        end
-      end
-
-
-      def hashify_and_verify_keys args, default_key=nil
-        if default_key
-          case args
-            when Symbol
-              { default_key => [ args ] }
-            when Array
-              { default_key => args }
-            when Hash
-              if block_given?
-                args.keys.select{ |key| !(yield(key)) }.each do |key|
-                  args[default_key] = { key => args[key] }
-                  args.delete key
-                end
-              end
-              args
-            end
-        else
-          case args
-          when Symbol
-            { args => {} }
-          when Array
-            args.inject({}) do |h, key|
-              h[key] = {}
-              h
-            end
-          else
-            args
-          end
-        end
-      end
-
-    end
-
-
-    class Entry
-      attr_accessor :level, :valid, :context, :parent, :children_cnt, :duration, :children
-      attr_reader :message
-
-      def initialize( parent, level, args )
-        @start = Time.new
-        @message = "#{ args[:title] ||  args[:method] || '' }"
-        @message += ": #{ args[:message] }" if args[:message]
-        @details = args[:details]
-        @context = args[:context]
-        @level = level
-        @duration = nil
-        @valid = true
-        @parent = parent
-        @children_cnt = 0
-        @children = []
-        if @parent
-          @parent.add_children self
-          #@sibling_nr = @parent.children_cnt
-        end
-      end
-
-      def add_children child=false
-        @children_cnt += 1
-        @children << child if child
-      end
-
-      def delete_children child=false
-        @children_cnt -= 1
-        @children.delete child if child
-
-      end
-
-      def has_younger_siblings?
-        @parent && @parent.children_cnt > 0 #@sibling_nr
-      end
-
-      def save_duration
-        @duration = (Time.now - @start) * 1000
-      end
-
-      def delete
-        @valid = false
-        @parent.delete_children(self) if @parent
-      end
-
-
-      # deletes the children counts in order to print the tree;
-      # must be called in the right order
-      #
-      # More robuts but more expensive approach: use @sibling_nr instead of counting @children_cnt down,
-      # but @sibling_nr has to be updated for all siblings of an entry if the entry gets deleted due to
-      # min_time or max_depth restrictions in the config, so we have to save all children relations for that
-      def to_s!
-        @to_s ||= begin
-          msg = indent
-          msg += "(%d.2ms) " % @duration if @duration
-          msg += @message if @message
-
-          if @details
-            msg +=  ", " + @details.to_s.gsub( "\n", "\n#{ indent(false) }#{' '* TAB_SIZE}" )
-          end
-          @parent.delete_children if @parent
-          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
-
-      def indent link=true
-        @indent ||= begin
-          if @level == 0
-            "\n"
-          else
-            res = '  '
-            res += (1..level-1).inject('') do |msg, index|
-                if younger_siblings[index]
-                  msg <<  '|' + ' ' * (TAB_SIZE-1)
-                else
-                  msg << ' ' * TAB_SIZE
-                end
-              end
-
-            res += link ? '|--' : '  '
-          end
-        end
-      end
-
-      def younger_siblings
-        res = []
-        next_parent = self
-        while (next_parent)
-          res << next_parent.has_younger_siblings?
-          next_parent = next_parent.parent
-        end
-        res.reverse
-      end
-
-    end
-
-
-    module BigBrother
-
-      def watch_method method_name, method_type=:all, options={}
-        Card::Log::Performance.enable_method method_name
-
-        if !SPECIAL_METHODS.include? method_name
-          if method_type == :all || method_type == :singleton
-            add_singleton_logging method_name, options
-          end
-          if method_type == :all || method_type == :instance
-            add_instance_logging method_name, options
-          end
-        end
-      end
-
-      def watch_instance_method *names
-        names.each do |name|
-          watch_method name, :instance
-        end
-      end
-
-      def watch_singleton_method *names
-        names.each do |name|
-          watch_method name, :singleton
-        end
-      end
-
-      def watch_all_instance_methods
-        watch_instance_method *instance_methods
-      end
-
-      def watch_all_singleton_methods
-        fragile_methods = [:default_scope, :default_scopes, :default_scopes=]  # if I touch these methods ActiveRecord breaks
-        watch_singleton_method *(singleton_methods - fragile_methods)
-      end
-
-      def watch_all_methods
-        watch_all_instance_methods
-        watch_all_singleton_methods
-      end
-
-      private
-
-      def add_singleton_logging method_name, options
-        return unless singleton_class.method_defined? method_name
-        m = method(method_name)
-        add_logging method_name, :define_singleton_method, options do |bind_object, args, &block|
-          m.call(*args, &block)
-        end
-      end
-
-      def add_instance_logging  method_name, options
-        return unless method_defined? method_name
-        m = instance_method(method_name)
-        add_logging method_name, :define_method, options do  |bind_object, args, &block|
-          m.bind(bind_object).(*args, &block)
-        end
-      end
-
-      def add_logging method_name, define_method, options, &bind_block
-        send(define_method, method_name) do |*args, &block|
-          log_args = {}
-          options.each do |key,value|
-            log_args[key] = case value
-              when Integer then args[value-1]
-              when Range   then args[value]
-              when Symbol  then eval(value.to_s)
-              when Proc    then value.call(self)
-              else              value
-              end
-          end
-          Card::Log::Performance.with_timer(method_name, log_args) do
-            bind_block.call(self, args, &block)
-          end
-        end
-      end
-
-      def log_options_variable_name method_name, define_method
-        "@_#{self.class.name}_#{method_name.hash.to_s.sub(/^-/,'_')}_#{define_method}_logging_options".to_sym
-      end
-
-    end
-
-
-  end
-
-end
-
-class Card
-  def self.with_logging method, opts, &block
-    if Card::Log::Performance.enabled_method? method
-      Card::Log::Performance.with_timer(method, opts) do
-        block.call
-      end
-    else
-      block.call
-    end
-  end
-end
-