card 1.20.4 → 1.21.0

data/mod/machines/set/type/css.rb

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
+
 require "sass"
 include_set Abstract::Machine
 include_set Abstract::MachineInput
-include_set Abstract::AceEditor
 
 store_machine_output filetype: "css"
 
@@ -36,8 +36,12 @@ format do
 end
 
 format :html do
-  def default_editor_args args
-    args[:ace_mode] = "css"
+  def editor
+    :ace_editor
+  end
+
+  def ace_mode
+    :css
   end
 
   def default_nest_view

data/mod/machines/set/type/scss.rb

@@ -2,7 +2,7 @@ include_set Type::Css
 
 format do
   view :core, cache: :never do |_args|
-    compile_scss(process_content _render_raw)
+    compile_scss(process_content(_render_raw))
   end
 
   def compile_scss scss, style=:expanded
@@ -12,3 +12,9 @@ format do
                        "#{e.message}"
   end
 end
+
+format :html do
+  def ace_mode
+    :scss
+  end
+end

data/mod/machines/spec/set/type/coffeescript_spec.rb

@@ -6,7 +6,7 @@ describe Card::Set::Type::CoffeeScript do
   let(:changed_coffee)            { 'alert "Hello"  ' }
   let(:compressed_changed_coffee) { '(function(){alert("Hello")}).call(this);' }
 
-  it_should_behave_like "content machine", that_produces: :js do
+  it_behaves_like "content machine", that_produces: :js do
     let(:machine_card) do
       Card.gimme! "coffee machine", type: Card::CoffeeScriptID,
                                     content: coffee

data/mod/machines/spec/set/type/javascript_spec.rb

@@ -10,7 +10,7 @@ describe Card::Set::Type::JavaScript do
     "//#{source}\n#{content}"
   end
 
-  it_should_behave_like "content machine", that_produces: :js do
+  it_behaves_like "content machine", that_produces: :js do
     let(:machine_card) do
       Card.gimme! "test javascript", type: :java_script, content: js
     end

data/mod/machines/spec/set/type/scss_spec.rb

@@ -15,6 +15,7 @@ describe Card::Set::Type::Scss do
     SCSS
   end
   let(:compressed_changed_css) { "a{color:#fedcba}\n" }
+
   before do
     @scss_card = Card[:style_cards]
   end
@@ -28,7 +29,7 @@ describe Card::Set::Type::Scss do
     expect(@scss_card.format(:css).render_core).not_to match(/CodeRay/)
   end
 
-  it_should_behave_like "machine input"  do
+  it_behaves_like "machine input"  do
     let(:create_machine_input_card) do
       Card.gimme! "test scss", type: :scss, content: scss
     end
@@ -52,7 +53,7 @@ describe Card::Set::Type::Scss do
     end
   end
 
