compony 0.0.9 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8157d970b7bb216a92e5ff27931775e1744063efcb91bd8c2c094d998bc0d74d
-  data.tar.gz: 1a10cfd007f6c94f2bd71076bd90688bd6761a597962414f56f31570cb4b6c31
+  metadata.gz: ecb0c40f2981194e5fa6a297731c5f224f49c8d73594f016149567da28553c93
+  data.tar.gz: 93b518bd1fd54dd04a628df57f18ee120b2be4485241b50b9143fe136eb4bb14
 SHA512:
-  metadata.gz: 37fdaa0c7e0c6e905fbf5239d79dc9df15bb27e3cf805953fc9daf75e421f04dc14b087165e2049c5e4ff87a13464d197a837cea24517467d591ff115c7f2cd3
-  data.tar.gz: 3f59823928a888c4bb5f501f4e1440ff4e3a1f83f627d23117af9c5b5e7afba65db48168a70685010c9c251f4b7331a232843a6209634ad004c3a15a0ee6653a
+  metadata.gz: d4f6f506c58e51ab3086b8a3870d05bccaefca10529869b90ed11b6ce83f0d76c6c114062c62a99ecdc3fa08dc24b8f55b825a586c640919b176ba2110eb7b7f
+  data.tar.gz: afddee67f4c6659008704e572bee553ec6350f3fb8ad06550089e9b1954a913e5e0faf43b6d83cb35b0ae14f70c4889577cab13fda427f5a9e7d25341a442164

data/CHANGELOG.md

@@ -1,5 +1,33 @@
+# 0.1.1
+
+- Support and force Rails 7.1.2
+
+## Steps to perform
+
+- in `config/application.rb`, replace `config.load_defaults 7.0` by `config.load_defaults 7.1` and add:
+  ```ruby
+    # Please, add to the `ignore` list any other `lib` subdirectories that do
+    # not contain `.rb` files, or that should not be reloaded or eager loaded.
+    # Common ones are `templates`, `generators`, or `middleware`, for example.
+    config.autoload_lib(ignore: %w(assets tasks))
+  ```
+
+# 0.1.0
+
+- Remove (hopefully) obsolete database safeguard in `resolve_association!` as we should no longer be accessing the DB.
+- BREAKING: Remove `primary_key_type` and tolerate int and str as primary and foreign key in all params.
+  - This fixes a bug introduced in 0.0.10 breaking polymorphic relations.
+- Support Rails 7.1
+  - No longer rely on `controller.response.body.blank?` but use `controller.response_body.nil?` instead
+
+## Steps to perform
+
+- Remove any calls to `primary_key_type`
+
 # 0.0.9
 
+Do not use.
+
 - Support forms with references to tables with uuid type primary key
 - Support for `owned_by` in model:
   - Smart redirect
@@ -9,6 +37,10 @@
 - Add features `Compony.content_before_root_comp` and `Compony.content_after_root_comp`
 - Add new field kind percentage
 
+## KNOWN BUGS
+
+- This version breaks polymorphic relations.
+
 # 0.0.8
 
 - Support selecting anchormodel inputs via radio buttons

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    compony (0.0.9.edge)
+    compony (0.1.0)
       anchormodel (~> 0.1.2)
       cancancan (~> 3.4.0)
       dslblend (>= 0.0.3)

data/Rakefile

@@ -17,6 +17,7 @@ task :gemspec do
     s.add_development_dependency 'rubocop', '>= 1.48'
     s.add_development_dependency 'rubocop-rails', '>= 2.18.0'
 
+    s.add_runtime_dependency 'rails', '>= 7.1.2'
     s.add_runtime_dependency 'request_store', '>= 1.5'
     s.add_runtime_dependency 'dyny', '>= 0.0.3'
     s.add_runtime_dependency 'schemacop', '>= 3.0.17'

data/compony.gemspec

@@ -2,31 +2,32 @@
 # This file is auto-generated via: 'rake gemspec'.
 
 # -*- encoding: utf-8 -*-
-# stub: compony 0.0.9 ruby lib
+# stub: compony 0.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "compony".freeze
-  s.version = "0.0.9"
+  s.version = "0.1.1".freeze
 
   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-11-03"
