store_model 4.1.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 707c92ee43a892de445a4abd3e2252dba4eda3c90b67d22a80aa47f63cb3e73d
-  data.tar.gz: 939854af9b309cdd947001a9f9e12d86e0dabcd9bb7c9479bf091e634c0ff391
+  metadata.gz: 80b3d46c14f2f0952709d1c0bd2d4ea2a3455cbedbeeb428a48e42886ef59270
+  data.tar.gz: 7f1b852caa46ca69e49e5f4a9ca58194b4bf2a9d63caa1dc295444b6913407b8
 SHA512:
-  metadata.gz: 7e5fdc3f088ec748ff2c23f7cac124faac4ec30a09cb55809b3cd2ad0db655a40891342d1ea8ee61149df0a5f3f532972ca9dc650e1e88c6bb8bd3bdaf1bbe8b
-  data.tar.gz: 1a8f8a29238fe6e51142ca468f3f84be30b4fc8e3cb9e343682a3cd525abf1e45d75da2fb02eedcbe156c3cb967ef8828a8eec21d3bb6e0809a4c1f789cd179f
+  metadata.gz: e895325edadf56ff398ae92f3968205efbc7e75f8ed5d1b06b2465224e223efef80ac366d968644030b9148550e88801cfad8908dd61348b31507ad4c793ae11
+  data.tar.gz: 1766b1327befd59eefc5186220202edbea2478080f5546b5042e2d01feb1d4f536c3aba66b8b7c247c06811673d4f5430823d31b132965ba7b0fca34cb0e873e

data/README.md

