Merge 2ef95e7 into 621a64f

Author: ethn

card/lib/card/format/render.rb

@@ -41,6 +41,57 @@ def final_render view
         add_debug_info view, method, rendered
       end
 
+      def pretty_path source_location
+        "#{source_location.first.gsub(%r{^.+mod\d+-([^/]+)},
+                                      '\1: ')}:#{source_location.second}"
+      end
+
+      # see {Abstract::Format}
+      # (:default), :yes, :deep, :always, :never
+      def view_cache_setting view
+        voo&.cache || view_setting(:cache, view) || :default
+      end
+
+      def view_setting setting_name, view
+        try Card::Set::Format.view_setting_method_name(view, setting_name)
+      end
+
+      def stub_render cached_content
+        return cached_content if Cardio.config.view_cache == :debug
+
+        # stub_debugging do
+        expand_stubs cached_content
+        # end
+      end
+
+      def view_method view
+        unless supports_view? view
+          raise Card::Error::UserError, unsupported_view_error_message(view)
+        end
+
+        method Card::Set::Format.view_method_name(view)
+      end
+
+      def supports_view? view
+        respond_to? Card::Set::Format.view_method_name(view)
+      end
+
+      def current_view view
+        old_view = @current_view
+        @current_view = view
+        yield
+      ensure
+        @current_view = old_view
+      end
+
+      def stub_nest stub_hash
+        prepare_stub_nest(stub_hash) do |stub_card, view_opts|
+          nest stub_card, view_opts, stub_hash[:format_opts]
+        end
+      end
+
+      private
+
       def wrap_and_render view
         current_view(view) { with_wrapper { final_render view } }
       rescue StandardError => e
@@ -64,27 +115,6 @@ def show_debug_info?
         Env.params[:debug] == "view"
       end
 
-      def pretty_path source_location
-        "#{source_location.first.gsub(%r{^.+mod\d+-([^/]+)},
-                                      '\1: ')}:#{source_location.second}"
-      end
-
-      # see {Abstract::Format}
-      # (:default), :yes, :deep, :always, :never
-      def view_cache_setting view
-        voo&.cache || view_setting(:cache, view) || :default
-      end
-
-      def view_setting setting_name, view
-        try Card::Set::Format.view_setting_method_name(view, setting_name)
-      end
-
-      def stub_render cached_content
-        # stub_debugging do
-        expand_stubs cached_content
-        # end
-      end
-
       # def stub_debugging
       #   result = yield
       #   if Rails.env.development? && result.is_a?(String) && result =~ /StUb/
@@ -118,32 +148,6 @@ def expand_stubs cached_content
           conto.to_s
         end
       end
-
-      def view_method view
-        unless supports_view? view
-          raise Card::Error::UserError, unsupported_view_error_message(view)
-        end
-
-        method Card::Set::Format.view_method_name(view)
-      end
-
-      def supports_view? view
-        respond_to? Card::Set::Format.view_method_name(view)
-      end
-
-      def current_view view
-        old_view = @current_view
-        @current_view = view
-        yield
-      ensure
-        @current_view = old_view
-      end
-
-      def stub_nest stub_hash
-        prepare_stub_nest(stub_hash) do |stub_card, view_opts|
-          nest stub_card, view_opts, stub_hash[:format_opts]
-        end
-      end
     end
   end
 end

card/lib/card/query.rb

@@ -83,7 +83,7 @@ module Query
     # "dir" is DEPRECATED in favor of sort_dir
     # "sort" is DEPRECATED in favor of sort_by, except in cases where sort's value
     # is a hash
-    MODIFIERS = %i[conj return sort_by sort_as sort_dir sort dir group limit offset]
+    MODIFIERS = %i[conj return index sort_by sort_as sort_dir sort dir group limit offset]
                 .each_with_object({}) { |v, h| h[v] = nil }
 
     OPERATORS =

card/lib/card/query/card_query/relational_attributes.rb

@@ -4,7 +4,7 @@ class CardQuery
       # interpret CQL attributes that relate multiple cards
       # each method below corresponds to a relational CQL term
       #
-      # NOTE: methods using "restrict" can  be executed without
+      # NOTE: methods using "restrict" can be executed without
       # tying in an additional query if the val in question can be
       # reduced to an id.
       module RelationalAttributes

card/lib/card/query/sql_statement.rb

@@ -24,6 +24,7 @@ def build
         @fields = fields
         @tables = tables
         @joins  = joins
+        @indexes = indexes
         @where  = where
         @group  = group
         @order  = order
@@ -33,7 +34,8 @@ def build
 
       def to_s
         [
-          comment, select, from, @joins, @where, @group, @order, @limit_and_offset
+          comment, select, from,
+          @joins, @indexes, @where, @group, @order, @limit_and_offset
         ].compact.join " "
       end
 
@@ -103,6 +105,11 @@ def limit_and_offset
         end
       end
 
+      def indexes
+        return unless @mods[:index]
+        "USE INDEX (#{Array.wrap(@mods[:index]).join ', '})"
+      end
+
       def full_syntax
         @query.full? ? yield : return
       end

mod/carrierwave/set/abstract/attachment/00_upload_cache.rb

@@ -58,6 +58,7 @@ def assign_attachment file, original_filename
 
 # at some point uploaded files of canceled file card creation
 # should be deleted. We do this when ever an new file is created.
+# FIXME: move to cron job
 event :clear_draft_files, :integrate_with_delay, priority: 100, on: :create do
   Card.delete_tmp_files_of_cached_uploads
 end

mod/format/lib/card/format/html_format.rb

@@ -25,14 +25,16 @@ def mime_type
         "text/html"
       end
 
+      def stylesheet_link_tag path
+        tag "link", href: path, media: "all", rel: "stylesheet", type: "text/css"
+      end
+
+      private
+
       def final_render_call method
         rendered = super
         rendered.is_a?(Array) ? output(rendered) : rendered
       end
-
-      def stylesheet_link_tag path
-        tag "link", href: path, media: "all", rel: "stylesheet", type: "text/css"
-      end
     end
   end
 end