sumaki 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc2e15ea308cacd7c524ba33698734f08020c2c9d6fb9b39accb4c79bc108a67
-  data.tar.gz: 1090e186dd028117e5f6cb7df816004dcc9508313757e6af8b802d6eeef74a2d
+  metadata.gz: 2be73f4aecd4989e377b39115c0fc5dfbd49ac540c897c0ec7c28f2401bac2af
+  data.tar.gz: be673d004a1fe0ba7fd93c195dfac2e2f097318da1e5a7d308220cfc9cb16539
 SHA512:
-  metadata.gz: 720e0a53bf096093e5e25c5b2dbd2d562666e696d274147d1b3634e49a350309be22b1ada5e069c43f23025e4fdeafbde25c7a9f0b8a4f2d05ffc47fcc7a25d6
-  data.tar.gz: e00e0ef3b7f0af18c438e680e4bfdc40aa83b3409853c5cc587c529b43c9c2f73cd9ad72d0e383d738fbe8879247a8f25beb829001daa3d397e836f1486850a6
+  metadata.gz: faf86d0ed3126295b4a4bc5f39f6cdda4b55d19aef9856af17c576cff16721cb72b0ecb78a55fb0d812ddfa05ea420581a456890f2dfc0f615ad76646db699e8
+  data.tar.gz: 8e6d8faafd3138cdb6bc1f32eea54b348cab3816db7f713b8f9c4a45ab06263de73bc882f6008abeb2bf230588ac7245acfad1618f3a26abd563be84b0690835

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    sumaki (0.5.0)
-      minenum (>= 0.2.0)
+    sumaki (0.5.1)
+      minenum (>= 0.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +19,7 @@ GEM
       reline (>= 0.4.2)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    minenum (0.2.0)
+    minenum (0.2.1)
     parallel (1.24.0)
     parser (3.3.1.0)
       ast (~> 2.4.1)

data/lib/sumaki/model/associations.rb

@@ -14,11 +14,11 @@ module Sumaki
 
       module AccessorAdder
         module Singular # :nodoc:
-          def add(model_class, methods_module, reflection)
+          def add(methods_module, reflections, reflection)
             add_getter(methods_module, reflection.name)
             add_builder(methods_module, reflection.name)
 
-            model_class.reflections[reflection.name] = reflection
+            reflections[reflection.name] = reflection
           end
 
           private
@@ -43,14 +43,14 @@ module Sumaki
         end
 
         module Repeated # :nodoc:
-          def add(model_class, methods_module, reflection)
+          def add(methods_module, reflections, reflection)
             methods_module.module_eval <<~RUBY, __FILE__, __LINE__ + 1
               def #{reflection.name}                        # def book
                 association(:#{reflection.name}).collection #   association(:book).collection
               end                                           # end
             RUBY
 
-            model_class.reflections[reflection.name] = reflection
+            reflections[reflection.name] = reflection
           end
           module_function :add
         end
@@ -90,7 +90,7 @@ module Sumaki
         #   to wrap is not inferred from the nested field names.
         def singular(name, class_name: nil)
           reflection = Reflection::Singular.new(self, name, class_name: class_name)
-          AccessorAdder::Singular.add(self, association_methods_module, reflection)
+          AccessorAdder::Singular.add(_sumaki_methods_module, _sumaki_association_reflections, reflection)
         end
 
         # Access to the repeated sub objects
@@ -128,21 +128,11 @@ module Sumaki
         #   to wrap is not inferred from the nested field names.
         def repeated(name, class_name: nil)
           reflection = Reflection::Repeated.new(self, name, class_name: class_name)
-          AccessorAdder::Repeated.add(self, association_methods_module, reflection)
+          AccessorAdder::Repeated.add(_sumaki_methods_module, _sumaki_association_reflections, reflection)
         end
 
-        def reflections
-          @reflections ||= {}
-        end
-
-        private
-
-        def association_methods_module
-          @association_methods_module ||= begin
-            mod = Module.new
-            include mod
-            mod
-          end
+        def _sumaki_association_reflections
+          @_sumaki_association_reflections ||= {}
         end
       end
 
@@ -151,7 +141,7 @@ module Sumaki
 
         def association(name)
           @associations ||= {}
-          @associations[name.to_sym] ||= self.class.reflections[name.to_sym].association_for(self)
+          @associations[name.to_sym] ||= self.class._sumaki_association_reflections[name.to_sym].association_for(self)
         end
       end
     end

data/lib/sumaki/model/enum.rb

@@ -46,17 +46,8 @@ module Sumaki
         #   character.type = 1
         #   character.type.name #=> :vampire
         def enum(name, values)
-          super(name, values, adapter_builder: EnumAttrAccessor)
-        end
-
-        private
-
-        def enum_methods_module
-          @enum_methods_module ||= begin
-            mod = Module.new
-            include mod
-            mod
-          end
+          _minenum_enum(name, values, _sumaki_methods_module, _sumaki_attribute_reflections,
+                        adapter_builder: EnumAttrAccessor)
         end
       end
     end

data/lib/sumaki/model/fields.rb

@@ -12,19 +12,20 @@ module Sumaki
       end
 
       class FieldAccessor # :nodoc:
-        def initialize(model)
+        def initialize(model, reflections)
           @model = model
+          @reflections = reflections
         end
 
         def get(field_name)
-          reflection = @model.class.field_reflections[field_name]
+          reflection = @reflections[field_name]
 
           value = @model.get(reflection.name)
           reflection.type_class.deserialize(value)
         end
 
         def set(field_name, value)
-          reflection = @model.class.field_reflections[field_name]
+          reflection = @reflections[field_name]
 
           serialized = reflection.type_class.serialize(value)
           @model.set(reflection.name, serialized)
@@ -32,11 +33,11 @@ module Sumaki
       end
 
       module AccessorAdder # :nodoc:
-        def add(model_class, methods_module, reflection)
+        def add(methods_module, reflections, reflection)
           add_getter(methods_module, reflection.name)
           add_setter(methods_module, reflection.name)
 
-          model_class.field_reflections[reflection.name] = reflection
+          reflections[reflection.name] = reflection
         end
 
         def add_getter(methods_module, field_name)
@@ -99,37 +100,27 @@ module Sumaki
         # * <tt>:datetime</tt>
         def field(name, type = nil)
           reflection = Reflection.new(name, type)
-          AccessorAdder.add(self, attribute_methods_module, reflection)
+          AccessorAdder.add(_sumaki_methods_module, _sumaki_attribute_reflections, reflection)
         end
 
-        def field_names
-          field_reflections.keys
+        def attribute_names
+          _sumaki_attribute_reflections.keys
         end
 
-        def field_reflections
-          @field_reflections ||= {}
-        end
-
-        private
-
-        def attribute_methods_module
-          @attribute_methods_module ||= begin
-            mod = Module.new
-            include mod
-            mod
-          end
+        def _sumaki_attribute_reflections
+          @_sumaki_attribute_reflections ||= {}
         end
       end
 
       module InstanceMethods # :nodoc:
-        def fields
-          self.class.field_names.map.with_object({}) { |e, r| r[e] = public_send(e) }
+        def attributes
+          self.class.attribute_names.map.with_object({}) { |e, r| r[e] = public_send(e) }
         end
 
         private
 
         def field_accessor
-          @field_accessor ||= FieldAccessor.new(self)
+          @field_accessor ||= FieldAccessor.new(self, self.class._sumaki_attribute_reflections)
         end
       end
     end

data/lib/sumaki/model.rb

@@ -175,6 +175,14 @@ module Sumaki
       def adapter
         @adapter || parent&.adapter || Config.default_adapter
       end
+
+      def _sumaki_methods_module
+        @_sumaki_methods_module ||= begin
+          mod = Module.new
+          include mod
+          mod
+        end
+      end
     end
 
     class ObjectAccessor # :nodoc:
@@ -231,7 +239,7 @@ module Sumaki
       end
 
       def inspect
-        inspection = fields
+        inspection = attributes
                      .map { |name, value| "#{name}: #{value.inspect}" }
                      .join(', ')
         "#<#{self.class.name} #{inspection}>"
@@ -239,10 +247,10 @@ module Sumaki
 
       def pretty_print(pp) # rubocop:disable Metrics/MethodLength
         pp.object_address_group(self) do
-          pp.seplist(fields, -> { pp.text ',' }) do |field, value|
+          pp.seplist(attributes, -> { pp.text ',' }) do |attribute, value|
             pp.breakable
             pp.group(1) do
-              pp.text field.to_s
+              pp.text attribute.to_s
               pp.text ':'
               pp.breakable
               pp.pp value

data/lib/sumaki/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sumaki
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumaki
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Loose Coupling
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minenum
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 description: |
   Sumaki is a wrapper for structured data like JSON.
   Since Sumaki wraps the target data as it is, rather than parsing it using a schema, the original data can be referenced at any time.