class_kit 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 174b8ba8709d3d55964c17cb86fb820b786e03a3bf4c17fa11b2db2c07ebf3f4
-  data.tar.gz: 1c1a03980781a37881a209e47cf596529dad0ce1a41dc6d301f91e295fd60e28
+  metadata.gz: adc7d06961d743b02621fcdd08fd15e284326e8af5356b0d99c4c7bc72c085d5
+  data.tar.gz: cf0fd671ff222e614ec865d1e0521ef68093f3742ce994b0f93874f107f583b5
 SHA512:
-  metadata.gz: df7de4121b05e773056d8ef4af2b7aefde3a47b6dc42ff2cf2d711ba841c1b2e79fcc978a278e208f355cadc0dba12e8906b390582dea2bdfa4e2952557d86a7
-  data.tar.gz: 2709a0c45a4e95f7bf79675821f1ee0a009887688f47b3a013f2e326a38a9ec97a3e3f44a37b00b243d2f937427a405470a21886eaa2e9d92ec4dafe7a8eb3e7
+  metadata.gz: 56aa30b2d347e2cb6aa3451e0da1249df9ab83c58ef27df14b81ad24363aeaf2cf4c3bc270697e5b1f88c1a4f0d316019f271bb2f7c8ce3ea62cb6f29d683a9e
+  data.tar.gz: 6ce07544f9b67cd5c6da85cc8e97568ec4dc051b5797695e124bf463d1e0aa921e867ad6823b0b58f809212deb157e26eb3332e0665f0d0e4d544498611fe02c

data/lib/class_kit/attribute_helper.rb

@@ -1,6 +1,5 @@
 module ClassKit
   class AttributeHelper
-
     def self.instance
       @instance ||= ClassKit::AttributeHelper.new
     end
@@ -18,12 +17,12 @@ module ClassKit
       return @attribute_store[klass] if @attribute_store.key?(klass)
 
       attributes = []
-      klass.ancestors.map do |k|
+      klass.ancestors.each do |k|
         hash = k.instance_variable_get(:@class_kit_attributes)
-        if hash != nil
-          hash.values.each do |a|
-            attributes.push(a)
-          end
+        next if hash.nil?
+
+        hash.each_value do |value|
+          attributes.push(value)
         end
       end
       attributes.compact!

data/lib/class_kit/class_methods.rb

@@ -8,15 +8,18 @@ module ClassKit
     default: nil,
     auto_init: false,
     alias_name: nil,
-    meta: {})
-    unless instance_variable_defined?(:@class_kit_attributes)
-      instance_variable_set(:@class_kit_attributes, {})
-    end
+    meta: {}
+  )
+    instance_variable_set(:@class_kit_attributes, {}) unless instance_variable_defined?(:@class_kit_attributes)
 
     attributes = instance_variable_get(:@class_kit_attributes)
 
-    attributes[name] = {
+    getter = :"@#{name}"
+    setter = :"#{name}="
+
+    cka = {
       name: name,
+      setter: setter,
       type: type,
       one_of: one_of,
       collection_type: collection_type,
@@ -25,68 +28,104 @@ module ClassKit
       auto_init: auto_init,
       alias: alias_name,
       meta: meta
-    }
-
-    class_eval do
-      define_method name do
+    }.freeze
+    attributes[name] = cka
 
-        cka = ClassKit::AttributeHelper.instance.get_attribute(klass: self.class, name: name)
+    value_helper = ClassKit::ValueHelper.instance
 
-        current_value = instance_variable_get(:"@#{name}")
+    # ========= Define attribute getter =========
+    if !default.nil? || auto_init
+      class_eval do
+        define_method name do
+          current_value = instance_variable_get(getter)
 
-        if current_value.nil?
-          if !cka[:default].nil?
-            current_value = instance_variable_set(:"@#{name}", cka[:default])
-          elsif cka[:auto_init]
-            current_value = instance_variable_set(:"@#{name}", cka[:type].new)
+          if current_value.nil?
+            if !cka[:default].nil?
+              current_value = instance_variable_set(getter, cka[:default])
+            elsif cka[:auto_init]
+              current_value = instance_variable_set(getter, cka[:type].new)
+            end
           end
-        end
 
-        current_value
+          current_value
+        end
       end
