codify.rb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 976aa2cb68736d757fe17521a6bf9dbfb059880802d79d28d668da85887599a5
-  data.tar.gz: c586733769830e10780861290ab637e02d076f00ddb7d74d68a776e845ec9d6e
+  metadata.gz: 84aae30b3df6e33c57174ae898b99e048e0b0a9df82297d296f1161afc8a2509
+  data.tar.gz: e7544e5d9a769837fee18b2baeb79647e6eaf874c4f937680632dee5659b7790
 SHA512:
-  metadata.gz: 7e98452a1cfc0521d87cb79a390e2631aed6c8149e923732b1404d69886fd8900d89644bc817ce03204e31c253e3988179fdd6711a91c208db1965582c7cf7d5
-  data.tar.gz: c05557e20ba4374996727fe471e64b74c97c1a7218f799296667a3bacf7384f152e20c73d50625bdcb082a0c7c2d81d357ab80f1705637e7318173255fbf4ef9
+  metadata.gz: f3dd64bc0fe9cfa1963159e21eb6abffbb29be32968bc776385d7549f6a5efe3fdc80d3b6bf725abd263bb422ec78ffa01d3d622fbbf20b02709185884d7be58
+  data.tar.gz: 7e60a3f096be2c2dbc3d5fccab31515416e09bfb7ad9022c4d0a9f15482dbe781f9258ac3851d8de020b9100ef79a74733fd2216f8f9b4464c14d000eade58bc

data/CHANGES.md

@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.1.3 - 2025-05-17
+
 ## 0.1.2 - 2025-05-14
 
 ## 0.1.1 - 2025-05-13

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/codify/rust/definition.rb

@@ -35,7 +35,9 @@ class Codify::Rust::Definition
 
   ##
   # @return [Boolean]
-  def primitive?() false end
+  def primitive?
+    false
+  end
 
   ##
   # @return [String]
@@ -52,9 +54,9 @@ class Codify::Rust::Definition
   ##
   # @param [IO] out
   # @return [void]
-  def write(out)
+  def write(out, extra_derives: [])
     out.puts wrap_text(self.comment, 80-4).map { |s| s.prepend("/// ") }.join("\n") if self.comment?
-    out.puts "#[derive(#{@derives.sort.join(", ")})]" unless @derives.empty?
+    out.puts "#[derive(#{(@derives + (extra_derives || [])).sort.uniq.join(", ")})]" unless (@derives + extra_derives).empty?
     if @cfg_derives.include?(:serde)
       out.puts "#[cfg_attr(feature = \"serde\", derive(serde::Serialize, serde::Deserialize))]"
     end

data/lib/codify/rust/enum.rb

@@ -11,24 +11,41 @@ class Codify::Rust::Enum < Codify::Rust::Definition
   # @param [Array<Symbol, #to_sym>, #to_a] derives
   # @param [String, #to_s] comment
   # @param [Proc] block
-  def initialize(name, variants: nil, **kwargs, &block)
+  def initialize(name, variants: nil, rename_all: nil, **kwargs, &block)
     super(name, **kwargs)
     @variants = (variants || []).to_a.dup
+    @rename_all = rename_all&.to_s
     block.call(self) if block_given?
   end
 
   ##
   # @return [Array<Type>]
-  def types() @variants.map(&:type).compact.uniq.to_a end
+  def types
+    @variants.map(&:type).compact.uniq.to_a
+  end
+
+  ##
+  # @return [Boolean]
+  def defaultible?
+    @variants.empty? || @variants.any?(&:defaultible?)
+  end
+  alias_method :has_default?, :defaultible?
 
   ##
   # @param [IO] out
   # @return [void]
   def write(out)
-    super(out)
+    super(out, extra_derives: self.defaultible? ? %i(Default) : [])
     if self.variants.empty?
       out.puts "pub struct #{@name};"
     else
+      if @cfg_derives.include?(:serde)
+        if @rename_all
+          out.puts "#[cfg_attr(feature = \"serde\", serde(untagged, rename_all = \"lowercase\"))]"
+        else
+          out.puts "#[cfg_attr(feature = \"serde\", serde(untagged))]"
+        end
+      end
       out.puts "pub enum #{@name} {"
       @variants.each_with_index do |variant, i|
         out.puts if i > 0

