card-mod-style 0.11.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bc5cef6aed93e801b546766ccac8c49995cbc592889c7d9ee3682ee33f53319
-  data.tar.gz: a39c37321d39eb29d05e43f351632eae6930f3092fd859b98270f07244a7b984
+  metadata.gz: c2ebebb440ed1d7a56c1c990f5ab3e1223bf8399a536258bb0d83a0ec0ecd019
+  data.tar.gz: 42947ba2bc13ea6181ac63840ac9a6fd074b619f073ddd0754c1362b9b4dd862
 SHA512:
-  metadata.gz: e997e4226f68b7a434354ebc3cee48dbe9a7f4d04f0aa361af7b49fdecd3afe983e5b7f44f4f33ec11cb1cab87befb8d563cf8e8d8fe655c644633f36161521a
-  data.tar.gz: 69251eef4560fbbd19f9df3b20cfa1babaa02c5a92fac570a73a8b6e3ca46d121851f8e2dc9c283cfb158af4244a211354ca37f9729f2faf846a899ef61a90de
+  metadata.gz: 32392ae5e4ee015a2bea68d4eccd705cdc6a49916f06b272ffea87c247d5695b6c483d5ef03bc03ee09dec39dfefb6e619dbb7a3877baaeebdd7beac4c40fc20
+  data.tar.gz: 51c37cd4e809310e18151dca09855158d0622b6047ad218335f1708f0e6290b7d8a2327918b1c9699e51abddac23939dc25600bde8409233b0fe63f3542d3248

data/db/migrate_core_cards/20200805112346_add_mod_style_assets_type.rb

@@ -0,0 +1,18 @@
+# -*- encoding : utf-8 -*-
+
+class AddModStyleAssetsType < Cardio::Migration::Core
+  def up
+    add_cardtypes
+    delete_style_cards
+  end
+
+  def add_cardtypes
+    ensure_code_card name: "Mod style assets", type_id: Card::CardtypeID
+    ensure_code_card name: "Local style folder group", type_id: Card::CardtypeID
+    ensure_code_card name: "Local style manifest group", type_id: Card::CardtypeID
+  end
+
+  def delete_style_cards
+    # delete_code_card :script_decko
+  end
+end

data/lib/stylesheets/style_cards.scss

@@ -849,7 +849,7 @@ h2.set-label {
 }
 
 .ui-icon {
-  background-image: url([[/assets/card-mod-style/jquery-ui-smoothness/ui-icons_454545_256x240.png]])
+  background-image: url([[/mod/style/jquery-ui-smoothness/ui-icons_454545_256x240.png]])
 }
 
 /* note said this is o non-ie browsers do better with image floats.  looks over-specified.

data/lib/stylesheets/style_jquery_ui_smoothness.css

@@ -507,7 +507,7 @@ button.ui-button::-moz-focus-inner {
 }
 .ui-widget-header {
 	border: 1px solid #aaaaaa;
-	background: #cccccc url([[/assets/card-mod-style/jquery-ui-smoothness/ui-bg_highlight-soft_75_cccccc_1x100.png]]) 50% 50% repeat-x;
+	background: #cccccc url([[/mod/style/jquery-ui-smoothness/ui-bg_highlight-soft_75_cccccc_1x100.png]]) 50% 50% repeat-x;
 	color: #222222;
 	font-weight: bold;
 }
@@ -527,7 +527,7 @@ works properly when clicked or hovered */
 html .ui-button.ui-state-disabled:hover,
 html .ui-button.ui-state-disabled:active {
 	border: 1px solid #d3d3d3;
-	background: #e6e6e6 url([[/assets/card-mod-style/jquery-ui-smoothness/ui-bg_glass_75_e6e6e6_1x400.png]]) 50% 50% repeat-x;
+	background: #e6e6e6 url([[/mod/style/jquery-ui-smoothness/ui-bg_glass_75_e6e6e6_1x400.png]]) 50% 50% repeat-x;
 	font-weight: normal;
 	color: #555555;
 }
@@ -550,7 +550,7 @@ a:visited.ui-button,
 .ui-button:hover,
 .ui-button:focus {
 	border: 1px solid #999999;
-	background: #dadada url([[/assets/card-mod-style/jquery-ui-smoothness/ui-bg_glass_75_dadada_1x400.png]]) 50% 50% repeat-x;
+	background: #dadada url([[/mod/style/jquery-ui-smoothness/ui-bg_glass_75_dadada_1x400.png]]) 50% 50% repeat-x;
 	font-weight: normal;
 	color: #212121;
 }
