card 1.17.4 → 1.18.0

data/mod/03_machines/lib/card/machine_input.rb

@@ -13,52 +13,53 @@ class Card
     end
 
     def self.included host_class
-      host_class.extend( ClassMethods )
+      host_class.extend(ClassMethods)
       host_class.machines_wql = {}
       host_class.machine_input do
         format._render_raw
       end
+      event_suffix = host_class.name.tr ':', '_'
+      define_update_event event_suffix, host_class
+      define_delete_events event_suffix, host_class
+    end
 
-      event_suffix = host_class.name.gsub ':', '_'
-
-      host_class.event(
-        "after_machine_input_updated_#{ event_suffix }".to_sym,
-        after: :extend, on: :save
-      ) do
-
-        wql_statement = { right_plus: [
-          { codename: "machine_input" },
-          { link_to: name}
-        ]}.merge(host_class.machines_wql)
-        machines = Card.search(wql_statement)
-        machines.each do |item|
-          item.reset_machine_output! if item.kind_of? Machine
-        end
+    def self.define_delete_events event_suffix, host_class
+      event_name = "before_machine_input_deleted_#{event_suffix}".to_sym
+      host_class.event event_name, :store, on: :delete do
+        # exclude self because it's on the way to the trash
+        # otherwise it will be created again with the reset_machine_output
+        # call in the event below
+        @involved_machines =
+          Card::MachineInput.search_involved_machines(name, host_class)
+                            .reject { |card| card == self }
       end
-
-      host_class.event(
-        "before_machine_input_deleted_#{ event_suffix }".to_sym,
-        after: :approve, on: :delete
-      ) do
-
-        @involved_machines = Card.search(
-          {right_plus: [
-            {codename: "machine_input"},
-            {link_to: name}
-          ]}.merge(host_class.machines_wql)
-        )
+      event_name = "after_machine_input_deleted_#{event_suffix}".to_sym
+      host_class.event event_name, :finalize, on: :delete do
+        @involved_machines.each do |item|
+          item.reset_machine_output! if item.is_a? Machine
+        end
       end
+    end
 
+    def self.define_update_event event_suffix, host_class
       host_class.event(
-       "after_machine_input_deleted_#{ event_suffix }".to_sym,
-       after: :store_subcards, on: :delete
+        "after_machine_input_updated_#{event_suffix}".to_sym, :integrate,
+        on: :save
       ) do
-
-        @involved_machines.each do |item|
-          item.reset_machine_output! if item.kind_of? Machine
+        Card::MachineInput.search_involved_machines(name, host_class)
+                          .each do |item|
+          item.reset_machine_output! if item.is_a? Machine
         end
       end
     end
+
+    def self.search_involved_machines name, host_class
+      wql_statement =
+        { right_plus: [
+          { codename: 'machine_input' },
+          { link_to: name }
+        ] }.merge(host_class.machines_wql)
+      Card.search(wql_statement)
+    end
   end
 end
-

data/mod/03_machines/set/right/machine_input.rb

@@ -1,3 +1,3 @@
 def followable?
   false
-end
+end

data/mod/03_machines/set/self/script_ace.rb

@@ -1,12 +1,11 @@
 
-view :raw do |args|
-  
+view :raw do |_args|
   Rails.logger.info "reading file: #{Cardio.gem_root}/mod/03_machines/lib/javascript/#{card.codename}.js"
   File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/#{card.codename}.js"
 end
 
 format :html do
-  view :editor do |args|
+  view :editor do |_args|
     "Content is stored in file and can't be edited."
   end
 end

data/mod/03_machines/set/self/script_card_menu.rb

@@ -1,11 +1,10 @@
-view :raw do |args|
-
+view :raw do |_args|
   Rails.logger.info "reading file: #{Cardio.gem_root}/mod/03_machines/lib/javascript/#{card.codename}.js.coffee"
   File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/#{card.codename}.js.coffee"
 end
 
 format :html do
-  view :editor do |args|
+  view :editor do |_args|
     "Content is stored in file and can't be edited."
   end
 end