@@ -111,7 +111,7 @@ Resulting in:
 In the controller:
 ```ruby
 def create
-  @supplier = Supplier.new(supplier_params)
+  @supplier = Supplier.from_value(supplier_params)
   @supplier.save
 end
 
@@ -126,6 +126,7 @@ end
 
 1. [Installation](./docs/installation.md)
 2. StoreModel::Model API:
+  * [Instantiation](./docs/instantiation.md)
   * [Validations](./docs/validations.md)
   * [Enums](./docs/enums.md)
   * [Nested models](./docs/nested_models.md)

data/lib/store_model/model.rb

@@ -19,6 +19,19 @@ module StoreModel
       base.extend StoreModel::TypeBuilders
 
       base.attribute_method_suffix "?"
+
+      base.extend(ClassMethods)
+    end
+
+    # Class methods for StoreModel::Model
+    module ClassMethods
+      def from_value(value)
+        to_type.cast_value(value)
+      end
+
+      def from_values(values)
+        to_array_type.cast_value(values)
+      end
     end
 
     attr_accessor :parent

data/lib/store_model/nested_attributes.rb

@@ -8,6 +8,17 @@ module StoreModel
     end
 
     module ClassMethods # :nodoc:
+      # gather storemodel attribute types on the class-level
+      def store_model_attribute_types
+        @store_model_attribute_types ||= {}
+      end
+
+      # add storemodel type of attribute if it is storemodel type
+      def attribute(name, type = nil, **)
+        store_model_attribute_types[name.to_s] = type if type.is_a?(Types::Base)
+        super
+      end
+
       # Enables handling of nested StoreModel::Model attributes
       #
       # @param associations [Array] list of associations and options to define attributes, for example:
@@ -38,8 +49,7 @@ module StoreModel
         options = attributes.extract_options!
 
         attributes.each do |attribute|
-          case nested_attribute_type(attribute)
-          when Types::OneBase, Types::ManyBase
+          if nested_attribute_type(attribute).is_a?(Types::Base)
             options.reverse_merge!(allow_destroy: false, update_only: false)
             define_store_model_attr_accessors(attribute, options)
           else
@@ -50,17 +60,19 @@ module StoreModel
 
       private
 
-      # If attribute defined in ActiveRecord model but you dont yet have database created
-      # you cannot access attribute types.
-      # To handle this case, we can use ActiveRecord::Attributes 'attributes_to_define_after_schema_loads'
-      # which stores information about custom defined attributes.
-      # See ActiveRecord::Attributes#atribute
-      # If #accepts_nested_attributes_for is used inside active model instance
-      # schema is not required to determine attribute type so we can still use attribute_types
-      # If schema loaded the attribute_types already populated and we can safely use it
-      # See ActiveRecord::ModelSchema#load_schema!
+      # when db connection is not available, it becomes impossible to read attributes types from
+      # ActiveModel::AttributeRegistration::ClassMethods.attribute_types, because activerecord
+      # overrides _default_attributes and triggers db connection.
+      # for activerecord model only use attribute_types if it has db connected
+      #
+      # @param attribute [String, Symbol]
+      # @return [StoreModel::Types::Base, nil]
       def nested_attribute_type(attribute)
-        attribute_types[attribute.to_s]
+        if self < ActiveRecord::Base && !schema_loaded?
+          store_model_attribute_types[attribute.to_s]
+        else
+          attribute_types[attribute.to_s]
+        end
       end
 
       def define_store_model_attr_accessors(attribute, options) # rubocop:disable Metrics/MethodLength
@@ -121,12 +133,12 @@ module StoreModel
         end
       end
 
-      attributes.reject! { |attribute| call_reject_if(attribute, options[:reject_if]) } if options&.dig(:reject_if)
+      attributes.reject! { call_store_model_reject_if(_1, options[:reject_if]) } if options&.dig(:reject_if)
 
       send("#{association}=", attributes)
     end
 
-    def call_reject_if(attributes, callback)
+    def call_store_model_reject_if(attributes, callback)
       callback = ActiveRecord::NestedAttributes::ClassMethods::REJECT_ALL_BLANK_PROC if callback == :all_blank
 
       case callback

data/lib/store_model/types/base.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "active_model"
+
+module StoreModel
+  module Types
+    # Base type for StoreModel::Model
+    class Base < ActiveModel::Type::Value
+      attr_reader :model_klass
+
+      # Returns type
+      #
+      # @return [Symbol]
+      def type
+        raise NotImplementedError
+      end
+
+      protected
+
+      def raise_cast_error(_value)
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/store_model/types/many_base.rb

@@ -4,18 +4,8 @@ require "active_model"
 
 module StoreModel
   module Types
-    # Implements ActiveModel::Type::Value type for handling an array of
-    # StoreModel::Model
-    class ManyBase < ActiveModel::Type::Value
-      attr_reader :model_klass
-
-      # Returns type
-      #
-      # @return [Symbol]
-      def type
-        raise NotImplementedError
-      end
-
+    # Implements type for handling an array of StoreModel::Model
+    class ManyBase < Base
       # Casts +value+ from DB or user to StoreModel::Model instance
       #
       # @param value [Object] a value to cast
@@ -70,10 +60,6 @@ module StoreModel
         raise NotImplementedError
       end
 
-      def raise_cast_error(_value)
-        raise NotImplementedError
-      end
-
       private
 
       # rubocop:disable Style/RescueModifier

data/lib/store_model/types/one_base.rb

@@ -4,17 +4,8 @@ require "active_model"
 
 module StoreModel
   module Types
-    # Implements ActiveModel::Type::Value type for handling an instance of StoreModel::Model
-    class OneBase < ActiveModel::Type::Value
-      attr_reader :model_klass
-
-      # Returns type
-      #
-      # @return [Symbol]
-      def type
-        raise NotImplementedError
-      end
-
+    # Implements type for handling an instance of StoreModel::Model
+    class OneBase < Base
       # Casts +value+ from DB or user to StoreModel::Model instance
       #
       # @param value [Object] a value to cast
@@ -36,10 +27,6 @@ module StoreModel
 
       protected
 
-      def raise_cast_error(_value)
-        raise NotImplementedError
-      end
-
       def model_instance(_value)
         raise NotImplementedError
       end

data/lib/store_model/types/one_polymorphic.rb

@@ -35,12 +35,12 @@ module StoreModel
 
         if value.is_a?(String)
           decode_and_initialize(value)
+        elsif value.class.ancestors.include?(StoreModel::Model)
+          value
         elsif value.respond_to?(:to_h) # Hash itself included
           extract_model_klass(value).new(value.to_h)
         else
-          raise_cast_error(value) unless value.class.ancestors.include?(StoreModel::Model)
-
-          value
+          raise_cast_error(value)
         end
       rescue ActiveModel::UnknownAttributeError => e
         handle_unknown_attribute(value, e)

data/lib/store_model/types.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "store_model/types/polymorphic_helper"
+require "store_model/types/base"
 
 require "store_model/types/one_base"
 require "store_model/types/one"

data/lib/store_model/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.1
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-05 00:00:00.000000000 Z
+date: 2025-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -92,6 +92,7 @@ files:
 - lib/store_model/railtie.rb
 - lib/store_model/type_builders.rb
 - lib/store_model/types.rb
+- lib/store_model/types/base.rb
 - lib/store_model/types/enum_type.rb
 - lib/store_model/types/many.rb
 - lib/store_model/types/many_base.rb