card-mod-script 0.12.0 → 0.13.3

data/init/early/init_execjs.rb

@@ -0,0 +1,3 @@
+# By requiring this here, we force the runtime detection (common installation problem)
+
+require "execjs"

data/set/abstract/{script.rb → 00_script.rb}

@@ -13,7 +13,7 @@ end
 
 def standard_machine_input
   js = format(:js)._render_core
-  js = compress_js js if compress_js?
+  js = compress js if compress?
   comment_with_source js
 end
 
@@ -21,7 +21,7 @@ def comment_with_source js
   "//#{name}\n#{js}"
 end
 
-def compress_js input
+def compress input
   Uglifier.compile input
 rescue StandardError => e
   # CoffeeScript is compiled in a view
@@ -39,7 +39,7 @@ def compression_error_message e
   end
 end
 
-def compress_js?
+def compress?
   Cardio.config.compress_javascript
 end
 
@@ -76,6 +76,10 @@ format :html do
     process_content highlight(script)
   end
 
+  view :javascript_include_tag do
+    javascript_include_tag card.machine_output_url # path(format: :js)
+  end
+
   def highlight script
     ::CodeRay.scan(script, :js).div
   end

data/set/abstract/01_asset_script.rb

@@ -0,0 +1,25 @@
+# -*- encoding : utf-8 -*-
+
+require "coffee-script"
+
+include_set Abstract::AssetFile
+
+def compress?
+  @minimize
+end
+
+format :js do
+  view :source do
+    if @local
+      card.machine_output_url
+    else
+      source
+    end
+  end
+end
+
+format :html do
+  view :javascript_include_tag do
+    javascript_include_tag card.machine_output_url
+  end
+end

data/set/abstract/01_java_script.rb

@@ -0,0 +1,9 @@
+# -*- encoding : utf-8 -*-
+
+include_set Abstract::Script
+
+format :js do
+  view :core do
+    _render_raw
+  end
+end

data/set/abstract/02_coffee_script.rb

@@ -0,0 +1,25 @@
+# -*- encoding : utf-8 -*-
+
+require "coffee-script"
+
+include_set Abstract::Script
+
+format :html do
+  def ace_mode
+    :coffee
+  end
+end
+
+format do
+  view :core do
+    compile_coffee _render_raw
+  end
+
+  def compile_coffee script
+    ::CoffeeScript.compile script
+  rescue StandardError => e
+    line_nr = e.to_s.match(/\[stdin\]:(\d*)/)&.capture(0)&.to_i
+    line = script.lines[line_nr - 1] if line_nr
+    raise Card::Error, "CoffeeScript::Error (#{card.name}): #{e.message}: #{line}"
+  end
+end

data/set/abstract/03_asset_java_script.rb

@@ -0,0 +1,4 @@
+# -*- encoding : utf-8 -*-
+
+include_set Abstract::AssetScript
+include_set Abstract::JavaScript

data/set/abstract/04_asset_coffee_script.rb

@@ -0,0 +1,4 @@
+# -*- encoding : utf-8 -*-
+
+include_set Abstract::AssetScript
+include_set Abstract::CoffeeScript

data/set/abstract/script_asset_list.rb

@@ -0,0 +1,32 @@
+include_set Abstract::Machine
+include_set Abstract::MachineInput
+include_set Abstract::AssetList
+
+machine_input { standard_machine_input }
+store_machine_output filetype: "js"
+
+def new_asset_constants path
+  if path.ends_with? ".js.coffee"
+    coffeescript_constants
+  elsif path.ends_with? ".js"
+    javascript_constants
+  end
+end
+
+def coffeescript_constants
+  { type_id: CoffeeScriptID, set_module: Abstract::AssetCoffeeScript }
+end
+
+def javascript_constants
+  { type_id: JavaScriptID, set_module: Abstract::AssetJavaScript }
+end
+
+def standard_machine_input
+  render_items_and_compress :js
+end
+
+format :html do
+  view :javascript_include_tag do
+    javascript_include_tag card.machine_output_url
+  end
+end

data/set/all/head_javascript.rb

