modeling 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3cc5b79ca0d36340e35381ab51d1b4d09486812bb8479267128a557e0130c01
-  data.tar.gz: b8ff810f7317108cbf1b8ef7290355041a8d29d20ecb3a57ad47f66fd3edc2f2
+  metadata.gz: cb09e609fc85c6ee5944802fc722aad61fea684980dd9bb31e076a8a3a9c898d
+  data.tar.gz: 74438aa9e3f63e36183857d15a1a9b7434107aa66b27e951c494cb59a51f4bdd
 SHA512:
-  metadata.gz: 6044d7ac29c9b23834aa7a848dc10c11430be05262bcaab38ad5417ee7a605d515a1d66bce01f6ff639750e566826856e39ed4aa46a33ffb26f36b71011970bb
-  data.tar.gz: 3a94d368fc0e022e2aaffccfb10247cfab48a7df9da53150a7a618b21cac7c529dbe906cd8c36169831dd499a9db93e586947147528ec4d17aba67260eb15341
+  metadata.gz: 7e76f03bae73c853c82c13e6f6358529748435c669d47b2581fe269908b69972ae8fad5ee1e8bcb13de6a3868f94257cc55ca44d035a600966692cb8cfef8708
+  data.tar.gz: 7bef9aa465dbc4f2a73ba129a2c86037e8d2baa66aa7f98b8a836a7fd7b4872d00b8f3f2d311ec2d0105fd7664ba3556d4cb722eee7f4327086ff3b0e09d7124

data/lib/modeling/model_field.rb

@@ -1,23 +1,21 @@
 module Modeling
   class ModelField
-    def initialize name, filter, create_attr, writer, reader, tester
+    def initialize name, instance_variable, writer, reader, tester
       @name = name
-      @filter = filter
-      @create_attr = create_attr
+      @instance_variable = instance_variable
       @writer = writer
       @reader = reader
       @tester = tester
     end
 
     attr :name
-    attr :filter
 
-    def attribute_name
+    def instance_variable_name
       "@#{name}"
     end
 
-    def create_attr?
-      @create_attr
+    def instance_variable?
+      @instance_variable
     end
 
     def writer?
@@ -37,52 +35,32 @@ module Modeling
         case argument
         when ModelField
           argument
-        when Symbol
-          from_symbol argument, filter
-        when String
-          from_string argument, filter
-        when Array
-          from_array argument, filter
-        when Hash
-          from_hash argument
+        when Symbol, String
+          parse_model_field argument
         else
-          raise "Unsupported argument #{argument}"
+          raise "Unsupported argument #{argument} of #{argument.class} class."
         end
       end
 
-      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}'"
+      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
+            end
+          end
+        else
+          name = argument
+          reader = writer = instance_variable = true
         end
+        raise "Invalid model field #{argument}" unless name =~ /\w+/
+        ModelField.new name.to_sym, instance_variable, writer, reader, tester
       end
-
-      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
   end
 end

data/lib/modeling/module.rb

@@ -4,36 +4,29 @@ module Modeling
 
   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 }
+  def model *fields, &initializer
+    self.model_fields = model_fields = fields.map{ ModelField.parse _1 }
     define_initialize self, &initializer
-    model_fields.each do |f|
-      attr_writer f.name if f.writer?
-      attr_reader f.name if f.reader?
-      attr_tester f.name if f.tester?
+    model_fields.each do |field|
+      attr_writer field.name if field.writer?
+      attr_reader field.name if field.reader?
+      attr_tester "#{field.name}?".to_sym, field.instance_variable_name if field.tester?
     end
   end
+  
+  private
 
-  def attr_tester symbol
-    define_method "#{symbol}?" do
-      !!instance_variable_get(symbol)
+  def attr_tester tester, instance_variable
+    define_method tester do
+      instance_variable_get(instance_variable) ? true : false
     end
   end
-  
-  private
 
   def self.model_arguments fields, *a, **na
-    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]
+    fields.zip(a).map do |field, arg| 
+      name = field.name
+      value = na.key?(name) ? na[name] : arg 
+      [name, value]
     end.to_h
   end
 
@@ -41,22 +34,23 @@ module Modeling
     define_method :initialize do |*a, **na, &b|
       model_fields = initializer_class.model_fields
       model_arguments = Modeling.model_arguments model_fields, *a, **na
-      super_call = proc do |*asc, **nasc, &bsc|
+      super_initialize = proc do |*asc, **nasc, &bsc|
         if asc.empty? && nasc.empty? && !bsc
           super(*(a[model_arguments.size..] || []), **na.except(*model_arguments.keys), &b)
         else
           super(*asc, **nasc, &bsc)
         end
       end
-      model_fields.each do |f|
-        instance_variable_set f.attribute_name, model_arguments[f.name] if f.create_attr?
+      model_fields.each do |field|
+        if field.instance_variable?
+          instance_variable_set field.instance_variable_name, model_arguments[field.name]
+        end
       end
       if initializer
-        instance_exec super_call, **model_arguments, &initializer
+        instance_exec super_initialize, **model_arguments, &initializer
       else
-        super_call.call
+        super_initialize.call
       end
     end
   end
-
 end

data/lib/modeling/version.rb

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

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: modeling
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Łukasz Pomietło
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-20 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies: []
-description: "  Enables writting class initializers and attribute accessors in one
-  line. \n  Struct class alternative. Keyword & positional arguments mixing. Optional
-  initializer arguments filtering.\n"
+description: "    Simplify common class definition by encoding attributes with their
+  access modes.\n"
 email: oficjalnyadreslukasza@gmail.com
 executables: []
 extensions: []
@@ -43,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: A concise way to define the class shape