abyme 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e71aaa0391ddf79198fbd0e3076b7899ecd8a72abbfac41429d416f3a671dccc
-  data.tar.gz: 382947241368e89f93142bb5b0c9b34f1af8323f5d8689fd54d2dd4a7907385e
+  metadata.gz: aa7e981607f8bab371a8cef7529510076e0095db0b3c1908ba045e21df10a476
+  data.tar.gz: f25822329ba46b8418e4d0507291b590a3ce3e9b1f2ff2a7b25ff78821fbb0dd
 SHA512:
-  metadata.gz: 34cc3af27975485027977aa98f51419924ec4d42f3f72a0a03c559eaed18bb2a2e5734efc9345ed10631740f7860b63691e42da159c84e89e27711505ce19a6c
-  data.tar.gz: e9588871ddce9c79d34d77511a9f56f29a280177a5dc9f9fe056cc7540ce2e28d3b0a64d6ceb5735811cd910e9cf1692e4a5ff81a87eaec8d0a0c4d466ff216d
+  metadata.gz: 77ea88778c1373472d1c8af396e235e6d51331ffabab8b613763a0fabb89ced08d76d0741af52254774d80011a2a77786520fd52f4385de8e212b5f3858884f4
+  data.tar.gz: 999cadbcf32145e4f1968815779d1828f04a272c1923135a5a049b40e676889755349c19b377f1b97913301b15ffce2650e9f4641442b4037d4851a1ba73b353

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abyme (0.6.3)
+    abyme (0.6.4)
 
 GEM
   remote: https://rubygems.org/
@@ -100,11 +100,9 @@ GEM
     marcel (1.0.1)
     method_source (1.0.0)
     mini_mime (1.1.0)
-    mini_portile2 (2.5.3)
     minitest (5.14.4)
     nio4r (2.5.7)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.11.7-x86_64-darwin)
       racc (~> 1.4)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -211,7 +209,7 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
   abyme!

data/abyme.gemspec

@@ -26,6 +26,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  # SimpleForm dependency is only required for test purposes and optional behaviour
+  spec.add_development_dependency 'simple_form'
+
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   # Tests
@@ -42,7 +45,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'web-console'
-  spec.add_development_dependency 'simple_form'
 
   spec.add_development_dependency 'puma'
   spec.add_development_dependency 'simplecov'

data/lib/abyme/version.rb

@@ -3,7 +3,7 @@ module Abyme
   module VERSION
     MAJOR = 0
     MINOR = 6
-    PATCH = 3
+    PATCH = 4
 
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end

data/lib/abyme/view_helpers.rb

@@ -113,7 +113,7 @@ module Abyme
 
       content_tag(:div, build_attributes(wrapper_default, options[:wrapper_html])) do
         content_tag(:template, class: "abyme--#{association.to_s.singularize}_template", data: {abyme_target: "template"}) do
-          form.fields_for association, association.to_s.classify.constantize.new, child_index: "NEW_RECORD" do |f|
+          fields_for_builder form, association, association.to_s.classify.constantize.new, child_index: "NEW_RECORD" do |f|
             content_tag(:div, build_attributes(fields_default, basic_fields_markup(options[:fields_html], association))) do
               # Here, if a block is passed, we're passing the association fields to it, rather than the form itself
               # block_given? ? yield(f) : render(options[:partial] || "abyme/#{association.to_s.singularize}_fields", f: f)
@@ -182,7 +182,7 @@ module Abyme
       end
 
       content_tag(:div, options[:wrapper_html]) do
-        form.fields_for(association, records) do |f|
+        fields_for_builder(form, association, records) do |f|
           content_tag(:div, build_attributes(fields_default, basic_fields_markup(options[:fields_html], association))) do
             block_given? ? yield(f) : render_association_partial(association, f, options[:partial])
           end
@@ -213,6 +213,19 @@ module Abyme
 
     private
 
+    # FORM BUILDER SELECTION
+
+    # If form builder inherits from SimpleForm, we should use its fields_for helper to keep the wrapper options
+    # :nocov:
+    def fields_for_builder(form, association, records, options = {}, &block)
+      if defined?(SimpleForm) && form.instance_of?(SimpleForm::FormBuilder)
+        form.simple_fields_for(association, records, options, &block)
+      else
+        form.fields_for(association, records, options, &block)
+      end
+    end
+    # :nocov:
+
     # CREATE_BUTTON
 
     # this helper is call by either add_associated_record or remove_associated_record

data/lib/generators/abyme/view/view_generator.rb

@@ -8,6 +8,7 @@ module Abyme
       argument :association, type: :string, required: true, banner: "association association"
       argument :attributes, type: :array, default: [], banner: "field field"
 
+      # :nocov:
       def create_partial_file
         create_file partial_file_path
         if defined?(SimpleForm)
@@ -16,6 +17,7 @@ module Abyme
           insert_fields
         end
       end
+      # :nocov:
 
       private
 
@@ -23,6 +25,7 @@ module Abyme
         Rails.root.join("app", "views", "abyme", "_#{association.downcase.singularize}_fields.html.erb")
       end
 
+      # :nocov:
       def insert_fields(builder = nil)
         return unless File.exist? partial_file_path
         if builder == :simple_form
@@ -31,6 +34,7 @@ module Abyme
           insert_into_file(partial_file_path, "<%# Insert #{association.downcase} fields below %>\n" << default_keys)
         end
       end
+      # :nocov:
 
       def simple_form_fields
         inputs = if attributes.include?("all_attributes")

data/lib/templates/erb/scaffold/_form.html.erb

@@ -0,0 +1,15 @@
+<%# frozen_string_literal: true %>
+<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
+  <%%= f.error_notification %>
+  <%%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
+
+  <div class="form-inputs">
+  <%- attributes.each do |attribute| -%>
+    <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
+  <%- end -%>
+  </div>
+
+  <div class="form-actions">
+    <%%= f.button :submit %>
+  </div>
+<%% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abyme
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Romain Sanson
@@ -9,8 +9,22 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-07-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: simple_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -193,20 +207,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simple_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -300,6 +300,7 @@ files:
 - lib/generators/abyme/stimulus/stimulus_generator.rb
 - lib/generators/abyme/view/USAGE
 - lib/generators/abyme/view/view_generator.rb
+- lib/templates/erb/scaffold/_form.html.erb
 - node_modules/.yarn-integrity
 - package-lock.json
 - package.json