finitio 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98a5d335829b36e4723c0cd55955fdd9a17125fe86d74e671b87fb3c965ce78e
-  data.tar.gz: 3c32527c4dddb343f218420943f748b7126f26b3676c7860371feb9d32136efe
+  metadata.gz: dba23fcd08948c1ba59360fcedd3deb9eab5b7f92c49ad8849256da1964574c6
+  data.tar.gz: eaea92410902208a2c003fe34f3935604d4c464f4917e4bf06f7129fbfc24364
 SHA512:
-  metadata.gz: dd1a8adf0cc87610d51397fee2a6c735f1e42ee58d1cb107da7372b1b1eaa158bc6499bfa01a0870c9721431adc59b28c1efc969258e4c3c89ba6bf6b3957474
-  data.tar.gz: 8cd34bae14c768d99408191b7484cd6620f99e87b1f7e03e4b1df75914da76c9df50f854e564056aaf5c8ed41d556a2634215f43d102da7006cc0b4d0edc265a
+  metadata.gz: 890a227df66eef86898513ba4269863f603c3289c65bd65ff68b1cd6372b5d60b6ae726b46fc9d4c5c898dab78dbc50e124b84733bf6df176c5b4401803741a0
+  data.tar.gz: db438df7b731247174b40954c050893fba97d7db522e8b423bf5fb62a0075e44d6d3cb96ea5e58144416801e7ccabb8471e23ffdd1071d29ee790f9c5db1047f

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.12.2 - 2025/03/22
+
+* Add Heading#allbut and (Multi)TupleType#allbut, to remove some attributes.
+
+  This actually starts the support for an algebra on types...
+
+* Don't generate anyOf with duplicate types in JsonSchema geneation.
+
 ## 0.12.1 - 2025/03/20
 
 * Allow Hash as bulttin type recognized by JsonSchema generation.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    finitio (0.12.1)
+    finitio (0.12.2)
       citrus (>= 3.0, < 4.0)
 
 GEM

data/lib/finitio/json_schema/ad_type.rb

@@ -2,9 +2,10 @@ module Finitio
   class AdType
 
     def to_json_schema(*args, &bl)
-      {
-        anyOf: contracts.map{|c| c.infotype.to_json_schema(*args, &bl) }
-      }
+      subtypes = contracts
+          .map{|c| c.infotype.to_json_schema(*args, &bl) }
+          .uniq
+      subtypes.size == 1 ? subtypes.first : { anyOf: subtypes }
     end
 
   end # class AdType

data/lib/finitio/json_schema/union_type.rb

@@ -14,8 +14,10 @@ module Finitio
       return { type: 'boolean'} if self == BOOLEAN_TYPE
       return cs.first.to_json_schema(*args, &bl) if cs.size == 1
 
+      subtypes = cs.map{|c| c.to_json_schema(*args, &bl) }.uniq
+      return subtypes.first if subtypes.size == 1
       {
-        anyOf: cs.map{|c| c.to_json_schema(*args, &bl) }
+        anyOf: subtypes
       }
     end
 

data/lib/finitio/support/heading.rb

@@ -114,6 +114,10 @@ module Finitio
       Heading.new(attributes.values.map{|a| a.unconstrained }, options)
     end
 
+    def allbut(attrs)
+      Heading.new(attributes.values.reject{|a| attrs.include?(a.name) }.to_a, @options)
+    end
+
   private
 
     def normalize_attributes(attrs)

data/lib/finitio/type/hash_based_type.rb

@@ -61,6 +61,10 @@ module Finitio
       uped
     end
 
+    def allbut(attrs)
+      factor(heading.allbut(attrs))
+    end
+
   protected
 
     def looks_a_tuple?(value)

data/lib/finitio/type/multi_tuple_type.rb

@@ -29,5 +29,9 @@ module Finitio
       super(other, TupleType, MultiTupleType)
     end
 
+    def factor(heading)
+      MultiTupleType.new(heading)
+    end
+
   end # class MultiTupleType
 end # module Finitio

data/lib/finitio/type/tuple_type.rb

@@ -48,5 +48,9 @@ module Finitio
       super(other, TupleType, MultiTupleType)
     end
 
+    def factor(heading)
+      TupleType.new(heading)
+    end
+
   end # class TupleType
 end # module Finitio

data/lib/finitio/version.rb

@@ -3,7 +3,7 @@ module Finitio
 
     MAJOR = 0
     MINOR = 12
-    TINY  = 1
+    TINY  = 2
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

data/spec/json_schema/test_ad_type.rb

@@ -3,10 +3,10 @@ module Finitio
     describe "AdType" do
 
       let(:type) {
-        type = AdType.new(Color, [rgb_contract, hex_contract])
+        type = AdType.new(Color, [rgb_contract, hex_contract, hex_contract])
       }
 
-      it 'works as expected' do
+      it 'works as expected and removes duplicates' do
         expect(type.to_json_schema).to eql({
           anyOf: [
             { type: "integer" },

data/spec/json_schema/test_union_type.rb

@@ -46,6 +46,18 @@ module Finitio
         end
       end
 
+      context 'when used with two yielding the same final type' do
+        let(:union_type) {
+          UnionType.new([string_type, string_type])
+        }
+
+        it 'works as expected' do
+          expect(union_type.to_json_schema).to eql({
+            :type => "string"
+          })
+        end
+      end
+
       context 'when used with a |Nil' do
         let(:union_type) {
           UnionType.new([string_type, int_type, nil_type])

data/spec/type/tuple_type/test_allbut.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+module Finitio
+  describe TupleType, "allbut" do
+
+    let(:h1){ Heading.new([Attribute.new(:r, intType), Attribute.new(:b, intType)]) }
+    let(:h2){ Heading.new([Attribute.new(:b, intType)]) }
+
+    let(:t1)  { TupleType.new(h1) }
+    let(:t2)  { TupleType.new(h2) }
+
+    it 'removes unwanted atributes' do
+      expect(t1.allbut([:r])).to eql(t2)
+    end
+
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finitio
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -446,6 +446,7 @@ files:
 - spec/type/sub_type/test_name.rb
 - spec/type/test_suppremum.rb
 - spec/type/test_unconstrained.rb
+- spec/type/tuple_type/test_allbut.rb
 - spec/type/tuple_type/test_default_name.rb
 - spec/type/tuple_type/test_dress.rb
 - spec/type/tuple_type/test_equality.rb
@@ -661,6 +662,7 @@ test_files:
 - spec/type/sub_type/test_name.rb
 - spec/type/test_suppremum.rb
 - spec/type/test_unconstrained.rb
+- spec/type/tuple_type/test_allbut.rb
 - spec/type/tuple_type/test_default_name.rb
 - spec/type/tuple_type/test_dress.rb
 - spec/type/tuple_type/test_equality.rb