card 1.16.15 → 1.17.0

data/tmpsets/set/mod002-01_history/all/history.rb

@@ -26,18 +26,22 @@ event :assign_action, after: :assign_act do
   end
 end
 
+def finalize_action?
+  (history? || respond_to?(:attachment)) && current_action
+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,
-      after: :stored,
-      when: proc { |c|
-        (c.history? || c.respond_to?(:attachment)) && c.current_action
-      } do
+event :finalize_action, after: :stored, when: proc { |c| c.finalize_action? } do
   @changed_fields = Card::TRACKED_FIELDS.select do |f|
     changed_attributes.member? f
   end
   if @changed_fields.present?
-    @changed_fields.each{ |f| Card::Change.create field: f, value: self[f], card_action_id: @current_action.id }
+    @changed_fields.each do |f|
+      Card::Change.create field: f,
+                          value: self[f],
+                          card_action_id: @current_action.id
+    end
     @current_action.update_attributes! card_id: id
   elsif @current_action.card_changes(true).empty?
     @current_action.delete
@@ -201,8 +205,10 @@ format :html do
                      card.current_rev_nr
     hide_diff = (params['hide_diff'] == ' true') || args[:hide_diff]
     args[:slot_class] = "revision-#{act.id} history-slot list-group-item"
+    draft = (last_action = act.actions.last) && last_action.draft
+
     wrap(args) do
-      render_haml card: card, act: act, act_view: act_view,
+      render_haml card: card, act: act, act_view: act_view, draft: draft,
                   current_rev_nr: current_rev_nr, rev_nr: rev_nr,
                   hide_diff: hide_diff do
         <<-HAML
@@ -216,7 +222,7 @@ format :html do
       .time.timeago
         = time_ago_in_words(act.acted_at)
         ago
-        - if act.actions.last.draft
+        - if draft
           |
           %em.info
             Autosave
@@ -224,14 +230,14 @@ format :html do
           %em.label.label-info
             Current
         - elsif act_view == :expanded
-          = rollback_link act.relevant_actions_for(card, act.actions.last.draft)
+          = rollback_link act.relevant_actions_for(card, draft)
           = show_or_hide_changes_link hide_diff, act_id: act.id, act_view: act_view, rev_nr: rev_nr, current_rev_nr: current_rev_nr
   .toggle
     = fold_or_unfold_link act_id: act.id, act_view: act_view, rev_nr: rev_nr, current_rev_nr: current_rev_nr
 
   .action-container{style: ("clear: left;" if act_view == :expanded)}
     - act.relevant_actions_for(card).each do |action|
-      = send("_render_action_#{ act_view }", action: action )
+      = send("_render_action_#{act_view}", action: action )
 HAML
       end
     end
@@ -245,7 +251,6 @@ HAML
     render_action :expanded, args
   end
 
-
   def render_action action_view, args
     action = args[:action] || card.last_action
     hide_diff = Env.params['hide_diff'] == 'true' || args[:hide_diff]
@@ -350,8 +355,8 @@ HAML
     toggled_view = args[:act_view] == :expanded ? :act_summary : :act_expanded
     arrow_dir = args[:act_view] == :expanded ? 'arrow-down' : 'arrow-right'
     link_to '', args.merge(view: toggled_view),
-              class: "slotter revision-#{args[:act_id]} #{arrow_dir}",
-              remote: true
+            class: "slotter revision-#{args[:act_id]} #{arrow_dir}",
+            remote: true
   end
 
   def show_or_hide_changes_link hide_diff, args

data/tmpsets/set/mod003-02_basic_types/all/base.rb

@@ -9,14 +9,41 @@ format do
   end
 
   # NAME VIEWS
+  view :name, closed: true, perms: :none do |args|
+    return card.name unless args[:variant]
+    args[:variant].split(/[\s,]+/).inject(card.name) do |name, variant|
+      case variant.to_sym
+      when :capitalized
+        name.capitalize
+      when :singular
+        name.singularize
+      when :plural
+        name.pluralize
+      when :title
+        name.titleize
+      else
+        if ::Set.new([
+          :downcase, :upcase, :swapcase, :reverse, :succ
+        ]).include?(variant.to_sym)
+          name.send variant
+        else
+          name
+        end
+      end
+    end
+  end
 
