card 1.16.6 → 1.16.7

data/mod/03_machines/set/type/coffee_script.rb

@@ -18,7 +18,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
@@ -33,7 +33,7 @@ end
 
 
 format :html do
-  view :editor, :mod=>Html::HtmlFormat
+  view :editor, mod: Html::HtmlFormat
 
   view :content_changes do |args|
     %{
@@ -57,5 +57,5 @@ format do
 end
 
 def diff_args
-   {:format=>:text}
+  { format: :text }
 end

data/mod/03_machines/set/type/css.rb

@@ -3,15 +3,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
@@ -30,20 +30,20 @@ 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, :content_opts=>{: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/mod/03_machines/set/type/java_script.rb

@@ -4,7 +4,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)
@@ -22,8 +22,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
@@ -33,5 +33,5 @@ format :html do
 end
 
 def diff_args
-   {:format=>:text}
+   {format: :text}
 end

data/mod/03_machines/set/type/scss.rb

@@ -1,7 +1,7 @@
 include Type::Css
 
 def diff_args
-  {:format=>:text}
+  {format: :text}
 end
 
 format do
@@ -12,7 +12,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/mod/03_machines/set/type/skin.rb

@@ -1,7 +1,7 @@
 include Machine
 include MachineInput
 
-store_machine_output :filetype => "css"
+store_machine_output filetype: "css"
 
 include Pointer
 format()      { include Pointer::Format     }

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

@@ -19,14 +19,14 @@ shared_examples_for 'machine' do |filetype|
     before do
       machine.update_machine_output
     end
-    
+
     it 'has +machine_input card' do
-      expect(machine.machine_input_card.real?).to be_truthy 
+      expect(machine.machine_input_card.real?).to be_truthy
     end
     it 'has +machine_output card' do
       expect(machine.machine_output_card.real?).to be_truthy
     end
-    it "generates #{filetype} file" do 
+    it "generates #{filetype} file" do
       expect(machine.machine_output_path).to match(/\.#{filetype}$/)
     end
   end
@@ -37,10 +37,10 @@ shared_examples_for 'content machine' do |filetype|
   it_should_behave_like 'machine', that_produces(filetype) do
     let(:machine) { machine_card }
   end
-  
+
   context '+machine_input card' do
-    
-    
+
+
     it "points to self" do
       Card::Auth.as_bot do
         machine_card.update_input_card
@@ -48,7 +48,7 @@ shared_examples_for 'content machine' do |filetype|
       expect(machine_card.input_item_cards).to eq([machine_card])
     end
   end
-  
+
   context '+machine_output card' do
     it 'creates file with supplied content' do
       path = machine_card.machine_output_path
@@ -56,7 +56,7 @@ shared_examples_for 'content machine' do |filetype|
     end
     it "updates #{filetype} file when content is changed" do
       changed_factory = machine_card
-      changed_factory.putty :content =>card_content[:changed_in]
+      changed_factory.putty content: card_content[:changed_in]
       changed_path = changed_factory.machine_output_path
       expect(File.read(changed_path)).to eq(card_content[:changed_out])
     end
@@ -68,20 +68,20 @@ shared_examples_for 'pointer machine' do |filetype|
   subject do
 =begin
 We build the following structure:
-    
+
  #{machine_card}
    |- expected_input_items (passed by the calling test if it prepopulates the machine_card with some additional items)
    |_ level 0 #{filetype}
         |- level 1 basic 1
-        |- level 1 #{filetype} 
+        |- level 1 #{filetype}
         |    |- level 2 basic 1
         |    |- level 2 #{filetype}
         |    |    |_ ....
-        |    |_ level 2 basic 2 
+        |    |_ level 2 basic 2
         |_ level 1 basic 2
-    
+
 =end
-    
+
     change_machine = machine_card
     @depth = 2
     @leaf_items = []
@@ -89,16 +89,16 @@ We build the following structure:
     start = @expected_items.size
     Card::Auth.as_bot do
       @depth.times do |i|
-        @leaf_items << Card.fetch( "level #{i} basic 1", :new =>  {:type => Card::BasicID } )
+        @leaf_items << Card.fetch( "level #{i} basic 1", new:  {type: Card::BasicID } )
         @leaf_items.last.save
-        @leaf_items << Card.fetch( "level #{i} basic 2", :new =>  {:type => Card::BasicID } )
+        @leaf_items << Card.fetch( "level #{i} basic 2", new:  {type: Card::BasicID } )
         @leaf_items.last.save
       end
 
       # we build the tree from bottom up
       last_level = false
       (@depth-1).downto(0) do |i|
-        next_level = Card.fetch(  "level #{i} #{filetype} ", :new => {:type => :pointer } )
+        next_level = Card.fetch(  "level #{i} #{filetype} ", new: {type: :pointer } )
         next_level.content = ""
         next_level << @leaf_items[i*2]
         next_level << last_level if last_level
@@ -121,38 +121,38 @@ We build the following structure:
   it_should_behave_like 'machine', that_produces(filetype) do
     let(:machine) { machine_card }
   end
-  
+
   describe '+machine_input card' do
     before do
       Card::Auth.as_bot do
         subject.update_input_card
       end
     end
-    
+
     it "contains items of all levels" do
       expect(subject.machine_input_card.item_cards.map(&:id).sort).to eq(@expected_items.map(&:id).sort)
     end
-    
+
     it "preserves order of items" do
       expect(subject.machine_input_card.item_cards.map(&:id)).to eq(@expected_items.map(&:id))
     end
   end
-  
+
   describe '+machine_output card' do
     it 'creates #{filetype} file with supplied content' do
       path = subject.machine_output_path
       expect(File.read(path)).to eq(card_content[:out])
     end
-    
+
     it 'updates #{filetype} file if item is changed' do
-      machine_input_card.putty :content => card_content[:changed_in]
+      machine_input_card.putty content: card_content[:changed_in]
       changed_path = subject.machine_output_path
       expect(File.read(changed_path)).to eq(card_content[:changed_out])
     end
-    
+
     it 'updates #{filetype} file if item is added' do
       Card::Auth.as_bot do
-        ca = Card.gimme! "pointer item", :type=>Card::SkinID, :content=>''
+        ca = Card.gimme! "pointer item", type: Card::SkinID, content: ''
         subject.items = [ca]
         ca << another_machine_input_card
         ca.save!
@@ -160,13 +160,13 @@ We build the following structure:
         expect(File.read(changed_path)).to eq(card_content[:new_out])
       end
     end
-    
+
     context 'a non-existent card was added as item and now created' do
       it 'updates #{filetype} file' do
         Card::Auth.as_bot do
-          subject.content = "[[non-existent input]]" 
+          subject.content = "[[non-existent input]]"
           subject.save!
-          ca = Card.gimme! "non-existent input", :type=>input_type, :content=>card_content[:changed_in]
+          ca = Card.gimme! "non-existent input", type: input_type, content: card_content[:changed_in]
           ca.save!
           changed_path = subject.machine_output_path
           expect(File.read(changed_path)).to eq(card_content[:changed_out])

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

@@ -1,12 +1,12 @@
 # -*- encoding : utf-8 -*-
 
-shared_examples_for 'machine input' do 
+shared_examples_for 'machine input' do
   subject(:input) do
     myinput = create_machine_input_card
     myinput
   end
   let!(:machine) do
-    f = create_machine_card 
+    f = create_machine_card
     f << create_machine_input_card
     f.putty
     f
@@ -15,7 +15,7 @@ shared_examples_for 'machine input' do
     moreinput = create_another_machine_input_card
     moreinput
   end
-  
+
   context 'when removed' do
     it 'updates machine_input card of machine card' do
       machine
@@ -25,7 +25,7 @@ shared_examples_for 'machine input' do
       f = Card.gimme machine.name
       expect(f.machine_input_card.item_cards).to eq([])
     end
-    
+
     it 'updates output of machine card' do
       machine
       Card::Auth.as_bot do
@@ -36,20 +36,20 @@ shared_examples_for 'machine input' do
       expect(File.read path).to eq('')
     end
   end
-  
+
   it 'delivers machine input' do
     expect(input.machine_input).to eq(card_content[:out])
   end
-  
+
   context 'when updated' do
     it 'updates output of related machine card' do
-      input.putty :content => card_content[:changed_in]
+      input.putty content: card_content[:changed_in]
       updated_machine  = Card.gimme machine.cardname
       path = updated_machine.machine_output_path
       expect(File.read path).to eq(card_content[:changed_out])
     end
   end
-  
+
   context 'when added' do
     it 'updates output of related machine card' do
       if machine.kind_of? Card::Set::Type::Pointer

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

@@ -9,19 +9,19 @@ describe Card::Set::Type::CoffeeScript do
 
 
   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)  { Card.gimme! "test coffeescript", type: Card::CoffeeScriptID, content: coffee}
     let(:card_content) do
-       { in:           coffee,         out:     compressed_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 }
+    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 }
     let(:card_content) do
