ariadne_view_components 0.0.67 → 0.0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd5283c6a467784134844ba0e33b4e057751409ab319edd1290d50187548d00f
-  data.tar.gz: 71955ed5ec0978b6dd4134e06e04ac75ab8431dcf1a773fa8ba44de714580a02
+  metadata.gz: 2c1c6ce26063b99def7c171185947bcadfc6ab4a01217570bd70ead0ac48fced
+  data.tar.gz: 2c77caa134f149e3b32d9c1e9e767177e00aeb9c9cd51924ad955fa81f974f2b
 SHA512:
-  metadata.gz: fdf4d46026299a7aacc15ce2a404f214fc44f9995295970ef2108ae6b8ae9491dc8434d576087f56dbe93c2cf477cf4b57a4a62c67bacf15a7841ec657b13b4e
-  data.tar.gz: d7a08dbe0d5307bf83b75daaa8c9d8d788a6078ef4877aecab4aa4f54698e3b10cc1dd078d335292b5f538014ac01a3f94ad9624aeb1ba8870f7bbfffb826f93
+  metadata.gz: 1a362bbcf743922eec8195d821f17b68d94d78d493f988b12f18994d3fa24efc4328451ff9a03e5f7ec17fe4e21754f322ac42756ca9f85de583dd3b351acd67
+  data.tar.gz: fe2e8da4c9af0221e781a2f11ea920a7a96971c6f0be2326c4e4f9065ed45f49c4b5f2a9086989cc85339a8b3af259c516e223cc3c89a188f001d685c232351a

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## [v0.0.67] - 05-04-2024
+**Full Changelog**: https://github.com/yettoapp/ariadne/compare/v0.0.66...v0.0.67
 ## [v0.0.66] - 05-04-2024
 **Full Changelog**: https://github.com/yettoapp/ariadne/compare/v0.0.65...v0.0.66
 ## [v0.0.65] - 05-04-2024

data/app/components/ariadne/base_component.rb

@@ -1,17 +1,13 @@
 # typed: false
 # frozen_string_literal: true
 
-require_relative "../../lib/view_components_contrib/html_attrs"
 require "dry-initializer"
 
 module Ariadne
   # :nodoc:
   class BaseComponent < ViewComponentContrib::Base
+    include Ariadne::ViewComponent::HTMLAttrs
     include ViewComponentContrib::StyleVariants
-    require_relative "../../lib/view_components_contrib/style_variants"
-
-    include ViewComponentContrib::HTMLAttrs
-    include ViewComponentContrib::TranslationHelper
 
     include Ariadne::AttributesHelper
 

data/app/components/ariadne/form/form_control/component.rb

@@ -4,7 +4,7 @@ module Ariadne
   module Form
     # :nodoc:
     module FormControl
-      class Component < Ariadne::Form::BaseInputComponent
+      class Component < Ariadne::Form::BaseComponent
         delegate :builder, :form, to: :@input
 
         def initialize(input:, tag: :div, **system_arguments)

data/app/components/ariadne/form/form_reference/component.rb

@@ -4,7 +4,7 @@ module Ariadne
   module Form
     # :nodoc:
     module FormReference
-      class Component < Ariadne::Form::BaseInputComponent
+      class Component < Ariadne::Form::BaseComponent
         delegate :builder, :form, to: :@input
 
         def initialize(input:)

data/app/components/ariadne/form/group/component.rb

@@ -4,24 +4,22 @@ module Ariadne
   module Form
     # :nodoc:
     module Group
-      module Component
-        class Component < Ariadne::Form::BaseInputComponent
-          VERTICAL = :vertical
-          HORIZONTAL = :horizontal
-          DEFAULT_LAYOUT = VERTICAL
-          LAYOUTS = [VERTICAL, HORIZONTAL].freeze
+      class Component < Ariadne::Form::BaseComponent
+        VERTICAL = :vertical
+        HORIZONTAL = :horizontal
+        DEFAULT_LAYOUT = VERTICAL
+        LAYOUTS = [VERTICAL, HORIZONTAL].freeze
 