@@ -0,0 +1,80 @@
+format :html do
+  # script_config basket is a hash where
+  #  - key is the codename of a card with javascript config (usually in json format)
+  #  - value is the name of a javascript method that handles the config
+  basket[:script_config] = {}
+
+  def views_in_head
+    super + %w[
+      decko_script_variables
+      head_javascript
+      html5shiv_tag
+      script_config_and_initiation
+    ]
+  end
+
+  view :decko_script_variables, unknown: true, cache: :never, perms: :none do
+    javascript_tag do
+      decko_script_variables.each_with_object("") do |(k, v), string|
+        string << "#{k}=#{script_variable_to_js v};\n"
+      end
+    end
+  end
+
+  view :head_javascript, unknown: true, cache: :never, perms: :none do
+    Array.wrap(head_javascript_paths).reject(&:empty?).join("\n")
+  end
+
+  view :html5shiv_tag, unknown: true, perms: :none do
+    nest :script_html5shiv_printshiv, view: :script_tag
+  end
+
+  view :script_config_and_initiation, unknown: true, perms: :none do
+    javascript_tag do
+      (script_configs << trigger_slot_ready).join "\n\n"
+    end
+  end
+
+  view :javascript_include_tag, unknown: true, perms: :none do
+    "\n<!-- javascript_include_tag not overridden for #{card.name} -->\n"
+  end
+
+  def decko_script_variables
+    {
+      "window.decko": { rootUrl: card_url("") },
+      "decko.doubleClick": Card.config.double_click,
+      "decko.cssPath": head_stylesheet_path,
+      "decko.currentUserId": (Auth.current_id if Auth.signed_in?)
+    }
+  end
+
+  def head_javascript_paths
+    return unless (asset_card = param_or_rule_card :script)
+
+    asset_card.item_cards.map do |script|
+      script.format(:html).render :javascript_include_tag
+    end
+  end
+
+  private
+
+  def trigger_slot_ready
+    "$('document').ready(function() { $('.card-slot').trigger('slotReady'); })"
+  end
+
+  def script_variable_to_js value
+    return "'#{value}'" unless value.is_a? Hash
+
+    vars = value.each_with_object("") do |(k, v), string|
+      string << "#{k}: #{script_variable_to_js v}"
+    end
+    "{ #{vars} }"
+  end
+
+  def script_configs
+    basket[:script_config].map do |codename, js_decko_function|
+      config_json = escape_javascript Card::Rule.global_setting(codename)
+      "decko.#{js_decko_function}('#{config_json}')"
+    end
+  end
+end

data/set/right/script.rb

@@ -1,18 +1,29 @@
-include_set Abstract::Machine
-
-store_machine_output filetype: "js"
+include_set Abstract::Pointer
 
 def ok_to_read
   true
 end
 
-view :javascript_include_tag do
-  %(
-    <script src="#{card.machine_output_url}" type="text/javascript"></script>
-  )
+def refresh_output force: false
+  item_cards.each do |item_card|
+    # puts "refreshing #{item_card.name}".yellow
+    item_card.try :refresh_output, force: force
+  end
+end
+
+def regenerate_machine_output
+  item_cards.each do |item_card|
+    item_card.try :regenerate_machine_output
+  end
 end
 
 format :html do
+  view :javascript_include_tag do
+    card.item_cards.map do |script|
+      script.format(:html).render :javascript_include_tag
+    end
+  end
+
   def raw_help_text
     "JavaScript (or CoffeeScript) for card's page."
   end

data/set/self/script_mods.rb

@@ -1 +1 @@
-include_set Abstract::CodePointer
+include_set Abstract::CodePointer, basket_name: :script_mods

data/set/type/coffee_script.rb

@@ -1,25 +1,3 @@
 # -*- encoding : utf-8 -*-
 
-require "coffee-script"
-
-include_set Abstract::Script
-
-format :html do
-  def ace_mode
-    :coffee
-  end
-end
-
-format do
-  view :core do
-    compile_coffee _render_raw
-  end
-
-  def compile_coffee script
-    ::CoffeeScript.compile script
-  rescue StandardError => e
-    line_nr = e.to_s.match(/\[stdin\]:(\d*)/)&.capture(0)&.to_i
-    line = script.lines[line_nr - 1] if line_nr
-    raise Card::Error, "CoffeeScript::Error (#{card.name}): #{e.message}: #{line}"
-  end
-end
+include_set Abstract::CoffeeScript

data/set/type/java_script.rb

@@ -1,9 +1,3 @@
 # -*- encoding : utf-8 -*-
 
-include_set Abstract::Script
-
-format :js do
-  view :core do
-    _render_raw
-  end
-end
+include_set Abstract::JavaScript

data/set/type/local_script_folder_group.rb

@@ -0,0 +1,2 @@
+include_set Abstract::LocalFolderGroup
+include_set Abstract::ScriptAssetList

data/set/type/local_script_manifest_group.rb

@@ -0,0 +1,2 @@
+include_set Abstract::LocalManifestGroup
+include_set Abstract::ScriptAssetList

data/set/type/mod_script_assets.rb

@@ -0,0 +1,21 @@
+include_set Abstract::ModAssets
+
+def subpath
+  "script"
+end
+
+def local_folder_group_type_id
+  ::Card::LocalScriptFolderGroupID
+end
+
+def local_manifest_group_type_id
+  ::Card::LocalScriptManifestGroupID
+end
+
+format :html do
+  view :javascript_include_tag do
+    card.item_cards.map do |icard|
+      nest icard, view: :javascript_include_tag
+    end.join("\n")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-script
 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,42 +18,56 @@ 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: card-mod-machines
   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-assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.13.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        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
 description: ''
 email:
 - info@decko.org
