card 1.17.4 → 1.18.0

data/mod/03_machines/spec/lib/shared_machine_input_examples.rb

@@ -11,7 +11,7 @@ shared_examples_for 'machine input' do
     f.putty
     f
   end
-  let!(:more_input) do
+  let(:more_input) do
     moreinput = create_another_machine_input_card
     moreinput
   end
@@ -22,8 +22,8 @@ shared_examples_for 'machine input' do
       Card::Auth.as_bot do
         input.delete!
       end
-      f = Card.gimme machine.name
-      expect(f.machine_input_card.item_cards).to eq([])
+      ca = Card.gimme machine.name
+      expect(ca.machine_input_card.item_cards).to eq([])
     end
 
     it 'updates output of machine card' do
@@ -44,7 +44,7 @@ shared_examples_for 'machine input' do
   context 'when updated' do
     it 'updates output of related machine card' do
       input.putty content: card_content[:changed_in]
-      updated_machine  = Card.gimme machine.cardname
+      updated_machine = Card.gimme machine.cardname
       path = updated_machine.machine_output_path
       expect(File.read path).to eq(card_content[:changed_out])
     end
@@ -52,14 +52,13 @@ shared_examples_for 'machine input' do
 
   context 'when added' do
     it 'updates output of related machine card' do
-      if machine.kind_of? Card::Set::Type::Pointer
+      if machine.is_a? Card::Set::Type::Pointer
         machine << more_input
         machine.putty
-        updated_machine  = Card.gimme machine.cardname
+        updated_machine = Card.gimme machine.cardname
         path = updated_machine.machine_output_path
-        expect(File.read path).to eq( ([card_content[:out]]*2).join("\n"))
+        expect(File.read path).to eq(([card_content[:out]] * 2).join("\n"))
       end
     end
   end
 end
-

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

@@ -1,29 +1,35 @@
 # -*- encoding : utf-8 -*-
 
-
 describe Card::Set::Type::CoffeeScript do
   let(:coffee)                    { 'alert "Hi"  '    }
   let(:compressed_coffee)         { '(function(){alert("Hi")}).call(this);'    }
   let(:changed_coffee)            { 'alert "Hello"  ' }
   let(:compressed_changed_coffee) { '(function(){alert("Hello")}).call(this);' }
 
-
   it_should_behave_like 'content machine', that_produces_js do
-    let(:machine_card)  { Card.gimme! "test coffeescript", type: Card::CoffeeScriptID, content: coffee}
+    let(:machine_card) do
+      Card.gimme! 'coffee machine', type: Card::CoffeeScriptID,
+                                    content: coffee
+    end
     let(:card_content) do
-       { in:           coffee,         out:     compressed_coffee,
-         changed_in:   changed_coffee, changed_out: compressed_changed_coffee }
+      { in:           coffee,         out:     compressed_coffee,
+        changed_in:   changed_coffee, changed_out: compressed_changed_coffee }
     end
   end
 
-  it_behaves_like "machine input"  do
-    let(:create_machine_input_card) { Card.gimme! "test coffeescript", type: :coffee_script, content: coffee }
-    let(:create_another_machine_input_card) { Card.gimme! "more coffee", type: :coffee_script, content: coffee }
-    let(:create_machine_card)  { Card.gimme! "script with coffee+*script", type: :pointer }
+  it_behaves_like 'machine input'  do
+    let(:create_machine_input_card) do
+      Card.gimme! 'coffee input', type: :coffee_script, content: coffee
+    end
+    let(:create_another_machine_input_card) do
+      Card.gimme! 'more coffee input', type: :coffee_script, content: coffee
+    end
+    let(:create_machine_card) do
+      Card.gimme! 'coffee machine+*script', type: :pointer
+    end
     let(:card_content) do
-       { in:           coffee,         out:     compressed_coffee,
-         changed_in:   changed_coffee, changed_out: compressed_changed_coffee }
+      { in:           coffee,         out:     compressed_coffee,
+        changed_in:   changed_coffee, changed_out: compressed_changed_coffee }
     end
   end
-
-end
+end

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

@@ -1,34 +1,40 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Css do
-  let(:css) { '#box { display: block }' }
-  let(:compressed_css) {  "#box{display:block}\n" }
-  let(:changed_css) { '#box { display: inline }' }
+  let(:css)                    { '#box { display: block }' }
+  let(:compressed_css)         { "#box{display:block}\n" }
+  let(:changed_css)            { '#box { display: inline }' }
   let(:compressed_changed_css) { "#box{display:inline}\n" }
 
