modeling 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb09e609fc85c6ee5944802fc722aad61fea684980dd9bb31e076a8a3a9c898d
-  data.tar.gz: 74438aa9e3f63e36183857d15a1a9b7434107aa66b27e951c494cb59a51f4bdd
+  metadata.gz: b86aef2212da331d45efd4c2d32352647c876f25f4379772496398c3880c2af6
+  data.tar.gz: 8def3789e08b6f41a3a7c72df81f4e967f95e8e37eb4412d6578ba66a943b654
 SHA512:
-  metadata.gz: 7e76f03bae73c853c82c13e6f6358529748435c669d47b2581fe269908b69972ae8fad5ee1e8bcb13de6a3868f94257cc55ca44d035a600966692cb8cfef8708
-  data.tar.gz: 7bef9aa465dbc4f2a73ba129a2c86037e8d2baa66aa7f98b8a836a7fd7b4872d00b8f3f2d311ec2d0105fd7664ba3556d4cb722eee7f4327086ff3b0e09d7124
+  metadata.gz: d6787537af7b26e954b46fca5ab1bdb3787bf6d0b411462a3dc866eb604328dc881ccb65b1b177957d47be721a53ec63cf5a598a64293c665a228e5dcf6acdc6
+  data.tar.gz: 1648de4591f2f127ad829e8e0a490ef6600f1fae0467534d9104286978b50c04cc3a4ff1be382fc2ffc7390e9822e026c2987f16704a047a14778aaa75f16545

data/lib/modeling/model_field.rb

@@ -1,17 +1,23 @@
 module Modeling
+  class Exception < ::Exception
+  end
+
   class ModelField
-    def initialize name, instance_variable, writer, reader, tester
+    def initialize name, initialize_argument, instance_variable, writer, reader, tester
       @name = name
+      @initialize_argument = initialize_argument
       @instance_variable = instance_variable
       @writer = writer
       @reader = reader
       @tester = tester
+      @instance_variable_name = "@#{name}".to_sym
     end
 
     attr :name
+    attr :instance_variable_name
 
-    def instance_variable_name
-      "@#{name}"
+    def initialize_argument?
+      @initialize_argument
     end
 
     def instance_variable?
@@ -38,28 +44,39 @@ module Modeling
         when Symbol, String
           parse_model_field argument
         else
-          raise "Unsupported argument #{argument} of #{argument.class} class."
+          raise Exception.new "Unsupported argument #{argument} of #{argument.class} class."
         end
       end
 
       def parse_model_field argument
-        instance_variable = reader = writer = tester = false
-        if argument.start_with? "@"
-          meta, name = argument.to_s.split "_", 2
-          meta.to_s.each_char do |char|
-            case char
-            when "r", "R" then reader = true
-            when "w", "W" then writer = true
-            when "t", "T" then tester = true
-            when "i", "I" then instance_variable = true
+        initialize_argument = instance_variable = reader = writer = tester = false
+        name_start = (0...argument.length).each do |i|
+          case a = argument[i]
+          when "R" then reader = true
+          when "W" then writer = true
+          when "T" then tester = true
+          when "V" then instance_variable = true
+          when "A" then initialize_argument = true
+          when "@" then instance_variable = initialize_argument = true
+          when "_" then break i + 1
+          else
+            if a.upcase != a
+              break i
+            else raise Exception.new "Invalid model field '#{argument}' - unknown option '#{a}'"
             end
           end
-        else
+        end
+        case name_start
+        when 0
+          initialize_argument = instance_variable = reader = writer = true
           name = argument
-          reader = writer = instance_variable = true
+        when Integer
+          name = argument[name_start..]
+        else raise Exception.new "Invalid model field '#{argument}' - field name is missing"
         end
-        raise "Invalid model field #{argument}" unless name =~ /\w+/
-        ModelField.new name.to_sym, instance_variable, writer, reader, tester
+
+        raise Exception.new "Invalid model field #{argument} - field name '#{name}' is invalid" unless name =~ /\w+/
+        ModelField.new name.to_sym, initialize_argument, instance_variable, writer, reader, tester
       end
     end
   end

data/lib/modeling/module.rb

@@ -22,8 +22,8 @@ module Modeling
     end
   end
 
-  def self.model_arguments fields, *a, **na
-    fields.zip(a).map do |field, arg| 
+  def self.initialize_arguments fields, *a, **na
+    fields.filter(&:initialize_argument?).zip(a).map do |field, arg| 
       name = field.name
       value = na.key?(name) ? na[name] : arg 
       [name, value]
@@ -33,23 +33,23 @@ module Modeling
   def define_initialize initializer_class, &initializer
     define_method :initialize do |*a, **na, &b|
       model_fields = initializer_class.model_fields
-      model_arguments = Modeling.model_arguments model_fields, *a, **na
-      super_initialize = proc do |*asc, **nasc, &bsc|
-        if asc.empty? && nasc.empty? && !bsc
-          super(*(a[model_arguments.size..] || []), **na.except(*model_arguments.keys), &b)
+      initialize_arguments = Modeling.initialize_arguments model_fields, *a, **na
+      super_initialize = proc do |*as, **nas, &bs|
+        if as.empty? && nas.empty? && !bs
+          super(*(a[initialize_arguments.size..] || []), **na.except(*initialize_arguments.keys), &b)
         else
-          super(*asc, **nasc, &bsc)
+          super(*as, **nas, &bs)
         end
       end
       model_fields.each do |field|
         if field.instance_variable?
-          instance_variable_set field.instance_variable_name, model_arguments[field.name]
+          instance_variable_set field.instance_variable_name, initialize_arguments[field.name]
         end
       end
       if initializer
-        instance_exec super_initialize, **model_arguments, &initializer
+        instance_exec super_initialize, **initialize_arguments, &initializer
       else
-        super_initialize.call
+        super(*(a[initialize_arguments.size..] || []), **na.except(*initialize_arguments.keys), &b)
       end
     end
   end

data/lib/modeling/version.rb

@@ -1,3 +1,3 @@
 module Modeling
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,17 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: modeling
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Łukasz Pomietło
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies: []
-description: "    Simplify common class definition by encoding attributes with their
-  access modes.\n"
+description: "Adds the ability to quickly model classes. Definitions of instance variables
+  and access methods are reduced to one line. \nCreating an instance of the modeled
+  class is significantly slower (~20x), so its use for classes whose instances are
+  created frequently is not recommended.\n"
 email: oficjalnyadreslukasza@gmail.com
 executables: []
 extensions: []