tensai-core 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79bafeb0e1ee8acc293938ac8ec9708e3bc37cc73cc5748f66d2e9d7fe3f19f6
-  data.tar.gz: 2797a5cb139b38517d9e9c4a9a661ccca493fdc52561978bbbf1c79435af7ab8
+  metadata.gz: 1a3f6bc75c998f6724fcc260d6864fc63803b2651fb8168b26cd94c8e933b5f5
+  data.tar.gz: 15f5e077f28534d457c3d68e12ab6e373707a2138999e649e65321d511cbb807
 SHA512:
-  metadata.gz: 59378c4d21b0a40f66e397e6986748a267a6dd6a92ae5d0000bff53e594789f8d074bcc637a27efcfb7e0ad23537cfc352a8cb759a75f6572bc65c567fbe6f4e
-  data.tar.gz: cc1fec80131c4195f6d91329a1e36d3f9f2d32c7f64cee5d87e9e7dad5855c45a255d5a2433f63bc15b8bae34755a652bc33bd01cd6fc703281dada7de2b6999
+  metadata.gz: 180f611385d4ab59b137e41e13d0a1cceb9787dec7fbfcd755c3165d293674211926389d39e96cecaf842e72e8851fa8865e2ace31e2dad2bf8f9ba81553f210
+  data.tar.gz: 64be2ab89535cb04099061a81c836f93e580b8d6654e3115dad34d93cd8240708a750ed32e99344550d4cc126e644d73f7084cb5a97ef6e377e6941010cd025f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tensai-core (0.1.0)
+    tensai-core (0.1.1)
       dry-types (~> 1.1)
 
 GEM

data/lib/tensai/util/initializer.rb

@@ -5,42 +5,69 @@ require 'tensai/types'
 module Tensai::Util
   # @private
   class Initializer < Module
+    attr_reader :args
+
     def initialize(**args)
       @args = args
-
-      define_method :__check_argument_type do |argument, value|
-        args[argument][value]
-      end
     end
 
     def included(klass)
-      klass.class_eval initializer_code, __FILE__, __LINE__ + 10
       @args.keys.each do |arg|
         klass.class_eval "attr_reader :#{arg}", __FILE__, __LINE__
       end
-    end
 
-    private
+      all_args = all_args_for(klass)
 
-    def initializer_code
-      <<~CODE
-        def initialize(#{initializer_signature})
-          #{check_argument_types_code}
-          #{assign_instance_variables_code}
+      klass.instance_eval do
+        define_method :__check_argument_type do |argument, value|
+          all_args[argument][value]
         end
-      CODE
-    end
+      end
 
-    def initializer_signature
-      @args.keys.map { |arg| "#{arg}:" }.join(', ')
+      klass.class_eval InitializeMethod.new(all_args).code, __FILE__, __LINE__ + 11
     end
 
-    def check_argument_types_code
-      @args.keys.map { |arg| "__check_argument_type(:#{arg}, #{arg})" }.join(';')
+    private
+
+    def all_args_for(klass)
+      parent_initializers = klass.ancestors.select { |a| a.is_a? Initializer }
+
+      parent_initializers.map(&:args)
+                         .reduce(args) { |result, parent_args| parent_args.merge result }
     end
 
-    def assign_instance_variables_code
-      @args.keys.map { |arg| "@#{arg} = #{arg}" }.join(';')
+    #
+    # Generates initialize method code
+    #
+    class InitializeMethod
+      def initialize(args)
+        @args = args
+      end
+
+      def code
+        <<~CODE
+          def initialize(#{signature})
+            #{check_argument_types_code}
+            #{assign_instance_variables_code}
+          end
+        CODE
+      end
+
+      private
+
+      attr_reader :args
+
+      def signature
+        args.keys.map { |arg| "#{arg}:" }.join(', ')
+      end
+
+      def check_argument_types_code
+        args.keys.map { |arg| "__check_argument_type(:#{arg}, #{arg})" }.join(';')
+      end
+
+      def assign_instance_variables_code
+        args.keys.map { |arg| "@#{arg} = #{arg}" }.join(';')
+      end
     end
   end
 end

data/lib/tensai/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tensai
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tensai-core
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kevin Fischer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types