compony 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e3590a5ce07d22e7d483af2c98c972e9c64403e43084560e193bb6382215844
-  data.tar.gz: 054e3c2ef26650cdf404b0615f74dc12f0a610728e9b9b1446a90a4c91952365
+  metadata.gz: 328b6b6671f93fa0575bf4224a5da90fecde74a0c00430346d36ca45a675cf24
+  data.tar.gz: a92107d9f9cf7b270d57059ad10bdec614d269615fd2eabfe58caeb0e44300bc
 SHA512:
-  metadata.gz: 90139644b0d2f3dd9adbff42e42bcdecae69d93676e5c4527795bd89a81103f5eabab4fd846fb3ad5e32b3463b0303b5e860f65d31939c0438f2e211bd28b4f6
-  data.tar.gz: a9c0714b201b1df42f0996e1a965de71ed6c6738cf8a6e0e332883a1b97f9dcdb876d89a138965c63db957e6b99bf54bdba7cbfc6a977b68c94f0b98dba496f5
+  metadata.gz: 1ae81390416e9f14dcfb1a1d2723fbd3714e4f271afe9dc9e2a3ee2f27012a1ee82cb846fb8b80be14b6fac73451477b9b8e00a960b8f88777670a10e4dcec13
+  data.tar.gz: d318c0bdc852f4ff1fcf1aef638eac97356a03621f70bb4bac7957bece7050ba5e152a4114d165c79200d3e2eefe6d61af69ac4fec10371da354f908164ab929

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.0.8
+
+- Support selecting anchormodel inputs via radio buttons
+- Fix `value_for` for associations to elements that have no show component
+- Fix spacing problem with invisible action buttons
+- Pass the controller as argument to action buttons
+- Support option `:label` in `value_for` of date and datetime, support superfluous options in association
+- Support argument list in form generator
+- Create new model field type :color
+
 # 0.0.7
 
 - Fix `standalone_access_permitted_for?` check for buttons pointing to non-get verbs

data/compony.gemspec

@@ -2,17 +2,17 @@
 # This file is auto-generated via: 'rake gemspec'.
 
 # -*- encoding: utf-8 -*-