-  it "should highlight code" do
+  it 'should highlight code' do
     Card::Auth.as_bot do
-      css_card = Card.create! name: 'tmp css', type_code: 'css', content: "p { border: 1px solid black; }"
+      css_card = Card.create! name: 'tmp css', type_code: 'css',
+                              content: 'p { border: 1px solid black; }'
       assert_view_select css_card.format.render_core, 'div[class=CodeRay]'
     end
   end
 
-
-  it_behaves_like "machine input"  do
-    let(:create_machine_input_card) { Card.gimme! "test css", type: :css, content: css }
-    let(:create_another_machine_input_card) { Card.gimme! "more test css", type: :css, content: css }
-    let(:create_machine_card)  { Card.gimme! "style with css+*style", type: :pointer }
+  it_behaves_like 'machine input'  do
+    let(:create_machine_input_card) do
+      Card.gimme! 'test css', type: :css, content: css
+    end
+    let(:create_another_machine_input_card) do
+      Card.gimme! 'more test css', type: :css, content: css
+    end
+    let(:create_machine_card) do
+      Card.gimme! 'style with css+*style', type: :pointer
+    end
     let(:card_content) do
-       { in:       css,         out:     compressed_css,
-         changed_in:   changed_css, changed_out: compressed_changed_css }
+      { in:         css,         out:         compressed_css,
+        changed_in: changed_css, changed_out: compressed_changed_css }
     end
   end
 
   it_behaves_like 'content machine', that_produces_css do
-    let(:machine_card) {  Card.gimme! "test css", type: :css, content: css }
+    let(:machine_card) { Card.gimme! 'test css', type: :css, content: css }
     let(:card_content) do
-       { in:       css,         out:     compressed_css,
-         changed_in:   changed_css, changed_out: compressed_changed_css }
+      { in:         css,         out:         compressed_css,
+        changed_in: changed_css, changed_out: compressed_changed_css }
     end
   end
-end
+end

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

@@ -1,43 +1,50 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Scss do
-  let(:scss) {
-    %{
+  let(:scss) do
+    <<-SCSS
       $link_color: #abcdef;
       a { color: $link_color; }
-    }
-  }
-  let(:compressed_css) {  "a{color:#abcdef}\n" }
-  let(:changed_scss) {
-    %{
+    SCSS
+  end
+  let(:compressed_css) { "a{color:#abcdef}\n" }
+  let(:changed_scss) do
+    <<-SCSS
       $link_color: #fedcba;
       a { color: $link_color; }
-    }
-  }
-  let(:compressed_changed_css) {  "a{color:#fedcba}\n" }
+    SCSS
+  end
+  let(:compressed_changed_css) { "a{color:#fedcba}\n" }
   before do
     @scss_card = Card[:style_cards]
   end
 
   it 'should highlight code in html' do
-    assert_view_select @scss_card.format(:html).render_core, 'div[class=CodeRay]'
+    assert_view_select @scss_card.format(:html).render_core,
+                       'div[class=CodeRay]'
   end
 
   it 'should not highlight code in css' do
     expect(@scss_card.format(:css).render_core).not_to match(/CodeRay/)
   end
 
-  it_should_behave_like "machine input"  do
-    let(:create_machine_input_card) { Card.gimme! "test scss", type: :scss, content: scss }
-    let(:create_another_machine_input_card) { Card.gimme! "more scss", type: :scss, content: scss }
-    let(:create_machine_card)  { Card.gimme! "style with scss+*style", type: :pointer }
+  it_should_behave_like 'machine input'  do
+    let(:create_machine_input_card) do
+      Card.gimme! 'test scss', type: :scss, content: scss
+    end
+    let(:create_another_machine_input_card) do
+      Card.gimme! 'more scss', type: :scss, content: scss
+    end
+    let(:create_machine_card) do
+      Card.gimme! 'style with scss+*style', type: :pointer
+    end
     let(:card_content) do
-       { in:       scss,         out:     compressed_css,
-         changed_in:   changed_scss, changed_out: compressed_changed_css }
+      { in:           scss,         out:     compressed_css,
+        changed_in:   changed_scss, changed_out: compressed_changed_css }
     end
   end
 
-  it "should process links and inclusions but not urls" do
+  it 'should process links and nests but not urls' do
     Card::Auth.as_bot do
       scss = ".TYPE-X.no-citations {\n  color: #BA5B5B;\n}\n"
       card = Card.create! name: 'minimal css', type: 'scss', content: scss
