shimmer 0.0.23 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b8e13a67c158deb5255b9a047415eca407baded8da093d1710c2a63d4e505fb
-  data.tar.gz: ecdfa43b53f32bca080085f2a1ffafe6393ba2c6739137843d54913fdadd0327
+  metadata.gz: 98504a2ff4a7a068681ac784ca6efc00e3d1ec91aabb0f4a5599a12e87f8decf
+  data.tar.gz: '08a7c167d5fa3611f925194591c1697b32c8fc1d572d54ea4f642567eadbf3e5'
 SHA512:
-  metadata.gz: 84811ac4a7369eff4cd958e0a111151dc98a9998ef0a087959b2ecb41cc883def34ffe4db77d0eb2ec66be752106f654a8884d01aad7e8d5666a02ef80555ca9
-  data.tar.gz: 5830376aea6021ddf9b557ddab8ebe3b1157cc08ecc5badaead61cf024d24bed9013b3264b350c362b0b3b4f63eb295496595b07d900a36a0f2efe5b3a7a3912
+  metadata.gz: a0adc008b3118a00a7ddcccb6d6541a50163cde552250871d33ed047a6299d7edcf9375f138eedb9240850bb47fd28e7913171f9df0dc89eabb5a11dab5de414
+  data.tar.gz: 2c99878dfcaa144dcabb5a12920caf3626c3b15e86314c94aa38da5bc832bc4b194ed5c1e53396bcbbb679c23bbd6d590d339a260a104ac7cb2722fd72b55e2c

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/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.23"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shimmer
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.25
 platform: ruby
 authors:
 - Jens Ravens
@@ -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