-# stub: compony 0.0.7 ruby lib
+# stub: compony 0.0.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "compony".freeze
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sandro Kalbermatter".freeze, "contributors".freeze]
-  s.date = "2023-09-18"
-  s.files = [".gitignore".freeze, ".ruby-version".freeze, ".yardopts".freeze, "CHANGELOG.md".freeze, "Gemfile".freeze, "Gemfile.lock".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "app/controllers/compony_controller.rb".freeze, "compony.gemspec".freeze, "config/locales/de.yml".freeze, "config/locales/en.yml".freeze, "config/routes.rb".freeze, "doc/resourceful_lifecycle.graphml".freeze, "doc/resourceful_lifecycle.pdf".freeze, "lib/compony.rb".freeze, "lib/compony/component.rb".freeze, "lib/compony/component_mixins/default/labelling.rb".freeze, "lib/compony/component_mixins/default/standalone.rb".freeze, "lib/compony/component_mixins/default/standalone/resourceful_verb_dsl.rb".freeze, "lib/compony/component_mixins/default/standalone/standalone_dsl.rb".freeze, "lib/compony/component_mixins/default/standalone/verb_dsl.rb".freeze, "lib/compony/component_mixins/resourceful.rb".freeze, "lib/compony/components/button.rb".freeze, "lib/compony/components/destroy.rb".freeze, "lib/compony/components/edit.rb".freeze, "lib/compony/components/form.rb".freeze, "lib/compony/components/new.rb".freeze, "lib/compony/components/with_form.rb".freeze, "lib/compony/controller_mixin.rb".freeze, "lib/compony/engine.rb".freeze, "lib/compony/method_accessible_hash.rb".freeze, "lib/compony/model_fields/anchormodel.rb".freeze, "lib/compony/model_fields/association.rb".freeze, "lib/compony/model_fields/attachment.rb".freeze, "lib/compony/model_fields/base.rb".freeze, "lib/compony/model_fields/boolean.rb".freeze, "lib/compony/model_fields/currency.rb".freeze, "lib/compony/model_fields/date.rb".freeze, "lib/compony/model_fields/datetime.rb".freeze, "lib/compony/model_fields/decimal.rb".freeze, "lib/compony/model_fields/email.rb".freeze, "lib/compony/model_fields/float.rb".freeze, "lib/compony/model_fields/integer.rb".freeze, "lib/compony/model_fields/phone.rb".freeze, "lib/compony/model_fields/rich_text.rb".freeze, "lib/compony/model_fields/string.rb".freeze, "lib/compony/model_fields/text.rb".freeze, "lib/compony/model_fields/time.rb".freeze, "lib/compony/model_fields/url.rb".freeze, "lib/compony/model_mixin.rb".freeze, "lib/compony/request_context.rb".freeze, "lib/compony/version.rb".freeze, "lib/compony/view_helpers.rb".freeze, "lib/generators/component/USAGE".freeze, "lib/generators/component/component_generator.rb".freeze, "lib/generators/component/templates/component.rb.erb".freeze, "lib/generators/component/templates/destroy.rb.erb".freeze, "lib/generators/component/templates/edit.rb.erb".freeze, "lib/generators/component/templates/form.rb.erb".freeze, "lib/generators/component/templates/new.rb.erb".freeze, "lib/generators/components/USAGE".freeze, "lib/generators/components/components_generator.rb".freeze]
+  s.date = "2023-10-03"
+  s.files = [".gitignore".freeze, ".ruby-version".freeze, ".yardopts".freeze, "CHANGELOG.md".freeze, "Gemfile".freeze, "Gemfile.lock".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "app/controllers/compony_controller.rb".freeze, "compony.gemspec".freeze, "config/locales/de.yml".freeze, "config/locales/en.yml".freeze, "config/routes.rb".freeze, "doc/resourceful_lifecycle.graphml".freeze, "doc/resourceful_lifecycle.pdf".freeze, "lib/compony.rb".freeze, "lib/compony/component.rb".freeze, "lib/compony/component_mixins/default/labelling.rb".freeze, "lib/compony/component_mixins/default/standalone.rb".freeze, "lib/compony/component_mixins/default/standalone/resourceful_verb_dsl.rb".freeze, "lib/compony/component_mixins/default/standalone/standalone_dsl.rb".freeze, "lib/compony/component_mixins/default/standalone/verb_dsl.rb".freeze, "lib/compony/component_mixins/resourceful.rb".freeze, "lib/compony/components/button.rb".freeze, "lib/compony/components/destroy.rb".freeze, "lib/compony/components/edit.rb".freeze, "lib/compony/components/form.rb".freeze, "lib/compony/components/new.rb".freeze, "lib/compony/components/with_form.rb".freeze, "lib/compony/controller_mixin.rb".freeze, "lib/compony/engine.rb".freeze, "lib/compony/method_accessible_hash.rb".freeze, "lib/compony/model_fields/anchormodel.rb".freeze, "lib/compony/model_fields/association.rb".freeze, "lib/compony/model_fields/attachment.rb".freeze, "lib/compony/model_fields/base.rb".freeze, "lib/compony/model_fields/boolean.rb".freeze, "lib/compony/model_fields/color.rb".freeze, "lib/compony/model_fields/currency.rb".freeze, "lib/compony/model_fields/date.rb".freeze, "lib/compony/model_fields/datetime.rb".freeze, "lib/compony/model_fields/decimal.rb".freeze, "lib/compony/model_fields/email.rb".freeze, "lib/compony/model_fields/float.rb".freeze, "lib/compony/model_fields/integer.rb".freeze, "lib/compony/model_fields/phone.rb".freeze, "lib/compony/model_fields/rich_text.rb".freeze, "lib/compony/model_fields/string.rb".freeze, "lib/compony/model_fields/text.rb".freeze, "lib/compony/model_fields/time.rb".freeze, "lib/compony/model_fields/url.rb".freeze, "lib/compony/model_mixin.rb".freeze, "lib/compony/request_context.rb".freeze, "lib/compony/version.rb".freeze, "lib/compony/view_helpers.rb".freeze, "lib/generators/component/USAGE".freeze, "lib/generators/component/component_generator.rb".freeze, "lib/generators/component/templates/component.rb.erb".freeze, "lib/generators/component/templates/destroy.rb.erb".freeze, "lib/generators/component/templates/edit.rb.erb".freeze, "lib/generators/component/templates/form.rb.erb".freeze, "lib/generators/component/templates/new.rb.erb".freeze, "lib/generators/components/USAGE".freeze, "lib/generators/components/components_generator.rb".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 3.0.0".freeze)
   s.rubygems_version = "3.4.19".freeze
   s.summary = "Needs summary".freeze

data/lib/compony/component.rb

@@ -206,9 +206,11 @@ module Compony
         button_htmls = @actions.map do |action|
           next if @skipped_actions.include?(action.name)
           Compony.with_button_defaults(feasibility_action: action.name.to_sym) do
-            action_button = action.block.call
+            action_button = action.block.call(controller)
             next unless action_button
-            h.content_tag(:div, action_button.render(controller), class: action_class)
+            button_html = action_button.render(controller)
+            next if button_html.blank?
+            h.content_tag(:div, button_html, class: action_class)
           end
         end
         next h.safe_join button_htmls

data/lib/compony/model_fields/anchormodel.rb

@@ -25,7 +25,8 @@ module Compony
           collection:    self.class.collect(anchormodel_class.all),
           label_method:  :first,
           value_method:  :second,
-          selected:      selected_key,
+          selected:      selected_key, # if used in select
+          checked:       selected_key, # if used in radio buttons
           include_blank: anchormodel_attribute.optional
         }.merge(input_opts)
         return form.input name || @name, **opts

