card-mod-machines 0.12.0 → 0.13.3

data/file/script_html5shiv_printshiv_machine_output/file.js

@@ -1,2 +1,2 @@
 //script: html5shiv printshiv
-!function(e,i){function m(e,t){var n=e.createElement("p"),r=e.getElementsByTagName("head")[0]||e.documentElement;return n.innerHTML="x<style>"+t+"</style>",r.insertBefore(n.lastChild,r.firstChild)}function c(){var e=T.elements;return"string"==typeof e?e.split(" "):e}function d(e){var t=N[e[b]];return t||(t={},S++,e[b]=S,N[S]=t),t}function r(e,t,n){return t||(t=i),u?t.createElement(e):(n||(n=d(t)),(r=n.cache[e]?n.cache[e].cloneNode():E.test(e)?(n.cache[e]=n.createElem(e)).cloneNode():n.createElem(e)).canHaveChildren&&!y.test(e)?n.frag.appendChild(r):r);var r}function t(e,t){if(e||(e=i),u)return e.createDocumentFragment();for(var n=(t=t||d(e)).frag.cloneNode(),r=0,a=c(),o=a.length;r<o;r++)n.createElement(a[r]);return n}function n(t,n){n.cache||(n.cache={},n.createElem=t.createElement,n.createFrag=t.createDocumentFragment,n.frag=n.createFrag()),t.createElement=function(e){return T.shivMethods?r(e,t,n):n.createElem(e)},t.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+c().join().replace(/\w+/g,function(e){return n.createElem(e),n.frag.createElement(e),'c("'+e+'")'})+");return n}")(T,n.frag)}function a(e){e||(e=i);var t=d(e);return!T.shivCSS||p||t.hasCSS||(t.hasCSS=!!m(e,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),u||n(e,t),e}function h(e){for(var t,n=e.getElementsByTagName("*"),r=n.length,a=RegExp("^(?:"+c().join("|")+")$","i"),o=[];r--;)t=n[r],a.test(t.nodeName)&&o.push(t.applyElement(l(t)));return o}function l(e){for(var t,n=e.attributes,r=n.length,a=e.ownerDocument.createElement(C+":"+e.nodeName);r--;)(t=n[r]).specified&&a.setAttribute(t.nodeName,t.nodeValue);return a.style.cssText=e.style.cssText,a}function f(e){for(var t,n=e.split("{"),r=n.length,a=RegExp("(^|[\\s,>+~])("+c().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),o="$1"+C+"\\:$2";r--;)(t=n[r]=n[r].split("}"))[t.length-1]=t[t.length-1].replace(a,o),n[r]=t.join("}");return n.join("{")}function o(e){for(var t=e.length;t--;)e[t].removeNode()}function s(c){function l(){clearTimeout(e._removeSheetTimer),s&&s.removeNode(!0),s=null}var s,u,e=d(c),t=c.namespaces,n=c.parentWindow;return!D||c.printShived||("undefined"==typeof t[C]&&t.add(C),n.attachEvent("onbeforeprint",function(){l();for(var e,t,n,r=c.styleSheets,a=[],o=r.length,i=Array(o);o--;)i[o]=r[o];for(;n=i.pop();)if(!n.disabled&&x.test(n.media)){try{t=(e=n.imports).length}catch(p){t=0}for(o=0;o<t;o++)i.push(e[o]);try{a.push(n.cssText)}catch(p){}}a=f(a.reverse().join("")),u=h(c),s=m(c,a)}),n.attachEvent("onafterprint",function(){o(u),clearTimeout(e._removeSheetTimer),e._removeSheetTimer=setTimeout(l,500)}),c.printShived=!0),c}var p,u,v="3.6.2",g=e.html5||{},y=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,E=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,b="_html5shiv",S=0,N={};!function(){try{var e=i.createElement("a");e.innerHTML="<xyz></xyz>",p="hidden"in e,u=1==e.childNodes.length||function(){i.createElement("a");var e=i.createDocumentFragment();return"undefined"==typeof e.cloneNode||"undefined"==typeof e.createDocumentFragment||"undefined"==typeof e.createElement}()}catch(m){u=p=!0}}();var T={elements:g.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:v,shivCSS:!1!==g.shivCSS,supportsUnknownElements:u,shivMethods:!1!==g.shivMethods,type:"default",shivDocument:a,createElement:r,createDocumentFragment:t};e.html5=T,a(i);var F,x=/^$|\b(?:all|print)\b/,C="html5shiv",D=!(u||(F=i.documentElement,"undefined"==typeof i.namespaces||"undefined"==typeof i.parentWindow||"undefined"==typeof F.applyElement||"undefined"==typeof F.removeNode||"undefined"==typeof e.attachEvent));T.type+=" print",(T.shivPrint=s)(i)}(this,document);
+!function(e,t){function n(e,t){var n=e.createElement("p"),r=e.getElementsByTagName("head")[0]||e.documentElement;return n.innerHTML="x<style>"+t+"</style>",r.insertBefore(n.lastChild,r.firstChild)}function r(){var e=T.elements;return"string"==typeof e?e.split(" "):e}function a(e){var t=N[e[b]];return t||(t={},S++,e[b]=S,N[S]=t),t}function o(e,n,r){if(n||(n=t),p)return n.createElement(e);r||(r=a(n));var o;return o=r.cache[e]?r.cache[e].cloneNode():E.test(e)?(r.cache[e]=r.createElem(e)).cloneNode():r.createElem(e),o.canHaveChildren&&!y.test(e)?r.frag.appendChild(o):o}function i(e,n){if(e||(e=t),p)return e.createDocumentFragment();n=n||a(e);for(var o=n.frag.cloneNode(),i=0,c=r(),l=c.length;l>i;i++)o.createElement(c[i]);return o}function c(e,t){t.cache||(t.cache={},t.createElem=e.createElement,t.createFrag=e.createDocumentFragment,t.frag=t.createFrag()),e.createElement=function(n){return T.shivMethods?o(n,e,t):t.createElem(n)},e.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+r().join().replace(/\w+/g,function(e){return t.createElem(e),t.frag.createElement(e),'c("'+e+'")'})+");return n}")(T,t.frag)}function l(e){e||(e=t);var r=a(e);return!T.shivCSS||h||r.hasCSS||(r.hasCSS=!!n(e,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),p||c(e,r),e}function u(e){for(var t,n=e.getElementsByTagName("*"),a=n.length,o=RegExp("^(?:"+r().join("|")+")$","i"),i=[];a--;)t=n[a],o.test(t.nodeName)&&i.push(t.applyElement(s(t)));return i}function s(e){for(var t,n=e.attributes,r=n.length,a=e.ownerDocument.createElement(x+":"+e.nodeName);r--;)t=n[r],t.specified&&a.setAttribute(t.nodeName,t.nodeValue);return a.style.cssText=e.style.cssText,a}function m(e){for(var t,n=e.split("{"),a=n.length,o=RegExp("(^|[\\s,>+~])("+r().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),i="$1"+x+"\\:$2";a--;)t=n[a]=n[a].split("}"),t[t.length-1]=t[t.length-1].replace(o,i),n[a]=t.join("}");return n.join("{")}function d(e){for(var t=e.length;t--;)e[t].removeNode()}function f(e){function t(){clearTimeout(i._removeSheetTimer),r&&r.removeNode(!0),r=null}var r,o,i=a(e),c=e.namespaces,l=e.parentWindow;return!C||e.printShived?e:("undefined"==typeof c[x]&&c.add(x),l.attachEvent("onbeforeprint",function(){t();for(var a,i,c,l=e.styleSheets,s=[],d=l.length,f=Array(d);d--;)f[d]=l[d];for(;c=f.pop();)if(!c.disabled&&F.test(c.media)){try{a=c.imports,i=a.length}catch(h){i=0}for(d=0;i>d;d++)f.push(a[d]);try{s.push(c.cssText)}catch(h){}}s=m(s.reverse().join("")),o=u(e),r=n(e,s)}),l.attachEvent("onafterprint",function(){d(o),clearTimeout(i._removeSheetTimer),i._removeSheetTimer=setTimeout(t,500)}),e.printShived=!0,e)}var h,p,v="3.6.2",g=e.html5||{},y=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,E=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,b="_html5shiv",S=0,N={};!function(){try{var e=t.createElement("a");e.innerHTML="<xyz></xyz>",h="hidden"in e,p=1==e.childNodes.length||function(){t.createElement("a");var e=t.createDocumentFragment();return"undefined"==typeof e.cloneNode||"undefined"==typeof e.createDocumentFragment||"undefined"==typeof e.createElement}()}catch(n){h=!0,p=!0}}();var T={elements:g.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:v,shivCSS:g.shivCSS!==!1,supportsUnknownElements:p,shivMethods:g.shivMethods!==!1,type:"default",shivDocument:l,createElement:o,createDocumentFragment:i};e.html5=T,l(t);var F=/^$|\b(?:all|print)\b/,x="html5shiv",C=!p&&function(){var n=t.documentElement;return!("undefined"==typeof t.namespaces||"undefined"==typeof t.parentWindow||"undefined"==typeof n.applyElement||"undefined"==typeof n.removeNode||"undefined"==typeof e.attachEvent)}();T.type+=" print",T.shivPrint=f,f(t)}(this,document);