data/mod/03_machines/set/self/script_jquery_helper.rb

@@ -1,7 +1,7 @@
 
-view :raw do |args|
+view :raw do |_args|
   # jquery.ui.all must be after jquery.mobile to override dialog weirdness *
-  # jquery.ui.autocomplete must be after jquery.ui stuff 
+  # jquery.ui.autocomplete must be after jquery.ui stuff
   # FIXME removed  jquerymobile.js. Doesn't work with the new jquery version
   js_files = %w( jquery-ui.js jquery.ui.autocomplete.html.js jquery.autosize.js jquery.fileupload.js jquery.iframe-transport.js jquery_ujs.js )
   js_files.map do |filename|

data/mod/03_machines/set/self/script_slot.rb

@@ -1,5 +1,5 @@
-view :raw do |args|
-  [ "wagn_mod.js.coffee", "wagn.js.coffee" ].map do |name|
+view :raw do |_args|
+  ['wagn_mod.js.coffee', 'wagn.js.coffee'].map do |name|
     File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/#{name}"
   end.join("\n")
 end

data/mod/03_machines/set/self/style_bootstrap_compatible.rb

@@ -1,4 +1,4 @@
-view :raw do |args|
+view :raw do |_args|
   File.read "#{Cardio.gem_root}/mod/03_machines/lib/stylesheets/#{card.codename}.css"
 end
 

data/mod/03_machines/set/self/style_cards.rb

@@ -1,5 +1,5 @@
 
-view :raw do |args|
+view :raw do |_args|
   File.read "#{Cardio.gem_root}/mod/03_machines/lib/stylesheets/style_cards.scss"
 end
 

data/mod/03_machines/set/self/style_jquery_ui_smoothness.rb

@@ -1,3 +1,2 @@
 format { include StyleBootstrapCompatible::Format }
 format(:html) { include ScriptAce::HtmlFormat }
-

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

@@ -10,12 +10,12 @@ include MachineInput
 
 def compile_coffee script
   ::CoffeeScript.compile script
-rescue =>e
+rescue => e
   e
 end
 
 machine_input do
-  Uglifier.compile( compile_coffee format(:js)._render_raw )
+  Uglifier.compile(compile_coffee format(:js)._render_raw)
 end
 
 store_machine_output filetype: 'js'
@@ -24,34 +24,30 @@ def clean_html?
   false
 end
 
-
 format do
-  def chunk_list  #turn off autodetection of uri's
-    :inclusion_only
+  def chunk_list  # turn off autodetection of uri's
+    :nest_only
   end
 end
 
-
 format :html do
   view :editor, mod: Html::HtmlFormat
 
   view :content_changes do |args|
-    %{
+    %(
       <pre>#{super(args)}</pre>
-    }
+    )
   end
 
-  view :core do |args|
+  view :core do |_args|
     js = card.compile_coffee _render_raw
-    highlighted_js = ::CodeRay.scan( js, :js ).div
+    highlighted_js = ::CodeRay.scan(js, :js).div
     process_content highlighted_js
   end
-
 end
 
-
 format do
-  view :core do |args|
+  view :core do |_args|
     process_content card.compile_coffee(_render_raw)
   end
 end

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

@@ -3,18 +3,16 @@ 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
 end
 
 def compress_css input
-  begin
-    Sass.compile input, style: :compressed
-  rescue => e
-    raise Card::Oops, "Stylesheet Error:\n#{ e.message }"
-  end
+  Sass.compile input, style: :compressed
+rescue => e
+  raise Card::Oops, "Stylesheet Error:\n#{e.message}"
 end
 
 def clean_html?
@@ -22,28 +20,29 @@ def clean_html?
 end
 
 format do
-  def chunk_list  #turn off autodetection of uri's
+  def chunk_list # turn off autodetection of uri's
     :references
   end
 end
 
-
 format :html do
-  def get_inclusion_defaults nested_card
+  def get_nest_defaults _nested_card
     { view: :closed }
   end
 
   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
+  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
 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)
