store_model 0.8.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf8ffb4a4b71d2d16c725611c6edefc59a05bf0d52a7eef6d75c113d70eb404a
-  data.tar.gz: f790eaa980f3974843f0f37214a728d85acc9e16f9de82af9d80856ab15074ed
+  metadata.gz: 3f94bfdbb51a596617e73ce1df8cffc444906bbbb2f2815f603b487673ac4038
+  data.tar.gz: 85545a53223eee0ab626d6f2c21974270cb16505c239308c656bf84d24bda54c
 SHA512:
-  metadata.gz: 7ab9e596d345fe2eddd6c638041c8496403f37a7af723694676d599c3d7824dabb95f211ddba6059a304718ea8c3987abb7d197287816b7a7fa6bd377491d6cb
-  data.tar.gz: 73a7f4cab97093f9c2985adc1161b7690cabd112d90f1cb431ffe7488a43a3e07a4cf8f42fceb6ed8e6ae6cb02b4316602db933407a393c2de100c3608fc4368
+  metadata.gz: 9b8dd9df6fd3f0c3d4307e647b95e7e568cf84a177b91d5e2c6fcb6a5ab8dfc8be3dfaa6f71b4bc352f0889b4f64c7f8bba46785d2882cbe83f6b299fd333385
+  data.tar.gz: b05e55818779210c5d1fe6458316f51b940adc09e51521c431eef470d09ba7cecfb6233dcf42b22238e3889fa43c2e9298f1e5895d5b3f1ba538d4b767a80ea3

data/README.md

@@ -44,7 +44,7 @@ This approach works fine when you don't have a lot of keys with logic around the
 
 For instance, try to find a way to validate `:model` value to be required. Despite of the fact, that you'll have to write this validation by hand, it violates single-repsponsibility principle: why parent model (`Product`) should know about the logic related to a child (`Configuration`)?
 
-> 📖 Read more about the motivation in the [Wrapping JSON-based ActiveRecord attributes with classes](https://dev.to/evilmartians/wrapping-json-based-activerecord-attributes-with-classes-4apf) post
+> 📖 Read more about the motivation in the [Wrapping JSON-based ActiveRecord attributes with classes](https://evilmartians.com/chronicles/wrapping-json-based-active-record-attributes-with-classes) post
 
 ## Getting started
 

data/lib/store_model/combine_errors_strategies/merge_error_strategy.rb

@@ -13,7 +13,8 @@ module StoreModel
       # attribute
       def call(attribute, base_errors, store_model_errors)
         if Rails::VERSION::MAJOR < 6 || Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR.zero?
-          base_errors.copy!(store_model_errors)
+          base_errors.delete(attribute)
+          store_model_errors.each { |field, error| base_errors.add(field, error) }
         else
           store_model_errors.errors.each do |error|
             base_errors.add(attribute, :invalid, message: error.full_message)

data/lib/store_model/model.rb

@@ -11,10 +11,13 @@ module StoreModel
     def self.included(base) # :nodoc:
       base.include ActiveModel::Model
       base.include ActiveModel::Attributes
+      base.include ActiveModel::AttributeMethods
       base.include StoreModel::NestedAttributes
 
       base.extend StoreModel::Enum
       base.extend StoreModel::TypeBuilders
+
+      base.attribute_method_suffix "?"
     end
 
     attr_accessor :parent
@@ -40,6 +43,13 @@ module StoreModel
       attributes.all? { |name, value| value == other.attributes[name] }
     end
 
+    # Returns hash for a StoreModel::Model instance based on attributes hash
+    #
+    # @return [Integer]
+    def hash
+      attributes.hash
+    end
+
     # Allows to call :presence validation on the association itself.
     #
     # @return [Boolean]
@@ -70,13 +80,37 @@ module StoreModel
 
     # Checks if the attribute with a given name is defined
     #
+    # @example
+    #    class Person
+    #      include StoreModel::Model
+    #      attribute :name, :string
+    #      alias_attribute :new_name, :name
+    #    end
+    #
+    #    Person.has_attribute?('name')     # => true
+    #    Person.has_attribute?('new_name') # => true
+    #    Person.has_attribute?(:age)       # => true
+    #    Person.has_attribute?(:nothing)   # => false
+    #
     # @param attr_name [String] name of the attribute
     #
     # @return [Boolean]
     # rubocop:disable Naming/PredicateName
     def has_attribute?(attr_name)
-      attribute_types.key?(attr_name.to_s)
+      attr_name = attr_name.to_s
+      attr_name = self.class.attribute_aliases[attr_name] || attr_name
+      attribute_types.key?(attr_name)
     end
+
+    # Legacy implementation of #has_attribute?
+    #
+    # @param attr_name [String] name of the attribute
+    #
+    # @return [Boolean]
+    def _has_attribute?(attr_name)
+      attribute_types.key?(attr_name)
+    end
+
     # rubocop:enable Naming/PredicateName
 
     # Contains a hash of attributes which are not defined but exist in the
@@ -86,5 +120,14 @@ module StoreModel
     def unknown_attributes
       @unknown_attributes ||= {}
     end
+
+    private
+
+    def attribute?(attribute)
+      case value = attributes[attribute]
+      when 0 then false
+      else value.present?
+      end
+    end
   end
 end

data/lib/store_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoreModel # :nodoc:
-  VERSION = "0.8.1"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.11.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord