readymade 0.2.4 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a6e8e90fddf55567acfe262c31551b786d880250075f4cd9c5c651cc4838dfe
-  data.tar.gz: e2349c3664e83acbeb0321d822ae80ddab1ad3a8ec8f97377cc0b2a2117ede68
+  metadata.gz: 78de03a88081398d6f7a8a5f3a16b5311d12488e9e0418e9cd3c8fba74295605
+  data.tar.gz: '0924386861d20eb8bb83426e1cbd824d35b7c72d027b8bc812ca21d8df858984'
 SHA512:
-  metadata.gz: e71191a5f142db70281225f3593f26b3f1e063c5a700ee029db55ca99486ed5e734490da0bd9ed360abb0544f8d4d567949c10f8baef33653a6497934dc99320
-  data.tar.gz: e1c077924ee5fa51a9e2e2ce9f7e520fcf75dda30c3a1400afc938154366abb587b8a0fda092d4dfb283d576a66b90ea34ee7823d21e4a8c880fd09f08c898ef
+  metadata.gz: 5a8182a959f3f8509835963292334ab7eb7912557ac04a312e86d746f77f406c4eb5252da002ba85226881e61e5ac7c8c37a5b818cd48b0c4270355320682834
+  data.tar.gz: 9b716935a3c69428018453240eb60d95a871b3a5862ad2e684258f8f152c737226766b33813a97047df86f3833825c2d4df184f7a7ff27cfe02cf1442f6548f0

data/CHANGELOG.md

@@ -1,6 +1,24 @@
 Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.2.7] - 2022-06-03
+
+### Improvement
+
+* Update `Readymade::Model::ApiAttachable` to support browser native base64 encoding
+
+## [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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    readymade (0.2.4)
+    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

@@ -49,7 +49,7 @@ module Readymade
         ActionDispatch::Http::UploadedFile.new(
           tempfile: Tempfile.new(attachment_file[:filename]).tap do |tf|
             tf.binmode
-            tf.write(Base64.decode64(attachment_file[:base64]))
+            tf.write(Base64.decode64(attachment_file[:base64].split('base64,')[-1]))
           end,
           filename: attachment_file[:filename],
           type: Mime::Type.lookup_by_extension(File.extname(attachment_file[:filename])[1..]).to_s
@@ -58,4 +58,3 @@ module Readymade
     end
   end
 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.4'
+  VERSION = '0.2.7'
 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.4
+  version: 0.2.7
 platform: ruby
 authors:
 - OrestF
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-06-03 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