@@ -14,10 +14,9 @@ def clean_html?
   false
 end
 
-
 format do
-  def chunk_list  #turn off autodetection of uri's
-    :inclusion_only
+  def chunk_list  # turn off autodetection of uri's
+    :nest_only
   end
 end
 
@@ -25,13 +24,12 @@ format :html do
   view :editor, mod: Html::HtmlFormat
   view :content_changes, mod: CoffeeScript::HtmlFormat
 
-  view :core do |args|
-    highlighted_js = ::CodeRay.scan( _render_raw, :js ).div
+  view :core do |_args|
+    highlighted_js = ::CodeRay.scan(_render_raw, :js).div
     process_content highlighted_js
   end
-
 end
 
 def diff_args
-   {format: :text}
+  { format: :text }
 end

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

@@ -1,22 +1,21 @@
 include Type::Css
 
 def diff_args
-  {format: :text}
+  { format: :text }
 end
 
 format do
   include Css::Format
 
-  view :core do |args|
+  view :core do |_args|
     compile_scss(process_content _render_raw)
   end
 
   def compile_scss scss, style=:expanded
     Sass.compile scss, style: style
-  rescue =>e
+  rescue => e
     e
   end
-
 end
 
-format( :html ) { include Css::HtmlFormat }
+format(:html) { include Css::HtmlFormat }

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

@@ -1,12 +1,9 @@
 include Machine
 include MachineInput
 
-store_machine_output filetype: "css"
+store_machine_output filetype: 'css'
 
 include Pointer
-format()      { include Pointer::Format     }
+format      { include Pointer::Format     }
 format(:html) { include Pointer::HtmlFormat }
-format(:css ) { include Pointer::CssFormat  }
-
-
-
+format(:css) { include Pointer::CssFormat  }

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

@@ -7,15 +7,14 @@ end
 def method_missing m, *args, &block
   case m
   when /that_produces_(.+)/
-    return $1
+    return Regexp.last_match(1)
   else
     super
   end
 end
 
-
 shared_examples_for 'machine' do |filetype|
-  context "machine is run" do
+  context 'machine is run' do
     before do
       machine.update_machine_output
     end
@@ -33,15 +32,12 @@ shared_examples_for 'machine' do |filetype|
 end
 
 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
+    it 'points to self' do
       Card::Auth.as_bot do
         machine_card.update_input_card
       end
@@ -63,24 +59,21 @@ shared_examples_for 'content machine' do |filetype|
   end
 end
 
-
 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 2 basic 1
-        |    |- level 2 #{filetype}
-        |    |    |_ ....
-        |    |_ level 2 basic 2
-        |_ level 1 basic 2
-
-=end
+    # 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 2 basic 1
+    #         |    |- level 2 #{filetype}
+    #         |    |    |_ ....
+    #         |    |_ level 2 basic 2
+    #         |_ level 1 basic 2
+    #
 
     change_machine = machine_card
     @depth = 2
@@ -89,24 +82,24 @@ 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.content = ""
-        next_level << @leaf_items[i*2]
+      (@depth - 1).downto(0) do |i|
+        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
-        next_level << @leaf_items[i*2+1]
+        next_level << @leaf_items[i * 2 + 1]
         next_level.save!
-        @expected_items.insert(start, @leaf_items[i*2])
-        @expected_items.insert(start+1, last_level) if last_level
-        @expected_items << @leaf_items[i*2+1]
+        @expected_items.insert(start, @leaf_items[i * 2])
+        @expected_items.insert(start + 1, last_level) if last_level
+        @expected_items << @leaf_items[i * 2 + 1]
         last_level = next_level
       end
       change_machine << last_level
@@ -129,11 +122,11 @@ We build the following structure:
       end
     end
 
-    it "contains items of all levels" do
+    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
+    it 'preserves order of items' do
       expect(subject.machine_input_card.item_cards.map(&:id)).to eq(@expected_items.map(&:id))
     end
   end
@@ -152,7 +145,7 @@ We build the following structure:
 
     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!
@@ -164,9 +157,9 @@ We build the following structure:
     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])