data/lib/card/machine.rb

@@ -3,16 +3,53 @@ class Card
     REFRESHED = "MACHINE_ASSETS_REFRESHED".freeze
 
     class << self
-      def refresh_script_and_style
-        return unless refresh_script_and_style?
+      def refresh_assets force: false
+        return unless force || refresh_assets?
 
-        Card.fetch(:all, :script)&.update_if_source_file_changed
-        Card.fetch(:all, :style)&.update_if_source_file_changed
+        refresh_asset :script, force
+        refresh_asset :style, force
+      end
+
+      def refresh_assets!
+        refresh_assets force: true
+      end
+
+      def reset_all
+        Auth.as_bot do
+          Card.search(right: { codename: "machine_output" }).each do |card|
+            card.update_columns trash: true
+            card.expire
+          end
+        end
+        reset_virtual_machine_cache
+      end
+
+      def reset_script
+        Auth.as_bot do
+          card = Card[:all, :script, :machine_output]
+          if card
+            card.update_columns trash: true
+            card.expire
+            reset_virtual_machine_cache
+          end
+        end
+      end
+
+      def refresh_asset asset_type, force
+        all_rule(asset_type)&.refresh_output force: force
       end
 
       private
 
-      def refresh_script_and_style?
+      def all_rule asset_type
+        Card[[:all, asset_type]]
+      end
+
+      def reset_virtual_machine_cache
+        Virtual.where(right_id: MachineCacheID).delete_all
+      end
+
+      def refresh_assets?
         case Cardio.config.machine_refresh
         when :eager    then true
         when :cautious then cautious_refresh?