-          def initialize(inputs:, builder:, form:, layout: DEFAULT_LAYOUT, **system_arguments)
-            @inputs = inputs
-            @builder = builder
-            @form = form
-            @layout = layout
-            @system_arguments = system_arguments
-          end
+        def initialize(inputs:, builder:, form:, layout: DEFAULT_LAYOUT, **system_arguments)
+          @inputs = inputs
+          @builder = builder
+          @form = form
+          @layout = layout
+          @system_arguments = system_arguments
+        end
 
-          def horizontal?
-            @layout == HORIZONTAL
-          end
+        def horizontal?
+          @layout == HORIZONTAL
         end
       end
     end

data/app/components/ariadne/form/separator/component.rb

@@ -3,7 +3,7 @@
 module Ariadne
   module Form
     module Separator
-      class Component < Ariadne::Form::BaseInputComponent
+      class Component < Ariadne::Form::BaseComponent
       end
     end
   end

data/app/components/ariadne/form/spacing_wrapper/component.rb

@@ -3,7 +3,7 @@
 module Ariadne
   module Form
     module SpacingWrapper
-      class Component < Ariadne::Form::BaseInputComponent
+      class Component < Ariadne::Form::BaseComponent
       end
     end
   end

data/app/components/ariadne/form/validation_message/component.rb

@@ -4,7 +4,7 @@ module Ariadne
   module Form
     # :nodoc:
     module ValidationMessage
-      class Component < Ariadne::Form::BaseInputComponent
+      class Component < Ariadne::Form::BaseComponent
         attr_reader :input
 
         def initialize(input:)

data/app/lib/ariadne/view_component/html_attrs.rb

@@ -0,0 +1,66 @@
+# typed: false
+# frozen_string_literal: true
+
+require "action_view/helpers/tag_helper"
+
+module Ariadne
+  module ViewComponent
+    module HTMLAttrs
+      class AttributesHash < ::Hash
+        TAG_BUILDER = ActionView::Helpers::TagHelper::TagBuilder.new(nil)
+        TAG_OPTIONS = ActionView::Helpers::TagHelper::TagBuilder.instance_method(:tag_options)
+
+        def to_html(nested: false)
+          # TODO: implement + change usage by @tag nested-attributes
+          tag_options(self)&.html_safe # rubocop:disable Rails/OutputSafety
+        end
+        private def tag_options(...) = TAG_OPTIONS.bind_call(TAG_BUILDER, ...)
+      end
+
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def accepts_html_attributes_for(name, **defaults, &block)
+          html_attribute_accessors[name] = defaults
+
+          name = name.to_sym
+          method_name = :"#{name}_attrs"
+          ivar_name = :"@#{method_name}"
+
+          attr_reader(method_name)
+
+          mod = Module.new do
+            define_method(:initialize) do |**options|
+              value = self.class.default_html_attributes_for(name).deep_merge!(options.delete(method_name).to_h)
+              super(**options)
+              instance_exec(value, &block) if block
+              instance_variable_set(ivar_name, value)
+            end
+          end
+
+          prepend(mod)
+        end
+
+        def accepts_html_attributes(**defaults, &block)
+          accepts_html_attributes_for(:html, **defaults, &block)
+        end
+
+        def html_attribute_accessors
+          @html_attribute_accessors ||=
+            if superclass.respond_to?(:html_attribute_accessors)
+              superclass.html_attribute_accessors.deep_dup
+            else
+              {}
+            end
+        end
+
+        def default_html_attributes_for(name)
+          html_attribute_accessors.fetch(name).each_with_object(AttributesHash.new) do |(k, v), acc|
+            acc[k] = v.is_a?(Proc) ? v.call : v
+            acc
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/ariadne/view_component/style_variants.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Ariadne
+  module ViewComponent
+    module StyleVariants
+      module ClassMethods
+        # Returns the name of the default style set based on the class name:
+        #  MyComponent::Component => my_component
+        #  Namespaced::MyComponent => my_component
+        def default_style_name
+          @default_style_name ||= name.split("::")[-2].underscore.presence || "component"
+        end
+      end
+    end
+  end
+end

