card 1.18.3 → 1.18.4

data/mod/03_machines/set/self/script_ace.rb

@@ -1,11 +1 @@
-
-view :raw do |_args|
-  Rails.logger.info "reading file: #{Cardio.gem_root}/mod/03_machines/lib/javascript/#{card.codename}.js"
-  File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/#{card.codename}.js"
-end
-
-format :html do
-  view :editor do |_args|
-    "Content is stored in file and can't be edited."
-  end
-end
+include_set Abstract::CodeFile

data/mod/03_machines/set/self/script_card_menu.rb

@@ -1,10 +1 @@
-view :raw do |_args|
-  Rails.logger.info "reading file: #{Cardio.gem_root}/mod/03_machines/lib/javascript/#{card.codename}.js.coffee"
-  File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/#{card.codename}.js.coffee"
-end
-
-format :html do
-  view :editor do |_args|
-    "Content is stored in file and can't be edited."
-  end
-end
+include_set Abstract::CodeFile

data/mod/03_machines/set/self/script_html5shiv_printshiv.rb

@@ -1,2 +1 @@
-format { include ScriptAce::Format }
-format(:html) { include ScriptAce::HtmlFormat }
+include_set Abstract::CodeFile

data/mod/03_machines/set/self/script_jquery.rb

@@ -1,2 +1 @@
-format { include ScriptAce::Format }
-format(:html) { include ScriptAce::HtmlFormat }
+include_set Abstract::CodeFile

data/mod/03_machines/set/self/script_jquery_helper.rb

@@ -1,12 +1,9 @@
+include_set Abstract::CodeFile
 
-view :raw do |_args|
+def source_files
   # jquery.ui.all must be after jquery.mobile to override dialog weirdness *
   # jquery.ui.autocomplete must be after jquery.ui stuff
   # FIXME removed  jquerymobile.js. Doesn't work with the new jquery version
-  js_files = %w( jquery-ui.js jquery.ui.autocomplete.html.js jquery.autosize.js jquery.fileupload.js jquery.iframe-transport.js jquery_ujs.js )
-  js_files.map do |filename|
-    File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/#{filename}"
-  end.join("\n")
+  %w( jquery-ui.js jquery.ui.autocomplete.html.js jquery.autosize.js
+      jquery.fileupload.js jquery.iframe-transport.js jquery_ujs.js )
 end
-
-format(:html) { include ScriptAce::HtmlFormat }

data/mod/03_machines/set/self/script_slot.rb

@@ -1,7 +1,5 @@
-view :raw do |_args|
-  ['wagn_mod.js.coffee', 'wagn.js.coffee'].map do |name|
-    File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/#{name}"
-  end.join("\n")
-end
+include_set Abstract::CodeFile
 
-format(:html) { include ScriptAce::HtmlFormat }
+def source_files
+  %w( wagn_mod.js.coffee wagn.js.coffee )
+end

data/mod/03_machines/set/self/script_tinymce.rb

@@ -1,2 +1 @@
-format { include ScriptAce::Format }
-format(:html) { include ScriptAce::HtmlFormat }
+include_set Abstract::CodeFile

data/mod/03_machines/set/self/style_bootstrap_compatible.rb

@@ -1,5 +1 @@
-view :raw do |_args|
-  File.read "#{Cardio.gem_root}/mod/03_machines/lib/stylesheets/#{card.codename}.css"
-end
-
-format(:html) { include ScriptAce::HtmlFormat }
+include_set Abstract::CodeFile

data/mod/03_machines/set/self/style_cards.rb

@@ -1,6 +1 @@
-
-view :raw do |_args|
-  File.read "#{Cardio.gem_root}/mod/03_machines/lib/stylesheets/style_cards.scss"
-end
-
-format(:html) { include ScriptAce::HtmlFormat }
+include_set Abstract::CodeFile

data/mod/03_machines/set/self/style_jquery_ui_smoothness.rb

@@ -1,2 +1 @@
-format { include StyleBootstrapCompatible::Format }
-format(:html) { include ScriptAce::HtmlFormat }
+include_set Abstract::CodeFile