+  s.date = "2023-11-23"
   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/percentage.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.rubygems_version = "3.4.21".freeze
   s.summary = "Needs summary".freeze
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<yard>.freeze, [">= 0.9.28"])
-  s.add_development_dependency(%q<rubocop>.freeze, [">= 1.48"])
-  s.add_development_dependency(%q<rubocop-rails>.freeze, [">= 2.18.0"])
-  s.add_runtime_dependency(%q<request_store>.freeze, [">= 1.5"])
-  s.add_runtime_dependency(%q<dyny>.freeze, [">= 0.0.3"])
-  s.add_runtime_dependency(%q<schemacop>.freeze, [">= 3.0.17"])
-  s.add_runtime_dependency(%q<simple_form>.freeze, [">= 5.1.0"])
-  s.add_runtime_dependency(%q<dslblend>.freeze, [">= 0.0.3"])
-  s.add_runtime_dependency(%q<anchormodel>.freeze, ["~> 0.1.2"])
-  s.add_runtime_dependency(%q<cancancan>.freeze, ["~> 3.4.0"])
+  s.add_development_dependency(%q<yard>.freeze, [">= 0.9.28".freeze])
+  s.add_development_dependency(%q<rubocop>.freeze, [">= 1.48".freeze])
+  s.add_development_dependency(%q<rubocop-rails>.freeze, [">= 2.18.0".freeze])
+  s.add_runtime_dependency(%q<rails>.freeze, [">= 7.1.2".freeze])
+  s.add_runtime_dependency(%q<request_store>.freeze, [">= 1.5".freeze])
+  s.add_runtime_dependency(%q<dyny>.freeze, [">= 0.0.3".freeze])
+  s.add_runtime_dependency(%q<schemacop>.freeze, [">= 3.0.17".freeze])
+  s.add_runtime_dependency(%q<simple_form>.freeze, [">= 5.1.0".freeze])
+  s.add_runtime_dependency(%q<dslblend>.freeze, [">= 0.0.3".freeze])
+  s.add_runtime_dependency(%q<anchormodel>.freeze, ["~> 0.1.2".freeze])
+  s.add_runtime_dependency(%q<cancancan>.freeze, ["~> 3.4.0".freeze])
 end

data/lib/compony/component.rb

@@ -152,7 +152,7 @@ module Compony
       # Call before_render hook if any and backfire instance variables back to the component
       RequestContext.new(self, controller, locals:).request_context.evaluate_with_backfire(&@before_render_block) if @before_render_block
       # Render, unless before_render has already issued a body (e.g. through redirecting).