-       { in:           coffee,         out:     compressed_coffee, 
+       { in:           coffee,         out:     compressed_coffee,
          changed_in:   changed_coffee, changed_out: compressed_changed_coffee }
     end
   end

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

@@ -5,29 +5,29 @@ describe Card::Set::Type::Css do
   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
     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 }
+    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 }
     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
 
   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, 
+       { in:       css,         out:     compressed_css,
          changed_in:   changed_css, changed_out: compressed_changed_css }
     end
   end

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

@@ -8,19 +8,19 @@ describe Card::Set::Type::JavaScript do
 
 
   it_should_behave_like 'content machine', that_produces_js do
-    let(:machine_card)  { Card.gimme! "test javascript", :type => :java_script, :content => js}
+    let(:machine_card)  { Card.gimme! "test javascript", type: :java_script, content: js}
     let(:card_content) do
-       { in:       js,         out:     compressed_js, 
+       { in:       js,         out:     compressed_js,
          changed_in:   changed_js, changed_out: compressed_changed_js }
     end
   end
 
   it_behaves_like "machine input"  do
-    let(:create_machine_input_card) { Card.gimme! "test javascript", :type => :java_script, :content => js }
-    let(:create_another_machine_input_card) { Card.gimme! "more javascript", :type => :java_script, :content => js }
-    let(:create_machine_card)  { Card.gimme! "script with js+*script", :type => :pointer }
+    let(:create_machine_input_card) { Card.gimme! "test javascript", type: :java_script, content: js }
+    let(:create_another_machine_input_card) { Card.gimme! "more javascript", type: :java_script, content: js }
+    let(:create_machine_card)  { Card.gimme! "script with js+*script", type: :pointer }
     let(:card_content) do
-       { in:       js,         out:     compressed_js, 
+       { in:       js,         out:     compressed_js,
          changed_in:   changed_js, changed_out: compressed_changed_js }
     end
   end

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

@@ -28,9 +28,9 @@ describe Card::Set::Type::Scss do
   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 }
+    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 }
     let(:card_content) do
        { in:       scss,         out:     compressed_css,
          changed_in:   changed_scss, changed_out: compressed_changed_css }
@@ -40,13 +40,13 @@ describe Card::Set::Type::Scss do
   it "should process links and inclusions 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
+      card = Card.create! name: 'minimal css', type: 'scss', content: scss
       card.format(:css).render_core.should == scss
     end
   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 }