data/lib/codify/rust/enum_variant.rb

@@ -5,16 +5,25 @@ require_relative 'definition'
 class Codify::Rust::EnumVariant
   include Codify::Rust
 
-  attr_reader :name, :type, :summary
+  attr_reader :name, :type, :default, :summary
   attr_accessor :comment
 
-  def initialize(name, type = nil, &block)
+  def initialize(name, type = nil, default: nil, rename: nil, other: nil, &block)
     @name = name.to_sym
     @type = type
     raise ArgumentError, "#{type.inspect}" unless type.nil? || type.is_a?(Type)
+    @default = default
+    @rename = rename
+    @other = other
     block.call(self) if block_given?
   end
 
+  ##
+  # @return [Boolean]
+  def defaultible?
+    self.default
+  end
+
   ##
   # @return [Boolean]
   def comment?
@@ -29,6 +38,9 @@ class Codify::Rust::EnumVariant
   # @param [IO] out
   # @return [void]
   def write(out)
+    out.puts "    #[default]" if @default
+    out.puts "    #[cfg_attr(feature = \"serde\", serde(rename = \"#{@rename}\"))]" if @rename
+    out.puts "    #[cfg_attr(feature = \"serde\", serde(other))]" if @other
     if !@type
       out.puts "    #{@name},"
     else

data/lib/codify/rust/newtype.rb

@@ -16,6 +16,12 @@ class Codify::Rust::Newtype < Codify::Rust::Definition
     block.call(self) if block_given?
   end
 
+  ##
+  # @return [Boolean]
+  def defaultible?
+    @type.defaultible?
+  end
+
   ##
   # @return [Array<Type>]
   def types() [@type] end

data/lib/codify/rust/struct.rb

@@ -17,9 +17,17 @@ class Codify::Rust::Struct < Codify::Rust::Definition
     block.call(self) if block_given?
   end
 
+  ##
+  # @return [Boolean]
+  def defaultible?
+    @fields.all?(&:defaultible?)
+  end
+
   ##
   # @return [Array<Type>]
-  def types() @fields.map(&:type).uniq.to_a end
+  def types
+    @fields.map(&:type).uniq.to_a
+  end
 
   ##
   # @param [IO] out

data/lib/codify/rust/struct_field.rb

@@ -17,11 +17,21 @@ class Codify::Rust::StructField
 
   ##
   # @return [Boolean]
-  def comment?() self.comment && !self.comment.empty? end
+  def defaultible?
+    @type.defaultible?
+  end
+
+  ##
+  # @return [Boolean]
+  def comment?
+    self.comment && !self.comment.empty?
+  end
 
   ##
   # @return [Array<Type>]
-  def types() [@type] end
+  def types
+    [@type]
+  end
 
   ##
   # @param [IO] out

data/lib/codify/rust/type.rb

@@ -10,10 +10,16 @@ module Codify::Rust::Type
 
   ##
   # @return [Boolean]
-  def primitive?()
+  def primitive?
     true
   end
 
+  ##
+  # @return [Boolean]
+  def defaultible?
+    self.primitive?
+  end
+
   def definition?
     Codify::Rust::Definition === self
   end

data/lib/codify/rust/type_alias.rb

@@ -15,6 +15,12 @@ class Codify::Rust::TypeAlias < Codify::Rust::Definition
     block.call(self) if block_given?
   end
 
+  ##
+  # @return [Boolean]
+  def defaultible?
+    @type.defaultible?
+  end
+
   ##
   # @return [Array<Type>]
   def types() [@type] end

data/lib/codify/rust/types.rb

@@ -8,6 +8,7 @@ module Codify::Rust::Types
 
     def self.to_s() 'Codify::Rust::Types::Named' end
 
+    def primitive?() false end
     def types() [] end # NB
     def to_s() t.to_s end
   end
@@ -63,6 +64,10 @@ module Codify::Rust::Types
 
     def types() [t] end
     def to_s() "Option<#{t}>" end
+
+    def flatten
+      t.is_a?(self.class) ? t : self
+    end
   end
 
   Result = ::Struct.new('Result', :t, :e) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: codify.rb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Arto Bendiken
 bindir: bin
 cert_chain: []
-date: 2025-05-14 00:00:00.000000000 Z
+date: 2025-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Codify.rb
 test_files: []