data/mod/03_machines/set/type/coffee_script.rb

@@ -11,7 +11,7 @@ include MachineInput
 def compile_coffee script
   ::CoffeeScript.compile script
 rescue => e
-  e
+  raise Card::Error, "CoffeeScript::Error (#{name}): #{e.message}"
 end
 
 machine_input do

data/mod/03_machines/set/type/css.rb

@@ -12,7 +12,16 @@ end
 def compress_css input
   Sass.compile input, style: :compressed
 rescue => e
-  raise Card::Oops, "Stylesheet Error:\n#{e.message}"
+  # scss is compiled in a view
+  # If there is a scss syntax error we get the rescued view here
+  # and the error that the rescued view is no valid css
+  # To get the original error we have to refer to Card::Error.current
+  msg = if Card::Error.current
+          Card::Error.current.message
+        else
+          "Sass::SyntaxError (#{name}): #{e.message}"
+        end
+  raise Card::Error, msg
 end
 
 def clean_html?

data/mod/03_machines/set/type/java_script.rb

@@ -7,7 +7,22 @@ include MachineInput
 store_machine_output filetype: 'js'
 
 machine_input do
-  Uglifier.compile(format(:js)._render_core)
+  compress_js format(:js)._render_core
+end
+
+def compress_js input
+  Uglifier.compile(input)
+rescue => e
+  # CoffeeScript is compiled in a view
+  # If there is a CoffeeScript syntax error we get the rescued view here
+  # and the error that the rescued view is no valid Javascript
+  # To get the original error we have to refer to Card::Error.current
+  msg = if Card::Error.current
+          Card::Error.current.message
+        else
+          "CoffeeScript::SyntaxError (#{name}): #{e.message}"
+        end
+  raise Card::Error, msg
 end
 
 def clean_html?

data/mod/03_machines/set/type/scss.rb

@@ -13,8 +13,9 @@ format do
 
   def compile_scss scss, style=:expanded
     Sass.compile scss, style: style
-  rescue => e
-    e
+  rescue Sass::SyntaxError => e
+    raise Card::Error, "Sass::SyntaxError (#{card.name}:#{e.sass_line}): " \
+                       "#{e.message}"
   end
 end
 

data/mod/05_standard/lib/image_uploader.rb

@@ -20,6 +20,21 @@ class ImageUploader < FileUploader
     process resize_to_fit: [500, 500]
   end
 
+  # version :small_square, if: :create_versions?,
+  #                        from_version: :medium_square do
+  #   process resize_to_fill: [75, 75]
+  # end
+  # version :medium_square, if: :create_versions? do
+  #   process resize_to_fill: [200, 200]
+  # end
+  #
+  # In case we decide to support the squared versions
+  # we have to update all existing images with the following snippet:
+  # Card.search(type_id: Card::ImageID) do |card|
+  #   card.image.cache_stored_file!
+  #   card.image.recreate_versions!
+  # end
+
   def identifier
     full_filename(super())
   end

data/mod/05_standard/set/all/rich_html/editing.rb

@@ -73,7 +73,7 @@ format :html do
   end
 
   view :edit, perms: :update, tags: :unknown_ok do |args|
