shimmer 0.0.22 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36f3761e1bd5856a9fd2078201abda25b544eff5e807566ce85847ba291c47d9
-  data.tar.gz: c946f2ec830a472aee08d835dbb697711d46c107152723ee8f9bb43a36bc4173
+  metadata.gz: c0eaed2568e6fdbdc41b8c47337b1c514f0db410c597c3b5727eb3de9ffa2367
+  data.tar.gz: b946998c24efbe8fe0307ef55ea9971233be36623cdbcdbd283306c319132d02
 SHA512:
-  metadata.gz: d8bb839595c9e32ab185276bdaac0c8a6f43b4ce1fb1ce0d82d47a1c18c5ae082e29caa68c34d14856db2ebb2001fe4774f5b687599b794706d199767bd46de1
-  data.tar.gz: 885c2bdb0326b02c3eebd7d4606d79906b52264ef8b6043dc6f4061dffd6c8b5a786af22f9d25378d7aa21988a34d6412409adcd7acb6acce7f478e342323eba
+  metadata.gz: 13279649e9331c200c8491974f57fc659aff3b60242f93683fba9a55d0d75583a32c6b9eaab4a4d128207f5be416b55493af629cd87edd02d01cc52c946da4da
+  data.tar.gz: 8f200cd8ed792dc4a33d2ab7fc2d0607a00ea9a2a4ad32f278d655a21d1510d7cd614483d15077cb99ab2ca9b124c6ec94b02cf8471740b0b17497f94bc61354

data/lib/shimmer/form/builder.rb

@@ -13,7 +13,7 @@ module Shimmer
         end
       end
 
-      def input(method, as: guess_type(method), **options)
+      def input(method, as: guess_type(method), wrapper_options: {}, description: nil, **options)
         as ||= guess_type(method)
         options[:class] ||= "input__input"
         collection = options.delete :collection
@@ -25,12 +25,12 @@ module Shimmer
         options[:required] ||= true if options[:required].nil? && required_attributes.include?(method)
         options[:data] ||= {}
         options[:data][:controller] = options.delete(:controller) if options[:controller]
-        wrapper_data = {}
         extra = []
         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)
-        wrap method: method, content: input.render, classes: classes + ["input--#{as}"], label: options[:label], data: wrapper_data, extra: extra
+        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
       end
 
       private
@@ -65,13 +65,14 @@ 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)
+      def wrap(method:, content:, classes:, label:, data: nil, extra: nil, description: nil, options: {})
         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")
-        content_tag(:div, safe_join([label, content, errors, extra].compact), class: ["input"] + classes, data: data)
+        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
 
       def helper

data/lib/shimmer/form/checkbox_field.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Shimmer
+  module Form
+    class CheckboxField < Field
+      self.type = :checkbox
+
+      def render
+        builder.check_box method, options
+      end
+    end
+  end
+end

data/lib/shimmer/form/datetime_field.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Shimmer
+  module Form
+    class DatetimeField < Field
+      self.type = :datetime
+
+      def render
+        builder.datetime_field method, options
+      end
+    end
+  end
+end

data/lib/shimmer/form/field.rb

@@ -13,6 +13,10 @@ module Shimmer
         end
       end
 
+      def wrapper_options
+        {}
+      end
+
       def initialize(builder:, method:, collection:, id_method:, name_method:, options: {})
         @builder = builder
         @method = method

data/lib/shimmer/form/image_field.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Shimmer
+  module Form
+    class ImageField < Field
+      self.type = :image
+
+      def render
+        builder.file_field method, options.reverse_merge(accept: "image/*")
+      end
+    end
+  end
+end

data/lib/shimmer/utils/file_helper.rb

@@ -27,19 +27,27 @@ module Shimmer
     end
 
     def image_file_path(source, width: nil, height: nil)
-      image_file_proxy(source, width: width, height: height)&.path
+      image_file_proxy(source, width: width, height: height, return_type: :path)
     end
 
     def image_file_url(source, width: nil, height: nil)
-      image_file_proxy(source, width: width, height: height)&.url
+      image_file_proxy(source, width: width, height: height, return_type: :url)
     end
 
-    def image_file_proxy(source, width: nil, height: nil)
+    def image_file_proxy(source, width: nil, height: nil, return_type: nil)
       return if source.blank?
       return source if source.is_a?(String)
 
       blob = source.try(:blob) || source
-      Shimmer::FileProxy.new(blob_id: blob.id, width: width, height: height)
+      proxy = Shimmer::FileProxy.new(blob_id: blob.id, width: width, height: height)
+      case return_type
+      when nil
+        proxy
+      when :path
+        proxy.path
+      when :url
+        proxy.url
+      end
     end
   end
 end

data/lib/shimmer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shimmer
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.24
 platform: ruby
 authors:
 - Jens Ravens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -147,10 +147,13 @@ files:
 - lib/shimmer/controllers/sitemaps_controller.rb
 - lib/shimmer/form.rb
 - lib/shimmer/form/builder.rb
+- lib/shimmer/form/checkbox_field.rb
 - lib/shimmer/form/checkboxes_field.rb
 - lib/shimmer/form/date_field.rb
+- lib/shimmer/form/datetime_field.rb
 - lib/shimmer/form/email_field.rb
 - lib/shimmer/form/field.rb
+- lib/shimmer/form/image_field.rb
 - lib/shimmer/form/number_field.rb
 - lib/shimmer/form/password_field.rb
 - lib/shimmer/form/pdf_field.rb