compony 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c832dc26e81d2231843d90891d9ca469d5e74dfd3b0e00a588bebf1e8d1f25a2
-  data.tar.gz: 7eb4e6953bbdf22fd67b7e6fa95d6f2ce012e2e350c1a4e3bb04bb34f3c2e9c5
+  metadata.gz: 8fa06e0cecacc05de1b6567e29594a44fcbfed063d0268e08de239432c51a7f2
+  data.tar.gz: 24ec1426a6259b2cc3b1ddbd0127d8878a46701a0d7b2003bf5668eddf1eb8a0
 SHA512:
-  metadata.gz: 5fba60b56710e929ad113ddf092019330810dd26036dfd7ce6550becac5e7bfb03d534ac80296707b4613fd12483690e83ff7e224a56b127677141bbd2e8f71d
-  data.tar.gz: 71719e23adfe9af22f347876540150b3435cd3226e5c7a409dc402368f5cc2879803341e2f213ab7f6fe920320eaec5feb1dbdde1a97fe122e4f2ea2b9281e49
+  metadata.gz: 66fc9fe7beb64285bc2f21a945d1596c24206072b0fd64172a3eea2130754363f11d980b9159b0ebc1702be72526eb2ce8e613d17ece625ac377eeb0698ee876
+  data.tar.gz: fce5758f4f812d6ba053cf085c807ffecbce5163ed676d529d00aaa36257478a3887f60d3d6bc1ec0294151144edb6d63dc415f82c8fa6b7727fc4f84be34a97

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.0.5
+
+- Fix row bug for Email field type
+- Auto-focus first non-hidden element in forms
+- Add field type :url
+- Automatically set the correct class when generating known components
+- Add generator `components` that is able to mass-produce the most used components
+- Make fields point to the correct `model_class` in case of STI
+- Support hidden Anchormodel fields
+
 # 0.0.4
 
 - Unscope the namespace of resourceful components

data/compony.gemspec

@@ -2,17 +2,17 @@
 # This file is auto-generated via: 'rake gemspec'.
 
 # -*- encoding: utf-8 -*-
-# stub: compony 0.0.4 ruby lib
+# stub: compony 0.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "compony".freeze
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   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-05-28"
-  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_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]
+  s.date = "2023-06-20"
+  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.required_ruby_version = Gem::Requirement.new(">= 3.0.0".freeze)
   s.rubygems_version = "3.4.13".freeze
   s.summary = "Needs summary".freeze

data/lib/compony/components/form.rb

@@ -71,6 +71,7 @@ module Compony
       # @todo Refactor? Could this be greatly simplified by having `form_field to |f|` ?
       def with_simpleform(simpleform)
         @simpleform = simpleform
+        @focus_given = false
         yield
         @simpleform = nil
       end
@@ -85,8 +86,12 @@ module Compony
         fail("Field #{name.to_sym.inspect} is not defined on #{@simpleform.object.inspect} but was requested in #{inspect}.") unless model_field
 
         if hidden
-          return @simpleform.input model_field.schema_key, as: :hidden, **input_opts
+          return model_field.simpleform_input_hidden(@simpleform, self, **input_opts)
         else
+          unless @focus_given
+            input_opts[:autofocus] = true unless input_opts.key? :autofocus
+            @focus_given = true
+          end
           return model_field.simpleform_input(@simpleform, self, **input_opts)
         end
       end

data/lib/compony/model_fields/anchormodel.rb

@@ -23,6 +23,13 @@ module Compony
         }.merge(input_opts)
         return form.input @name, **opts
       end
+
+      def simpleform_input_hidden(form, _component, **input_opts)
+        selected_cst = form.object.send(@name)
+        input_opts[:input_html] ||= {}
+        input_opts[:input_html][:value] = selected_cst.is_a?(::Anchormodel) ? selected_cst.key : selected_cst
+        return form.input @name, as: :hidden, **input_opts
+      end
     end
   end
 end

data/lib/compony/model_fields/base.rb

@@ -46,6 +46,12 @@ module Compony
         return form.input @name, **input_opts
       end
 
+      # Used in form helper
+      # Given a simpleform instance, returns a suitable hidden input for thetype
+      def simpleform_input_hidden(form, _component, **input_opts)
+        return form.input @name, as: :hidden, **input_opts
+      end
+
       protected
 
       # If given a scalar, calls the block on the scalar. If given a list, calls the block on every member and joins the result with ",".

data/lib/compony/model_fields/email.rb

@@ -4,7 +4,8 @@ module Compony
       def value_for(data, controller: nil, **_)
         return transform_and_join(data.send(@name), controller:) do |el|
           fail('Must pass controller to generate the link to the email.') unless controller
-          return controller.helpers.mail_to(data.send(@name))
+          return nil unless el
+          return controller.helpers.mail_to(el)
         end
       end
     end

data/lib/compony/model_fields/url.rb

