card 1.96.1 → 1.96.2

data/mod/standard/set/all/rich_html/form.rb

@@ -29,7 +29,7 @@ format :html do
   end
 
   def button_formgroup
-    wrap_with :div, class: "form-group" do
+    wrap_with :div, class: classy("form-group") do
       wrap_with :div, yield
     end
   end
@@ -92,10 +92,14 @@ format :html do
 
   # test: are we opening a new multi-card form?
   def multi_card_editor?
-    nests_editor? ||                         # editor configured in voo
-      voo.structure || voo.edit_structure || # structure configured in voo
-      card.structure ||                      # structure in card rule
-      edit_fields.present?                   # list of fields in card rule
+    voo.structure || voo.edit_structure || # structure configured in voo
+      card.structure ||                    # structure in card rule
+      edit_fields?                         # list of fields in card rule
+  end
+
+  # override and return true to optimize
+  def edit_fields?
+    edit_fields.present?
   end
 
   # test: are we already within a multi-card form?
@@ -103,10 +107,6 @@ format :html do
     @in_multi_card_editor.present?
   end
 
-  def nests_editor?
-    voo.editor == :nests
-  end
-
   def single_card_edit_field
     if voo.show?(:type_formgroup) || voo.show?(:name_formgroup)
       # display content field in formgroup for consistency with other fields

data/mod/standard/set/all/rich_html/menu.rb

@@ -14,22 +14,31 @@ format :html do
   end
 
   def wrap_menu
-    wrap_with :div, class: classy(%w(menu-slot nodblclick)) do
+    wrap_with :div, class: classy(%w[menu-slot nodblclick]) do
       yield
     end
   end
 
   view :menu_link do
-    css_class =
-      show_view?(:horizontal_menu, :hide) ? "d-sm-none" : "_show-on-hover"
+    menu_link
+  end
 
-    wrap_with :div, class: "vertical-card-menu card-menu #{css_class}" do
+  def menu_link
+    wrap_with :div, class: "vertical-card-menu card-menu #{menu_link_classes}" do
       wrap_with :div, class: "btn-group slotter card-slot float-right" do
         link_to_view :vertical_menu, menu_icon, path: menu_link_path_opts
       end
     end
   end
 
+  def menu_link_classes
+    if show_view? :hover_link
+      show_view?(:horizontal_menu, :hide) ? "d-sm-none" : "_show-on-hover"
+    else
+      ""
+    end
+  end
+
   # this should probably be added in javascript.
   # the menu link is not a "slotter", because it doesn't replace the whole
   # slot (it just adds a menu). But it should use the js code that adds slot
@@ -60,7 +69,7 @@ format :html do
   def vertical_menu_item_list
     wrap_with :ul, class: "dropdown-menu dropdown-menu-right", role: "menu" do
       menu_item_list.map do |item|
