shimmer 0.0.24 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0eaed2568e6fdbdc41b8c47337b1c514f0db410c597c3b5727eb3de9ffa2367
-  data.tar.gz: b946998c24efbe8fe0307ef55ea9971233be36623cdbcdbd283306c319132d02
+  metadata.gz: 56d4b2433dce6cff2fbaee9f1eb4591caf4f9abdbbc50aa9154f9eb81c5ce068
+  data.tar.gz: 9f95b3f5e0dfda4d102f529d7bd0334dbbbd4cbc31c026069be0a949f49f04c3
 SHA512:
-  metadata.gz: 13279649e9331c200c8491974f57fc659aff3b60242f93683fba9a55d0d75583a32c6b9eaab4a4d128207f5be416b55493af629cd87edd02d01cc52c946da4da
-  data.tar.gz: 8f200cd8ed792dc4a33d2ab7fc2d0607a00ea9a2a4ad32f278d655a21d1510d7cd614483d15077cb99ab2ca9b124c6ec94b02cf8471740b0b17497f94bc61354
+  metadata.gz: 5625382dc2804fd1d0f6b93c8a2bdb391f2c2d632c70ab023ca22abdb7d661a746a799f13772f269ed160f420b32712825ec0ae5693683c98beb84f57c324f89
+  data.tar.gz: 559862f18bca1477be21b2cf40666da06c2b294177ecf4fac46a4d769ede304d55c767eab945c87b470d145bef7fbba3e0ebc1635f8174a633c7925279fadb94

data/lib/shimmer/form/builder.rb

@@ -13,7 +13,7 @@ module Shimmer
         end
       end
 
-      def input(method, as: guess_type(method), wrapper_options: {}, description: nil, **options)
+      def input(method, as: guess_type(method), wrapper_options: {}, description: nil, label_method: nil, **options)
         as ||= guess_type(method)
         options[:class] ||= "input__input"
         collection = options.delete :collection
@@ -29,8 +29,10 @@ module Shimmer
         input_class = self.class.input_registry[as]
         raise "Unknown type #{as}" unless input_class
         input = input_class.new(builder: self, method: method, options: options, id_method: id_method, collection: collection, name_method: name_method)
+        input.prepare
         wrapper_options.reverse_merge! input.wrapper_options
-        wrap method: method, content: input.render, classes: classes + ["input--#{as}"], label: options[:label], extra: extra, description: description, options: wrapper_options
+        label_method ||= wrapper_options.delete(:label_method)
+        wrap method: method, content: input.render, classes: classes + ["input--#{as}"], label: options[:label], extra: extra, description: description, options: wrapper_options, label_method: label_method
       end
 
       private
@@ -65,12 +67,12 @@ module Shimmer
         object.class.types.keys if object.class.respond_to?(method.to_s.pluralize)
       end
 
-      def wrap(method:, content:, classes:, label:, data: nil, extra: nil, description: nil, options: {})
+      def wrap(method:, content:, classes:, label:, data: nil, extra: nil, description: nil, options: {}, label_method: nil)
         if object&.errors&.[](method)&.any?
           classes << "input--error"
           errors = safe_join(object.errors[method].map { |e| content_tag :div, e, class: "input__error" })
         end
-        label = label == false ? nil : self.label(method, label, class: "input__label")
+        label = label == false ? nil : self.label(label_method || method, label, class: "input__label")
         description = description.presence ? content_tag(:div, description, class: "input__description") : nil
         content_tag(:div, safe_join([label, content, description, errors, extra].compact), class: ["input"] + classes, **options)
       end

data/lib/shimmer/form/field.rb

@@ -17,6 +17,9 @@ module Shimmer
         {}
       end
 
+      def prepare
+      end
+
       def initialize(builder:, method:, collection:, id_method:, name_method:, options: {})
         @builder = builder
         @method = method

data/lib/shimmer/form/radio_field.rb

@@ -5,8 +5,16 @@ module Shimmer
     class RadioField < Field
       self.type = :radio
 
+      def prepare
+        @value = options.delete(:value)
+      end
+
       def render
-        builder.collection_radio_buttons method, collection, id_method, name_method, {}, options
+        builder.radio_button method, @value, options
+      end
+
+      def wrapper_options
+        {label_method: "#{method}_#{@value.to_s.underscore}".to_sym}
       end
     end
   end

data/lib/shimmer/form/radios_field.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Shimmer
+  module Form
+    class RadiosField < Field
+      self.type = :radios
+
+      def render
+        builder.collection_radio_buttons method, collection, id_method, name_method, {}, options
+      end
+    end
+  end
+end

data/lib/shimmer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shimmer
-  VERSION = "0.0.24"
+  VERSION = "0.0.26"
 end

data/src/consent.ts

@@ -54,7 +54,7 @@ export class Consent {
   ): Promise<void> {
     await this.consentFor(role);
     window.gtag("js", new Date());
-    window.gtag("config", id);
+    window.gtag("config", id, { send_page_view: false }); // page view is disabled because it's tracked via the analytics stimulus controller already
     const script = document.createElement("script");
     script.async = true;
     script.setAttribute(

data/src/controllers/analytics.ts

@@ -12,7 +12,8 @@ declare global {
 }
 
 const dataLayer = (window.dataLayer = window.dataLayer ?? []);
-function gtag(): void {
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function gtag(..._arg): void {
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   // eslint-disable-next-line prefer-rest-params
@@ -29,15 +30,15 @@ export default class extends Controller {
     const data = JSON.parse(
       (event.target as HTMLElement).dataset.analytics ?? "{}"
     );
-    dataLayer.push(data);
+    const eventName = data["event"];
+    delete data["event"];
+    gtag("event", eventName, data);
   }
 
   recordPage(): void {
-    const event = {
-      event: "Pageview",
-      path: location.pathname + location.search,
-      host: location.host,
-    };
-    dataLayer.push(event);
+    gtag("event", "page_view", {
+      page_title: document.title,
+      page_location: document.location.toString(),
+    });
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shimmer
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.26
 platform: ruby
 authors:
 - Jens Ravens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -158,6 +158,7 @@ files:
 - lib/shimmer/form/password_field.rb
 - lib/shimmer/form/pdf_field.rb
 - lib/shimmer/form/radio_field.rb
+- lib/shimmer/form/radios_field.rb
 - lib/shimmer/form/select_field.rb
 - lib/shimmer/form/text_area_field.rb
 - lib/shimmer/form/text_field.rb