-      if controller.response.body.blank?
+      if controller.response_body.nil?
         fail "#{self.class.inspect} must define `content` or set a response body in `before_render`" if @content_blocks.none?
         return controller.render_to_string(
           type:   :dyny,

data/lib/compony/components/destroy.rb

@@ -43,12 +43,10 @@ module Compony
 
         store_data do
           # Validate params against the form's schema
-          local_data = @data # Capture data for usage in the Schemacop call
           schema = Schemacop::Schema3.new :hash, additional_properties: true do
-            if local_data.class.primary_key_type_key == :string
-              str! :id
-            else
-              int! :id, cast_str: true
+            any_of! :id do
+              str
+              int cast_str: true
             end
           end
           schema.validate!(controller.request.params)

data/lib/compony/components/edit.rb

@@ -44,10 +44,9 @@ module Compony
           local_form_comp = form_comp # Capture form_comp for usage in the Schemacop call
           local_data = @data # Capture data for usage in the Schemacop call
           schema = Schemacop::Schema3.new :hash, additional_properties: true do
-            if local_data.class.primary_key_type_key == :string
-              str! :id
-            else
-              int! :id, cast_str: true
+            any_of! :id do
+              str
+              int cast_str: true
             end
             hsh? local_form_comp.schema_wrapper_key_for(local_data), &local_form_comp.schema_block_for(local_data)
           end

data/lib/compony/engine.rb

@@ -1,13 +1,15 @@
+module ::Components; end
+
 module Compony
   class Engine < Rails::Engine
     initializer 'compony.configure_eager_load_paths', before: :load_environment_hook, group: :all do
       # Allow app/components/foo/bar.rb to define constants Components::Foo::Bar and make sure components are eager loaded (needed for route generation etc.)
-      Rails.application.config.eager_load_paths.delete(Rails.root.join('app', 'components').to_s)
-      Rails.application.config.eager_load_paths.unshift(Rails.root.join('app').to_s)
-
-      # Prevent *.rb files in assets and views directories to be loaded
-      Rails.autoloaders.main.ignore(Rails.root.join('app', 'assets').to_s)
-      Rails.autoloaders.main.ignore(Rails.root.join('app', 'views').to_s)
+      Rails.autoloaders.main.push_dir(Rails.root.join('app', 'components'), namespace: ::Components)
+      unless Rails.application.config.eager_load
+        Rails.application.config.to_prepare do
+          Rails.autoloaders.main.eager_load_dir(Rails.root.join('app', 'components'))
+        end
+      end
     end
 
     initializer 'compony.controller_mixin' do

data/lib/compony/model_fields/association.rb

@@ -24,27 +24,20 @@ module Compony
 
       def schema_line
         local_schema_key = @schema_key # Capture schema_key as it will not be available within the lambda
-        target_primary_key_type = @target_class.primary_key_type_key
         if multi?
           return proc do
             ary? local_schema_key do
-              if target_primary_key_type == :integer
-                list :integer, cast_str: true
-              elsif target_primary_key_type == :string
-                list :string
-              else
-                fail("Unsupported target primary_key_type_key #{target_primary_key_type}")
+              list :any_of do
+                int cast_str: true
+                str
               end
             end
           end
         else
           return proc do
-            if target_primary_key_type == :integer
-              int? local_schema_key, cast_str: true
-            elsif target_primary_key_type == :string
-              str? local_schema_key
-            else
-              fail("Unsupported target primary_key_type_key #{target_primary_key_type}")
+            any_of? local_schema_key do
+              str
+              int cast_str: true
             end
           end
         end
@@ -66,11 +59,8 @@ module Compony
         @association = true
         association_info = @model_class.reflect_on_association(@name) || fail("Association #{@name.inspect} does not exist for #{@model_class.inspect}.")
         @multi = association_info.macro == :has_many
-        @target_class = association_info.klass
         id_name = "#{@name.to_s.singularize}_id"
         @schema_key = @multi ? id_name.pluralize.to_sym : id_name.to_sym
-      rescue ActiveRecord::NoDatabaseError
-        Rails.logger.warn('Warning: Compony could not auto-detect fields due to missing database. This is ok when running db:create.')
       end
     end
   end

data/lib/compony/model_mixin.rb

@@ -5,7 +5,6 @@ module Compony
     included do
       class_attribute :fields, default: {}
       class_attribute :feasibility_preventions, default: {}
-      class_attribute :primary_key_type_key, default: :integer
       class_attribute :owner_model_attr
 
       class_attribute :autodetect_feasibilities_completed, default: false
@@ -27,14 +26,6 @@ module Compony
         fields[name] = Compony.model_field_class_for(type.to_s.camelize).new(name, self, **extra_attrs)
       end
 
-      # DSL method, sets the primary key type
-      def primary_key_type(new_type)
-        unless %i[integer string].include?(new_type.to_sym)
-          fail("#{self} is declaring primary_key_type as #{new_type.inspect} but only :integer and :string are supported at this time.")
-        end
-        self.primary_key_type_key = new_type.to_sym
-      end
-
       # DSL method, sets the containing model.
       # Use this when a model only makes sense within the context of another model and typically has no own index page.
       # For instance, a model LineItem that belongs_to :invoice would typically be owned_by :invoice.

data/lib/compony/version.rb

@@ -1,8 +1,8 @@
 module Compony
   module Version
     MAJOR = 0
-    MINOR = 0
-    PATCH = 9
+    MINOR = 1
+    PATCH = 1
 
     EDGE = false
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compony
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.1
 platform: ruby
 authors:
 - Sandro Kalbermatter
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.18.0
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.2
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement