card-mod-style 0.13.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e407848866fa084c25af743f75c039adda8bf3886feb24ebbdd95384b94f5ffc
-  data.tar.gz: 62a5cfee81f7045c016a03d3bd86def970e876de6a76e675dfe670fcff9a3010
+  metadata.gz: 425d3f1319d77552389e5e07397d2dd31b527c4a0defa3840e0c975215425c27
+  data.tar.gz: 72a5a96a383d313ecf1566226a0069158778327ac3e7f45024bd6e89481c855b
 SHA512:
-  metadata.gz: b5630777673b6edd762a2700f682de4491b249afd9ffeb0f29810b11afe19ca96def58e776ac07dde3dc46e242ecfde0387f5079cf2bd616d94b912ac0097c35
-  data.tar.gz: fd31ae10c45e77109cf74665f6ec87abb8b08cfb506dfa47cd14eb54e2f9a4bfe173758c044398a44a683077ab1530e93fbe7f777d0c5eeaf2fbe8a7c299c08a
+  metadata.gz: 9005eab2b0403b5eb391937f45158d1bc2d9eaa0a45325127f16543c4c19c3f8ffd1d0ef03f0dd97fec2c4fe47c1a6228f2d8bdc34c596245479cdcd2840d273
+  data.tar.gz: b912da7e3bf0e2d1ad958d396c0803990f7158a8d974527549563bcd2949fcb2ca463e2b4d9bc0cd329fcd69e97c803e780ecdb381eca38c387cb5a42b708d60

data/{lib/stylesheets → assets/style}/style_cards.scss

@@ -31,7 +31,6 @@ $d-yellow-1: #ffd;
 
 /* NOTE: we recommend against styling ".d0-card-slot", which is heavily used by javascript */
 
-
 /* --  hidden info -- */
 
 .ui-loader,
@@ -1281,9 +1280,9 @@ body.right-sidebar, body.left-sidebar, body.two-sidebar {
   }
 }
 
