crystalruby 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 157d03e574c1ef5e06073e71c29e259741c26373113f2ae51c692b4aaef429f9
-  data.tar.gz: 94c1f670b52a39b78c961a3050c2587c540a1cb1593c30e87d6bd05d90a4d736
+  metadata.gz: e8dc48667be65ee6e6d36ba7efcfc87dfefb133a06cb375a22297db9643221e3
+  data.tar.gz: 40753b3741ae9fb5dec86019d35968027517280a08ae6bffbcf8f2e207fe96b3
 SHA512:
-  metadata.gz: 1b7972639977a290fd9a42b737edd1f3eec28a240a6e0e773619190bf646ec0707520d317ddf6e6152f507753b16fa66db0d2903c18fd23e58ebce4422e02555
-  data.tar.gz: bc3d03de05c21a14a6d6d9b6de76ff04efcd660999c0dd2c166cc306707d0f93be01053e34ba8a531c9e0a9154e887bb1c6796b141564e290e25d537eeab88b4
+  metadata.gz: 1682a4405fd2baf66a93fc913af2146fa11e9806b90c8d6ac6d0eebc496b30415204474bd841377e3ea409401608f2907f58d7b717b21520cd4b1fe04d825d86
+  data.tar.gz: 8682ebdcdd83bda6ab29261cdfc627afe1bd211343bc4caa95c9f08cbb30fba663f1aebcf4df1535e27d7a84377449d5028afcce145cc0a91c153721e2d261f1

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

@@ -1,4 +1,19 @@
-# crystalruby
+<table>
+  <tr>
+    <td><img src="logo.png" alt="logo" width="150"></td>
+    <td>
+      <h1 align="center">crystalruby</h1>
+      <p align="center">
+        <a href="https://rubygems.org/gems/crystalruby">
+          <img alt="GEM Version" src="https://img.shields.io/gem/v/crystalruby?color=168AFE&include_prereleases&logo=ruby&logoColor=FE1616">
+        </a><br>
+        <a href="https://rubygems.org/gems/crystalruby">
+          <img alt="GEM Downloads" src="https://img.shields.io/gem/dt/crystalruby?color=168AFE&logo=ruby&logoColor=FE1616">
+        </a>
+      </p>
+    </td>
+  </tr>
+</table>
 
 `crystalruby` is a gem that allows you to write Crystal code, inlined in Ruby. All you need is a modern crystal compiler installed on your system.
 
@@ -196,6 +211,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.
@@ -294,7 +325,6 @@ It should support escape hatches to allow it to coexist with code that performs
 The library is currently in its infancy. Planned additions are:
 
 - Replace existing checksum process, with one that combines results of inline and external crystal to more accurately detect when recompilation is necessary.
-- Support for automatic serialization of nested data structures (holding _ONLY_ primitives), using JSON as our serialization protocol (prioritizing portability over raw serialization performance. JSON generation and parsing is bundled into the stdlib in both languages).
 - Simple mixin/concern that utilises `FFI::Struct` for bi-directional passing of Ruby objects and Crystal objects (by value).
 - Install command to generate a sample build script, and supports build command (which simply verifies then invokes this script)
 - Call Ruby from Crystal using FFI callbacks (implement `.expose_to_crystal`)

data/lib/crystalruby/template.rb

@@ -1,4 +1,3 @@
-require 'pry-byebug'
 module CrystalRuby
   module Template
     Dir[File.join(File.dirname(__FILE__), "templates", "*.cr")].each do |file|

data/lib/crystalruby/typebuilder.rb

@@ -65,115 +65,3 @@ module CrystalRuby
     end
   end
 end
-
-# class UnionType
-#   attr_reader :inner
-
-#   def initialize(*inner)
-#     @inner = inner
-#   end
-
-#   def |(other)
-#     UnionType.new(*inner, *other.inner)
-#   end
-
-#   def inspect
-#     elements = inner.map(&:inspect).join(" | ")
-#   end
-# end
-
-# class Type
-#   attr_reader :inner, :contains
-
-#   def initialize(name)
-#     @name = name
-#     @contains = contains
-#     @inner = [self]
-#   end
-
-#   def |(other)
-#     UnionType.new(*inner, *other.inner)
-#   end
-
-#   def inspect
-#     if @contains
-#       "#{@name}(#{@contains.inspect})"
-#     else
-#       @name
-#     end
-#   end
-# end
-
-# module_function
-
-# %w[
-#   Bool Uint8 Uint16 Uint32 Uint64 Int8 Int16 Int32 Int64 Float32 Float64 String Time Symbol
-#   Null
-# ].map do |t|
-#   cls = Class.new(Type)
-#   const_set(t, cls)
-#   define_method(t.downcase) do
-#     cls.new(t)
-#   end
-# end
-
-# def build(&blk)
-#   instance_exec(&blk)
-# end
-
-# def hash(key_type, value_type)
-#   Hash.new(key_type, value_type)
-# end
-
-# def array(type)
-#   Array.new(type)
-# end
-
-# def tuple(*types)
-#   Tuple.new(*types)
-# end
-
-# def named_tuple(type_hash)
-#   NamedTuple.new(type_hash)
-# end
-
-# def NamedTuple(type_hash)
-#   NamedTuple.new(type_hash)
-# end
-
-# class Hash < Type
-#   HASH_KEY_TYPES = %w[String Symbol].freeze
-#   def initialize(key_type, value_type)
-#     super("Hash")
-#     @key_type = key_type
-#     @value_type = value_type
-#     raise "Invalid key type" unless [Uint8, Uint16, Uint32, Uint64, Int8, Int16, Int32, Int64,
-#                                      String].include?(key_type)
-#     raise "Invalid value type" unless value_type.is_a?(Type)
-#   end
-# end
-
-# class Array < Type
-#   def initialize(value_type)
-#     super("Array")
-#     @value_type = value_type
-#     raise "Invalid value type" unless value_type.is_a?(Type)
-#   end
-# end
-
-# class NamedTuple < Type
-#   def initialize(types_hash)
-#     raise "keys must be symbols" unless types_hash.keys.all? { |k| k.is_a?(Symbol) }
-#     raise "Invalid value type" unless types_hash.values.all? { |v| v.is_a?(Type) }
-
-#     super("NamedTuple")
-#     @types_hash = types_hash
-#   end
-# end
-
-# class Tuple < Type
-#   def initialize(*value_types)
-#     super("Tuple")
-#     raise "Invalid value type" unless value_types.all? { |v| v.is_a?(Type) }
-#   end
-# end

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.5"
 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.5
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -107,6 +107,7 @@ files:
 - lib/crystalruby/types/union_type.rb
 - lib/crystalruby/version.rb
 - lib/module.rb
+- logo.png
 - sig/crystalruby.rbs
 homepage: https://github.com/wouterken/crystalruby
 licenses: