modeling 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ba8acab76eeef9bbc6a79b4eab6c0fe1cb1d02d074ab9f6063fed05a5717bcd
-  data.tar.gz: '0971e3332d5bceae49f1a9dcd060ddbc154c446ecc3a9914c4a06b612b2a773a'
+  metadata.gz: 1808a9621f5f4e419a137e8f2cc01c85aebcc29e94f20c270301e1d2dafd6806
+  data.tar.gz: 0d24e7745e3c3e177060bd436856b63adc59c89ca09ff7b01e184fc804cc622c
 SHA512:
-  metadata.gz: de58c6a741ce4eb22033c2f0ff8307381f35b0a3eb65bb93a18ad3dd91b928978e4134f4d5eff299cf98d8efa1dac902145c59c633fa5ba71c93ab531962471f
-  data.tar.gz: aa922c332e3ee9bee58919eda6613918c03e5c87b181b26beeb6386673866e330e59d2f566bdc1a6d8bd9a6e021bfbc9a620ed8ba360a30b0415c7122a979138
+  metadata.gz: 7728919bd5af78a82bed604551715f2bb4d10c4cf736d232b8d73293e7db99a34ef233dc5308121993073c7b7ca8b9e4287a278ae5e9a798a1bbf2fd8b7281b7
+  data.tar.gz: 76d4cc5dd6006574ad4c225a695c36a6e6886d8ae9a40aa26159e873ce572992db6ff4e45f54b8b463298eaa2195d0d5fbf039a64f30c3bde8156f8bb44ce729

data/lib/modeling/model_field.rb

@@ -1,60 +1,86 @@
 module Modeling
   class ModelField
-    def initialize name, assign, setter, getter
+    def initialize name, filter, create_attr, writer, reader, tester
       @name = name
-      @assign = assign
-      @setter = setter
-      @getter = getter
+      @filter = filter
+      @create_attr = create_attr
+      @writer = writer
+      @reader = reader
+      @tester = tester
     end
 
     attr :name
+    attr :filter
 
     def attribute_name
       "@#{name}"
     end
 
-    def assign?
-      @assign
+    def create_attr?
+      @create_attr
     end
 
-    def setter?
-      @setter
+    def writer?
+      @writer
     end
 
-    def getter?
-      @getter
+    def reader?
+      @reader
+    end
+
+    def tester?
+      @tester
     end
 
     class << self
-      def parse argument
+      def parse argument, filter = nil
         case argument
         when ModelField
           argument
-        when String
-          from_string argument
         when Symbol
-          from_string argument.to_s
+          from_symbol argument, filter
+        when String
+          from_string argument, filter
         when Array
-          from_array argument
+          from_array argument, filter
+        when Hash
+          from_hash 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?(".")
+      def from_symbol argument, filter
+        at = argument.start_with? "@"
+        bang = argument.end_with? "!"
+        hook = argument.end_with? "?"
+        rail = argument.end_with? "="
+        bald = !(at || bang || hook || rail)
+        name = argument.to_s[/\w+/].to_sym
+        ModelField.new name, filter, bald || hook || at || rail, bald || rail, bald || hook, false
+      end
+
+      def from_string argument, filter
+        if argument =~ /(\w+)\s*(:?\/([traw\s]*))/
+          ModelField.new $1.to_sym, filter, $2.include?("a"), $2.include?("w"), $2.include?("r"), $2.include?("t")
         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)
+      def from_array argument, filter
+        name = argument.shift.to_sym
+        ModelField.new name, filter, argument.include?(:attr), argument.include?(:writer), 
+          argument.include?(:reader), argument.include?(:tester)
+      end
+
+      def from_hash argument
+        name = argument[:name] || argument.keys.first
+        filter = argument[:filter] || argument[name]
+        parsed = parse name, filter
+        ModelField.new parsed.name, parsed.filter, argument[:attr] || parsed.create_attr?,
+          argument[:writer] || parsed.writer?, argument[:reader] || parsed.reader?,
+          argument[:tester] || parsed.tester?
       end
 
     end

data/lib/modeling/module.rb

@@ -2,27 +2,48 @@ require_relative 'model_field'
 
 module Modeling
 
-  def model *fields, &initializer
-    model_fields = fields.map{ ModelField.parse _1 }
-    define_initialize model_fields, &initializer
+  attr_accessor :model_fields
+
+  def model *fields, **filtered_fields, &initializer
+    self.model_fields = model_fields = fields.map{ ModelField.parse _1 } + 
+      filtered_fields.map{ ModelField.parse _1, _2 }
+    define_initialize self, &initializer
     model_fields.each do |f|
-      attr_writer f.name if f.setter?
-      attr_reader f.name if f.getter?
+      attr_writer f.name if f.writer?
+      attr_reader f.name if f.reader?
+      attr_tester f.name if f.tester?
+    end
+  end
+
+  def attr_tester symbol
+    define_method "#{symbol}?" do
+      !!instance_variable_get(symbol)
     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
+    fields.zip(a).map do |f, arg| 
+      value = na.key?(f.name) ? na[f.name] : arg
+      if !f.filter.nil? && !(f.filter === value)
+        if f.filter.respond_to? :from
+          value = f.filter.from value
+        else
+          raise ArgumentError.new "#{value}(#{value.class}) does not match #{f.filter}"
+        end
+      end
+      [f.name, value]
+    end.to_h
   end
 
-  def define_initialize fields, &initializer
+  def define_initialize initializer_class, &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?
+      model_fields = initializer_class.model_fields
+      model_arguments = Modeling.model_arguments model_fields, *a, **na
+      super(*(a[model_arguments.size..] || []), **na.except(*model_arguments.keys), &b)
+      model_fields.each do |f|
+        instance_variable_set f.attribute_name, model_arguments[f.name] if f.create_attr?
       end
       instance_exec **model_arguments, &initializer if initializer
     end

data/lib/modeling/version.rb

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

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: modeling
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Łukasz Pomietło
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies: []
 description: "  Enables writting class initializers and attribute accessors in one
-  line. \n  Struct class alternative.\n"
+  line. \n  Struct class alternative. Keyword & positional arguments mixing. Optional
+  initializer arguments filtering.\n"
 email: oficjalnyadreslukasza@gmail.com
 executables: []
 extensions: []