@@ -578,7 +578,7 @@ a.ui-button:active,
 .ui-button:active,
 .ui-button.ui-state-active:hover {
 	border: 1px solid #aaaaaa;
-	background: #ffffff url([[/assets/card-mod-style/jquery-ui-smoothness/ui-bg_glass_65_ffffff_1x400.png]]) 50% 50% repeat-x;
+	background: #ffffff url([[/mod/style/jquery-ui-smoothness/ui-bg_glass_65_ffffff_1x400.png]]) 50% 50% repeat-x;
 	font-weight: normal;
 	color: #212121;
 }
@@ -600,7 +600,7 @@ a.ui-button:active,
 .ui-widget-content .ui-state-highlight,
 .ui-widget-header .ui-state-highlight {
 	border: 1px solid #fcefa1;
-	background: #fbf9ee url([[/assets/card-mod-style/jquery-ui-smoothness/ui-bg_glass_55_fbf9ee_1x400.png]]) 50% 50% repeat-x;
+	background: #fbf9ee url([[/mod/style/jquery-ui-smoothness/ui-bg_glass_55_fbf9ee_1x400.png]]) 50% 50% repeat-x;
 	color: #363636;
 }
 .ui-state-checked {
@@ -616,7 +616,7 @@ a.ui-button:active,
 .ui-widget-content .ui-state-error,
 .ui-widget-header .ui-state-error {
 	border: 1px solid #cd0a0a;
-	background: #fef1ec url([[/assets/card-mod-style/jquery-ui-smoothness/ui-bg_glass_95_fef1ec_1x400.png]]) 50% 50% repeat-x;
+	background: #fef1ec url([[/mod/style/jquery-ui-smoothness/ui-bg_glass_95_fef1ec_1x400.png]]) 50% 50% repeat-x;
 	color: #cd0a0a;
 }
 .ui-state-error a,
@@ -662,31 +662,31 @@ a.ui-button:active,
 }
 .ui-icon,
 .ui-widget-content .ui-icon {
-	background-image: url([[/assets/card-mod-style/jquery-ui-smoothness/ui-icons_222222_256x240.png]]);
+	background-image: url([[/mod/style/jquery-ui-smoothness/ui-icons_222222_256x240.png]]);
 }
 .ui-widget-header .ui-icon {
-	background-image: url([[/assets/card-mod-style/jquery-ui-smoothness/ui-icons_222222_256x240.png]]);
+	background-image: url([[/mod/style/jquery-ui-smoothness/ui-icons_222222_256x240.png]]);
 }
 .ui-state-hover .ui-icon,
 .ui-state-focus .ui-icon,
 .ui-button:hover .ui-icon,
 .ui-button:focus .ui-icon {
-	background-image: url([[/assets/card-mod-style/jquery-ui-smoothness/ui-icons_454545_256x240.png]]);
+	background-image: url([[/mod/style/jquery-ui-smoothness/ui-icons_454545_256x240.png]]);
 }
 .ui-state-active .ui-icon,
 .ui-button:active .ui-icon {
-	background-image: url([[/assets/card-mod-style/jquery-ui-smoothness/ui-icons_454545_256x240.png]]);
+	background-image: url([[/mod/style/jquery-ui-smoothness/ui-icons_454545_256x240.png]]);
 }
 .ui-state-highlight .ui-icon,
 .ui-button .ui-state-highlight.ui-icon {
-	background-image: url([[/assets/card-mod-style/jquery-ui-smoothness/ui-icons_2e83ff_256x240.png]]);
+	background-image: url([[/mod/style/jquery-ui-smoothness/ui-icons_2e83ff_256x240.png]]);
 }
 .ui-state-error .ui-icon,
 .ui-state-error-text .ui-icon {
-	background-image: url([[/assets/card-mod-style/jquery-ui-smoothness/ui-icons_cd0a0a_256x240.png]]);
+	background-image: url([[/mod/style/jquery-ui-smoothness/ui-icons_cd0a0a_256x240.png]]);
 }
 .ui-button .ui-icon {
-	background-image: url([[/assets/card-mod-style/jquery-ui-smoothness/ui-icons_888888_256x240.png]]);
+	background-image: url([[/mod/style/jquery-ui-smoothness/ui-icons_888888_256x240.png]]);
 }
 
 /* positioning */

data/set/abstract/01_asset_style.rb

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

data/set/abstract/01_css.rb

