tensai-core 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a38d61c0552c55ae738a98e940df39273b40d74cbd3beca6b14e6b533a8a5a5
-  data.tar.gz: 6afe1d5a11b6fe578e0ec3c10eab69981fc322e6667b7d7f6266b36a900fe259
+  metadata.gz: 74e858174ff63a9b7c6766058c7f0ba6b8480fb3ab2c3dc36a8153130ea4c9fc
+  data.tar.gz: ce4458d89ba475e768d88ca6daf10ee5518b4fe6f9a3eb8f21a2c362461b7014
 SHA512:
-  metadata.gz: fcb9637cef98d96f5c9b1742a034fcf0d9aedf0a71c2f32c3eb162ef27a797b715015b0b73317975cf3766365ae008d71215b8476bc3cff4936795ed9a3024a6
-  data.tar.gz: deecb846c655d8798f5cda9edeca2fb528f729a890f7ee80546ca86749bb1db549cdc9b56586084e8300db811829de87a355d7a715f59f7756bfccb02ec94118
+  metadata.gz: 93862828daba8fd33dc1f3084628246d48ede34939f3efac5fc7c1d89267b59e81284e425f4e2e8d8c12cb2393c46859ae998bef7b260ed2e41c25841488e83b
+  data.tar.gz: 760b0241b2df55f483185223f8f343f6fd2102661eb8f7da7ea82dd7c86fed26133dfa5e259ca3e344acffbc786b97f16661c7a34c3523f157f6c1044ea22f84

data/lib/tensai/util/initializer.rb

@@ -11,17 +11,21 @@ module Tensai::Util
       @args = args
     end
 
-    def included(klass)
-      @args.keys.each do |arg|
-        klass.class_eval "attr_reader :#{arg}", __FILE__, __LINE__
-      end
-
+    def included(klass) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      this_class_args = args
       all_args = all_args_for(klass)
 
       klass.instance_eval do
         define_method :__check_argument_type do |argument, value|
-          all_args[argument][value]
+          type = all_args[argument]
+          if type.default? && value.nil?
+            instance_variable_set("@#{argument}".to_sym, type[])
+          else
+            type[value]
+          end
         end
+
+        attr_reader(*this_class_args.keys)
       end
 
       klass.class_eval InitializeMethod.new(all_args).code, __FILE__, __LINE__ + 11
@@ -47,8 +51,8 @@ module Tensai::Util
       def code
         <<~CODE
           def initialize(#{signature})
-            #{check_argument_types_code}
             #{assign_instance_variables_code}
+            #{check_argument_types_code}
           end
         CODE
       end
@@ -64,11 +68,11 @@ module Tensai::Util
       end
 
       def required_args
-        args.reject { |_, type| type.optional? }.to_h
+        args.reject { |_, type| optional_arg?(type) }.to_h
       end
 
       def optional_args
-        args.select { |_, type| type.optional? }.to_h
+        args.select { |_, type| optional_arg?(type) }.to_h
       end
 
       def check_argument_types_code
@@ -78,6 +82,10 @@ module Tensai::Util
       def assign_instance_variables_code
         args.keys.map { |arg| "@#{arg} = #{arg}" }.join(';')
       end
+
+      def optional_arg?(arg_type)
+        arg_type.optional? || arg_type.default?
+      end
     end
   end
 end

data/lib/tensai/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tensai-core
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Kevin Fischer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types