-  simple_args = { closed: true, perms: :none }
-  view(:name,     simple_args) { card.name                           }
-  view(:key,      simple_args) { card.key                            }
-  view(:title,    simple_args) { |args| args[:title] || card.name    }
-  view(:linkname, simple_args) { card.cardname.url_key               }
-  view(:url,      simple_args) { card_url _render_linkname           }
-  view(:url_link, simple_args) { web_link card_url(_render_linkname) }
+  view(:key,      closed: true, perms: :none) { card.key }
+  view(:linkname, closed: true, perms: :none) { card.cardname.url_key }
+  view(:url,      closed: true, perms: :none) { card_url _render_linkname }
+
+  view :title, closed: true, perms: :none do |args|
+    args[:title] || card.name
+  end
+
+  view :url_link, closed: true, perms: :none do
+    web_link card_url(_render_linkname)
+  end
 
   view :link, closed: true, perms: :none do |args|
     card_link(
@@ -95,9 +122,9 @@ format do
     # FIXME: - relativity should be handled in smartname
     return '' unless args[:inc_name]
     name = args[:inc_name].to_name
-    stripped_name = name.stripped.to_name
+    stripped = name.stripped
 
-    if name.relative? && !stripped_name.starts_with_joint?
+    if name.relative? && !stripped.to_name.starts_with_joint?
       # not a simple relative name; just return the original syntax
       "{{#{args[:inc_syntax]}}}"
     else
@@ -108,7 +135,7 @@ format do
         when type = on_type_set
           "#{type}#{name}+#{Card[:type_plus_right].name}" # *type plus right
         else
-          "#{stripped_name.gsub(/^\+/, '')}+#{Card[:right].name}" # *right
+          "#{stripped.gsub(/^\+/, '')}+#{Card[:right].name}" # *right
         end
       subformat(Card.fetch set_name).render_template_link args
     end

data/tmpsets/set/mod003-02_basic_types/all/rss.rb

@@ -1,10 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module All; module Rss; extend Card::Set
 # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/02_basic_types/set/all/rss.rb ~~~~~~~~~~~
-
-
 format :rss do
-
   attr_accessor :xml
 
   def initialize card, args
@@ -18,10 +15,10 @@ format :rss do
   end
 
   # FIXME: integrate this with common XML features when it is added
-  view :feed do |args|
+  view :feed do
     begin
-      @xml.instruct! :xml, version: "1.0"
-      @xml.rss version: "2.0" do
+      @xml.instruct! :xml, version: '1.0'
+      @xml.rss version: '2.0' do
         @xml.channel do
           @xml.title       render_feed_title
           @xml.description render_feed_description
@@ -38,43 +35,41 @@ format :rss do
     [card]
   end
 
-  view :feed_body do |args|
+  view :feed_body do |_args|
     render_feed_item_list
   end
 
   view :feed_item_list do |args|
     raw_feed_items(args).each do |item|
       @xml.item do
-        subformat(item).render_feed_item view_changes: (card.id==RecentID)  #FIXME! yuck.
+        # FIXME: yuck.
+        subformat(item).render_feed_item view_changes: (card.id == RecentID)
       end
     end
   end
 
-
-  view :feed_title do |args|
-    Card.setting(:title) + " : " + card.name.gsub(/^\*/,'')
+  view :feed_title do
+    Card.global_setting(:title) + ' : ' + card.name.gsub(/^\*/,'')
   end
 
   view :feed_item do |args|
     @xml.title card.name
     add_name_context
     @xml.description render((args[:view_changes] ? :change : :open_content))
-    @xml.pubDate card.revised_at.to_s(:rfc822)  #updated_at fails on virtual cards, because not all to_s's take args (just actual dates)
+    @xml.pubDate card.revised_at.to_s(:rfc822)  # updated_at fails on virtual
+    # cards, because not all to_s's take args (just actual dates)
     @xml.link render_url
     @xml.guid render_url
   end
 
+  view :feed_description do '' end
+  view :comment_box      do '' end
+  view :menu             do '' end
 
-  view :feed_description do |args| '' end
-  view :comment_box      do |args| '' end
-  view :menu             do |args| '' end
-
-
-  view :open,         { view: :titled, mod: All::Base::Format }
-  view :content,      { view: :core,   mod: All::Base::Format }
-  view :open_content, { view: :core,   mod: All::Base::Format }
-  view :closed,       { view: :link,   mod: All::Base::Format }
-
+  view :open,         view: :titled, mod: All::Base::Format
+  view :content,      view: :core,   mod: All::Base::Format
+  view :open_content, view: :core,   mod: All::Base::Format
+  view :closed,       view: :link,   mod: All::Base::Format
 end
 
 

data/tmpsets/set/mod003-02_basic_types/type/plain_text.rb

@@ -4,11 +4,14 @@ class Card; module Set; module Type; module PlainText; extend Card::Set
 format :html do
 
   view :editor do |args|
-    text_area :content, rows: 5, class: 'card-content', "data-card-type-code"=>card.type_code
+    text_area :content,
+              rows: 5,
+              class: 'card-content',
+              'data-card-type-code' => card.type_code
   end
 
   view :core do |args|
-    process_content_object( CGI.escapeHTML _render_raw )
+    process_content_object(CGI.escapeHTML _render_raw)
   end
 end
 

data/tmpsets/set/mod003-02_basic_types/type/pointer.rb

@@ -2,9 +2,12 @@
 class Card; module Set; module Type; module Pointer; extend Card::Set
 # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/02_basic_types/set/type/pointer.rb ~~~~~~~~~~~
 
+
 event :add_and_drop_items, before: :approve, on: :save do
-  self.add_item Env.params['add_item']   if Env.params['add_item']
-  self.drop_item Env.params['drop_item'] if Env.params['drop_item']
+  adds = Env.params['add_item']
+  drops = Env.params['drop_item']
+  Array.wrap(adds).each { |i| add_item i } if adds
+  Array.wrap(drops).each { |i| drop_item i } if drops
 end
 
 event :insert_item_event, before: :approve, on: :save, when: proc {|c| Env.params['insert_item']} do
@@ -12,6 +15,20 @@ event :insert_item_event, before: :approve, on: :save, when: proc {|c| Env.param
   self.insert_item index.to_i, Env.params['insert_item']
 end
 
+phase_method :changed_item_names do
+  dropped_item_names + added_item_names
+end
+
+phase_method :dropped_item_names do
+  old_items = item_names content: db_content_was
+  old_items - item_names
+end
+
+phase_method :added_item_names do
+  old_items = item_names content: db_content_was
+  item_names - old_items
+end
+
 format do
   def item_links args={}
     card.item_cards(args).map do |item_card|
@@ -290,37 +307,38 @@ def item_type
 end
 
 def items= array
-  self.content=''
+  self.content = ''
   array.each { |i| self << i }
   save!
 end
 
 def << item
-  newname = case item
-    when Card     ;  item.name
-    when Integer  ;  c = Card[item] and c.name
-    else             item
+  newname =
+    case item
+    when Card    then item.name
+    when Integer then (c = Card[item]) && c.name
+    else              item
     end
   add_item newname
 end
 
 def add_item name
-  unless include_item? name
-    self.content="[[#{(item_names << name).reject(&:blank?)*"]]\n[["}]]"
-  end
+  return if include_item? name
+  self.content = "[[#{(item_names << name).reject(&:blank?) * "]]\n[["}]]"
 end
+
 def add_item! name
   add_item name
   save!
 end
 
 def drop_item name
-  if include_item? name
-    key = name.to_name.key
-    new_names = item_names.reject{ |n| n.to_name.key == key }
-    self.content = new_names.empty? ? '' : "[[#{new_names * "]]\n[["}]]"
-  end
+  return unless include_item? name
+  key = name.to_name.key
+  new_names = item_names.reject { |n| n.to_name.key == key }
+  self.content = new_names.empty? ? '' : "[[#{new_names * "]]\n[["}]]"
 end
+
 def drop_item! name
   drop_item name
   save!
@@ -328,45 +346,39 @@ end
 
 def insert_item index, name
   new_names = item_names
-  new_names.delete(name)
-  new_names.insert(index,name)
-  self.content =  new_names.map { |name| "[[#{name}]]" }.join "\n"
+  new_names.delete name
+  new_names.insert index, name
+  self.content = new_names.map { |new_name| "[[#{new_name}]]" }.join "\n"
 end
+
 def insert_item! index, name
   insert_item index, name
   save!
 end
 
-
 def options_rule_card
-  self.rule_card :options
+  rule_card :options
 end
 
 def option_names
-  result_cards = if oc = options_rule_card
-    oc.item_names default_limit: 50, context: name
-  else
-    Card.search sort: 'name', limit: 50, return: :name
-  end
-  if selected_options = item_names
-    result_cards = result_cards | selected_options
+  result_names =
+    if (oc = options_rule_card)
+      oc.item_names default_limit: 50, context: name
+    else
+      Card.search({ sort: 'name', limit: 50, return: :name },
+                  "option names for pointer: #{name}")
+    end
+  if (selected_options = item_names)
+    result_names += selected_options
+    result_names.uniq!
   end
-  result_cards
+  result_names
 end
 
 def option_cards
-  result_cards = if oc = options_rule_card
-    oc.item_cards default_limit: 50, context: name
-  else
-    Card.search sort: 'alpha', limit: 50
-  end
-  if selected_options = item_names
-    selected_options.each do |item|
-      result_cards.push Card.fetch(item,new: {})
-    end
-    result_cards.uniq!
+  option_names.map do |name|
+    Card.fetch name, new: {}
   end
-  result_cards
 end
 
 

data/tmpsets/set/mod004-03_machines/right/machine_output.rb

@@ -12,7 +12,7 @@ end
 format do
   view :not_found do |args|
     if update_machine_output_live?
-      Card::Cache.reset_global # FIXME - wow, this kind of hard core, no?
+      Card::Cache.reset_all # FIXME: wow, this is overkill, no?
       root.error_status = 302
       card.left.update_machine_output
       card_path card.left.machine_output_url
@@ -22,12 +22,16 @@ format do
   end
 
   def update_machine_output_live?
-    said = card.selected_action_id
-    card.left.kind_of? Machine and                                  # must be a machine
-    !card.left.locked?         and                                  # machine must not already be running
-    ( card.new_card? or !said or said == card.last_action_id )      # must want current output (won't re-output old stuff)
+    case
+    when !card.left.is_a?(Machine) then false # must be a machine
+    when card.left.locked?         then false # machine must not be running
+    when card.new_card?            then true  # always update if new
+    else
+      # must want current output (won't re-output old stuff)
+      (selected_id = card.selected_action_id) &&
+        selected_id == card.last_action_id
+    end
   end
-
 end
 
 

data/tmpsets/set/mod005-04_settings/abstract/permission.rb

@@ -6,13 +6,16 @@ def standardize_items
 end
 
 format :html do
-
-  view :pointer_core do |args| #, view: :core, mod: Type::Pointer::HtmlFormat
-    %{<div class="pointer-list">#{ render_pointer_items args }</div>}
+  view :pointer_core do |args| # view: :core, mod: Type::Pointer::HtmlFormat
+    %{<div class="pointer-list">#{render_pointer_items args}</div>}
   end
 
   view :core do |args|
-    card.content=='_left' ? core_inherit_content(args) : render( :pointer_core, args )
+    if card.content == '_left'
+      core_inherit_content args
+    else
+      render :pointer_core, args
+    end
   end
 
   view :closed_content do |args|
@@ -25,7 +28,9 @@ format :html do
     set_card = Card.fetch(set_name)
     not_set = set_card && set_card.type_id != SetID
 
-    group_options = Auth.as_bot { Card.search(type_id: RoleID, sort: 'name') }
+    group_options = Auth.as_bot do
+      Card.search({ type_id: RoleID, sort: 'name' }, 'roles by name')
+    end
 
     inheritable = not_set ? false : set_card.inheritable?
     inheriting = inheritable && card.content=='_left'