statinize 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3dda46ee65052ce2579b2b223c659c3c76d68d85df008400d14432aeaf53fb1
-  data.tar.gz: bd60810a6e386bdad9d9628dc9f1cb2f0cf2b1e04df41f6fc1762109c7909081
+  metadata.gz: 667a2ecdfba95106c743143e47a3373c1c5dab105f82b1f69b3384c84e2aeb4a
+  data.tar.gz: f1005a83f8ae7a816f1b9bea2f8cdca1812e4bcd7a32bed2b928a8338fe68682
 SHA512:
-  metadata.gz: d3ca8f71c4efa6b8298fffc4ff94fa45193d7aa0ef60bfb6128ca539683c8500086362e520c6e8937dfd82d7896475d90854b01a947a38519d08105a4c048cb3
-  data.tar.gz: d2d6b696b3195cd9b75cfe8b35ce7eb149965ed89c3d79c2f3737e575cb5bcd2a2be80e6e5061c712e4f68a57aa9d71fcdf90a4c5c36a2e7d7f4069d07a2826b
+  metadata.gz: 0b888eaccd5ae0e23cc8a303abdaf8207fcc0f1bcd618bbe1985d71e3fc1b77c2b4e65e5a98bdcd04468e7977a37c69a8af732b1d1035c856f7fe0561b5359a7
+  data.tar.gz: bd422a1a7ddb0b917c895ebc8078b071b07bc1b35cb2090c2750a451df119adc668ba9e727d1ad11b534f44a37a58772ddc7f6837e996970d6990d75b7d38f9a

data/lib/statinize/attribute.rb

@@ -17,7 +17,11 @@ module Statinize
     end
 
     def create
-      statinizer.add_attribute(self) unless attribute?
+      if attribute?
+        statinizer.attributes.find { |a| a.name == name }.options = options
+      else
+        statinizer.add_attribute(self)
+      end
       klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
         def #{name}
           @#{name}

data/lib/statinize/dsl.rb

@@ -37,24 +37,5 @@ module Statinize
     def force(force = nil)
       force.nil? ? @force : @force = force
     end
-
-    protected
-
-    def merge_options(**options)
-      attributes.each do |attribute|
-        attribute.options.each do |option|
-          option.merge!(options)
-        end
-      end
-    end
-
-    def populate(attrs)
-      attrs.each do |attr|
-        attribute attr.name
-        attributes
-          .find { _1.name == attr.name }
-          .options = attr.options.clone
-      end
-    end
   end
 end

data/lib/statinize/errors.rb

@@ -5,7 +5,9 @@ module Statinize
 
   class InvalidConditionError < StandardError; end
 
-  class UndefinedAttribute < StandardError; end
+  class UndefinedAttributeError < StandardError; end
+
+  class UnknownAttributeError < StandardError; end
 
   class Errors < Hash
     def nice

data/lib/statinize/statinizable.rb

@@ -3,12 +3,25 @@ module Statinize
     def self.included(klass)
       klass.extend(ClassMethods)
       klass.prepend(PrependedMethods)
+
+      statinized_ancestors = klass.ancestors
+        .reject { |a| a == klass || a == Statinize::Statinizable }
+        .select { |a| a.ancestors.include? Statinize::Statinizable }
+
+      if statinized_ancestors.any?
+        klass.instance_variable_set("@statinizer", Statinizer.new(klass))
+
+        statinized_ancestors.each do |ancestor|
+          klass.statinizer.populate(ancestor.statinizer.attributes)
+        end
+      end
     end
 
     module PrependedMethods
       def initialize(options = {}, *args, **kwargs, &block)
-        symbolized = kwargs.transform_keys(&:to_sym)
-          .merge(options.transform_keys(&:to_sym))
+        symbolized = kwargs.merge(options).transform_keys(&:to_sym)
+        extra_attributes = symbolized.keys.map(&:to_sym) - statinizer.attributes.map(&:name).map(&:to_sym)
+        raise UnknownAttributeError, "Attributes #{extra_attributes.join(", ")} are unknown" if extra_attributes.any?
 
         if private_methods(false).include? :initialize
           super(*args, **kwargs, &block)
@@ -47,9 +60,9 @@ module Statinize
 
       private
 
-      def check_defined!(kwargs)
+      def check_defined!(options)
         statinizer.attributes.map(&:name).each do |attr|
-          undefined_attrs << attr if public_send(attr) != kwargs[attr] || !kwargs.key?(attr)
+          undefined_attrs << attr if public_send(attr) != options[attr] || !options.key?(attr)
         end
 
         raise UndefinedAttributeError, "Not all attributes defined in statinize block are defined in initialize"
@@ -58,7 +71,7 @@ module Statinize
 
     module ClassMethods
       def statinize(&block)
-        @statinizer = Statinizer.new(self)
+        @statinizer = Statinizer.new(self) unless @statinizer
 
         statinizer.instance_eval(&block)
 
@@ -68,6 +81,11 @@ module Statinize
       def statinizer
         @statinizer
       end
+
+      def inherited(klass)
+        super(klass)
+        klass.include(Statinize::Statinizable)
+      end
     end
   end
 end

data/lib/statinize/statinizer.rb

@@ -23,7 +23,7 @@ module Statinize
     end
 
     def add_attribute(attribute)
-      attributes.add(attribute) unless attribute? attribute
+      attributes.add(attribute)
     end
 
     def attributes
@@ -44,6 +44,23 @@ module Statinize
       raise NoSuchValidatorError unless all_validators_defined?
     end
 
+    def merge_options(**options)
+      attributes.each do |attribute|
+        attribute.options.each do |option|
+          option.merge!(options)
+        end
+      end
+    end
+
+    def populate(attrs)
+      attrs.each do |attr|
+        attribute attr.name
+        attributes
+          .find { _1.name == attr.name }
+          .options = attr.options.clone
+      end
+    end
+
     protected
 
     def all_validators_defined?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statinize
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Barseek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-03 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies: []
 description: Statinization gem. Allows for creation of attributes for a class with
   a given type.