view_component_scoped_css 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca24b914debb17569e059d451c0963f456c1431794e8f47d00267c2b2211f342
-  data.tar.gz: 04b5d64c71a8843a3137bfb5df321f4ea0db95a5584eb7ed562b95653f30809f
+  metadata.gz: 1efadcc6268b2ae05a59c932fa65ac87c1ef3fa4cac6ba663db21319448f47f9
+  data.tar.gz: c0d4498cb5db29c1b348721430a789e3058947bae9e6046558cd539b3f3a8cd3
 SHA512:
-  metadata.gz: 78144240a0d2f1a975015f5e3870b1a0b7c0807f2fe196d5bc7d23a408886549d8928864f9c6819c47f3c0d53f69d19b3295875f0f85d9cd1e8dca0eb211dca5
-  data.tar.gz: a79a5ded14cbf384942bcaa215b5f20373bb61dd66094f4ea0197a157baee0ad4f36aa21ad130d9dfe1f347fdd57c4797113b7ea06c8d03b0754a5fffe014644
+  metadata.gz: c5f8d15bad3c880d02eb0fb508e39ef50a6f60c8bf3a764a7cf2a21c11e22c67765e71e6e49579a498bfac063c5ae962970d6ecce4e609577c70415a1243ee46
+  data.tar.gz: e5432f3dc3dd08e6a6d6844b062ca22903a306a864351a997970c66bdace8040f7039f3a773642c170ab45a8cdda97755d90db38338df0b10abe8cf2037c434b

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+Gemfile.lock

data/Gemfile.lock

@@ -1,38 +1,34 @@
 PATH
   remote: .
   specs:
-    view_component_styled (0.1.0)
+    view_component_scoped_css (0.2.0)
       activesupport (>= 6.0.0)
-      css_parser
+      sass-embedded
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    css_parser (1.12.0)
-      addressable
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
+    google-protobuf (3.22.0-arm64-darwin)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.6.2)
     method_source (1.0.0)
-    minitest (5.16.3)
+    minitest (5.18.0)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.0)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.6.0)
@@ -63,19 +59,22 @@ GEM
     rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    tzinfo (2.0.5)
+    sass-embedded (1.58.3-arm64-darwin)
+      google-protobuf (~> 3.21)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
 
 PLATFORMS
   arm64-darwin-20
+  arm64-darwin-21
 
 DEPENDENCIES
   pry
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 1.7)
-  view_component_styled!
+  view_component_scoped_css!
 
 BUNDLED WITH
    2.2.22

data/lib/view_component_scoped_css/base.rb

@@ -8,17 +8,9 @@ module ViewComponentScopedCss
   module Base
     extend ActiveSupport::Concern
 
-    included do
-      include ViewComponentScopedCss::Hook
-    end
-
     class_methods do
-      def reload_component_css_tag
-        @component_css_tag = ViewComponentScopedCss::Tag.new(self).call
-      end
-
       def component_css_tag
-        @component_css_tag ||= ViewComponentScopedCss::Tag.new(self).call
+        ViewComponentScopedCss::CurrentContext.render_if_need(self)
       end
 
       def component_identifier
@@ -38,12 +30,16 @@ module ViewComponentScopedCss
       self.class.component_identifier_for_css
     end
 
-    def component_tag(name = ViewComponentScopedCss.config.component_tag, &block)
-      content_tag(
-        name,
-        class: [self.class.component_identifier_for_css, component_options[:class]].compact.join(" "),
-        **component_options,
-        &block
+    def component_tag(name = ViewComponentScopedCss.config.component_tag, **tag_options, &block)
+      safe_join(
+        [
+          self.class.component_css_tag,
+          content_tag(
+            name,
+            class: [self.class.component_identifier_for_css, tag_options[:class]].compact.join(" "),
+            **component_options, &block
+          )
+        ].compact
       )
     end
   end

data/lib/view_component_scoped_css/current_context.rb

@@ -2,22 +2,21 @@
 
 module ViewComponentScopedCss
   #
-  # Class for holding the <style></style> of the component called on each request.
+  # Manage whether CSS has been Render
   #
   class CurrentContext < ActiveSupport::CurrentAttributes
-    attribute :css
+    attribute :called
 
-    def self.render
-      return if css.empty?
-
-      css.values.join("\n").html_safe
-    end
-
-    def self.add(view_component)
-      self.css ||= {}
-      self.css[view_component.class.name] ||= view_component.class.component_css_tag
+    def self.render_if_need(view_component_class)
+      self.called ||= {}
+      if called[view_component_class.name]
+        nil
+      else
+        called[view_component_class.name] = true
+        ViewComponentScopedCss::Tag.new(view_component_class).call
+      end
     end
 
-    resets { self.css = {} }
+    resets { self.called = {} }
   end
 end

data/lib/view_component_scoped_css/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ViewComponentScopedCss
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/view_component_scoped_css.rb

@@ -14,16 +14,11 @@ module ViewComponentScopedCss
   extend ActiveSupport::Autoload
   autoload :Loader
   autoload :CurrentContext
-  autoload :Hook
   autoload :Base
   autoload :Config
   autoload :Tag
   autoload :Compiler
 
-  def self.tags
-    CurrentContext.render
-  end
-
   def self.configure
     yield config
   end

data/view_component_scoped_css.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
     Inspired by the css in js component, it provides functionality to allow the same
     component-by-component implementation of styles in rails' standard component, view_components.
   "
-  spec.homepage      = "https://github.com/aileron-inc/view_component_in_css"
+  spec.homepage      = "https://github.com/aileron-inc/view_component_scoped_css"
   spec.license       = "MIT"
   spec.required_ruby_version = ">= 3.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_component_scoped_css
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Masa (Aileron inc)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-20 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -65,17 +65,16 @@ files:
 - lib/view_component_scoped_css/compiler.rb
 - lib/view_component_scoped_css/config.rb
 - lib/view_component_scoped_css/current_context.rb
-- lib/view_component_scoped_css/hook.rb
 - lib/view_component_scoped_css/loader.rb
 - lib/view_component_scoped_css/railtie.rb
 - lib/view_component_scoped_css/tag.rb
 - lib/view_component_scoped_css/version.rb
 - view_component_scoped_css.gemspec
-homepage: https://github.com/aileron-inc/view_component_in_css
+homepage: https://github.com/aileron-inc/view_component_scoped_css
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/aileron-inc/view_component_in_css
+  homepage_uri: https://github.com/aileron-inc/view_component_scoped_css
   source_code_uri: https://github.com/aileron-inc/view_component_scoped_css
   changelog_uri: https://github.com/aileron-inc/view_component_scoped_css/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
@@ -94,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.3
 signing_key:
 specification_version: 4
 summary: Provides view_component with scss in the form of css modules

data/lib/view_component_scoped_css/hook.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module ViewComponentScopedCss
-  #
-  # Hook before_render to view component to provide inline css
-  #
-  module Hook
-    extend ActiveSupport::Concern
-    included do
-      include ActiveSupport::Callbacks
-      define_callbacks :render
-    end
-
-    if ViewComponentScopedCss.config.compile_cache
-      def before_render
-        run_callbacks :render do
-          ViewComponentScopedCss::CurrentContext.add(self)
-        end
-      end
-    else
-      def before_render
-        run_callbacks :render do
-          self.class.reload_component_css_tag
-          ViewComponentScopedCss::CurrentContext.add(self)
-        end
-      end
-    end
-
-    class_methods do
-      def before_render(&block)
-        set_callback(:render, :before, &block)
-      end
-    end
-  end
-end