-    end
-
-    class_eval do
-      define_method "#{name}=" do |value|
-        # get the attribute meta data
-        cka = ClassKit::AttributeHelper.instance.get_attribute(klass: self.class, name: name)
-
-        # verify if the attribute is allowed to be set to nil
-        if value.nil? && cka[:allow_nil] == false
-          raise ClassKit::Exceptions::InvalidAttributeValueError, "Attribute: #{name}, must not be nil."
+    else
+      # no default or auto_init: just return the variable
+      class_eval do
+        define_method(name) do
+          instance_variable_get(getter)
         end
+      end
+    end
 
-        if !cka[:one_of].nil? && !value.nil?
-          parsed_value =
-          if value == true || value == false
-            value
-          elsif(/(true|t|yes|y|1)$/i === value.to_s.downcase)
-            true
-          elsif (/(false|f|no|n|0)$/i === value.to_s.downcase)
-            false
+    # ========= Define attribute setter =========
+    # The methods are defined as lean as possible
+    # This is a bit harder to read at this level but it gets rid of unnecessary runtime checks
+    # 1. If one_of is specified, we check if the value matches any of the allowed types
+    if one_of
+      class_eval do
+        define_method "#{name}=" do |value|
+          if value.nil? && cka[:allow_nil] == false
+            raise ClassKit::Exceptions::InvalidAttributeValueError, "Attribute: #{name}, must not be nil."
           end
 
-          if parsed_value != nil
-            value = parsed_value
-          else
+          value = if value.nil?
+                    value
+                  elsif [true, false].include?(value)
+                    value
+                  elsif Constants::BOOL_TRUE_RE.match?(value.to_s)
+                    true
+                  elsif Constants::BOOL_FALSE_RE.match?(value.to_s)
+                    false
+                  else
+                    begin
+                      t = cka[:one_of].detect { |t| value.is_a?(t) }
+                      value = value_helper.parse(type: t, value: value)
+                    rescue StandardError => e
+                      raise ClassKit::Exceptions::InvalidAttributeValueError,
+                            "Attribute: #{name}, must be of type: #{t}. Error: #{e}"
+                    end
+                  end
+
+          instance_variable_set(getter, value)
+        end
+      end
+    # 2. When the attribute is typed, we parse into the target type if needed
+    elsif type
+      class_eval do
+        define_method "#{name}=" do |value|
+          if value.nil?
+            if cka[:allow_nil] == false
+              raise ClassKit::Exceptions::InvalidAttributeValueError, "Attribute: #{name}, must not be nil."
+            end
+          elsif type == :bool || !value.is_a?(type)
             begin
-              type = cka[:one_of].detect {|t| value.is_a?(t) }
-              value = ClassKit::ValueHelper.instance.parse(type: type, value: value)
-            rescue => e
-              raise ClassKit::Exceptions::InvalidAttributeValueError, "Attribute: #{name}, must be of type: #{type}. Error: #{e}"
+              value = value_helper.parse(type: type, value: value)
+            rescue StandardError => e
+              raise ClassKit::Exceptions::InvalidAttributeValueError,
+                    "Attribute: #{name}, must be of type: #{type}. Error: #{e}"
             end
           end
-        end
 
-        if !cka[:type].nil? && !value.nil? && (cka[:type] == :bool || !value.is_a?(cka[:type]))
-          begin
-            value = ClassKit::ValueHelper.instance.parse(type: cka[:type], value: value)
-          rescue => e
-            raise ClassKit::Exceptions::InvalidAttributeValueError, "Attribute: #{name}, must be of type: #{cka[:type]}. Error: #{e}"
-          end
+          instance_variable_set(getter, value)
+        end
+      end
+    # 3. If untyped and we allow nil, simply set the variable
+    elsif allow_nil == true
+      class_eval do
+        define_method "#{name}=" do |value|
+          instance_variable_set(getter, value)
         end
+      end
+    # 4. In all other cases, only set the variable if non-nil
+    else
+      class_eval do
+        define_method "#{name}=" do |value|
+          raise ClassKit::Exceptions::InvalidAttributeValueError, "Attribute: #{name}, must not be nil." if value.nil?
 
-        instance_variable_set(:"@#{name}", value)
+          instance_variable_set(getter, value)
+        end
       end
     end
   end