@@ -25,7 +62,7 @@ class Card
 
       # only refresh when cache was cleared
       def cautious_refresh?
-        return false unless Card::Cache.persistent_cache
+        return false unless Cache.persistent_cache
         return false if Card.cache.read REFRESHED
 
         Card.cache.write REFRESHED, true

data/set/abstract/machine/output_update.rb

@@ -4,7 +4,7 @@ def reset_machine_output
     @updated_at = output_updated_at
     moc.delete! if moc.real?
     update_input_card
-    expire_if_source_file_changed @updated_at
+    expire_outdated @updated_at
   end
 end
 
@@ -19,7 +19,7 @@ def update_machine_output
 
   lock do
     update_input_card
-    expire_if_source_file_changed output_updated_at
+    expire_outdated
     run_machine
   end
 end
@@ -41,29 +41,24 @@ def update_input_card
   end
 end
 
-def input_cards_with_changed_source output_updated
-  machine_input_card.extended_item_cards.select do |i_card|
-    i_card.try(:source_changed?, since: output_updated)
-  end
+# regenerates the machine output if a source file of a input card has been changed
+def refresh_output force: false
+  regenerate_machine_output if expire_outdated || force
 end
 
-def expire_if_source_file_changed output_updated_at
-  return unless output_updated_at
+private
+
+def expire_outdated updated_at=nil
+  updated_at ||= output_updated_at
+  return true unless updated_at
 