-    frame_and_form :update, args.merge(optional_toolbar: :show) do
+    frame_and_form :update, args.reverse_merge(optional_toolbar: :show) do
       [
         _optional_render(:content_formgroup, args),
         _optional_render(:button_formgroup, args)
@@ -214,7 +214,7 @@ format :html do
   view :edit_nests do |args|
     frame args do
       with_nest_mode :edit do
-        process_relative_tags optional_toolbar: :hide
+        process_nested_fields optional_toolbar: :hide
       end
     end
   end

data/mod/05_standard/set/all/rich_html/form.rb

@@ -1,7 +1,8 @@
 format :html do
   def edit_slot args={}
     # note: @mode should already be :edit here...
-    if args[:structure] || card.structure
+    if args[:structure] || card.structure ||
+       args[:edit_fields]
       multi_card_edit_slot args
     else
       single_card_edit_slot args
@@ -11,8 +12,10 @@ format :html do
   def multi_card_edit_slot args
     if args[:core_edit] # need better name
       _render_core args
+    elsif args[:edit_fields]
+      process_edit_fields args[:edit_fields]
     else
-      process_relative_tags optional_toolbar: :hide,
+      process_nested_fields optional_toolbar: :hide,
                             structure: args[:structure]
     end
   end
@@ -28,6 +31,28 @@ format :html do
     end
   end
 
+  def process_nested_fields args
+    nested_fields(args).map do |chunk|
+      nested_card = fetch_nested_card chunk.options
+      nest nested_card, chunk.options.reverse_merge(args)
+    end.join "\n"
+  end
+
+  # @param [Hash|Array] fields either an array with field names and/or field
+  # cards or a hash with the fields as keys and a hash with nest options as
+  # values
+  def process_edit_fields fields
+    fields.map do |field, opts|
+      nested_card =
+        if field.is_a?(Card)
+          field
+        else
+          fetch_nested_card inc_name: field
+        end
+      nest nested_card, opts
+    end.join "\n"
+  end
+
   def form_for_multi
     instantiate_builder("card#{subcard_input_names}", card, {})
   end
@@ -99,7 +124,7 @@ format :html do
   def formgroup title, content, opts={}
     wrap_with :div, formgroup_div_args(opts[:class]) do
       %(
-        <label>#{title}</label>
+        #{form.label(opts[:editor] || :content, title)}
         <div>
           #{editor_wrap(opts[:editor]) { content }}
           #{formgroup_help_text opts[:help]}
@@ -127,12 +152,13 @@ format :html do
     result = ''
     hash ||= {}
     hash.each do |key, val|
-      result += if Hash === val
-                  hidden_tags val, key
-                else
-                  name = base ? "#{base}[#{key}]" : key
-        hidden_field_tag name, val
-      end
+      result +=
+        if val.is_a?(Hash)
+          hidden_tags val, key
+        else
+          name = base ? "#{base}[#{key}]" : key
+          hidden_field_tag name, val
+        end
     end
     result
   end
@@ -140,15 +166,17 @@ format :html do
   # FIELDSET VIEWS
 
   view :name_formgroup do |args|
-    formgroup 'name', raw(name_field form), editor: 'name', help: args[:help]
+    formgroup 'name', raw(name_field(form)),
+              editor: 'name', help: args[:help]
   end
 
   view :type_formgroup do |args|
     field = if args[:variety] == :edit # FIXME: dislike this api -ef
               type_field class: 'type-field edit-type-field'
             else
-              type_field class: 'type-field live-type-field', href: path(view: :new), 'data-remote' => true
-    end
+              type_field class: 'type-field live-type-field',
+                         href: path(view: :new), 'data-remote' => true
+            end
     formgroup 'type', field, editor: 'type', class: 'type-formgroup'
   end
 
@@ -224,13 +252,6 @@ format :html do
     formgroup fancy_title(args[:title]), content, opts
   end
 
-  def process_relative_tags args
-    nested_fields(args).map do |chunk|
-      nested_card = fetch_nested_card chunk.options
-      nest nested_card, chunk.options.reverse_merge(args)
-    end.join "\n"
-  end
-
   # form helpers
 
   FIELD_HELPERS =

data/mod/05_standard/set/all/rich_html/modal.rb

@@ -8,10 +8,12 @@ format :html do
     link_to(args[:text] || _render_title(args), path(path_opts), html_args)
   end
 
-  view :modal_slot do |args|
+  view :modal_slot, tags: :unknown_ok do |args|
     id = "modal-#{args[:modal_id] || 'main-slot'}"
+    dialog_args = { class: 'modal-dialog' }
+    add_class dialog_args, args[:dialog_class]
     wrap_with(:div, class: 'modal fade', role: 'dialog', id: id) do
-      wrap_with(:div, class: 'modal-dialog') do
+      wrap_with(:div, dialog_args) do
         content_tag :div, class: 'modal-content' do
           ''
         end

data/mod/05_standard/set/all/rich_html/toolbar.rb

@@ -1,12 +1,14 @@
-
 format :html do
   def toolbar_pinned?
     (tp = Card[:toolbar_pinned]) && tp.content == 'true'
   end
 
   view :toolbar do |args|
-    navbar "toolbar-#{card.cardname.safe_key}-#{args[:home_view]}", toggle_align: :left, class: 'slotter toolbar', navbar_type: 'inverse',
-                                                                    collapsed_content: close_link(args.merge(class: 'pull-right visible-xs')) do
+    collapsed = close_link(args.merge(class: 'pull-right visible-xs'))
+    navbar "toolbar-#{card.cardname.safe_key}-#{args[:home_view]}",
+           toggle_align: :left, class: 'slotter toolbar',
+           navbar_type: 'inverse',
+           collapsed_content: collapsed do
       [
         close_link(args.merge(class: 'hidden-xs navbar-right')),
         (wrap_with(:form, class: 'navbar-form navbar-left') do
@@ -25,6 +27,7 @@ format :html do
       ]
     end
   end
+
   def default_toolbar_args args
     args[:nested_fields] = nested_fields(args)
     args[:active_toolbar_button] ||= active_toolbar_button @slot_view, args
@@ -54,11 +57,18 @@ format :html do
     end
   end
 
+  TOOLBAR_TITLE = {
+    edit: 'content', edit_name: 'name', edit_type: 'type',
+    edit_structure: 'structure', edit_nests: 'nests', history: 'history',
+    common_rules: 'common', recent_rules: 'recent', grouped_rules: 'all',
+    edit_nest_rules: 'nests'
+  }.freeze
+
   def toolbar_view_title view
     if view == :edit_rules
       current_set_card.name
     else
-      { edit: 'content', edit_name: 'name', edit_type: 'type', edit_structure: 'structure', edit_nests: 'nests', history: 'history', common_rules: 'common', recent_rules: 'recent', grouped_rules: 'all', edit_nest_rules: 'nests' }[view]
+      TOOLBAR_TITLE[view]
     end
   end
 
@@ -76,11 +86,16 @@ format :html do
   end
 
   def rules_split_button args
-    recent = smart_link 'recent',   view: :edit_rules, slot: { rule_view: :recent_rules }
-    common = smart_link 'common',   view: :edit_rules, slot: { rule_view: :common_rules }
-    group  = smart_link 'by group', view: :edit_rules, slot: { rule_view: :grouped_rules }
-    all    = smart_link 'by name',  view: :edit_rules, slot: { rule_view: :all_rules }
-    nests  = smart_link 'nests',    view: :edit_nest_rules, slot: { rule_view: :field_related_rules }
+    recent = smart_link 'recent',   view: :edit_rules,
+                                    slot: { rule_view: :recent_rules }
+    common = smart_link 'common',   view: :edit_rules,
+                                    slot: { rule_view: :common_rules }
+    group  = smart_link 'by group', view: :edit_rules,
+                                    slot: { rule_view: :grouped_rules }
+    all    = smart_link 'by name',  view: :edit_rules,
+                                    slot: { rule_view: :all_rules }
+    nests  = smart_link 'nests',    view: :edit_nest_rules,
+                                    slot: { rule_view: :field_related_rules }
     toolbar_split_button 'rules',   { view: :edit_rules }, args do
       {
         common_rules:    common,
@@ -97,19 +112,27 @@ format :html do
     toolbar_split_button 'edit', { view: :edit }, args do
       {
         edit:       _render_edit_content_link(args),
-        edit_nests: (_render_edit_nests_link if !card.structure && args[:nested_fields].present?),
-        structure:  (smart_link 'structure', view: :edit_structure if structure_editable?),
+        edit_nests: (_render_edit_nests_link if nests_editable?(args)),
+        structure:  (_render_edit_structure_link if structure_editable?),
         edit_name:  _render_edit_name_link,
         edit_type:  _render_edit_type_link
       }
     end
   end
 
+  def nests_editable? args
+    !card.structure && args[:nested_fields].present?
+  end
+
   def account_split_button args
     toolbar_split_button 'account', { related: Card[:account].key }, args do
       {
-        account: smart_link('details', related: { name: "#{card.name}+#{Card[:account].key}", view: :edit }),
-        roles:   smart_link('roles',  related: Card[:roles].key),
+        account: smart_link('details',
+                            related: {
+                              name: "#{card.name}+#{Card[:account].key}",
+                              view: :edit }
+                           ),
+        roles:   smart_link('roles', related: Card[:roles].key),
         created: smart_link('created', related: Card[:created].key),
         edited:  smart_link('edited', related: Card[:edited].key),
         follow:  smart_link('follow', related: Card[:follow].key)
@@ -118,12 +141,15 @@ format :html do
   end
 
   def toolbar_split_button name, button_args, args
-    button = button_link name, button_args, class: ('active' if args[:active_toolbar_button] == name)
+    button =
+      button_link name, button_args,
+                  class: ('active' if args[:active_toolbar_button] == name)
     active_item =
       if @slot_view == :related
         if args[:rule_view]
           args[:rule_view].to_sym
-        elsif args[:related_card] && (r = args[:related_card].right) && (cn = r.codename)
+        elsif args[:related_card] && (r = args[:related_card].right) &&
+              (cn = r.codename)
           cn.to_sym
         end
       else
@@ -135,10 +161,10 @@ format :html do
   end
 
   def close_link args
-    link_opts = { title: 'cancel' }
+    link_opts = { title: 'cancel',
+                  class: 'btn-toolbar-control btn btn-primary' }
     link_opts[:path_opts] = { slot: { subframe: true } } if args[:subslot]
-
-    link = view_link glyphicon('remove'), :home, link_opts.merge(class: 'btn-toolbar-control btn btn-primary')
+    link = view_link glyphicon('remove'), :home, link_opts
     css_class = ['nav navbar-nav', args[:class]].compact.join "\n"
     wrap_with :div, class: css_class do
       [
@@ -146,17 +172,21 @@ format :html do
         link
       ]
     end
-    # list_tag link, class: css_class
   end
 
   def toolbar_pin_button
-    button_tag glyphicon('pushpin'), situation: :primary, remote: true, title: "#{'un' if toolbar_pinned?}pin", class: "btn-toolbar-control toolbar-pin #{'in' unless toolbar_pinned?}active"
+    button_tag glyphicon('pushpin'),
+               situation: :primary, remote: true,
+               title: "#{'un' if toolbar_pinned?}pin",
+               class: 'btn-toolbar-control toolbar-pin ' \
+                      "#{'in' unless toolbar_pinned?}active"
   end
 
   view :toolbar_buttons do |args|
+    show_or_hide_delete = card.ok?(:delete) ? :show : :hide
     wrap_with(:div, class: 'btn-group') do
       [
-        _optional_render(:delete_button,  args, (card.ok?(:delete) ? :show : :hide)),
+        _optional_render(:delete_button,  args, show_or_hide_delete),
         _optional_render(:refresh_button, args, :show),
         _optional_render(:related_button, args, :show),
         _optional_render(:history_button, args, :hide)
@@ -166,52 +196,63 @@ format :html do
 
   view :related_button do |_args|
     path_opts = { slot: { show: :toolbar } }
-    dropdown_button '', icon: 'education', class: 'related' do # , icon: 'eye-open' do
+    dropdown_button '', icon: 'education', class: 'related' do
       [
-        menu_item(' children',       'baby-formula', path_opts.merge(related: '*children')),
-        menu_item(' mates',          'bed',          path_opts.merge(related: '*mates')),
-        menu_item(' references out', 'log-out',      path_opts.merge(related: '*refers_to')),
-        menu_item(' references in',  'log-in',       path_opts.merge(related: '*referred_to_by'))
+        menu_item(' children',       'baby-formula',
+                  path_opts.merge(related: '*children')),
+        menu_item(' mates',          'bed',
+                  path_opts.merge(related: '*mates')),
+        menu_item(' references out', 'log-out',
+                  path_opts.merge(related: '*refers_to')),
+        menu_item(' references in',  'log-in',
+                  path_opts.merge(related: '*referred_to_by'))
       ]
     end
   end
   view :refresh_button do |_args|
     path_opts = { slot: { show: :toolbar }, page: card }
     icon = main? ? 'refresh' : 'new-window'
-    toolbar_button('refresh', icon, 'hidden-xs hidden-sm hidden-md hidden-lg', path_opts: path_opts)
+    toolbar_button 'refresh', icon, 'hidden-xs hidden-sm hidden-md hidden-lg',
+                   path_opts: path_opts
   end
 
   view :delete_button do |_args|
-    toolbar_button('delete', 'trash', 'hidden-xs hidden-sm hidden-md hidden-lg',
-                   action: :delete,
-                   class: 'slotter',
-                   remote: true,
-                   path_opts: { success: main? ? 'REDIRECT: *previous' : "TEXT: #{card.name} deleted" },
-                   :'data-confirm' => "Are you sure you want to delete #{card.name}?"
-                  )
+    toolbar_button(
+      'delete', 'trash', 'hidden-xs hidden-sm hidden-md hidden-lg',
+      action: :delete,
+      class: 'slotter',
+      remote: true,
+      path_opts: {
+        success: main? ? 'REDIRECT: *previous' : "TEXT: #{card.name} deleted"
+      },
+      :'data-confirm' => "Are you sure you want to delete #{card.name}?"
+    )
   end
 
   def toolbar_button text, symbol, hide=nil, tag_args={}
     hide ||= 'hidden-xs hidden-sm hidden-md hidden-lg'
     tag_args[:class] = [tag_args[:class], 'btn btn-primary'].compact * ' '
     tag_args[:title] ||= text
-    link_text = "#{glyphicon symbol}<span class='menu-item-label #{hide}'>#{text}</span>"
+    link_text =
+      glyphicon(symbol) +
+      content_tag(:span, text.html_safe, class: "menu-item-label #{hide}")
 
-    if cardname = tag_args.delete(:page)
+    if (cardname = tag_args.delete(:page))
       card_link cardname, class: klass, text: link_text
-    elsif viewname = tag_args.delete(:view)
+    elsif (viewname = tag_args.delete(:view))
       tag_args[:path_opts] ||= { slot: { show: :toolbar } }
       view_link link_text, viewname, tag_args
     else
       path_opts = tag_args.delete(:path_opts) || {}
       path_opts[:action] = tag_args.delete(:action) if tag_args[:action]
       link_to link_text, path_opts, tag_args
-
     end
   end
 
   def autosaved_draft_link
-    view_link('autosaved draft', :edit, path_opts: { edit_draft: true, slot: { show: :toolbar } }, class: 'navbar-link slotter pull-right')
+    view_link 'autosaved draft', :edit,
+              path_opts: { edit_draft: true, slot: { show: :toolbar } },
+              class: 'navbar-link slotter pull-right'
   end
 
   def default_edit_content_link_args args
@@ -220,24 +261,32 @@ format :html do
   view :edit_content_link do |args|
     toolbar_view_link :edit, args
   end
+
   def default_edit_name_link_args args
     args[:title] ||= 'name'
   end
   view :edit_name_link do |args|
     toolbar_view_link :edit_name, args
   end
+
   def default_edit_type_link_args args
     args[:title] ||= 'type'
   end
   view :edit_type_link do |args|
     toolbar_view_link :edit_type, args
   end
+
+  view :edit_structure_link do |_args|
+    smart_link 'structure', view: :edit_structure
+  end
+
   def default_history_link_args args
     args[:title] ||= 'history'
   end
   view :history_link do |args|
     toolbar_view_link :history, args
   end
+
   def default_edit_nests_link_args args
     args[:title] ||= 'nests'
   end