readymade 0.2.3 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f26bb52b5176c6325c252ac67735fbd6f21f26ad194d0dbdc9e915e421421840
-  data.tar.gz: b0500fc448b0681c6e436ad2f22fd2f43d880542500042a7bb9853a69d58fdd0
+  metadata.gz: 9f32e2e65f330e17be52ef81b4b998905a3ebf586026ad53fd93c4d6349f66ad
+  data.tar.gz: 67b118d934e376684a0e9a7b76116a5f71f070a13fe6ae4a736cf1c0b5852388
 SHA512:
-  metadata.gz: 93cde55d0896d28b379fa699846abed6e3d8e72d2dbae8f7027b2813cc4a5fa277d8b1c07f8d0fe1905890cbf0b2fa654caeed7a8b791ff4ada4ac995d0edfd9
-  data.tar.gz: b1928db06558f7d28c83cda0827f065f3e8278567647844ab9f768fdf70183b2b1126e6fc016cb93df0d36f258152713372c0f8ef899bfbb026b1d11e35c327f
+  metadata.gz: ad656ea48e81585d91232caa3a8f107fb9eaa06174c3df6cef346e66c4efb0986dce0b0729b10facb4d1954c907e04a501ab48ae910c367af84026443ed5d712
+  data.tar.gz: bd994daea95faa0a0354ad7483cf92c33ee0915a6a85f3e56fd698c64ee5919c059d5a63ab49f6da2a2a2e90fb306b3c1aa7343f38af3884c332c53baa115ba8

data/CHANGELOG.md

@@ -1,6 +1,24 @@
 Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.2.6] - 2022-05-24
+
+### Features
+
+* Add `Readymade::Model::Filterable` - model concern for scopes filtering
+
+## [0.2.5] - 2022-05-19
+
+### Improvements
+
+* Form#required_attributes returns `[]` if `params[:_destroy]` present
+
+## [0.2.4] - 2022-05-12
+
+### Fixes
+
+* Fix ApiAttachable empty attachments for non hash assignement
+
 ## [0.2.3] - 2022-05-03
 
 ### Features

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    readymade (0.2.3)
+    readymade (0.2.6)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -195,6 +195,21 @@ let(:avatar) { Rack::Test::UploadedFile.new(Rails.root.join('spec/support/assets
 let(:params) { { user: attributes_for(:user).merge!(avatar: to_api_file(avatar)) } }
 ```
 
+### Readymade::Model::Filterable
+
+```ruby
+class User < ApplicationRecord
+  include Readyamde::Model::Filterable
+  
+  scope :by_status, ->(status) { where(status: status) }
+  scope :by_role, ->(role) { where(role: role) }
+end
+```
+
+```ruby
+User.all.filter_collection({ by_status: 'active', by_role: 'manager' })
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/readymade/form.rb

@@ -45,6 +45,8 @@ module Readymade
     end
 
     def required_attributes
+      return [] if params.try(:[], :_destroy).present?
+
       @required_attributes ||= self.class::REQUIRED_ATTRIBUTES
     end
 
@@ -79,9 +81,17 @@ module Readymade
 
     # copy errors from nested forms into parent form
     def sync_nested_errors(nested_forms)
-      nested_forms.each do |n_form|
-        n_form.errors.each do |code, text|
-          errors.add("#{n_form.humanized_name}.#{code}", text)
+      if rails_errors_v2?
+        nested_forms.each do |n_form|
+          n_form.errors.each do |code|
+            errors.add("#{n_form.humanized_name}.#{code.attribute}", code.message)
+          end
+        end
+      else
+        nested_forms.each do |n_form|
+          n_form.errors.each do |code, text|
+            errors.add("#{n_form.humanized_name}.#{code}", text)
+          end
         end
       end
 
@@ -92,7 +102,7 @@ module Readymade
     def sync_errors(from: self, to: record)
       return if [from, to].any?(&:blank?)
 
-      if Rails.version.to_f > 6.0
+      if rails_errors_v2?
         from.errors.messages.each do |key, values|
           Array.wrap(values).uniq.each do |uv|
             to.errors.add(key, uv)
@@ -145,6 +155,12 @@ module Readymade
       {}
     end
 
+    private
+
+    def rails_errors_v2?
+      Rails.version.to_f > 6.0
+    end
+
     # EXAMPLE
     # class Items::Forms::Create::Value < ::Readymade::Form
     #   PERMITTED_ATTRIBUTES = %i[vat_percent price_type item_category].freeze

data/lib/readymade/model/api_attachable.rb

@@ -22,7 +22,7 @@ module Readymade
         has_many_attached_reflections.map(&:name).each do |attachment_method_name|
           define_method("#{attachment_method_name}=") do |attachment_file|
             attachment_file = Array.wrap(attachment_file).map do |af|
-              api_attachment_to_uploaded(af) if api_attachable_format?(af)
+              api_attachable_format?(af) ? api_attachment_to_uploaded(af) : af
             end
             super(attachment_file)
           end

data/lib/readymade/model/filterable.rb

@@ -0,0 +1,34 @@
+require 'active_support/concern'
+
+module Readymade
+  module Model
+    module Filterable
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def send_chain(methods, scope = self)
+          return scope if methods.blank?
+
+          if methods.respond_to?(:keys)
+            methods.inject(scope) do |obj, (method, value)|
+              obj.send(method, value)
+            end
+          else
+            methods.inject(scope) do |obj, method|
+              obj.send(method)
+            end
+          end
+        end
+
+        def filter_collection(filtering_params)
+          filtering_params.permit! if filtering_params.respond_to?(:permit)
+
+          regular_params = filtering_params.select { |_key, value| value.present? }.to_h
+          custom_params = filtering_params.to_h.select { |_key, value| value.is_a?(String) && value.start_with?('without_') }.values
+
+          send_chain(regular_params, send_chain(custom_params)).distinct
+        end
+      end
+    end
+  end
+end

data/lib/readymade/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Readymade
-  VERSION = '0.2.3'
+  VERSION = '0.2.6'
 end

data/lib/readymade.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'readymade/model/api_attachable'
+require 'readymade/model/filterable'
 require 'readymade/controller/serialization'
 require 'readymade/action'
 require 'readymade/form'

data/readymade.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.files << 'lib/readymade/model/api_attachable.rb'
+  spec.files << 'lib/readymade/model/filterable.rb'
   spec.files << 'lib/readymade/controller/serialization.rb'
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: readymade
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.6
 platform: ruby
 authors:
 - OrestF
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -77,6 +77,7 @@ files:
 - lib/readymade/form.rb
 - lib/readymade/instant_form.rb
 - lib/readymade/model/api_attachable.rb
+- lib/readymade/model/filterable.rb
 - lib/readymade/operation.rb
 - lib/readymade/response.rb
 - lib/readymade/version.rb