-        %{<li>#{item}</li>}
+        %(<li>#{item}</li>)
       end.join("\n").html_safe
     end
   end

data/mod/standard/spec/content/chunk/include_spec.rb

@@ -154,8 +154,7 @@ describe Card::Content::Chunk::Nest, "Inclusion" do
       create! "Quentin", "{{Admin}}"
       adm = Card["Quentin"]
       adm.update_attributes content: "{{Oak}}"
-      result = adm.format.render_core
-      expect(result).to match("too deep")
+      expect(adm.format.render_core).to match(/too deep/)
     end
 
     it "handles missing cards" do

data/mod/standard/spec/set/type/search_type_spec.rb

@@ -131,7 +131,7 @@ RSpec.describe Card::Set::Type::SearchType do
 
       context "with paging" do
         def paging_url offset
-          json_url(card_subject.name.url_key, "limit=1&offset=#{offset}")
+          json_url card_subject.name.url_key, "item=name&limit=1&offset=#{offset}"
         end
 
         let(:paging_values) do

data/mod/utility/set/abstract/bs_badge/bs_badge.haml

@@ -1,5 +1,5 @@
 %span.labeled-badge{ class: klass }
   %span.badge{ class: "badge-#{color}" }
     = count
-  %label.mr-2.text-muted
+  %label.mr-2.text-muted.small
     = label

data/mod/utility/set/abstract/media.rb

@@ -13,6 +13,7 @@ format :html do
   end
 
   def text_with_image opts={}
+    class_up "media-left", "m-2"
     @image_card = Card.cardish(opts[:image]) if opts[:image]
     haml :media_snippet, normalized_text_with_image_opts(opts)
   end
@@ -26,6 +27,7 @@ format :html do
                         alt: image_alt,
                         size: :original,
                         media_opts: {},
-                        media_left_extras: ""
+                        media_left_extras: "",
+                        media_left: ""
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.96.1
+  version: 1.96.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -561,15 +561,15 @@ files:
 - lib/card/query/act_query.rb
 - lib/card/query/action_query.rb
 - lib/card/query/card_query.rb
-- lib/card/query/card_query/attribute_helper.rb
 - lib/card/query/card_query/conjunctions.rb
+- lib/card/query/card_query/found_by.rb
 - lib/card/query/card_query/interpretation.rb
+- lib/card/query/card_query/match_attributes.rb
 - lib/card/query/card_query/normalization.rb
 - lib/card/query/card_query/reference_attributes.rb
 - lib/card/query/card_query/relational_attributes.rb
 - lib/card/query/card_query/run.rb
 - lib/card/query/card_query/sorting.rb
-- lib/card/query/card_query/special_attributes.rb
 - lib/card/query/clause.rb
 - lib/card/query/join.rb
 - lib/card/query/reference_query.rb
@@ -4707,15 +4707,16 @@ files:
 - mod/history/lib/card/action/admin.rb
 - mod/history/lib/card/action/differ.rb
 - mod/history/lib/card/change.rb
-- mod/history/set/all/act_view.rb
-- mod/history/set/all/action_view.rb
-- mod/history/set/all/actions.rb
-- mod/history/set/all/acts.rb
-- mod/history/set/all/content_history.rb
 - mod/history/set/all/history.rb
-- mod/history/spec/set/all/act_view_spec.rb
-- mod/history/spec/set/all/action_view_spec.rb
-- mod/history/spec/set/all/history_spec.rb
+- mod/history/set/all/history/act_listing.rb
+- mod/history/set/all/history/actions.rb
+- mod/history/set/all/history/acts.rb
+- mod/history/set/all/history/events.rb
+- mod/history/set/all/history/last.rb
+- mod/history/set/all/history/revision.rb
+- mod/history/set/all/history/selected.rb
+- mod/history/set/all/history/views.rb
+- mod/history/spec/set/all/history/views_spec.rb
 - mod/item/set/all/bar.haml
 - mod/item/set/all/bar.rb
 - mod/item/set/all/box.haml
@@ -4901,6 +4902,7 @@ files:
 - mod/pointer/spec/set/abstract/pointer/events_spec.rb
 - mod/pointer/spec/set/abstract/pointer/html_views_spec.rb
 - mod/pointer/spec/set/abstract/pointer/item_api_spec.rb
+- mod/pointer/spec/set/abstract/pointer/options_api_spec.rb
 - mod/pointer/spec/set/abstract/pointer/other_views_spec.rb
 - mod/pointer/spec/set/self/input_options_spec.rb
 - mod/prosemirror_editor/db/migrate_core_cards/20160804112548_add_prosemirror_cards.rb
@@ -4919,6 +4921,7 @@ files:
 - mod/search/set/abstract/03_filter.rb
 - mod/search/set/abstract/04_right_filter_form.rb
 - mod/search/set/abstract/search.rb
+- mod/search/set/abstract/search/views.rb
 - mod/search/set/abstract/wql_search.rb
 - mod/search/set/self/navbox.rb
 - mod/search/set/self/recent.rb
@@ -5017,6 +5020,9 @@ files:
 - mod/standard/set/all/rich_html/content.rb
 - mod/standard/set/all/rich_html/editing.rb
 - mod/standard/set/all/rich_html/editor.rb
+- mod/standard/set/all/rich_html/error.rb
+- mod/standard/set/all/rich_html/error/not_found.haml
+- mod/standard/set/all/rich_html/error/server_error.haml
 - mod/standard/set/all/rich_html/form.rb
 - mod/standard/set/all/rich_html/form_elements.rb
 - mod/standard/set/all/rich_html/formgroup.rb
@@ -5105,8 +5111,6 @@ files:
 - mod/standard/spec/set/type/set_spec.rb
 - mod/standard/spec/set/type/toggle_spec.rb
 - mod/standard/spec/set/type/uri_spec.rb
-- mod/standard/template/all/error/not_found.haml
-- mod/standard/template/all/error/server_error.haml
 - mod/tinymce_editor/db/migrate_core_cards/20160804112560_add_tinymce_cards.rb
 - mod/tinymce_editor/db/migrate_core_cards/20171113233151_update_tinymce_config.rb
 - mod/tinymce_editor/lib/javascript/script_tinymce.js

data/lib/card/query/card_query/attribute_helper.rb

@@ -1,74 +0,0 @@
-class Card
-  module Query
-    class CardQuery
-      # helper methods for relational and special attributes
-      module AttributeHelper
-        private
-
-        def tie_action action, val
-          tie :action, { action => val }, to: :card_id
-        end
-
-        def tie_act action, val
-          tie :act, { action => val }, to: :actor_id
-        end
-
-        def junction val, side, field
-          tie :card, junction_val(val, side), to: field
-        end
-
-        def junction_val val, side
-          part_clause, junction_clause = val.is_a?(Array) ? val : [val, {}]
-          clause_to_hash(junction_clause).merge side => part_clause
-        end
-
-        def name_or_content_match val
-          cxn = connection
-          or_join([field_match("replace(#{table_alias}.name,'+',' ')", val, cxn),
-                   field_match("#{table_alias}.db_content", val, cxn)])
-        end
-
-        def field_match field, val, cxn
-          %(#{field} #{cxn.match quote("[[:<:]]#{val}[[:>:]]")})
-        end
-
-        def name_like patterns, extra_cond=""
-          likes =
-            Array(patterns).map do |pat|
-              "lower(#{table_alias}.name) LIKE lower(#{quote pat})"
-            end
-          add_condition "#{or_join(likes)} #{extra_cond}"
-        end
-
-        def found_by_statement card
-          card&.try(:wql_hash) || invalid_found_by_card!(card)
-        end
-
-        def invalid_found_by_card! card
-          raise Card::Error::BadQuery, '"found_by" value must be valid Search, ' \
-                                       "but #{card.name} is a #{card.type_name}"
-        end
-
-        def found_by_cards val
-          if val.is_a? Hash
-            Query.run val
-          else
-            Array.wrap(val).map do |v|
-              Card.fetch v.to_name.absolute(context), new: {}
-            end
-          end
-        end
-
-        # TODO: use standard conjunction handling
-
-        def or_join conditions
-          "(#{Array(conditions).join ' OR '})"
-        end
-
-        def and_join conditions
-          "(#{Array(conditions).join ' AND '})"
-        end
-      end
-    end
-  end
-end

data/lib/card/query/card_query/special_attributes.rb

@@ -1,49 +0,0 @@
-class Card
-  module Query
-    class CardQuery
-      # handle special CQL attributes
-      module SpecialAttributes
-        def found_by val
-          found_by_cards(val).compact.each do |card|
-            subquery found_by_statement(card).merge(fasten: :direct, context: card.name)
-          end
-        end
-
-        # Implements the match attribute that matches always against content and name.
-        # That's different from the match operator that can be restricted to names or
-        # content.
-        # Example: { match: "name or content" } vs. { name: ["match", "a name"] }
-        def match val
-          val.gsub!(/[^#{Card::Name::OK4KEY_RE}]+/, " ")
-          return nil if val.strip.empty?
-          val.gsub!("*", '\\\\\\\\*')
-          val_list = val.split(/\s+/).map do |v|
-            name_or_content_match v
-          end
-          add_condition and_join(val_list)
-        end
-
-        def name_match val
-          name_like "%#{val}%"
-        end
-
-        def complete val
-          no_plus_card = (val =~ /\+/ ? "" : "and #{table_alias}.right_id is null")
-          # FIXME: -- this should really be more nuanced --
-          # it breaks down after one plus
-          name_like "#{val}%", no_plus_card
-        end
-
-        def junction_complete val
-          name_like ["#{val}%", "%+#{val}%"]
-        end
-
-        def extension_type _val
-          # DEPRECATED LONG AGO!!!
-          Rails.logger.info "using DEPRECATED extension_type in WQL"
-          interpret right_plus: AccountID
-        end
-      end
-    end
-  end
-end

data/mod/history/set/all/action_view.rb

@@ -1,52 +0,0 @@
-format :html do
-  view :action_summary do
-    action_content action_from_context, :summary
-  end
-
-  view :action_expanded do
-    action_content action_from_context, :expanded
-  end
-
-  def action_from_context
-    if (action_id = voo.action_id || params[:action_id])
-      Action.fetch action_id
-    else
-      card.last_action
-    end
-  end
-
-  def action_content action, view_type
-    return "" unless action.present?
-    wrap do
-      [action_content_toggle(action, view_type),
-       content_diff(action, view_type)]
-    end
-  end
-
-  def content_diff action, view_type
-    diff = action.new_content? && content_changes(action, view_type)
-    return "<i>empty</i>" unless diff.present?
-    diff
-  end
-
-  def action_content_toggle action, view_type
-    return unless show_action_content_toggle?(action, view_type)
-    toggle_action_content_link action, view_type
-  end
-
-  def show_action_content_toggle? action, view_type
-    view_type == :expanded || action.summary_diff_omits_content?
-  end
-
-  def toggle_action_content_link action, view_type
-    other_view_type = view_type == :expanded ? :summary : :expanded
-    link_to_view "action_#{other_view_type}",
-                 icon_tag(action_arrow_dir(view_type)),
-                 class: "slotter revision-#{action.card_act_id} float-right",
-                 path: { action_id: action.id, look_in_trash: true }
-  end
-
-  def action_arrow_dir view_type
-    view_type == :expanded ? :triangle_left : :triangle_right
-  end
-end

data/mod/history/set/all/actions.rb

@@ -1,185 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-# must be called on all actions and before :set_name, :process_subcards and
-# :validate_delete_children
-event :assign_action, :initialize, when: :actionable? do
-  act = director.need_act
-  @current_action = Card::Action.create(
-    card_act_id: act.id,
-    action_type: @action,
-    draft: (Env.params["draft"] == "true")
-  )
-  if @supercard && @supercard != self
-    @current_action.super_action = @supercard.current_action
-  end
-end
-
-# can we store an action?
-def actionable?
-  history?
-end
-
-# stores changes in the changes table and assigns them to the current action
-# removes the action if there are no changes
-event :finalize_action, :finalize, when: :finalize_action? do
-  if changed_fields.present?
-    @current_action.update_attributes! card_id: id
-
-    # Note: #last_change_on uses the id to sort by date
-    # so the changes for the create changes have to be created before the first change
-    store_card_changes_for_create_action if first_change?
-    store_card_changes if @current_action.action_type != :create
-  elsif @current_action.card_changes.reload.empty?
-    @current_action.delete
-    @current_action = nil
-  end
-end
-
-def finalize_action?
-  actionable? && current_action
-end
-
-event :rollback_actions, :prepare_to_validate, on: :update, when: :rollback_request? do
-  update_args = process_revert_actions
-  Env.params["revert_actions"] = nil
-  update_attributes! update_args
-  clear_drafts
-  abort :success
-end
-
-def rollback_request?
-  history? && actions_to_revert.any?
-end
-
-def process_revert_actions
-  update_args = { subcards: {} }
-  reverting_to_previous = Env.params["revert_to"] == "previous"
-  actions_to_revert.each do |action|
-    merge_revert_action! action, update_args, reverting_to_previous
-  end
-  update_args
-end
-
-def actions_to_revert
-  Array.wrap(Env.params["revert_actions"]).map do |a_id|
-    Action.fetch(a_id) || nil
-  end.compact
-end
-
-def merge_revert_action! action, update_args, reverting_to_previous
-  rev = action.card.revision(action, reverting_to_previous)
-  if action.card_id == id
-    update_args.merge! rev
-  else
-    update_args[:subcards][action.card.name] = rev
-  end
-end
-
-def select_action_by_params params
-  return unless (action = find_action_by_params(params))
-  run_callbacks :select_action do
-    self.selected_action_id = action.id
-  end
-end
-
-def find_action_by_params args
-  if args[:rev]
-    nth_action args[:rev]
-  elsif args[:rev_id].is_a?(Integer) || args[:rev_id] =~ /^\d+$/
-    if (action = Action.fetch(args[:rev_id])) && action.card_id == id
-      action
-    end
-  # revision id is probably a mod (e.g. if you request
-  # files/:logo/standard.png)
-  elsif args[:rev_id]
-    last_action
-  end
-end
-
-def nth_action index
-  index = index.to_i
-  return unless id && index > 0
-  Action.where("draft is not true AND card_id = #{id}")
-        .order(:id).limit(1).offset(index - 1).first
-end
-
-def revision action, before_action=false
-  # a "revision" refers to the state of all tracked fields
-  # at the time of a given action
-  action = Card::Action.fetch(action) if action.is_a? Integer
-  return unless action
-  return revision_before_action action if before_action
-  Card::Change::TRACKED_FIELDS.each_with_object({}) do |field, attr_changes|
-    last_change = action.change(field) ||
-                  last_change_on(field, not_after: action)
-    attr_changes[field.to_sym] = (last_change ? last_change.value : self[field])
-  end
-end
-
-def revision_before_action action
-  if (prev_action = action.previous_action)
-    revision prev_action
-  else
-    { trash: true }
-  end
-end
-
-# Delete all changes and old actions and make the last action the create action
-# (that way the changes for that action will be created with the first update)
-def make_last_action_the_initial_action
-  delete_all_changes
-  old_actions.delete_all
-  last_action.update_attributes! action_type: :create
-end
-
-# # moves for every field the last change to the last action and deletes all other actions
-# def clear_history
-#   Card::Change::TRACKED_FIELDS.each do |field|
-#       # assign previous changes on each tracked field to the last action
-#       next unless (la = last_action) && !la.change(field).present? &&
-#                   (last_change = last_change_on field)
-#       # last_change comes as readonly record
-#       last_change = Card::Change.find(last_change.id)
-#       last_change.update_attributes!(card_action_id: last_action_id)
-#   end
-#   delete_old_action
-# end
-
-def clear_history
-  delete_all_changes
-  delete_old_actions
-end
-
-def delete_old_actions
-  old_actions.delete_all
-end
-
-def delete_all_changes
-  Card::Change.where(card_action_id: Card::Action.where(card_id: id).pluck(:id)).delete_all
-end
-
-def old_actions
-  actions.where("id != ?", last_action_id)
-end
-
-def create_action
-  @create_action ||= actions.first
-end
-
-# changes for the create action are stored after the first update
-def store_card_changes_for_create_action
-  Card::Change::TRACKED_FIELDS.each do |f|
-    Card::Change.create field: f,
-                        value: attribute_before_act(f),
-                        card_action_id: create_action.id
-  end
-end
-
-def store_card_changes
-  # FIXME: should be one bulk insert
-  changed_fields.each do |f|
-    Card::Change.create field: f,
-                        value: self[f],
-                        card_action_id: @current_action.id
-  end
-end