card 1.16.6 → 1.16.7

data/tmpsets/set/mod004-03_machines/type/coffee_script.rb

@@ -20,7 +20,7 @@ machine_input do
   Uglifier.compile( compile_coffee format(:js)._render_raw )
 end
 
-store_machine_output :filetype => "js"
+store_machine_output filetype: 'js'
 
 def clean_html?
   false
@@ -35,7 +35,7 @@ end
 
 
 format :html do
-  view :editor, :mod=>Html::HtmlFormat
+  view :editor, mod: Html::HtmlFormat
 
   view :content_changes do |args|
     %{
@@ -59,7 +59,7 @@ format do
 end
 
 def diff_args
-   {:format=>:text}
+  { format: :text }
 end
 
 

data/tmpsets/set/mod004-03_machines/type/css.rb

@@ -5,15 +5,15 @@ require 'sass'
 include Machine
 include MachineInput
 
-store_machine_output :filetype => "css"
+store_machine_output filetype: "css"
 
 machine_input do
-  compress_css format(:format => :css)._render_core
+  compress_css format(format: :css)._render_core
 end
 
 def compress_css input
   begin
-    Sass.compile input, :style=>:compressed
+    Sass.compile input, style: :compressed
   rescue => e
     raise Card::Oops, "Stylesheet Error:\n#{ e.message }"
   end
@@ -32,22 +32,22 @@ end
 
 format :html do
   def get_inclusion_defaults nested_card
-    { :view => :closed }
+    { view: :closed }
   end
 
-  view :editor, :mod=>Html::HtmlFormat
+  view :editor, mod: Html::HtmlFormat
 
   view :core do |args|
     # FIXME: scan must happen before process for inclusion interactions to work, but this will likely cause
     # problems with including other css?
-    process_content ::CodeRay.scan( _render_raw, :css ).div, :size=>:icon
+    process_content ::CodeRay.scan( _render_raw, :css ).div, content_opts: {size: :icon}
   end
 
-  view :content_changes, :mod=>CoffeeScript::HtmlFormat
+  view :content_changes, mod: CoffeeScript::HtmlFormat
 end
 
 def diff_args
-   {:format=>:text}
+   {format: :text}
 end
 
 

data/tmpsets/set/mod004-03_machines/type/java_script.rb

@@ -6,7 +6,7 @@ require 'uglifier'
 include Machine
 include MachineInput
 
-store_machine_output :filetype => "js"
+store_machine_output filetype: "js"
 
 machine_input do
   Uglifier.compile(format(:js)._render_core)
@@ -24,8 +24,8 @@ format do
 end
 
 format :html do
-  view :editor, :mod=>Html::HtmlFormat
-  view :content_changes, :mod=>CoffeeScript::HtmlFormat
+  view :editor, mod: Html::HtmlFormat
+  view :content_changes, mod: CoffeeScript::HtmlFormat
 
   view :core do |args|
     highlighted_js = ::CodeRay.scan( _render_raw, :js ).div
@@ -35,7 +35,7 @@ format :html do
 end
 
 def diff_args
-   {:format=>:text}
+   {format: :text}
 end
 
 

data/tmpsets/set/mod004-03_machines/type/scss.rb

@@ -3,7 +3,7 @@ class Card; module Set; module Type; module Scss; extend Card::Set # ~~~~~~~~~~~
 include Type::Css
 
 def diff_args
-  {:format=>:text}
+  {format: :text}
 end
 
 format do
@@ -14,7 +14,7 @@ format do
   end
 
   def compile_scss scss, style=:expanded
-    Sass.compile scss, :style=>style
+    Sass.compile scss, style: style
   rescue =>e
     e
   end

data/tmpsets/set/mod004-03_machines/type/skin.rb

@@ -3,7 +3,7 @@ class Card; module Set; module Type; module Skin; extend Card::Set # ~~~~~~~~~~~
 include Machine
 include MachineInput
 
-store_machine_output :filetype => "css"
+store_machine_output filetype: "css"
 
 include Pointer
 format()      { include Pointer::Format     }

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

@@ -6,7 +6,7 @@ end
 
 format :html do
 
-  view :pointer_core do |args| #, :view=>:core, :mod=>Type::Pointer::HtmlFormat
+  view :pointer_core do |args| #, view: :core, mod: Type::Pointer::HtmlFormat
     %{<div class="pointer-list">#{ render_pointer_items args }</div>}
   end
 
@@ -24,7 +24,7 @@ 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 { Card.search(type_id: RoleID, sort: 'name') }
 
     inheritable = not_set ? false : set_card.inheritable?
     inheriting = inheritable && card.content=='_left'
@@ -32,15 +32,15 @@ format :html do
     item_names = inheriting ? [] : card.item_names
 
     %{
-      #{ hidden_field :content, :class=>'card-content' }
+      #{ hidden_field :content, class: 'card-content' }
       <div class="perm-editor">
 
         #{ if inheritable; %{
           <div class="perm-inheritance perm-section">
             #{ check_box_tag 'inherit', 'inherit', inheriting }
             <label>
-              #{ core_inherit_content args.merge(:target=>'wagn_role') }
-              #{ content_tag( :a, :title=>"use left's #{card.cardname.tag} rule") { '?' } }
+              #{ core_inherit_content args.merge(target: 'wagn_role') }
+              #{ content_tag( :a, title: "use left's #{card.cardname.tag} rule") { '?' } }
             </label>
           </div>
         } end }
@@ -52,8 +52,8 @@ format :html do
               checked = !!item_names.delete(option.name)
               %{
                 <div class="group-option">
-                  #{ check_box_tag( "#{option.key}-perm-checkbox", option.name, checked, :class=>'perm-checkbox-button'  ) }
-                  <label>#{ card_link option.name, :target=>'wagn_role' }</label>
+                  #{ check_box_tag( "#{option.key}-perm-checkbox", option.name, checked, class: 'perm-checkbox-button'  ) }
+                  <label>#{ card_link option.name, target: 'wagn_role' }</label>
                 </div>
               }
             end * "\n"
@@ -62,7 +62,7 @@ format :html do
 
         <div class="perm-indiv perm-vals perm-section">
           <h5>Individuals</h5>
-          #{ _render_list :item_list=>item_names, :extra_css_class=>'perm-indiv-ul' }
+          #{ _render_list item_list: item_names, extra_css_class: 'perm-indiv-ul' }
         </div>
 
       </div>
@@ -81,7 +81,7 @@ format :html do
         task = card.tag.codename
         ancestor = Card[sc.trunk_name.trunk_name]
         links = ancestor.who_can( task.to_sym ).map do |card_id|
-          card_link Card[card_id].name, :target=>args[:target]
+          card_link Card[card_id].name, target: args[:target]
         end*", "
         "Inherit ( #{links} )"
       rescue

data/tmpsets/set/mod005-04_settings/right/script.rb

@@ -2,7 +2,7 @@
 class Card; module Set; module Right; module Script; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/right/script.rb ~~~~~~~~~~~
 include Machine
 
-store_machine_output :filetype => "js"
+store_machine_output filetype: "js"
 
 
 view :javascript_include_tag do |args|

data/tmpsets/set/mod005-04_settings/right/structure.rb

@@ -9,11 +9,6 @@ end
 
 format :html do
   include AddHelp::HtmlFormat
-
-  view :core do |args|
-    render_raw args
-  end
-
 end
 
 

data/tmpsets/set/mod005-04_settings/right/style.rb

@@ -3,10 +3,10 @@ class Card; module Set; module Right; module Style; extend Card::Set # ~~~~~~~~~
 require 'sass'
 include Machine
 
-store_machine_output :filetype => "css"
+store_machine_output filetype: "css"
 
 format do
-  def chunk_list  #turn off autodetection of uri's 
+  def chunk_list  #turn off autodetection of uri's
     :inclusion_only
   end
 end

data/tmpsets/set/mod005-04_settings/self/accountable.rb

@@ -2,7 +2,7 @@
 class Card; module Set; module Self; module Accountable; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/accountable.rb ~~~~~~~~~~~
 require_dependency 'card/setting'
 extend Card::Setting
-setting_opts :group=>:other, :position=>2
+setting_opts group: :other, position: 2
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/accountable.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/add_help.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module AddHelp; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/add_help.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts  :group=>:editing_cue, :position=>2, :rule_type_editable => true
+setting_opts  group: :editing_cue, position: 2, rule_type_editable: true
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/add_help.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/autoname.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Autoname; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/autoname.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:templating, :position=>3
+setting_opts group: :templating, position: 3
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/autoname.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/captcha.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Captcha; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/captcha.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:permission, :position=>5
+setting_opts group: :permission, position: 5
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/captcha.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/create.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Create; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/create.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=> :permission, :position=>1, :rule_type_editable=>false
+setting_opts group: :permission, position: 1, rule_type_editable: false
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/create.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/default.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Default; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/default.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=> :templating, :position=>2, :rule_type_editable => true
+setting_opts group: :templating, position: 2, rule_type_editable: true
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/default.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/delete.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Delete; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/delete.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=> :permission, :position=>4, :rule_type_editable=>false
+setting_opts group: :permission, position: 4, rule_type_editable: false
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/delete.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/help.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Help; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/help.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:editing_cue, :position=>1, :rule_type_editable => true
+setting_opts group: :editing_cue, position: 1, rule_type_editable: true
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/help.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/input.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Input; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/input.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:pointer, :position=>3, :restricted_to_type => [:pointer,:session], :rule_type_editable => false
+setting_opts group: :pointer, position: 3, restricted_to_type: [:pointer,:session], rule_type_editable: false
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/input.rb ~~~~~~~~~~~
 end;end;end;end;

data/tmpsets/set/mod005-04_settings/self/layout.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Layout; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/layout.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:webpage, :position=>3, :rule_type_editable => false
+setting_opts group: :webpage, position: 3, rule_type_editable: false
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/layout.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/on_create.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module OnCreate; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/on_create.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:event, :position=>1 , :rule_type_editable => false
+setting_opts group: :event, position: 1 , rule_type_editable: false
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/on_create.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/on_delete.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module OnDelete; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/on_delete.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:event, :position=>3, :rule_type_editable => false
+setting_opts group: :event, position: 3, rule_type_editable: false
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/on_delete.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/on_update.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module OnUpdate; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/on_update.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:event, :position=>2, :rule_type_editable => false
+setting_opts group: :event, position: 2, rule_type_editable: false
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/on_update.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/options.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Options; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/options.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:pointer, :position=>1, :restricted_to_type => [:pointer,:session], :rule_type_editable=>true
+setting_opts group: :pointer, position: 1, restricted_to_type: [:pointer,:session], rule_type_editable: true
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/options.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/options_label.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module OptionsLabel; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/options_label.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:pointer, :position=>2, :restricted_to_type => [:pointer,:session], :rule_type_editable => false
+setting_opts group: :pointer, position: 2, restricted_to_type: [:pointer,:session], rule_type_editable: false
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/options_label.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/read.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Read; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/read.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=> :permission, :position=>2, :rule_type_editable=>false
+setting_opts group: :permission, position: 2, rule_type_editable: false
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/read.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/script.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Script; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/script.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:webpage, :position=>5
+setting_opts group: :webpage, position: 5
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/script.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/structure.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Structure; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/structure.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=> :templating, :position=>2, :rule_type_editable => true
+setting_opts group: :templating, position: 2, rule_type_editable: true
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/structure.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/style.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Style; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/style.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:webpage, :position=>4
+setting_opts group: :webpage, position: 4
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/style.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/table_of_contents.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module TableOfContents; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/table_of_contents.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=> :other, :position=>1, :rule_type_editable=>false
+setting_opts group: :other, position: 1, rule_type_editable: false
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/table_of_contents.rb ~~~~~~~~~~~

data/tmpsets/set/mod005-04_settings/self/thanks.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Thanks; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/thanks.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:other, :position=>3, :rule_type_editable => false
+setting_opts group: :other, position: 3, rule_type_editable: false
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/self/thanks.rb ~~~~~~~~~~~