store_model 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7842213fb20b584acad440071c9e48335e2e42b798e4b59246742c0ce0edde63
-  data.tar.gz: d72f8f61111b3c2e7d03aab2fbb9160fda08aebd8b0a519031e8096daa96c81e
+  metadata.gz: 5f9b992038ac6e32409aeb104f8a6de62c848550a7b79160ce83f777547f0ea0
+  data.tar.gz: 8a2f3e43dbd4dea884581a5ff1caf017eb03e71c17fee015dd83cb95244dc267
 SHA512:
-  metadata.gz: b2156d9c70cf0297d2759ae31736b82b2a93c462ac105c39d649043f039032df77c5ad508b89d860b3b38cd43a60e213ce72cc1f8df8ec5bc6b633c44977d0c5
-  data.tar.gz: 9b002f40458b95dc6ee9f25643c5a602ab68f85a8029af284d4ce8f04e730ac588d87129010510797e8840f948dd04c72c2ec6f84f09a7bdd733f8f5760cc522
+  metadata.gz: 3675e1f7c3b1aea633b3931bde2d4c51e3841633b5712c8b73c7227d07d49edbb7c9ec8e029c5a1b98cf5a2ac6afcc78a2f2a3e2eb39966d4a9f5d9ccbd71e83
+  data.tar.gz: 619425140ebbf8b9cb4fa6d3171977d19aab43b4981647a7c6b4bc28c65e79b0026083459cdec9e6d3761839225e4079ad4496ac361ba0080247d472cf0fd215

data/README.md

@@ -13,7 +13,7 @@ For instance, imagine that you have a model `Product` with a `jsonb` column call
 
 ```ruby
 product = Product.find(params[:id])
-if product.configuration["model"] = "spaceship"
+if product.configuration["model"] == "spaceship"
   product.configuration["color"] = "red"
 end
 product.save
@@ -23,14 +23,12 @@ This approach works fine when you don't have a lot of keys with logic around the
 
 ```ruby
 product = Product.find(params[:id])
-if product.configuration.model = "spaceship"
+if product.configuration.model == "spaceship"
   product.configuration.color = "red"
 end
 product.save
 ```
 
-> **Note**: if you want to work with JSON fields as an attributes, defined on the ActiveRecord model (not in the separate class) - consider using [store_attribute](https://github.com/palkan/store_attribute) or [jsonb_accessor](https://github.com/devmynd/jsonb_accessor).
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -62,7 +60,7 @@ class Configuration
 end
 ```
 
-Attributes shoould be defined using [Rails Attributes API](https://api.rubyonrails.org/classes/ActiveRecord/Attributes/ClassMethods.html). There is a number of types available out of the box, and you can always extend the type system with your own ones.
+Attributes should be defined using [Rails Attributes API](https://api.rubyonrails.org/classes/ActiveRecord/Attributes/ClassMethods.html). There is a number of types available out of the box, and you can always extend the type system with your own ones.
 
 Register the field in the ActiveRecord model class:
 
@@ -172,6 +170,22 @@ class Product < ApplicationRecord
 end
 ```
 
+**Note**: `:store_model` validator does not allow nils by default, if you want to change this behavior - configure the validation with `allow_nil: true`:
+
+```ruby
+class Product < ApplicationRecord
+  attribute :configuration, Configuration.to_type
+
+  validates :configuration, store_model: true, allow_nil: true
+end
+```
+
+## Alternatives
+
+- [store_attribute](https://github.com/palkan/store_attribute) - work with JSON fields as an attributes, defined on the ActiveRecord model (not in the separate class)
+- [jsonb_accessor](https://github.com/devmynd/jsonb_accessor) - same thing, but with built-in queries
+- [attr_json](https://github.com/jrochkind/attr_json) - works like previous one, but using `ActiveModel::Type`
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/active_model/validations/store_model_validator.rb

@@ -5,24 +5,19 @@ require "store_model/combine_errors_strategies"
 
 module ActiveModel
   module Validations
-    class StoreModelValidator < ActiveModel::Validator
-      def validate(record)
-        options[:attributes].each do |attribute|
-          attribute_value = record.send(attribute)
-          combine_errors(record, attribute) if attribute_value&.invalid?
+    class StoreModelValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        if value.nil?
+          record.errors.add(attribute, :blank)
+        elsif value.invalid?
+          strategy.call(attribute, record.errors, value.errors)
         end
       end
 
       private
 
-      def combine_errors(record, attribute)
-        base_errors = record.errors
-        store_model_errors = record.send(attribute).errors
-
-        base_errors.delete(attribute)
-
-        strategy = StoreModel::CombileErrorsStrategies.configure(options)
-        strategy.call(attribute, base_errors, store_model_errors)
+      def strategy
+        StoreModel::CombineErrorsStrategies.configure(options)
       end
     end
   end

data/lib/store_model/combine_errors_strategies.rb

@@ -4,7 +4,7 @@ require "store_model/combine_errors_strategies/mark_invalid_error_strategy"
 require "store_model/combine_errors_strategies/merge_error_strategy"
 
 module StoreModel
-  module CombileErrorsStrategies
+  module CombineErrorsStrategies
     module_function
 
     # Finds a strategy based on options and global config
@@ -14,9 +14,9 @@ module StoreModel
       if configured_strategy.respond_to?(:call)
         configured_strategy
       elsif configured_strategy == true
-        StoreModel::CombileErrorsStrategies::MergeErrorStrategy.new
+        StoreModel::CombineErrorsStrategies::MergeErrorStrategy.new
       elsif configured_strategy.nil?
-        StoreModel::CombileErrorsStrategies::MarkInvalidErrorStrategy.new
+        StoreModel::CombineErrorsStrategies::MarkInvalidErrorStrategy.new
       else
         const_get(configured_strategy.to_s.camelize).new
       end

data/lib/store_model/combine_errors_strategies/mark_invalid_error_strategy.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module StoreModel
-  module CombileErrorsStrategies
+  module CombineErrorsStrategies
     class MarkInvalidErrorStrategy
       def call(attribute, base_errors, _store_model_errors)
-        base_errors.add(attribute, I18n.translate("invalid", scope: "errors.messages"))
+        base_errors.add(attribute, :invalid)
       end
     end
   end

data/lib/store_model/combine_errors_strategies/merge_error_strategy.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module StoreModel
-  module CombileErrorsStrategies
+  module CombineErrorsStrategies
     class MergeErrorStrategy
       def call(_attribute, base_errors, store_model_errors)
         base_errors.copy!(store_model_errors)

data/lib/store_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoreModel
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,8 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gem for working with JSON-backed attributes as ActiveRecord models