card 1.16.6 → 1.16.7

data/mod/03_machines/spec/set/type/skin_spec.rb

@@ -7,37 +7,37 @@ describe Card::Set::Type::Skin do
   let(:compressed_changed_css) { "#box{display:inline}\n"   }
   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
-    let(:machine_card)  { Card.gimme! "test skin machine", :type => :skin, :content => ''}
-    let(:machine_input_card) { Card.gimme! "test skin supplier",  :type => :css, :content => css  }
-    let(:another_machine_input_card) { Card.gimme! "more css",  :type => :css, :content => new_css  }
+    let(:machine_card)  { Card.gimme! "test skin machine", type: :skin, content: ''}
+    let(:machine_input_card) { Card.gimme! "test skin supplier",  type: :css, content: css  }
+    let(:another_machine_input_card) { Card.gimme! "more css",  type: :css, content: new_css  }
     let(:expected_input_items) { nil }
     let(:input_type) { :css }
     let(:card_content) do
-       { in:           css,         out:         compressed_css, 
+       { in:           css,         out:         compressed_css,
          changed_in:   changed_css, changed_out: compressed_changed_css,
          new_in:       new_css,     new_out:     compressed_new_css   }
     end
   end
-  
+
   it_behaves_like "machine input"  do
-    let(:create_machine_input_card) { Card.gimme! "test skin input", :type => :css, :content => css }
-    let(:create_another_machine_input_card) { Card.gimme! "more skin input", :type => :css, :content => css }
-    let(:create_machine_card)  { Card.gimme! "style with skin machine+*style", :type => :pointer }
+    let(:create_machine_input_card) { Card.gimme! "test skin input", type: :css, content: css }
+    let(:create_another_machine_input_card) { Card.gimme! "more skin input", type: :css, content: css }
+    let(:create_machine_card)  { Card.gimme! "style with skin machine+*style", type: :pointer }
     let(:card_content) do
-       { in:           css,         out:     compressed_css, 
+       { in:           css,         out:     compressed_css,
          changed_in:   changed_css, changed_out: compressed_changed_css
        }
     end
   end
-  
+
   context 'when item added' do
     it 'updates output of related machine card' do
-        #item = Card.gimme! "skin item", :type => :css, :content => css 
-        skin = Card.gimme! "test skin supplier", :type => :skin, :content => ''
-        machine = Card.gimme! "style with skin machine+*style", :type => :pointer, :content=>'[[test skin supplier]]'
-        item = Card.gimme! "skin item", :type => :css, :content => css 
+        #item = Card.gimme! "skin item", type: :css, content: css
+        skin = Card.gimme! "test skin supplier", type: :skin, content: ''
+        machine = Card.gimme! "style with skin machine+*style", type: :pointer, content: '[[test skin supplier]]'
+        item = Card.gimme! "skin item", type: :css, content: css
         skin << item
         skin.putty
         updated_machine  = Card.gimme machine.cardname
@@ -45,26 +45,26 @@ describe Card::Set::Type::Skin do
         expect(File.read path).to eq( compressed_css )
     end
   end
-  
+
   context 'when item changed' do
     it 'updates output of related machine card' do
-      skin = Card.gimme! "test skin supplier", :type => :skin, :content => ''
-      machine = Card.gimme! "style with skin machine+*style", :type => :pointer, :content=>'[[test skin supplier]]'
-      item = Card.gimme! "skin item", :type => :css, :content => css 
+      skin = Card.gimme! "test skin supplier", type: :skin, content: ''
+      machine = Card.gimme! "style with skin machine+*style", type: :pointer, content: '[[test skin supplier]]'
+      item = Card.gimme! "skin item", type: :css, content: css
       skin << item
       skin.putty
       Card::Auth.as_bot do
-        item.update_attributes :content=>changed_css
-        { :get => machine.machine_output_url }
-        item.update_attributes :content=>new_css
+        item.update_attributes content: changed_css
+        { get: machine.machine_output_url }
+        item.update_attributes content: new_css
       end
       updated_machine  = Card.gimme machine.cardname
       path = updated_machine.machine_output_path
       expect(File.read path).to eq( compressed_new_css )
       expect(updated_machine.machine_input_card.content).to include("[[skin item]]")
-      expect(Card.search(:link_to => "skin item")).to include(updated_machine.machine_input_card)
+      expect(Card.search(link_to: "skin item")).to include(updated_machine.machine_input_card)
     end
   end
-  
-  
+
+
 end

data/mod/04_settings/lib/card/setting.rb

@@ -15,13 +15,13 @@ class Card
     end
 
     @@group_names = {
-      :templating    => "Templating",
-      :permission    => "Permissions",
-      :webpage       => "Webpage",
-      :pointer       => "Pointer",
-      :editing_cue   => "Editing cues",
-      :event         => "Events",
-      :other         => "Other"
+      templating:  "Templating",
+      permission:  "Permissions",
+      webpage:     "Webpage",
+      pointer:     "Pointer",
+      editing_cue: "Editing cues",
+      event:       "Events",
+      other:       "Other"
     }
     @@groups = @@group_names.keys.each_with_object({}) { |key, groups| groups[key] = [] }
     @@user_specific = ::Set.new
@@ -35,10 +35,10 @@ class Card
     end
 
     # usage:
-    # setting_opts :group              => :permission | :event | ...
-    #              :position           => <Fixnum> (starting at 1, default: add to end)
-    #              :rule_type_editable => true | false (default: false)
-    #              :restricted_to_type => <cardtype> | [ <cardtype>, ...]
+    # setting_opts group:              :permission | :event | ...
+    #              position:           <Fixnum> (starting at 1, default: add to end)
+    #              rule_type_editable: true | false (default: false)
+    #              restricted_to_type: <cardtype> | [ <cardtype>, ...]
     def setting_opts opts
       group = opts[:group] || :other
       @@groups[group] ||= []

data/mod/04_settings/set/abstract/permission.rb

@@ -4,7 +4,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
 
@@ -22,7 +22,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'
@@ -30,15 +30,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 }
@@ -50,8 +50,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"
@@ -60,7 +60,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>
@@ -79,7 +79,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/mod/04_settings/set/right/script.rb

@@ -1,6 +1,6 @@
 include Machine
 
-store_machine_output :filetype => "js"
+store_machine_output filetype: "js"
 
 
 view :javascript_include_tag do |args|

data/mod/04_settings/set/right/structure.rb

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

data/mod/04_settings/set/right/style.rb

@@ -1,10 +1,10 @@
 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/mod/04_settings/set/self/accountable.rb

@@ -1,3 +1,3 @@
 require_dependency 'card/setting'
 extend Card::Setting
-setting_opts :group=>:other, :position=>2
+setting_opts group: :other, position: 2

data/mod/04_settings/set/self/add_help.rb

@@ -1,2 +1,2 @@
 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

data/mod/04_settings/set/self/autoname.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:templating, :position=>3
+setting_opts group: :templating, position: 3

data/mod/04_settings/set/self/captcha.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:permission, :position=>5
+setting_opts group: :permission, position: 5

data/mod/04_settings/set/self/create.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=> :permission, :position=>1, :rule_type_editable=>false
+setting_opts group: :permission, position: 1, rule_type_editable: false

data/mod/04_settings/set/self/default.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=> :templating, :position=>2, :rule_type_editable => true
+setting_opts group: :templating, position: 2, rule_type_editable: true

data/mod/04_settings/set/self/delete.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=> :permission, :position=>4, :rule_type_editable=>false
+setting_opts group: :permission, position: 4, rule_type_editable: false

data/mod/04_settings/set/self/help.rb

@@ -1,2 +1,2 @@
 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

data/mod/04_settings/set/self/input.rb

@@ -1,2 +1,2 @@
 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

data/mod/04_settings/set/self/layout.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:webpage, :position=>3, :rule_type_editable => false
+setting_opts group: :webpage, position: 3, rule_type_editable: false

data/mod/04_settings/set/self/on_create.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:event, :position=>1 , :rule_type_editable => false
+setting_opts group: :event, position: 1 , rule_type_editable: false

data/mod/04_settings/set/self/on_delete.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:event, :position=>3, :rule_type_editable => false
+setting_opts group: :event, position: 3, rule_type_editable: false

data/mod/04_settings/set/self/on_update.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:event, :position=>2, :rule_type_editable => false
+setting_opts group: :event, position: 2, rule_type_editable: false

data/mod/04_settings/set/self/options.rb

@@ -1,2 +1,2 @@
 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

data/mod/04_settings/set/self/options_label.rb

@@ -1,2 +1,2 @@
 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

data/mod/04_settings/set/self/read.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=> :permission, :position=>2, :rule_type_editable=>false
+setting_opts group: :permission, position: 2, rule_type_editable: false

data/mod/04_settings/set/self/script.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:webpage, :position=>5
+setting_opts group: :webpage, position: 5

data/mod/04_settings/set/self/structure.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=> :templating, :position=>2, :rule_type_editable => true
+setting_opts group: :templating, position: 2, rule_type_editable: true

data/mod/04_settings/set/self/style.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:webpage, :position=>4
+setting_opts group: :webpage, position: 4

data/mod/04_settings/set/self/table_of_contents.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=> :other, :position=>1, :rule_type_editable=>false
+setting_opts group: :other, position: 1, rule_type_editable: false

data/mod/04_settings/set/self/thanks.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:other, :position=>3, :rule_type_editable => false
+setting_opts group: :other, position: 3, rule_type_editable: false

data/mod/04_settings/set/self/update.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=> :permission, :position=>3, :rule_type_editable=>false
+setting_opts group: :permission, position: 3, rule_type_editable: false

data/mod/04_settings/set/type/setting.rb

@@ -2,7 +2,7 @@ require_dependency 'json'
 
 def self.member_names
   @@member_names ||= begin
-    Card.search( :type_id=>SettingID, :return=>'key' ).inject({}) do |hash, card_key|
+    Card.search( type_id: SettingID, return: 'key' ).inject({}) do |hash, card_key|
       hash[card_key] = true
       hash
     end
@@ -12,12 +12,12 @@ end
 view :core do |args|
 
   klasses = Card.set_patterns.reverse.map do |set_class|
-    wql = { :left  => { :type =>Card::SetID },
-            :right => card.id,
-            #:sort  => 'content',
-            
-            :sort  => ['content', 'name'],
-            :limit => 0
+    wql = { left:  { type: Card::SetID },
+            right: card.id,
+            #sort:  'content',
+
+            sort:  ['content', 'name'],
+            limit: 0
           }
     wql[:left][ (set_class.anchorless? ? :id : :right_id )] = set_class.pattern_id
 
@@ -26,14 +26,14 @@ view :core do |args|
   end.compact
 
 
-  
-  %{ 
+
+  %{
     #{ _render_rule_help args }
     <table class="setting-rules">
       <tr><th>Set</th><th>Rule</th></tr>
       #{
         klasses.map do |klass, rules|
-          %{ 
+          %{
             <tr class="klass-row anchorless-#{ klass.anchorless? }">
               <td class="setting-klass">#{ klass.anchorless? ? card_link( klass.pattern ) : klass.pattern }</td>
               <td class="rule-content-container">
@@ -50,8 +50,8 @@ view :core do |args|
                   previous_content = current_content
                   %{
                     <tr class="#{ 'rule-changeover' if changeover }">
-                    <td class="rule-anchor">#{ card_link rule.cardname.trunk_name, :text=> rule.cardname.trunk_name.trunk_name }</td>
-                    
+                    <td class="rule-anchor">#{ card_link rule.cardname.trunk_name, text: rule.cardname.trunk_name.trunk_name }</td>
+
                       #{
                         if duplicate
                           %{ <td></td> }
@@ -68,11 +68,11 @@ view :core do |args|
 
                 end * "\n"
               end
-            
+
             }
           }
         end * "\n"
-      
+
       }
     </table>
   }

data/mod/04_settings/spec/set/right/comment_spec.rb

@@ -4,8 +4,8 @@ describe Card::Set::Right::Comment do
 
   context "record appender" do
     before do
-#      @r = Card.where(:type_id=>Card::RoleID).first
-      @rule = Card.new :name=>'A+*self+*comment', :type_id=>Card::PointerID, :content=>"[[Anyone Signed In]]"
+#      @r = Card.where(type_id: Card::RoleID).first
+      @rule = Card.new name: 'A+*self+*comment', type_id: Card::PointerID, content: "[[Anyone Signed In]]"
     end
 
     it "should have appender immediately" do
@@ -17,8 +17,8 @@ describe Card::Set::Right::Comment do
     end
 
     it "should have appender immediately" do
-      Card::Auth.as_bot do 
-        expect(Card['a'].ok?(:comment)).not_to be_truthy 
+      Card::Auth.as_bot do
+        expect(Card['a'].ok?(:comment)).not_to be_truthy
         @rule.save!
         expect(Card['a'].ok?(:comment)).to be_truthy
       end
@@ -29,7 +29,7 @@ describe Card::Set::Right::Comment do
   context "comment addition" do
     it "should combine content after save" do
       Card::Auth.as_bot do
-        Card.create :name => 'basicname+*self+*comment', :content=>'[[Anyone Signed In]]'
+        Card.create name: 'basicname+*self+*comment', content: '[[Anyone Signed In]]'
         @c = Card.fetch "basicname"
         @c.comment = " and more\n  \nsome lines\n\n"
         @c.save!

data/mod/04_settings/spec/set/right/create_spec.rb

@@ -3,7 +3,7 @@
 describe Card::Set::Right::Create do
   it 'should render the perm editor' do
     Card::Auth.as_bot do
-      card = Card.new :name=>'A+B+*self+*create'
+      card = Card.new name: 'A+B+*self+*create'
       assert_view_select card.format._render_editor, 'div[class=perm-editor]'
     end
   end