-  changed = input_cards_with_changed_source(output_updated_at)
+  changed = input_cards_with_changed_source updated_at
   return if changed.empty?
 
   changed.each(&:expire_machine_cache)
   true
 end
 
-# regenerates the machine output if a source file of a input card has been changed
-def update_if_source_file_changed
-  return unless expire_if_source_file_changed output_updated_at
-
-  regenerate_machine_output
-end
-
 def output_updated_at
   return unless (output_card = machine_output_card)
 
@@ -73,3 +68,9 @@ def output_updated_at
     output_card.updated_at
   end
 end
+
+def input_cards_with_changed_source output_updated
+  machine_input_card.extended_item_cards.select do |i_card|
+    i_card.try(:source_changed?, since: output_updated)
+  end
+end

data/set/abstract/machine.rb

@@ -88,7 +88,7 @@ class EngineInput
   end
 
   def simple_item?
-    @item.item_cards == [@item] # no pointer card
+    @item.item_cards == [@item] || @item.try(:self_machine_input?) # no pointer card
   end
 
   def pointer_item
@@ -123,17 +123,15 @@ def after_engine output
   file = Tempfile.new [id.to_s, ".#{filetype}"]
   file.write output
   file.rewind
-  Card::Auth.as_bot do
-    p = machine_output_card
-    p.file = file
-    p.save!
-  end
+  store_machine_output file
   file.close
   file.unlink
 end
 
-view :machine_output_url do
-  machine_output_url
+format do
+  view :machine_output_url do
+    machine_output_url
+  end
 end
 
 class << self
@@ -166,15 +164,14 @@ def run_machine joint="\n"
 end
 
 def direct_machine_input? input_card
-  !input_card.collection? ||
-    input_card.respond_to?(:machine_input)
+  !input_card.collection? || input_card.respond_to?(:machine_input)
 end
 
 def run_engine input_card
   return unless direct_machine_input? input_card
-  if (cached = fetch_cache_card(input_card)) && cached.content?
-    return cached.content
-  end
+  # if (cached = fetch_cache_card(input_card)) && cached.content?
+  #  return cached.content
+  # end
 
   engine(input_from_card(input_card)).tap do |output|
     cache_output_part input_card, output
@@ -189,6 +186,7 @@ def input_from_card input_card
   end
 end
 
+# FIXME: this is wack. set the storage right the first time through. obviate
 def make_machine_output_coded mod=:machines
   update_machine_output
   Card::Auth.as_bot do
@@ -219,3 +217,24 @@ def machine_output_path
   ensure_machine_output
   machine_output_card.file.path
 end
+
+private
+
+# TODO: make more methods private!
+
+def store_machine_output file
+  Card::Auth.as_bot do
+    moc = machine_output_card
+    prepare_coded_output moc
+    moc.file = file
+    moc.save!
+  end
+end
+
+def prepare_coded_output moc
+  return unless (dir = ENV["SEED_MACHINE_OUTPUT_TO"])
+  ENV["STORE_CODED_FILES"] = "true"
+  moc.storage_type = moc.new_storage_type = :coded
+  moc.mod = dir
+  moc.codename = machine_output_codename
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-machines
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.102.0
+        version: 1.103.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.102.0
+        version: 1.103.3
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -52,56 +52,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: card-mod-format
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: card-mod-carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
 description: ''
 email:
 - info@decko.org
@@ -109,7 +109,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- file/all_script_machine_output/file.js
 - file/all_style_machine_output/file.css
 - file/script_html5shiv_printshiv_machine_output/file.js
 - lib/card/machine.rb
@@ -117,7 +116,6 @@ files:
 - set/abstract/machine/output_cache.rb
 - set/abstract/machine/output_update.rb
 - set/abstract/machine_input.rb
-- set/all/reset_machines.rb
 - set/right/machine_cache.rb
 - set/right/machine_input.rb
 - set/right/machine_output.rb
@@ -146,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: decko machines