@@ -46,10 +53,10 @@ describe Card::Set::Type::Scss do
   end
 
   it_should_behave_like 'content machine', that_produces_css do
-    let(:machine_card) {  Card.gimme! "test scss", type: :scss, content: scss }
+    let(:machine_card) { Card.gimme! 'test scss', type: :scss, content: scss }
     let(:card_content) do
-       { in:       scss,         out:     compressed_css,
-         changed_in:   changed_scss, changed_out: compressed_changed_css }
+      { in:           scss,         out:     compressed_css,
+        changed_in:   changed_scss, changed_out: compressed_changed_css }
     end
   end
 end

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

@@ -1,56 +1,56 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Skin do
-  let(:css)                    { "#box { display: block }"  }
+  let(:css)                    { '#box { display: block }'  }
   let(:compressed_css)         { "#box{display:block}\n"    }
-  let(:changed_css)            { "#box { display: inline }" }
+  let(:changed_css)            { '#box { display: inline }' }
   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,
-         changed_in:   changed_css, changed_out: compressed_changed_css,
-         new_in:       new_css,     new_out:     compressed_new_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 }
+  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(:card_content) do
-       { in:           css,         out:     compressed_css,
-         changed_in:   changed_css, changed_out: compressed_changed_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
+        updated_machine = Card.gimme machine.cardname
         path = updated_machine.machine_output_path
-        expect(File.read path).to eq( compressed_css )
+        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
@@ -58,13 +58,11 @@ describe Card::Set::Type::Skin do
         { get: machine.machine_output_url }
         item.update_attributes content: new_css
       end
-      updated_machine  = Card.gimme machine.cardname
+      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(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)
     end
   end
-
-
 end

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

@@ -27,8 +27,8 @@ class Card
       config:      'Config'
     }
     @@groups = @@group_names.keys.each_with_object({}) do |key, groups|
-                 groups[key] = []
-               end
+      groups[key] = []
+    end
     @@user_specific = ::Set.new
 
     def self.user_specific? codename
@@ -55,8 +55,8 @@ class Card
       self.restricted_to_type =
         if opts[:restricted_to_type]
           type_ids = [opts[:restricted_to_type]].flatten.map do |cardtype|
-                       to_type_id(cardtype)
-                     end
+            to_type_id(cardtype)
+          end
           ::Set.new(type_ids)
         end
       return unless opts[:user_specific]

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

@@ -5,7 +5,7 @@ end
 
 format :html do
   view :pointer_core do |args| # view: :core, mod: Type::Pointer::HtmlFormat
-    %{<div class="pointer-list">#{render_pointer_items args}</div>}
+    %(<div class="pointer-list">#{render_pointer_items args}</div>)
   end
 
   view :core do |args|
@@ -31,71 +31,64 @@ format :html do
     end
 
     inheritable = not_set ? false : set_card.inheritable?
-    inheriting = inheritable && card.content=='_left'
+    inheriting = inheritable && card.content == '_left'
 
     item_names = inheriting ? [] : card.item_names
 
-    %{
-      #{ hidden_field :content, class: 'card-content' }
+    %(
+      #{hidden_field :content, class: 'card-content'}
       <div class="perm-editor">
 
-        #{ if inheritable; %{
+        #{if inheritable; %(
           <div class="perm-inheritance perm-section">
-            #{ check_box_tag 'inherit', 'inherit', inheriting }
+            #{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 }
+        ) end}
 
         <div class="perm-group perm-vals perm-section">
           <h5>Groups</h5>
-          #{
-            group_options.map do |option|
+          #{group_options.map do |option|
               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"
-          }
+              )
+            end * "\n"}
         </div>
 
         <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>
-    }
+    )
   end
 
-
-
-
   private
 
   def core_inherit_content args={}
     sc = args[:set_context]
     text = if sc && sc.tag_name.key == Card[:self].key
-      begin
-        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]
-        end*", "
-        "Inherit ( #{links} )"
-      rescue
-        'Inherit'
-      end
-    else
-      'Inherit from left card'
+             begin
+               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]
+               end * ', '
+               "Inherit ( #{links} )"
+             rescue
+               'Inherit'
+             end
+           else
+             'Inherit from left card'
     end
-    %{<span class="inherit-perm">#{text}</span>}
+    %(<span class="inherit-perm">#{text}</span>)
   end
 end
-
-