data/lib/compony/model_fields/association.rb

@@ -6,11 +6,16 @@ module Compony
         resolve_association!
       end
 
-      def value_for(data, link_to_component: nil, link_opts: {}, controller: nil)
+      def value_for(data, link_to_component: nil, link_opts: {}, controller: nil, **_)
         if link_to_component
           fail('Must pass controller if link_to_component is given.') unless controller
           return transform_and_join(data.send(@name), controller:) do |el|
-            el.nil? ? nil : controller.helpers.compony_link(link_to_component, el, **link_opts)
+            next nil if el.nil?
+            if Compony.comp_class_for(link_to_component, el)
+              next controller.helpers.compony_link(link_to_component, el, **link_opts)
+            else
+              next el.label
+            end
           end
         else
           return transform_and_join(data.send(@name), controller:) { |el| el&.label }

data/lib/compony/model_fields/color.rb

@@ -0,0 +1,16 @@
+module Compony
+  module ModelFields
+    class Color < Base
+      def value_for(data, controller: nil, **_)
+        return transform_and_join(data.send(@name), controller:) do |el|
+          next nil unless el
+          next controller.helpers.raw "#{el}&nbsp;<span style=\"background-color: #{el}\">&nbsp;&nbsp;&nbsp;&nbsp;</span>"
+        end
+      end
+
+      def simpleform_input(form, _component, name: nil, **input_opts)
+        return form.input name || @name, as: :color, **input_opts
+      end
+    end
+  end
+end

data/lib/compony/model_fields/date.rb

@@ -1,8 +1,8 @@
 module Compony
   module ModelFields
     class Date < Base
-      def value_for(data, controller: nil, **_)
-        return transform_and_join(data.send(@name), controller:) { |el| el.nil? ? nil : I18n.l(el) }
+      def value_for(data, controller: nil, format: nil, **_)
+        return transform_and_join(data.send(@name), controller:) { |el| el.nil? ? nil : I18n.l(el, format:) }
       end
     end
   end

data/lib/compony/model_fields/datetime.rb

@@ -1,8 +1,8 @@
 module Compony
   module ModelFields
     class Datetime < Base
-      def value_for(data, controller: nil, **_)
-        return transform_and_join(data.send(@name), controller:) { |el| el.nil? ? nil : I18n.l(el) }
+      def value_for(data, controller: nil, format: nil, **_)
+        return transform_and_join(data.send(@name), controller:) { |el| el.nil? ? nil : I18n.l(el, format:) }
       end
     end
   end

data/lib/compony/version.rb

@@ -2,7 +2,7 @@ module Compony
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 7
+    PATCH = 8
 
     EDGE = false
 

data/lib/compony.rb

@@ -245,6 +245,7 @@ require 'compony/model_fields/anchormodel'
 require 'compony/model_fields/association'
 require 'compony/model_fields/attachment'
 require 'compony/model_fields/boolean'
+require 'compony/model_fields/color'
 require 'compony/model_fields/currency'
 require 'compony/model_fields/date'
 require 'compony/model_fields/datetime'

data/lib/generators/component/USAGE

@@ -6,3 +6,5 @@ Example:
 
     This will create:
         app/components/users/new.rb
+
+    For Foo::Form, arguments will produce form fields.

data/lib/generators/component/component_generator.rb

@@ -8,6 +8,7 @@ class ComponentGenerator < Rails::Generators::NamedBase
     @family = @family.pluralize # Force plural
     @family_cst = @family.camelize.pluralize # Force plural
     @comp_cst = @comp.camelize # Tolerate singular and plural
+    @args = args
 
     case @comp_cst
     when 'Destroy'

data/lib/generators/component/templates/form.rb.erb

@@ -1,8 +1,10 @@
 class Components::<%= @family_cst %>::<%= @comp_cst %> < Compony::Components::Form
   setup do
-    form_fields do
+    form_fields do<% @args.each do |arg| %>
+      concat field :<%= arg.strip %><% end %>
     end
-
-    schema_fields
+    <% if @args.any? %><% @args.each do |arg| %>
+    schema_field :<%= arg.strip %><% end %><% else %>
+    schema_fields<% end %>
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compony
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Sandro Kalbermatter
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -195,6 +195,7 @@ files:
 - lib/compony/model_fields/attachment.rb
 - lib/compony/model_fields/base.rb
 - lib/compony/model_fields/boolean.rb
+- lib/compony/model_fields/color.rb
 - lib/compony/model_fields/currency.rb
 - lib/compony/model_fields/date.rb
 - lib/compony/model_fields/datetime.rb