@@ -0,0 +1,13 @@
+module Compony
+  module ModelFields
+    class Url < Base
+      def value_for(data, controller: nil, **_)
+        return transform_and_join(data.send(@name), controller:) do |el|
+          fail('Must pass controller to generate the link to the link.') unless controller
+          return nil unless el
+          return controller.helpers.link_to(el, el, target: '_blank', rel: 'noopener')
+        end
+      end
+    end
+  end
+end

data/lib/compony/model_mixin.rb

@@ -11,6 +11,13 @@ module Compony
     end
 
     class_methods do
+      # This hook updates all fields from a subclass, making sure that fields point to correct model classes even in STI
+      # e.g. in Parent: field :foo, ... omitted in child -> child.fields[:foo] should point to Child and not Parent.
+      def inherited(subclass)
+        super
+        subclass.fields = subclass.fields.transform_values { |f| f.class.new(f.name, subclass, **f.extra_attrs) }
+      end
+
       # DSL method, defines a new field which will be translated and can be added to field groups
       # For virtual attributes, you must pass a type explicitely, otherwise it's auto-infered.
       def field(name, type, **extra_attrs)

data/lib/compony/version.rb

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

data/lib/compony.rb

@@ -255,6 +255,7 @@ require 'compony/model_fields/rich_text'
 require 'compony/model_fields/string'
 require 'compony/model_fields/text'
 require 'compony/model_fields/time'
+require 'compony/model_fields/url'
 require 'compony/component_mixins/default/standalone'
 require 'compony/component_mixins/default/standalone/standalone_dsl'
 require 'compony/component_mixins/default/standalone/verb_dsl'

data/lib/generators/component/component_generator.rb

@@ -3,12 +3,23 @@ class ComponentGenerator < Rails::Generators::NamedBase
 
   def add_component
     segments = name.underscore.split('/')
-    fail('NAME must be of the form Family::ComponentName or family/component_name') if segments.size != 2
+    fail("NAME must be of the form Family::ComponentName or family/component_name but got #{name.inspect}") if segments.size != 2
     @family, @comp = segments
     @family = @family.pluralize # Force plural
     @family_cst = @family.camelize.pluralize # Force plural
     @comp_cst = @comp.camelize # Tolerate singular and plural
 
-    template 'component.rb.erb', "app/components/#{@family}/#{@comp}.rb"
+    case @comp_cst
+    when 'Destroy'
+      template 'destroy.rb.erb', "app/components/#{@family}/#{@comp}.rb"
+    when 'Edit'
+      template 'edit.rb.erb', "app/components/#{@family}/#{@comp}.rb"
+    when 'Form'
+      template 'form.rb.erb', "app/components/#{@family}/#{@comp}.rb"
+    when 'New'
+      template 'new.rb.erb', "app/components/#{@family}/#{@comp}.rb"
+    else
+      template 'component.rb.erb', "app/components/#{@family}/#{@comp}.rb"
+    end
   end
 end

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

@@ -1,4 +1,4 @@
 class Components::<%= @family_cst %>::<%= @comp_cst %> < Compony::Component
   setup do
   end
-end
+end

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

@@ -0,0 +1,2 @@
+class Components::<%= @family_cst %>::<%= @comp_cst %> < Compony::Components::Destroy
+end

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

@@ -0,0 +1,2 @@
+class Components::<%= @family_cst %>::<%= @comp_cst %> < Compony::Components::Edit
+end

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

@@ -0,0 +1,8 @@
+class Components::<%= @family_cst %>::<%= @comp_cst %> < Compony::Components::Form
+  setup do
+    form_fields do
+    end
+
+    schema_fields
+  end
+end

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

@@ -0,0 +1,2 @@
+class Components::<%= @family_cst %>::<%= @comp_cst %> < Compony::Components::New
+end

data/lib/generators/components/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Generate the most used components for a family
+
+Example:
+    bin/rails generate components Users
+
+    This will create and fill with the usual components:
+        app/components/users/

data/lib/generators/components/components_generator.rb

@@ -0,0 +1,12 @@
+class ComponentsGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path('templates', __dir__)
+
+  def add_component
+    @family = name.underscore.pluralize # Force plural
+    @family_cst = @family.camelize.pluralize # Force plural
+
+    %w[Destroy Edit Form New].each do |comp_cst|
+      generate "component #{name}::#{comp_cst}"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compony
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sandro Kalbermatter
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-28 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -207,6 +207,7 @@ files:
 - lib/compony/model_fields/string.rb
 - lib/compony/model_fields/text.rb
 - lib/compony/model_fields/time.rb
+- lib/compony/model_fields/url.rb
 - lib/compony/model_mixin.rb
 - lib/compony/request_context.rb
 - lib/compony/version.rb
@@ -214,6 +215,12 @@ files:
 - lib/generators/component/USAGE
 - lib/generators/component/component_generator.rb
 - lib/generators/component/templates/component.rb.erb
+- lib/generators/component/templates/destroy.rb.erb
+- lib/generators/component/templates/edit.rb.erb
+- lib/generators/component/templates/form.rb.erb
+- lib/generators/component/templates/new.rb.erb
+- lib/generators/components/USAGE
+- lib/generators/components/components_generator.rb
 homepage:
 licenses: []
 metadata: {}