data/lib/ariadne/view_components/engine.rb

@@ -50,7 +50,7 @@ module Ariadne
           helper Ariadne::FormHelper
 
           # make ariadne_form_with available to view components also
-          ViewComponent::Base.prepend(Ariadne::FormHelper)
+          ::ViewComponent::Base.prepend(Ariadne::FormHelper)
         end
       end
 

data/lib/ariadne/view_components/version.rb

@@ -3,6 +3,6 @@
 # :nocov:
 module Ariadne
   module ViewComponents
-    VERSION = "0.0.67"
+    VERSION = "0.0.68"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ariadne_view_components
 version: !ruby/object:Gem::Version
-  version: 0.0.67
+  version: 0.0.68
 platform: ruby
 authors:
 - Garen J. Torikian
@@ -193,9 +193,9 @@ files:
 - app/lib/ariadne/form.rb
 - app/lib/ariadne/icon_helper.rb
 - app/lib/ariadne/logger_helper.rb
+- app/lib/ariadne/view_component/html_attrs.rb
+- app/lib/ariadne/view_component/style_variants.rb
 - app/lib/ariadne/view_helper.rb
-- app/lib/view_component_contrib/html_attrs.rb
-- app/lib/view_component_contrib/style_variants.rb
 - lib/ariadne/forms/acts_as_component.rb
 - lib/ariadne/forms/base.html.erb
 - lib/ariadne/forms/base.rb

data/app/lib/view_component_contrib/html_attrs.rb

@@ -1,64 +0,0 @@
-# typed: false
-# frozen_string_literal: true
-
-require "action_view/helpers/tag_helper"
-
-module ViewComponentContrib
-  module HTMLAttrs
-    class AttributesHash < ::Hash
-      TAG_BUILDER = ActionView::Helpers::TagHelper::TagBuilder.new(nil)
-      TAG_OPTIONS = ActionView::Helpers::TagHelper::TagBuilder.instance_method(:tag_options)
-
-      def to_html(nested: false)
-        # TODO: implement + change usage by @tag nested-attributes
-        tag_options(self)&.html_safe # rubocop:disable Rails/OutputSafety
-      end
-      private def tag_options(...) = TAG_OPTIONS.bind_call(TAG_BUILDER, ...)
-    end
-
-    extend ActiveSupport::Concern
-
-    class_methods do
-      def accepts_html_attributes_for(name, **defaults, &block)
-        html_attribute_accessors[name] = defaults
-
-        name = name.to_sym
-        method_name = :"#{name}_attrs"
-        ivar_name = :"@#{method_name}"
-
-        attr_reader(method_name)
-
-        mod = Module.new do
-          define_method(:initialize) do |**options|
-            value = self.class.default_html_attributes_for(name).deep_merge!(options.delete(method_name).to_h)
-            super(**options)
-            instance_exec(value, &block) if block
-            instance_variable_set(ivar_name, value)
-          end
-        end
-
-        prepend(mod)
-      end
-
-      def accepts_html_attributes(**defaults, &block)
-        accepts_html_attributes_for(:html, **defaults, &block)
-      end
-
-      def html_attribute_accessors
-        @html_attribute_accessors ||=
-          if superclass.respond_to?(:html_attribute_accessors)
-            superclass.html_attribute_accessors.deep_dup
-          else
-            {}
-          end
-      end
-
-      def default_html_attributes_for(name)
-        html_attribute_accessors.fetch(name).each_with_object(AttributesHash.new) do |(k, v), acc|
-          acc[k] = v.is_a?(Proc) ? v.call : v
-          acc
-        end
-      end
-    end
-  end
-end

data/app/lib/view_component_contrib/style_variants.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module ViewComponentContrib
-  module StyleVariants
-    module ClassMethods
-      # Returns the name of the default style set based on the class name:
-      #  MyComponent::Component => my_component
-      #  Namespaced::MyComponent => my_component
-      def default_style_name
-        @default_style_name ||= name.split("::")[-2].underscore.presence || "component"
-      end
-    end
-  end
-end