-.rename-button-form-group {
-  display: flex;
-  .btn {
-    margin-right: 1rem;
-  }
+.button-form-group {
+  display: flex
+}
+.rename-button-form-group .btn {
+  margin-right: 1rem;
 }

data/set/abstract/01_asset_style.rb

@@ -7,19 +7,3 @@ 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

@@ -4,42 +4,10 @@ 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
@@ -80,6 +48,45 @@ format :css do
   view :import do
     %{\n@import url("#{_render_url}");\n}
   end
+
+  view :compiled do
+    compile(_render_core, :nested)
+  end
+
+  view :compressed do
+    compress(_render_core)
+  end
+
+  def comment_with_source css
+    "// #{card.name}\n#{css}"
+  end
+
+  def compress input
+    compress? ? compile(input) : compile(input, :nested)
+  end
+
+  # FIXME: method is repeated called with "nested", but there is no handling for it
+  def compile input, _style=:compressed
+    SassC::Engine.new(input, style: :compressed).render
+  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 compress?
+    Cardio.config.compress_assets
+  end
 end
 
 def diff_args

data/set/abstract/02_scss.rb

@@ -1,11 +1,16 @@
 include_set Abstract::Css
 
-format do
-  view :core, cache: :never do
-    compile_scss process_content(_render_raw)
+format :css do
+  view :compiled do
+    compile_scss _render_core
+  end
+
+  view :core do
+    process_content(_render_raw)
   end
 
   def compile_scss scss, style=:expanded
+    # return scss if Rails.env.development?
     SassC::Engine.new(scss, style: style).render
   rescue SassC::SyntaxError => e
     raise Card::Error,
@@ -14,6 +19,16 @@ format do
   end
 end
 
+format :scss do
+  view :labeled do
+    "//#{card.name}\n#{_render_core}"
+  end
+
+  view :core do
+    process_content _render_raw
+  end
+end
+
 format :html do
   def ace_mode
     :scss

data/set/abstract/style_group.rb

@@ -0,0 +1,41 @@
+# A list of styles defined by a manifest group or a "style" asset folder.
+# Usually part of a mod_style_assets card
+include_set Abstract::AssetGroup
+
+def asset_input_content
+  format(:scss).render_core
+end
+
+format :scss do
+  view :core do
+    card.item_cards.compact.map do |mcard|
+      mcard.format(:scss)._render_core
+    end.join "\n"
+  end
+end
+
+def valid_file_extensions
+  %w[css scss]
+end
+
+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
+
+format :html do
+  view :stylesheet_include_tag do
+    stylesheet_include_tag card.asset_output_url
+  end
+end

data/set/self/style_mods.rb

@@ -1 +1,6 @@
-include_set Abstract::CodePointer, basket_name: :style_mods
+include_set Abstract::AssetInputter, input_format: :scss
+
+# find all theme cards that appear in style rules
+def dependent_asset_inputters
+  Card::Assets.active_theme_cards
+end

data/set/type/css.rb

@@ -1 +1,2 @@
 include_set Abstract::Css
+include_set Abstract::AssetInputter, input_format: :css, input_view: :compressed

data/set/type/local_style_folder_group.rb

@@ -1,2 +1,2 @@
-include_set Abstract::LocalFolderGroup
-include_set Abstract::StyleAssetList
+include_set Abstract::FolderGroup
+include_set Abstract::StyleGroup

data/set/type/local_style_manifest_group.rb

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

data/set/type/scss.rb

@@ -1 +1,2 @@
 include_set Abstract::Scss
+include_set Abstract::AssetInputter, input_format: :scss

data/set/type/skin.rb

@@ -1,9 +1,11 @@
-include_set Abstract::MachineInput
+include_set Abstract::AssetInputter, input_format: :css, input_view: :concat
 include_set Abstract::SkinBox
-include_set Pointer
+include_set List
 
-def machine_input
-  # only the item of a skin card contribute input to the machine
-  # not the skin card itself
-  ""
+format :css do
+  view :concat do
+    card.item_cards.map do |item|
+      item.respond_to?(:asset_input) ? item.asset_input : nest(item, view: :core)
+    end.join("\n")
+  end
 end

data/set/type_plus_right/customized_bootswatch_skin/stylesheets.rb

@@ -0,0 +1,3 @@
+def dependent_asset_inputters
+  [left]
+end

data/set/type_plus_right/mod/style.rb

@@ -0,0 +1,33 @@
+# card, that lists all styles that belong to one mod, for example:
+# "mod: bootstrap+*style"
+
+include_set Abstract::AssetInputter, input_format: :scss
+include_set Abstract::ModAssets
+
+def subpath
+  "style"
+end
+
+def 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
+
+def asset_input_needs_refresh?
+  !asset_input_updated_at || source_changed?(since: asset_input_updated_at)
+end
+
+def asset_input_updated_at
+  asset_input_card&.updated_at
+end

data/set/{right → type_plus_right/set}/style.rb

@@ -1,16 +1,24 @@
 require "sassc"
-include_set Abstract::Machine
 
-store_machine_output filetype: "css"
+include_set Abstract::Css
+include_set Abstract::AssetOutputter, output_format: :css, output_view: :compressed
+
+def output_filetype
+  "css"
+end
 
 def ok_to_read
   true
 end
 
+def make_asset_output_coded
+  super ENV["STYLE_OUTPUT_MOD"]
+end
+
 format do
   # turn off autodetection of uri's
   def chunk_list
-    :nest_only
+    :references
   end
 end
 
@@ -38,10 +46,18 @@ end
 
 event :customize_theme, :prepare_to_validate, on: :update, when: :customize_theme? do
   skin_name = free_skin_name
-  add_subcard skin_name, type_id: CustomizedBootswatchSkinID
+  subcard skin_name, type_id: CustomizedBootswatchSkinID
   self.content = "[[#{skin_name}]]"
 end
 
+event :update_theme_input, :finalize,
+      before: :update_asset_output_file, changed: :content do
+  item_cards.each do |theme_card|
+    next unless theme_card.respond_to? :theme_name
+    theme_card.update_asset_input
+  end
+end
+
 def free_skin_name
   name = "#{@theme} skin customized"
   if Card.exist?(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-style
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.4
+        version: 1.104.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.4
+        version: 1.104.0
 - !ruby/object:Gem::Dependency
-  name: card-mod-machines
+  name: card-mod-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
 description: ''
 email:
 - info@decko.org
@@ -61,10 +61,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- assets/style/jquery_ui_smoothness.css
+- assets/style/style_cards.scss
 - 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/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
@@ -83,21 +82,18 @@ files:
 - 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/abstract/style_group.rb
 - set/self/style.rb
-- set/self/style_bootstrap_compatible.rb
-- set/self/style_cards.rb
-- set/self/style_jquery_ui_smoothness.rb
-- 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
+- set/type_plus_right/customized_bootswatch_skin/stylesheets.rb
+- set/type_plus_right/mod/style.rb
+- set/type_plus_right/set/style.rb
+- set/type_plus_right/set/style/input.haml
 homepage: https://decko.org
 licenses:
 - GPL-3.0
@@ -123,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Skins, CSS, SCSS, etc

data/lib/stylesheets/style_bootstrap_compatible.css

@@ -1,68 +0,0 @@
-/*
-  This backwards-compatibility stylesheet is intended to keep the old "Classic" skins working.
-  It is NOT intended to be used in new skins.
-*/
-
-#menu {
-  height: 30px;
-  div.container-fluid{
-    display: block;
-  }
-  div.navbar-header {
-    display: none;
-  }
-  ul {
-    font-size: 14px;
-    margin-top: 5px;
-  }
-  li {
-    display: inline;
-  }
-  .navbar-left {
-    float: left;
-  }
-  .navbar-right {
-    float: right;
-    margin-right: 15px;
-  }
-  .navbar-form {
-    width: 30%;
-    margin-top: 5px;
-    margin-left: 10px;
-    input {
-      width: 100%;
-    }
-  }
-  .navbox-form {
-    input {
-      display: inline;
-      min-height: 25px;
-    }
-  }
-}
-
-#primary {
-  clear: both;
-}
-
-
-// removed from standard.scss
-input, select, textarea {
-  padding: 0 1%;
-}
-input, select {
-  max-width: 97.5%;
-}
-
-fieldset {
-  border: 0;
-  padding: 0;
-}
-.form-group {
-  padding: 10px;
-}
-
-.alert-info {
-  background: #ccc;
-  padding: 5px 10px;
-}

data/set/abstract/style_asset_list.rb

@@ -1,32 +0,0 @@
-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/self/style_bootstrap_compatible.rb

@@ -1 +0,0 @@
-include_set Abstract::CodeFile

data/set/self/style_cards.rb

@@ -1 +0,0 @@
-include_set Abstract::CodeFile

data/set/self/style_jquery_ui_smoothness.rb

@@ -1 +0,0 @@
-include_set Abstract::CodeFile

data/set/self/style_libraries.rb

@@ -1 +0,0 @@
-include_set Abstract::CodePointer, basket_name: :style_libraries

data/set/type/mod_style_assets.rb

@@ -1,22 +0,0 @@
-
-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