data/lib/class_kit/constants.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ClassKit
+  module Constants
+    # Shared constants, to avoid re-creating them on each call to helper methods.
+    BOOL_TRUE_RE  = /\A(?:true|t|yes|y|1)\z/i
+    BOOL_FALSE_RE = /\A(?:false|f|no|n|0)\z/i
+  end
+end

data/lib/class_kit/value_helper.rb

@@ -1,39 +1,19 @@
 module ClassKit
   class ValueHelper
-
     def self.instance
       @@instance ||= new
     end
 
     def parse(type:, value:)
-      if type == Time
-        if value.is_a?(Time)
-          value
-        elsif value.is_a?(Integer) || value.is_a?(Float) || value.is_a?(BigDecimal)
-          Time.at(value)
-        else
-          Time.parse(value)
-        end
-      elsif type == Date
-        if value.is_a?(Date)
-          value
-        else
-          Date.parse(value)
-        end
-      elsif type == DateTime
-        if value.is_a?(DateTime)
-          value
-        else
-          DateTime.parse(value)
-        end
-      elsif type == :bool
-        if value == true || value == false
-          value
-        elsif(/(true|t|yes|y|1)$/i === value.to_s.downcase)
+      if type == :bool
+        return value if value == true || value == false
+
+        s = value.to_s
+        if Constants::BOOL_TRUE_RE.match?(s)
           true
-        elsif (/(false|f|no|n|0)$/i === value.to_s.downcase)
+        elsif Constants::BOOL_FALSE_RE.match?(s)
           false
-        elsif value != nil
+        elsif !value.nil?
           raise 'Unable to parse bool'
         end
       elsif type == Integer
@@ -44,26 +24,41 @@ module ClassKit
         if value.is_a?(BigDecimal)
           value
         else
-          value = value.to_s
-          raise 'Unable to parse BigDecimal' unless value =~ /\A-?\d+(\.\d*)?/
-          BigDecimal(value)
+          s = value.to_s
+          raise 'Unable to parse BigDecimal' unless s =~ /\A-?\d+(\.\d*)?/
+
+          BigDecimal(s)
         end
       elsif type == String
         String(value)
+      elsif type == Time
+        if value.is_a?(Time)
+          value
+        elsif value.is_a?(Integer) || value.is_a?(Float) || value.is_a?(BigDecimal)
+          Time.at(value)
+        else
+          Time.parse(value)
+        end
+      elsif type == Date
+        value.is_a?(Date) ? value : Date.parse(value)
+      elsif type == DateTime
+        value.is_a?(DateTime) ? value : DateTime.parse(value)
       elsif type == Regexp
         Regexp.new(value)
       elsif type == Hash
         raise 'Unable to parse Hash' unless value.is_a?(Hash)
+
         value
       elsif type == Array
         raise 'Unable to parse Array' unless value.is_a?(Array)
+
         value
       elsif type.include?(ClassKit::CustomType)
         type.parse_assign(value)
       else
         raise 'Unable to parse'
       end
-    rescue => e
+    rescue StandardError => e
       raise ClassKit::Exceptions::InvalidParseValueError,
             "Unable to parse value: #{value} into type: #{type}. Error: #{e}"
     end

data/lib/class_kit/version.rb

@@ -1,5 +1,5 @@
 # Namespace
 module ClassKit
   # :nodoc:
-  VERSION = '0.9.1'
+  VERSION = '0.10.0'
 end

data/lib/class_kit.rb

@@ -1,3 +1,4 @@
+require_relative 'class_kit/constants'
 require_relative 'class_kit/class_methods'
 require_relative 'class_kit/exceptions'
 require_relative 'class_kit/attribute_helper'
@@ -10,4 +11,3 @@ require 'json'
 require 'date'
 require 'bigdecimal'
 require 'time'
-

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: class_kit
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Sage One
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-28 00:00:00.000000000 Z
+date: 2026-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,6 +132,7 @@ files:
 - lib/class_kit.rb
 - lib/class_kit/attribute_helper.rb
 - lib/class_kit/class_methods.rb
+- lib/class_kit/constants.rb
 - lib/class_kit/custom_type.rb
 - lib/class_kit/exceptions.rb
 - lib/class_kit/exceptions/attribute_not_found_error.rb