@@ -0,0 +1,87 @@
+# -*- encoding : utf-8 -*-
+
+require "sassc"
+require "benchmark"
+require "coderay"
+
+include_set Abstract::Machine
+include_set Abstract::MachineInput
+
+store_machine_output filetype: "css"
+
+machine_input do
+  compress format(:css)._render_core
+end
+
+def compress input
+  compress? ? SassC::Engine.new(input, style: :compressed).render : input
+rescue StandardError => e
+  raise Card::Error, css_compression_error(e)
+end
+
+def css_compression_error error
+  # scss is compiled in a view
+  # If there is a scss syntax error we get the rescued view here
+  # and the error that the rescued view is no valid css
+  # To get the original error we have to refer to Card::Error.current
+  if Card::Error.current
+    Card::Error.current.message
+  else
+    "Sass::SyntaxError (#{name}): #{error.message}"
+  end
+end
+
+def clean_html?
+  false
+end
+
+def compress?
+  true
+  # !Rails.env.development?
+end
+
+format do
+  # def default_nest_view
+  #   :raw
+  # end
+
+  # turn off autodetection of uri's
+  def chunk_list
+    :references
+  end
+end
+
+format :html do
+  def input_type
+    :ace_editor
+  end
+
+  def ace_mode
+    :css
+  end
+
+  def default_nest_view
+    :closed
+  end
+
+  view :core do
+    # 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, size: :icon
+  end
+
+  def content_changes action, diff_type, hide_diff=false
+    wrap_with(:pre) { super }
+  end
+end
+
+format :css do
+  view :import do
+    %{\n@import url("#{_render_url}");\n}
+  end
+end
+
+def diff_args
+  { diff_format: :text }
+end

data/set/abstract/02_scss.rb

@@ -0,0 +1,21 @@
+include_set Abstract::Css
+
+format do
+  view :core, cache: :never do
+    compile_scss process_content(_render_raw)
+  end
+
+  def compile_scss scss, style=:expanded
+    SassC::Engine.new(scss, style: style).render
+  rescue SassC::SyntaxError => e
+    raise Card::Error,
+          "SassC::SyntaxError (#{card.name}:#{e.sass_backtrace}): #{e.message}"
+    # "#{#scss.lines[e.sass_line - 1]}\n" \
+  end
+end
+
+format :html do
+  def ace_mode
+    :scss
+  end
+end

data/set/abstract/03_asset_css.rb

@@ -0,0 +1,4 @@
+# -*- encoding : utf-8 -*-
+
+include_set Abstract::AssetStyle
+include_set Abstract::Css

data/set/abstract/03_asset_scss.rb

@@ -0,0 +1,4 @@
+# -*- encoding : utf-8 -*-
+
+include_set Abstract::AssetStyle
+include_set Abstract::Scss

data/set/abstract/style_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: "css"
+
+def new_asset_constants path
+  if path.ends_with? ".scss"
+    scss_constants
+  elsif path.ends_with? ".css"
+    css_constants
+  end
+end
+
+def scss_constants
+  { type_id: ScssID, set_module: Abstract::AssetScss }
+end
+
+def css_constants
+  { type_id: CssID, set_module: Abstract::AssetCss }
+end
+
+def standard_machine_input
+  render_items_and_compress :css
+end
+
+format :html do
+  view :stylesheet_include_tag do
+    stylesheet_include_tag card.machine_output_url
+  end
+end

data/set/type/css.rb

@@ -1,86 +1 @@
-# -*- encoding : utf-8 -*-
-
-require "sassc"
-require "benchmark"
-
-include_set Abstract::Machine
-include_set Abstract::MachineInput
-
-store_machine_output filetype: "css"
-
-machine_input do
-  compress_css format(format: :css)._render_core
-end
-
-def compress_css input
-  compress_css? ? SassC::Engine.new(input, style: :compressed).render : input
-rescue StandardError => e
-  raise Card::Error, css_compression_error(e)
-end
-
-def css_compression_error error
-  # scss is compiled in a view
-  # If there is a scss syntax error we get the rescued view here
-  # and the error that the rescued view is no valid css
-  # To get the original error we have to refer to Card::Error.current
-  if Card::Error.current
-    Card::Error.current.message
-  else
-    "Sass::SyntaxError (#{name}): #{error.message}"
-  end
-end
-
-def clean_html?
-  false
-end
-
-def compress_css?
-  true
-  # !Rails.env.development?
-end
-
-format do
-  # def default_nest_view
-  #   :raw
-  # end
-
-  # turn off autodetection of uri's
-  def chunk_list
-    :references
-  end
-end
-
-format :html do
-  def input_type
-    :ace_editor
-  end
-
-  def ace_mode
-    :css
-  end
-
-  def default_nest_view
-    :closed
-  end
-
-  view :core do
-    # 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, size: :icon
-  end
-
-  def content_changes action, diff_type, hide_diff=false
-    wrap_with(:pre) { super }
-  end
-end
-
-format :css do
-  view :import do
-    %{\n@import url("#{_render_url}");\n}
-  end
-end
-
-def diff_args
-  { diff_format: :text }
-end
+include_set Abstract::Css

data/set/type/local_style_folder_group.rb

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

data/set/type/local_style_manifest_group.rb

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

data/set/type/mod_style_assets.rb

