modeling 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 984bdb92ad9c4e829cf239f3df9eb1479e41c37d5659944933edb8d69282020f
-  data.tar.gz: b47547c32079a0d5680d99dd7cca3f8fa5736a2eb56bd9a5bfcab9547aa14687
+  metadata.gz: 8ba8acab76eeef9bbc6a79b4eab6c0fe1cb1d02d074ab9f6063fed05a5717bcd
+  data.tar.gz: '0971e3332d5bceae49f1a9dcd060ddbc154c446ecc3a9914c4a06b612b2a773a'
 SHA512:
-  metadata.gz: b3d8cd4181cf41ea9007cfaf8aa5e4eaa80c2bd68ff65e42a00fd4902590dca277226a18f011f8cb854d2f18791b910042e2b4c2e16e0410c0536253c785fd29
-  data.tar.gz: e66cc1a8d2c45d361508ea206dcbfb94ed54875d05966b603447d6fe77d122f37d013068e70223de41bb2c777fc7df43a4439f265eb364a904ea648f084d1b54
+  metadata.gz: de58c6a741ce4eb22033c2f0ff8307381f35b0a3eb65bb93a18ad3dd91b928978e4134f4d5eff299cf98d8efa1dac902145c59c633fa5ba71c93ab531962471f
+  data.tar.gz: aa922c332e3ee9bee58919eda6613918c03e5c87b181b26beeb6386673866e330e59d2f566bdc1a6d8bd9a6e021bfbc9a620ed8ba360a30b0415c7122a979138

data/lib/modeling/model_field.rb

@@ -0,0 +1,62 @@
+module Modeling
+  class ModelField
+    def initialize name, assign, setter, getter
+      @name = name
+      @assign = assign
+      @setter = setter
+      @getter = getter
+    end
+
+    attr :name
+
+    def attribute_name
+      "@#{name}"
+    end
+
+    def assign?
+      @assign
+    end
+
+    def setter?
+      @setter
+    end
+
+    def getter?
+      @getter
+    end
+
+    class << self
+      def parse argument
+        case argument
+        when ModelField
+          argument
+        when String
+          from_string argument
+        when Symbol
+          from_string argument.to_s
+        when Array
+          from_array argument
+        else
+          raise "Unsupported argument #{argument}"
+        end
+      end
+
+      def from_string argument
+        if argument =~ /(\W*)(\w+)(\W*)/
+          modifiers = $1 + $3
+          ModelField.new $2.to_sym, modifiers.include?("@") || modifiers.include?("?"), 
+            modifiers.include?("@") || modifiers.include?("!") || modifiers.include?("="), 
+            modifiers.include?("@") || modifiers.include?("!") || modifiers.include?(".")
+        else 
+          raise "Invalid argument string format '#{argument}'"
+        end
+      end
+
+      def from_array argument
+        name = argument.shift
+        ModelField.new name, argument.include?(:assign), argument.include?(:setter), argument.include?(:getter)
+      end
+
+    end
+  end
+end

data/lib/modeling/module.rb

@@ -1,26 +1,30 @@
-require_relative 'model_argument'
+require_relative 'model_field'
 
 module Modeling
 
-  def model *fields, &initialize
-    fields.map!{ ModelArgument.parse _1 }
-    initialize_context = Struct.new(nil, *fields.map(&:name))
-    define_method :initialize do |*a, **na|
-      arguments = fields.zip(a).map do |f, arg|
-        value = (f.keyword? ? na[f.name] : nil) || arg
-        instance_variable_set f.attribute_name, value if f.attribute?
-        value
-      end
-      initialize_context.new(*arguments).instance_exec &initialize if initialize
-    end
-    fields.each do |f|
+  def model *fields, &initializer
+    model_fields = fields.map{ ModelField.parse _1 }
+    define_initialize model_fields, &initializer
+    model_fields.each do |f|
       attr_writer f.name if f.setter?
       attr_reader f.name if f.getter?
-      if f.tester?
-        define_method "#{f.name}?" do
-          !!instance_variable_get(f.attribute_name)
-        end
+    end
+  end
+  
+  private
+
+  def self.model_arguments fields, *a, **na
+    fields.zip(a).map{|f, arg| [f.name, na.key?(f.name) ? na[f.name] : arg]}.to_h
+  end
+
+  def define_initialize fields, &initializer
+    define_method :initialize do |*a, **na, &b|
+      model_arguments = Modeling.model_arguments fields, *a, **na
+      super *(a[model_arguments.size..] || []), **na.except(*model_arguments.keys), &b
+      fields.each do |f|
+        instance_variable_set f.attribute_name, model_arguments[f.name] if f.assign?
       end
+      instance_exec **model_arguments, &initializer if initializer
     end
   end
 

data/lib/modeling/version.rb

@@ -1,3 +1,3 @@
 module Modeling
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,23 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: modeling
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Łukasz Pomietło
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-24 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies: []
-description: "\n"
+description: "  Enables writting class initializers and attribute accessors in one
+  line. \n  Struct class alternative.\n"
 email: oficjalnyadreslukasza@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/modeling.rb
-- lib/modeling/model_argument.rb
+- lib/modeling/model_field.rb
 - lib/modeling/module.rb
 - lib/modeling/version.rb
 homepage: https://github.com/lpogic/modeling
@@ -25,6 +26,7 @@ licenses:
 - Zlib
 metadata:
   documentation_uri: https://github.com/lpogic/modeling/blob/main/doc/wiki/README.md
+  homepage_uri: https://github.com/lpogic/modeling
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/modeling/model_argument.rb

@@ -1,78 +0,0 @@
-module Modeling
-  class ModelArgument
-    def initialize name, attribute, setter, getter, keyword, tester
-      @name = name
-      @attribute = attribute
-      @setter = setter
-      @getter = getter
-      @keyword = keyword
-      @tester = tester
-    end
-
-    attr :name
-
-    def attribute_name
-      "@#{name}"
-    end
-
-    def attribute?
-      @attribute
-    end
-
-    def setter?
-      @setter
-    end
-
-    def getter?
-      @getter
-    end
-
-    def keyword?
-      @keyword
-    end
-
-    def tester?
-      @tester
-    end
-
-    class << self
-      def parse argument
-        case argument
-        when ModelArgument
-          argument
-        when String
-          from_string argument
-        when Symbol
-          from_symbol argument
-        when Array
-          from_array argument
-        else
-          raise "Unsupported argument #{argument}"
-        end
-      end
-
-      def from_symbol argument
-        name = argument.to_s.delete_prefix("@").to_sym
-        attribute = argument.start_with?("@")
-        ModelArgument.new name, attribute, attribute, attribute, false, false
-      end
-
-      def from_string argument
-        if argument =~ /(\W*)(\w+)(\W*)/
-          modifiers = $1 + $3
-          ModelArgument.new $2.to_sym, modifiers.include?("@"), modifiers.include?("="), 
-            modifiers.include?("+"), modifiers.include?(":"), modifiers.include?("?")
-        else 
-          raise "Invalid argument string format '#{argument}'"
-        end
-      end
-
-      def from_array argument
-        name = argument.shift
-        ModelArgument.new name, argument.include?(:attribute), argument.include?(:setter), argument.include?(:getter), 
-          argument.include?(:keyword), argument.include?(:tester)
-      end
-
-    end
-  end
-end