-  it_should_behave_like "content machine", that_produces: :css do
+  it_behaves_like "content machine", that_produces: :css do
     let(:machine_card) { Card.gimme! "test scss", type: :scss, content: scss }
     let(:card_content) do
       { in:           scss,         out:     compressed_css,

data/mod/machines/spec/set/type/skin_spec.rb

@@ -8,7 +8,7 @@ describe Card::Set::Type::Skin do
   let(:new_css)                { "#box{display: none }\n"   }
   let(:compressed_new_css)     { "#box{display:none}\n"   }
 
-  it_should_behave_like "pointer machine", that_produces: :css do
+  it_behaves_like "pointer machine", that_produces: :css do
     let(:machine_card) do
       Card.gimme! "test skin machine", type: :skin, content: ""
     end

data/mod/machines/spec/shared_examples/machine.rb

@@ -2,6 +2,7 @@
 
 shared_examples_for "machine" do |args|
   let(:filetype)  { args[:that_produces] }
+
   context "machine is run" do
     before do
       machine.update_machine_output
@@ -22,7 +23,7 @@ end
 shared_examples_for "content machine" do |args|
   let(:filetype) { args[:that_produces] }
 
-  it_should_behave_like "machine", args do
+  it_behaves_like "machine", args do
     let(:machine) { machine_card }
   end
 
@@ -50,7 +51,6 @@ shared_examples_for "content machine" do |args|
 end
 
 shared_examples_for "pointer machine" do |args|
-  let(:filetype) { args[:that_produces] }
   subject do
     # We build the following structure:
     #
@@ -106,7 +106,9 @@ shared_examples_for "pointer machine" do |args|
     change_machine
   end
 
-  it_should_behave_like "machine", args do
+  let(:filetype) { args[:that_produces] }
+
+  it_behaves_like "machine", args do
     let(:machine) { machine_card }
   end
 

data/mod/machines/spec/shared_examples/machine_input.rb

@@ -5,6 +5,7 @@ shared_examples_for "machine input" do
     myinput = create_machine_input_card
     myinput
   end
+
   let!(:machine) do
     f = create_machine_card
     f << create_machine_input_card

data/mod/notifications/format/email_html_format.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Card
   class Format
     class EmailHtmlFormat < Card::Format::HtmlFormat

data/mod/notifications/set/all/follow.rb

@@ -10,7 +10,7 @@ event :cache_expired_for_new_set, :store,
 end
 
 event :cache_expired_for_type_change, :store,
-      on: :update, changed: [:type_id, :name] do
+      on: :update, changed: %i[type_id name] do
   # FIXME: expire (also?) after save
   Card.follow_caches_expired
 end

data/mod/notifications/set/all/observer.rb

@@ -1,4 +1,4 @@
-[:create, :update, :delete].each do |action|
+%i[create update delete].each do |action|
   event "observer_#{action}".to_sym, :integrate, on: action do
     execute_card_events on: action
   end

data/mod/notifications/set/all/send_notifications.rb

@@ -135,8 +135,8 @@ format do
 
     relevant_fields =
       case action.action_type
-      when :create then [:cardtype, :content]
-      when :update then [:name, :cardtype, :content]
+      when :create then %i[cardtype content]
+      when :update then %i[name cardtype content]
       when :delete then [:content]
       end
 

data/mod/notifications/set/self/follow_defaults.rb

@@ -31,7 +31,8 @@ end
 
 format :html do
   view :edit, perms: :update, tags: :unknown_ok do
-    frame_and_form :update do
+    frame_and_form :update, hidden: { success: "_self",
+                                      card: { update_all_users: false } } do
       [
         _optional_render_content_formgroup,
         _optional_render_confirm_update_all,
@@ -59,7 +60,7 @@ format :html do
     cancel_button href: path(view: :edit, id: card.id)
   end
 
-  view :confirm_update_all do |args|
+  view :confirm_update_all do |_args|
     wrap do
       alert "info" do
         %(
@@ -70,10 +71,4 @@ format :html do
       end
     end
   end
-
-  def default_edit_args args
-    args[:hidden] ||= {}
-    args[:hidden].reverse_merge!(success: "_self",
-                                 card: { update_all_users: false })
-  end
 end

data/mod/notifications/set/type/email_template/email_config.rb

@@ -2,7 +2,7 @@ def email_config args={}
   config = {}
   args[:context] ||= self
 
-  [:to, :from, :cc, :bcc].each do |field_name|
+  %i[to from cc bcc].each do |field_name|
     process_email_field(field_name, config, args) do |field_card|
       field_card.process_email_addresses(
         args[:context], { format: "email_text" }, args
@@ -44,7 +44,7 @@ def process_email_field field, config, args
     elsif (field_card = fetch(trait: field))
       # configuration can be anything visible to configurer
       user = (args[:follower] && Card.fetch(args[:follower])) ||
-        field_card.updater
+             field_card.updater
       Auth.as(user) do
         yield(field_card)
       end

data/mod/notifications/set/type_plus_right/user/follow.rb

@@ -107,7 +107,7 @@ format :html do
 
   view :following_list, cache: :never do |_args|
     if !Auth.signed_in? || Auth.current_id != card.left.id
-      hide_buttons = [:delete_follow_rule_button, :add_follow_rule_button]
+      hide_buttons = %i[delete_follow_rule_button add_follow_rule_button]
     end
 
     sets = followed_by_set
@@ -135,7 +135,7 @@ format :html do
       end
     end
     if !Auth.signed_in? || Auth.current_id != card.left.id
-      hide_buttons = [:delete_follow_rule_button, :add_follow_rule_button]
+      hide_buttons = %i[delete_follow_rule_button add_follow_rule_button]
     end
     never = Card[:never].name
     wrap_with :div, class: "pointer-list-editor" do

data/mod/notifications/spec/set/all/follow_spec.rb

@@ -17,23 +17,28 @@ describe Card::Set::All::Follow do
     end
 
     subject { Card[cardname].follower_names.sort }
+
     context "followers of No One Sees Me" do
       let(:cardname) { "No One Sees Me" }
+
       it { is_expected.to eq([]) }
     end
 
     context "followers of Magnifier" do
       let(:cardname) { "Magnifier" }
+
       it { is_expected.to eq([]) }
     end
 
     context "followers of Magnifier+lens" do
       let(:cardname) { "Magnifier+lens" }
+
       it { is_expected.to eq ["Big Brother", "Narcissist"] }
     end
 
     context "followers of Sunglasses" do
       let(:cardname) { "Sunglasses" }
+
       it do
         is_expected.to eq ["Big Brother", "Narcissist", "Optic fan", "Sara",
                            "Sunglasses fan"]
@@ -42,6 +47,7 @@ describe Card::Set::All::Follow do
 
     context "followers of Sunglasses+tint" do
       let(:cardname) { "Sunglasses+tint" }
+
       it do
         is_expected.to eq ["Big Brother", "Narcissist", "Optic fan", "Sara",
                            "Sunglasses fan"]
@@ -50,6 +56,7 @@ describe Card::Set::All::Follow do
 
     context "followers of Google glass" do
       let(:cardname) { "Google glass" }
+
       it { is_expected.to eq ["Big Brother", "Optic fan", "Sara"] }
     end
   end

data/mod/notifications/spec/set/all/notify_spec.rb

@@ -37,6 +37,7 @@ shared_examples_for "notifications" do
         )
         @card.format(format: format).render_list_of_changes(action: action)
       end
+
       it { is_expected.to include "content: #{content}" }
     end
     context "for a given action id" do
@@ -48,6 +49,7 @@ shared_examples_for "notifications" do
         @card.format(format: format)
              .render_list_of_changes(action_id: action_id)
       end
+
       it { is_expected.to include "content: #{content}" }
     end
   end
@@ -141,6 +143,7 @@ describe Card::Set::All::SendNotifications do
               follow_option: "*always"
             ).text_part.body.raw_source
           end
+
           before do
             create_or_update! "#{name}+*self+*read",
                               type: "Pointer", content: "[[Administrator]]"

data/mod/notifications/spec/set/all/observer_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::EmailTemplate do
-  before :each do
+  before do
     Card::Auth.as_bot do
       Card.create! name: "mail template",  type_code: "email_template",
                    subcards: {

data/mod/notifications/spec/set/right/followers_spec.rb

@@ -28,6 +28,7 @@ describe Card::Set::Right::Followers do
 
   describe "item_names" do
     subject { @card.followers_card.item_names.sort }
+
     it "is an array of followers" do
       @card = Card["All Eyes On Me"]
       is_expected.to eq ["Big Brother", "John", "Sara"]

data/mod/pointer/set/abstract/00_paging_params.rb

@@ -0,0 +1,11 @@
+format do
+  def limit_param
+    @limit ||=
+      Env.params[:limit].present? ? Env.params.delete(:limit).to_i : default_limit
+  end
+
+  def offset_param
+    @offset ||=
+      Env.params[:offset].present? ? Env.params.delete(:offset).to_i : 0
+  end
+end

data/mod/pointer/set/abstract/{00_paging.rb → 01_paging.rb}

@@ -1,11 +1,12 @@
+include_set Abstract::PagingParams
+
 format do
   def limit
-    default_limit
+    limit_param
   end
 
   def offset
-    return 0 unless Env.params[:offset].present?
-    Env.params[:offset].to_i
+    offset_param
   end
 
   def search_with_params args={}
@@ -20,7 +21,7 @@ end
 format :html do
   def with_paging path_args={}
     paging_path_args path_args
-    output [yield, _optional_render_paging]
+    output [yield(@paging_path_args), _optional_render_paging]
   end
 
   view :paging, cache: :never do
@@ -59,11 +60,14 @@ format :html do
   end
 
   def paging_path_args local_args={}
-    @paging_path_args ||= {
+    @paging_path_args ||= {}
+    @paging_path_args.reverse_merge!(
       limit: limit,
+      offset: offset,
       view: paging_view,
       slot: voo.slot_options
-    }.merge(extra_paging_path_args)
+    )
+    @paging_path_args.merge! extra_paging_path_args
     @paging_path_args.merge local_args
   end
 

data/mod/pointer/set/abstract/{01_pointer.rb → 02_pointer.rb}

@@ -19,6 +19,10 @@ stage_method :changed_item_cards do
 end
 
 format do
+  def default_limit
+    20
+  end
+
   def item_links args={}
     card.item_cards(args).map do |item_card|
       subformat(item_card).render_link
@@ -40,7 +44,8 @@ format do
   end
 
   def pointer_items args={}
-    card.item_cards.map do |item_card|
+    page_args = args.extract! :limit, :offset
+    card.item_cards(page_args).map do |item_card|
       nest_item item_card, args do |rendered, item_view|
         wrap_item rendered, item_view
       end
@@ -50,14 +55,19 @@ end
 
 format :html do
   view :core do
-    wrap_with :div, pointer_items, class: "pointer-list"
+    with_paging do |paging_args|
+      wrap_with :div, pointer_items(paging_args.extract!(:limit, :offset)),
+                class: "pointer-list"
+    end
   end
 
   view :closed_content do
     item_view = implicit_item_view
     item_view = item_view == "name" ? "name" : "link"
     wrap_with :div, class: "pointer-list" do
-      pointer_items(view: item_view).join ", "
+      # unlikely that more than 100 items fit in closed content
+      # even if every item is only one character
+      pointer_items(view: item_view, limit: 100, offset: 0).join ", "
     end
   end
 
@@ -98,17 +108,28 @@ end
 
 format :rss do
   def raw_feed_items
-    @raw_feed_items ||= card.item_cards
+    @raw_feed_items ||= card.item_cards(limit: limit, offset: offset)
   end
 end
 
 format :json do
+  def max_depth
+    params[:max_depth] || 1
+  end
+
   view :export_items do |args|
     item_args = args.merge view: :export
     card.known_item_cards.map do |item_card|
       nest_item item_card, item_args
     end.flatten.reject(&:blank?)
   end
+
+  def essentials
+    return if @depth > max_depth
+    card.item_cards.map do |item|
+      nest item, view: :essentials
+    end
+  end
 end
 
 # If a card's type and content are updated in the same action, the new module
@@ -164,7 +185,7 @@ def item_names args={}
   raw_items = content.to_s.split(/\n+/)
   if args[:limit].present? && args[:limit].to_i > 0
     offset = args[:offset] || 0
-    raw_items = raw_items[offset, args[:limit].to_i]
+    raw_items = raw_items[offset, args[:limit].to_i] || []
   end
   raw_items.map do |line|
     item_name = line.gsub(/\[\[|\]\]/, "").strip