@@ -0,0 +1,22 @@
+
+include_set Abstract::ModAssets
+
+def subpath
+  "style"
+end
+
+def local_folder_group_type_id
+  ::Card::LocalStyleFolderGroupID
+end
+
+def local_manifest_group_type_id
+  ::Card::LocalStyleManifestGroupID
+end
+
+format :html do
+  view :stylesheet_include_tag do
+    card.item_cards.map do |icard|
+      nest icard, view: :stylesheet_include_tag
+    end.join("\n")
+  end
+end

data/set/type/scss.rb

@@ -1,21 +1 @@
-include_set Type::Css
-
-format do
-  view :core, cache: :never do
-    compile_scss(process_content(_render_raw))
-  end
-
-  def compile_scss scss, style=:expanded
-    SassC::Engine.new(scss, style: style).render
-  rescue SassC::SyntaxError => e
-    raise Card::Error,
-          "SassC::SyntaxError (#{card.name}:#{e.sass_backtrace}): #{e.message}"
-    # "#{#scss.lines[e.sass_line - 1]}\n" \
-  end
-end
-
-format :html do
-  def ace_mode
-    :scss
-  end
-end
+include_set Abstract::Scss

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-style
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.5
+        version: 1.103.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.5
+        version: 1.103.0
 - !ruby/object:Gem::Dependency
   name: card-mod-machines
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.5
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.5
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.5
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.5
+        version: 0.13.0
 description: ''
 email:
 - info@decko.org
@@ -61,22 +61,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- db/migrate_core_cards/20200805112346_add_mod_style_assets_type.rb
 - lib/stylesheets/style_bootstrap_compatible.css
 - lib/stylesheets/style_cards.scss
 - lib/stylesheets/style_jquery_ui_smoothness.css
-- public/assets/jquery-ui-smoothness/ui-bg_glass_55_fbf9ee_1x400.png
-- public/assets/jquery-ui-smoothness/ui-bg_glass_65_ffffff_1x400.png
-- public/assets/jquery-ui-smoothness/ui-bg_glass_75_dadada_1x400.png
-- public/assets/jquery-ui-smoothness/ui-bg_glass_75_e6e6e6_1x400.png
-- public/assets/jquery-ui-smoothness/ui-bg_glass_95_fef1ec_1x400.png
-- public/assets/jquery-ui-smoothness/ui-bg_highlight-soft_75_cccccc_1x100.png
-- public/assets/jquery-ui-smoothness/ui-icons_222222_256x240.png
-- public/assets/jquery-ui-smoothness/ui-icons_2e83ff_256x240.png
-- public/assets/jquery-ui-smoothness/ui-icons_454545_256x240.png
-- public/assets/jquery-ui-smoothness/ui-icons_888888_256x240.png
-- public/assets/jquery-ui-smoothness/ui-icons_cd0a0a_256x240.png
+- public/jquery-ui-smoothness/ui-bg_glass_55_fbf9ee_1x400.png
+- public/jquery-ui-smoothness/ui-bg_glass_65_ffffff_1x400.png
+- public/jquery-ui-smoothness/ui-bg_glass_75_dadada_1x400.png
+- public/jquery-ui-smoothness/ui-bg_glass_75_e6e6e6_1x400.png
+- public/jquery-ui-smoothness/ui-bg_glass_95_fef1ec_1x400.png
+- public/jquery-ui-smoothness/ui-bg_highlight-soft_75_cccccc_1x100.png
+- public/jquery-ui-smoothness/ui-icons_222222_256x240.png
+- public/jquery-ui-smoothness/ui-icons_2e83ff_256x240.png
+- public/jquery-ui-smoothness/ui-icons_454545_256x240.png
+- public/jquery-ui-smoothness/ui-icons_888888_256x240.png
+- public/jquery-ui-smoothness/ui-icons_cd0a0a_256x240.png
+- set/abstract/01_asset_style.rb
+- set/abstract/01_css.rb
+- set/abstract/02_scss.rb
+- set/abstract/03_asset_css.rb
+- set/abstract/03_asset_scss.rb
 - set/abstract/skin_box.rb
 - set/abstract/skin_box/box_bottom.haml
+- set/abstract/style_asset_list.rb
 - set/right/style.rb
 - set/right/style/input.haml
 - set/self/style.rb
@@ -86,6 +93,9 @@ files:
 - set/self/style_libraries.rb
 - set/self/style_mods.rb
 - set/type/css.rb
+- set/type/local_style_folder_group.rb
+- set/type/local_style_manifest_group.rb
+- set/type/mod_style_assets.rb
 - set/type/scss.rb
 - set/type/skin.rb
 homepage: https://decko.org
@@ -113,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Skins, CSS, SCSS, etc