typed_struct 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b464562db650de5a4d3026ca8806d85b993c8f6bfcf3e86d1988c859432a427
-  data.tar.gz: a6d38114357f8657b675074a36cbfba6129695eb80bc1b9333219f241cc44b79
+  metadata.gz: aee9975f17031f02fbf826c5d78c8d08c30027a890bbe90b53c8abc03d798501
+  data.tar.gz: 1b049a9ba9041053685eeced2db7dcdebc2b870fb1385911a32fccfb960bad21
 SHA512:
-  metadata.gz: b280075f73bf18618ea3ab207b9d3f632928d69a364902b3374ab4b4a728ba791874247a7d36502fd4c83e00f980e4e35e7b777d8e80a40223377a207a03432c
-  data.tar.gz: 9ba0515a1401a4be3d0feaa4bd79fe1dee3c7d20c1d84990485c0eb411df88df16d3bb86a5703f13fca71299e925c6b0e157932a1691efdb10987be536cd1d2d
+  metadata.gz: 91ebd0411fb2ba31da1a04edbc5b550ebed30439c2480fb77bbaa25fa00b8baa40a8bf5e709574e6845c1a70ad8918c421894fa5cdabe0121679aa98dae904b2
+  data.tar.gz: 5b6be63355c328a74333869470e0bbf32101d5e117f661b85945f320c95d1a1427848d7d9c6063920985344956e9f13ee2f99e6570baab3075d5abf75da35388

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typed_struct (0.1.2)
+    typed_struct (0.1.3)
       rbs (~> 1.0)
 
 GEM

data/lib/typed_struct/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class TypedStruct < Struct
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/typed_struct.rb

@@ -4,6 +4,10 @@ require_relative "typed_struct/version"
 require_relative "typed_struct/type_checking"
 require "rbs"
 
+def Rbs(type_str)
+  RBS::Parser.parse_type(type_str)
+end
+
 class TypedStruct < Struct
   include TypeChecking
 
@@ -13,8 +17,10 @@ class TypedStruct < Struct
   # any methods which are able to be overridden
   alias_method :__class__, :class
 
+  Options = nil
+
   class << self
-    def new(**properties)
+    def new(opts = Options.new, **properties)
       properties.each_key do |prop|
         if method_defined?(prop)
           $stdout.puts OVERRIDING_NATIVE_METHOD_MSG % [prop.inspect, caller(3).first]
@@ -28,7 +34,7 @@ class TypedStruct < Struct
         end
 
         klass.instance_eval do
-          @options = { types: properties }
+          @options = { types: properties, options: opts }
 
           define_method :[]= do |key, val|
             prop = properties[key]
@@ -51,17 +57,16 @@ class TypedStruct < Struct
 
   def initialize(**attrs)
     opts = self.__class__.options
-    opts[:types].each do |prop, expected_type|
-      passed_value = attrs[prop]
-      next if val_is_type? passed_value, expected_type
-
-      raise "Unexpected type #{passed_value.class} for #{prop.inspect} (expected #{expected_type})"
+    vals = opts[:types].to_h do |prop, expected_type|
+      value = attrs.fetch(prop, opts[:options][:default])
+      unless val_is_type? value, expected_type
+        raise "Unexpected type #{value.class} for #{prop.inspect} (expected #{expected_type})"
+      end
+      [prop, value]
     end
 
-    super
+    super **vals
   end
-end
 
-def Rbs(type_str)
-  RBS::Parser.parse_type(type_str)
+  Options = TypedStruct.new({ default: nil }, default: Rbs("untyped"))
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typed_struct
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Joseph Johansen