crystalruby 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 157d03e574c1ef5e06073e71c29e259741c26373113f2ae51c692b4aaef429f9
-  data.tar.gz: 94c1f670b52a39b78c961a3050c2587c540a1cb1593c30e87d6bd05d90a4d736
+  metadata.gz: 26b2e0d15fd3b320f700a1f0571b8bb5d8991a4ed1c60cfcd9f003b48bb9f891
+  data.tar.gz: 27243d104172eef50adfc46524a0b9052410636dc0b39e142fc3e53c04ded1f0
 SHA512:
-  metadata.gz: 1b7972639977a290fd9a42b737edd1f3eec28a240a6e0e773619190bf646ec0707520d317ddf6e6152f507753b16fa66db0d2903c18fd23e58ebce4422e02555
-  data.tar.gz: bc3d03de05c21a14a6d6d9b6de76ff04efcd660999c0dd2c166cc306707d0f93be01053e34ba8a531c9e0a9154e887bb1c6796b141564e290e25d537eeab88b4
+  metadata.gz: a54c1cf883a7dea97d66e9c18903139713aaec0b965026a21fc2e14ced85c13fc676f7d8e76ecc9a2e6ca2fc69034185a9fa4eb6fc66a6986cc9bb2d037738fb
+  data.tar.gz: 0f29fe7bad266af6593d0e4533af27a9be925372befe40ed0e4ee5ea8c9293c7ea62aab4b1664eaf3d2202eb3000b3dda1dfbdc44ae9e924e2de017f5516a6bc

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.1.4] - 2024-04-10
+
+- Fix bug in type checking on deserialization of union types
+
 ## [0.1.3] - 2024-04-10
 
 - Support exceptions thrown in Crystal being caught in Ruby

data/README.md

@@ -196,6 +196,22 @@ ArgumentError: Expected Bool but was Int at line 1, column 15
 from crystalruby.rb:303:in `block in compile!'
 ```
 
+## Named Types
+
+You can name your types, for more succinct method signatures.
+The type names will be mirrored in the generated Crystal code.
+E.g.
+
+```ruby
+
+IntArrOrBoolArr = crtype{ Array(Bool) | Array(Int32) }
+
+crystalize [a: IntArrOrBoolArr] => json{ IntArrOrBoolArr }
+def method_with_named_types(a)
+  return a
+end
+```
+
 ## Exceptions
 
 Exceptions thrown in Crystal code can be caught in Ruby.

data/lib/crystalruby/types/union_type.rb

@@ -27,7 +27,11 @@ module CrystalRuby
       def interpret!(raw)
         union_types.each do |type|
           if type.interprets?(raw)
-            return type.interpret!(raw)
+            begin
+              return type.interpret!(raw)
+            rescue
+              # Pass
+            end
           end
         end
         raise "Invalid deserialized value #{raw} for type #{inspect}"

data/lib/crystalruby/version.rb

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

data/lib/crystalruby.rb

@@ -112,7 +112,9 @@ module CrystalRuby
         fn_ret_type: return_type[:crystal_type],
         lib_fn_args: arg_types.map { |k, arg_type| "_#{k}: #{arg_type[:lib_type]}" }.join(","),
         lib_fn_ret_type: return_type[:lib_type],
-        convert_lib_args:  arg_types.map{|k, arg_type| "#{k} = #{arg_type[:convert_lib_to_crystal_type]["_#{k}"]}" }.join("\n    "),
+        convert_lib_args: arg_types.map do |k, arg_type|
+          "#{k} = #{arg_type[:convert_lib_to_crystal_type]["_#{k}"]}"
+        end.join("\n    "),
         arg_names: args.keys.join(","),
         convert_return_type: return_type[:convert_crystal_to_lib_type]["return_value"],
         error_value: return_type[:error_value]
@@ -212,7 +214,10 @@ module CrystalRuby
     FileUtils.mkdir_p "#{config.crystal_src_dir}/#{config.crystal_codegen_dir}"
     FileUtils.mkdir_p "#{config.crystal_lib_dir}"
     unless File.exist?("#{config.crystal_src_dir}/#{config.crystal_main_file}")
-      IO.write("#{config.crystal_src_dir}/#{config.crystal_main_file}", "require \"./#{config.crystal_codegen_dir}/index\"\n")
+      IO.write(
+        "#{config.crystal_src_dir}/#{config.crystal_main_file}",
+        "require \"./#{config.crystal_codegen_dir}/index\"\n"
+      )
     end
     return if File.exist?("#{config.crystal_src_dir}/shard.yml")
 
@@ -295,12 +300,11 @@ module CrystalRuby
     extend FFI::Library
     ffi_lib "#{config.crystal_lib_dir}/#{config.crystal_lib_name}"
     attach_function :attach_rb_error_handler, [:pointer], :int
-    const_set(:ErrorCallback, FFI::Function.new(:void, [:string, :string]) do |error_type, message|
+    const_set(:ErrorCallback, FFI::Function.new(:void, %i[string string]) do |error_type, message|
       error_type = error_type.to_sym
-      error_type = Object.const_defined?(error_type) && Object.const_get(error_type).ancestors.include?(Exception) ?
-        Object.const_get(error_type) :
-        RuntimeError
-        raise error_type.new(message)
+      is_exception_type = Object.const_defined?(error_type) && Object.const_get(error_type).ancestors.include?(Exception)
+      error_type = is_exception_type ?  Object.const_get(error_type) : RuntimeError
+      raise error_type.new(message)
     end)
     attach_rb_error_handler(ErrorCallback)
   end
@@ -313,7 +317,9 @@ module CrystalRuby
   end
 
   def self.write_function(owner, name:, body:, &compile_callback)
-    @compiled = File.exist?("#{config.crystal_src_dir}/#{config.crystal_codegen_dir}/index.cr") unless defined?(@compiled)
+    unless defined?(@compiled)
+      @compiled = File.exist?("#{config.crystal_src_dir}/#{config.crystal_codegen_dir}/index.cr")
+    end
     @block_store ||= []
     @block_store << { owner: owner, name: name, body: body, compile_callback: compile_callback }
     FileUtils.mkdir_p("#{config.crystal_src_dir}/#{config.crystal_codegen_dir}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crystalruby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Wouter Coppieters