@@ -61,54 +75,64 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/javascript/decko/autosave.js.coffee
-- lib/javascript/decko/bridge.js.coffee
-- lib/javascript/decko/card_menu.js.coffee
-- lib/javascript/decko/components.js.coffee
-- lib/javascript/decko/decko.js.coffee
-- lib/javascript/decko/doubleclick.js.coffee
-- lib/javascript/decko/editor.js.coffee
-- lib/javascript/decko/filter.js.coffee
-- lib/javascript/decko/filter_items.js.coffee
-- lib/javascript/decko/filter_links.js.coffee
-- lib/javascript/decko/follow.js.coffee
-- lib/javascript/decko/layout.js.coffee
-- lib/javascript/decko/link_editor.js.coffee
-- lib/javascript/decko/mod.js.coffee
-- lib/javascript/decko/modal.js.coffee
-- lib/javascript/decko/name_editor.js.coffee
-- lib/javascript/decko/navbox.js.coffee
-- lib/javascript/decko/nest_editor.js.coffee
-- lib/javascript/decko/nest_editor_name.js.coffee
-- lib/javascript/decko/nest_editor_options.js.coffee
-- lib/javascript/decko/nest_editor_rules.js.coffee
-- lib/javascript/decko/overlay.js.coffee
-- lib/javascript/decko/recaptcha.js.coffee
-- lib/javascript/decko/selectable_filtered_content.js.coffee
-- lib/javascript/decko/slot.js.coffee
-- lib/javascript/decko/slot_ready.js.coffee
-- lib/javascript/decko/slotter.js.coffee
-- lib/javascript/decko/upload.js.coffee
-- lib/javascript/jquery-ui.js
-- lib/javascript/jquery.autosize.js
+- README.md
+- assets/script/decko/autosave.js.coffee
+- assets/script/decko/bridge.js.coffee
+- assets/script/decko/card_menu.js.coffee
+- assets/script/decko/components.js.coffee
+- assets/script/decko/decko.js.coffee
+- assets/script/decko/doubleclick.js.coffee
+- assets/script/decko/editor.js.coffee
+- assets/script/decko/filter.js.coffee
+- assets/script/decko/filter_items.js.coffee
+- assets/script/decko/filter_links.js.coffee
+- assets/script/decko/follow.js.coffee
+- assets/script/decko/layout.js.coffee
+- assets/script/decko/link_editor.js.coffee
+- assets/script/decko/mod.js.coffee
+- assets/script/decko/modal.js.coffee
+- assets/script/decko/name_editor.js.coffee
+- assets/script/decko/navbox.js.coffee
+- assets/script/decko/nest_editor.js.coffee
+- assets/script/decko/nest_editor_name.js.coffee
+- assets/script/decko/nest_editor_options.js.coffee
+- assets/script/decko/nest_editor_rules.js.coffee
+- assets/script/decko/overlay.js.coffee
+- assets/script/decko/recaptcha.js.coffee
+- assets/script/decko/selectable_filtered_content.js.coffee
+- assets/script/decko/slot.js.coffee
+- assets/script/decko/slot_ready.js.coffee
+- assets/script/decko/slotter.js.coffee
+- assets/script/decko/upload.js.coffee
+- assets/script/jquery-ui.min.js
+- assets/script/jquery.autosize.js
+- assets/script/manifest.yml
+- assets/script/script_pointer_config.js.coffee
+- assets/script/script_pointer_list_editor.js.coffee
+- db/migrate_core_cards/20200804112348_add_mod_script_assets_type.rb
+- file/mod_script_script_decko_machine_output/file.js
+- file/mod_script_script_jquery_machine_output/file.js
+- init/early/init_execjs.rb
 - lib/javascript/jquery.iframe-transport.js
 - lib/javascript/script_html5shiv_printshiv.js
-- lib/javascript/script_pointer_config.js.coffee
-- lib/javascript/script_pointer_list_editor.js.coffee
 - lib/javascript/theme-textmate.js
-- set/abstract/script.rb
+- set/abstract/00_script.rb
+- set/abstract/01_asset_script.rb
+- set/abstract/01_java_script.rb
+- set/abstract/02_coffee_script.rb
+- set/abstract/03_asset_java_script.rb
+- set/abstract/04_asset_coffee_script.rb
+- set/abstract/script_asset_list.rb
+- set/all/head_javascript.rb
 - set/right/script.rb
-- set/self/01_script_libraries.rb
 - set/self/script.rb
-- set/self/script_decko.rb
-- set/self/script_editors.rb
 - set/self/script_html5shiv_printshiv.rb
-- set/self/script_jquery.rb
-- set/self/script_jquery_helper.rb
 - set/self/script_mods.rb
-- set/self/script_pointer_config.rb
 - set/type/coffee_script.rb
 - set/type/java_script.rb
+- set/type/local_script_folder_group.rb
+- set/type/local_script_manifest_group.rb
+- set/type/mod_script_assets.rb
 - vendor/jquery_file_upload/CONTRIBUTING.md
 - vendor/jquery_file_upload/LICENSE.txt
 - vendor/jquery_file_upload/README.md
@@ -210,7 +234,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: JavaScript, CoffeeScript, etc.