yaaf 0.2.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a1722cf68a3ac8c7aa91f75205ff4885bae7a94fbf8764c94c2b0466959174a
-  data.tar.gz: d35126b6b21dbd8e57fa67090ba8802323f4adbd61514cb50b0002adb48e2987
+  metadata.gz: 1f6365d22e17a82c62a4b7ee12928c35056003f5e3ab0ac6e03c83c47e01ab18
+  data.tar.gz: adf77ecf7ccf550b4c11420fd062eb0e2c544a375658cd55d4afbf71c4b328a4
 SHA512:
-  metadata.gz: 64ef092463adeacde6d6a4dd42c660ae005255de36ec6df071575d08086029dd6bd62bd212eba4add212eb437c402edb8f083758e3b1a7d4a61e628ec978d94b
-  data.tar.gz: 26cda08a6ef4ad7dc741ade6ddce45e77720ecf979a9e788492c471ba486ed09b8a4791e81acaf3ac3ed8da875b5483928145ceec5e69c04060cdcb47f94ff41
+  metadata.gz: 9a8d5eaf80ad70bc1dcd3404caa4d23ac96a034e5e851867967a01a79a641b84da050706a365b59bfaa72e2b3340559c13b12e1bc3d992633edbcbb7d4717b44
+  data.tar.gz: d410ed1067bdeb314f6096017d08edc690405714055005109680d86321b3c67de16d9e3a436e16fee64c79dd3343e523d2a3009b56655936f57d8cf6a45715e7

data/README.md

@@ -39,7 +39,7 @@ Form Objects is a design pattern that allows us to:
 3. Keep business logic validations out of models
 
 There are some other form objects gems but we felt none of them provided us all the features that we expected:
-1. Form objects that behaves like Rails models
+1. Form objects that behave like Rails models
 2. Simple to use and to understand the implementation (no magic)
 3. Easy to customize
 4. Gem is well tested and maintained
@@ -50,7 +50,7 @@ If you want to learn more about Form Objects you can check out [these great arti
 
 ### Why YAAF?
 
-- It is [64 lines long](https://github.com/rootstrap/yaaf/blob/master/lib/yaaf/form.rb#L64). As you can imagine, we did no magic in such a few lines of code, we just leveraged Rails modules in order to provide our form objects with a Rails-like behavior. You can review the code, it's easy to understand.
+- It is [71 lines long](https://github.com/rootstrap/yaaf/blob/master/lib/yaaf/form.rb#L71). As you can imagine, we did no magic in such a few lines of code, we just leveraged Rails modules in order to provide our form objects with a Rails-like behavior. You can review the code, it's easy to understand.
 
 - It provides a similar API to `ActiveModel` models so you can treat them interchangeably.
 
@@ -231,7 +231,7 @@ end
 
 ### Callbacks
 
-`YAAF` form objects support validations the same way as `ActiveModel` models. For example:
+`YAAF` form objects support callbacks the same way as `ActiveModel` models. For example:
 
 ```ruby
 class RegistrationForm < YAAF::Form

data/lib/yaaf/form.rb

@@ -8,42 +8,39 @@ module YAAF
     include ::ActiveRecord::Transactions
     define_model_callbacks :save
 
+    delegate :transaction, to: ::ActiveRecord::Base
+
     validate :validate_models
 
     def save(options = {})
-      unless options[:validate] == false
-        return false if invalid?
-      end
-
-      run_callbacks :commit do
-        save_in_transaction(options)
-      end
+      save_form(options)
+    rescue ActiveRecord::RecordInvalid,
+           ActiveRecord::RecordNotSaved,
+           ActiveModel::ValidationError
 
-      true
+      false
     end
 
     def save!(options = {})
-      save(options) || raise(ActiveRecord::RecordNotSaved.new('Failed to save the form', self))
+      save_form(options)
     end
 
     private
 
     attr_accessor :models
 
-    def promote_errors(model)
-      if rails_version_less_than_6_1?
-        model.errors.each do |attribute, message|
-          errors.add(attribute, message)
-        end
-      else
-        model.errors.each do |model_error|
-          errors.add(model_error.attribute, model_error.message)
-        end
+    def save_form(options)
+      validate! unless options[:validate] == false
+
+      run_callbacks :commit do
+        save_in_transaction(options)
       end
+
+      true
     end
 
     def save_in_transaction(options)
-      ::ActiveRecord::Base.transaction do
+      transaction do
         run_callbacks :save do
           save_models(options)
         end
@@ -53,23 +50,22 @@ module YAAF
     end
 
     def save_models(options)
-      models.map { |model| model.save!(options) }
+      options.merge!(validate: false)
+
+      models.map { |model| model.save!(**options) }
     end
 
     def validate_models
-      models.each do |model|
-        promote_errors(model) if model.invalid?
-      end
+      models.each { |model| promote_errors(model) if model.invalid? }
+    end
+
+    def promote_errors(model)
+      errors.merge!(model.errors)
     end
 
     def handle_transaction_rollback(exception)
       run_callbacks :rollback
       raise exception
     end
-
-    def rails_version_less_than_6_1?
-      ActiveModel::VERSION::MAJOR < 6 ||
-        ActiveModel::VERSION::MAJOR == 6 && ActiveModel::VERSION::MINOR.zero?
-    end
   end
 end

data/lib/yaaf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module YAAF
-  VERSION = '0.2.0'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaaf
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Juan Manuel Ramallo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -17,40 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +155,8 @@ licenses:
 metadata:
   homepage_uri: https://github.com/rootstrap/yaaf
   source_code_uri: https://github.com/rootstrap/yaaf
+  bug_tracker_uri: https://github.com/rootstrap/yaaf/issues
+  changelog_uri: https://github.com/rootstrap/yaaf/releases
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -182,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Easing the form object pattern in Rails applications.