finitio 0.12.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92c67dd32e89dd6c4597b4a8456572bb1a5b3de07bdf58e88bcb9dc3f0874462
-  data.tar.gz: 4ecd7898e477113040613415f9bc2cc8f23bc3605d0f71a3ccaefbbe1eaf31ff
+  metadata.gz: dba23fcd08948c1ba59360fcedd3deb9eab5b7f92c49ad8849256da1964574c6
+  data.tar.gz: eaea92410902208a2c003fe34f3935604d4c464f4917e4bf06f7129fbfc24364
 SHA512:
-  metadata.gz: eb3042b639a82d469bb760807e6c94e1f70c39a3249420d30e339d5f004048e8abe6026de3b3b834e3703f88b3dd10a6d2937abdba5a183444af13609cc150b5
-  data.tar.gz: f44c30f37848ad1e0b8344487cc0f0353ad694ce31c535ff6dd4ae02e903bebc92d11b29ac78ae0aa7d21f7bce6ba3fbd7ecdceb2cb6d14aa4bd3f9d6fb5164a
+  metadata.gz: 890a227df66eef86898513ba4269863f603c3289c65bd65ff68b1cd6372b5d60b6ae726b46fc9d4c5c898dab78dbc50e124b84733bf6df176c5b4401803741a0
+  data.tar.gz: db438df7b731247174b40954c050893fba97d7db522e8b423bf5fb62a0075e44d6d3cb96ea5e58144416801e7ccabb8471e23ffdd1071d29ee790f9c5db1047f

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 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.
+* Remove Ruby 2.6 from supported versions. Requirement is Ruby 2.7.
+
 ## 0.12.0 - 2023/05/23
 
 * Remove support for ruby < 2.6

data/Gemfile.lock

@@ -1,21 +1,22 @@
 PATH
   remote: .
   specs:
-    finitio (0.12.0)
+    finitio (0.12.2)
       citrus (>= 3.0, < 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.3)
+    activesupport (7.0.8.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     awesome_print (1.9.2)
-    builder (3.2.4)
+    bigdecimal (3.1.9)
+    builder (3.3.0)
     citrus (3.0.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.5)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -54,13 +55,13 @@ GEM
       cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
       cucumber-messages (~> 12.2, >= 12.2.0)
     diff-lcs (1.3)
-    docile (1.4.0)
-    ffi (1.15.5)
-    i18n (1.13.0)
+    docile (1.4.1)
+    ffi (1.17.1-x86_64-linux-gnu)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
+    json (2.10.2)
     middleware (0.1.0)
-    minitest (5.18.0)
+    minitest (5.25.5)
     multi_json (1.15.0)
     multi_test (0.1.2)
     path (2.1.0)
@@ -69,33 +70,34 @@ GEM
       middleware
       thor
       thread_safe
-    rake (13.0.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rake (13.2.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     sync (0.5.0)
-    sys-uname (1.2.3)
+    sys-uname (1.3.1)
       ffi (~> 1.1)
-    term-ansicolor (1.7.1)
+    term-ansicolor (1.11.2)
       tins (~> 1.0)
-    thor (1.2.2)
+    thor (1.3.2)
     thread_safe (0.3.6)
-    tins (1.32.1)
+    tins (1.38.0)
+      bigdecimal
       sync
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -104,6 +106,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  activesupport (~> 7.0.8)
   awesome_print (~> 1.8)
   coveralls (~> 0.8)
   cucumber (~> 4.1)
@@ -114,4 +117,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.3.26
+   2.4.19

data/finitio.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake", "~> 13.0")
   s.add_development_dependency("rspec", "~> 3.0")
   s.add_development_dependency("cucumber", "~> 4.1")
+  s.add_development_dependency('activesupport', '~> 7.0.8')
   s.add_development_dependency("path", ">= 2.1", "< 3.0")
   s.add_development_dependency("awesome_print", "~> 1.8")
   s.add_development_dependency("coveralls", "~> 0.8")

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/builtin_type.rb

@@ -9,6 +9,7 @@ module Finitio
       Numeric => "number",
       TrueClass => "boolean",
       FalseClass => "boolean",
+      Hash => "object",
       Object => "object"
     }
 

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  = 0
+    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.0
+  version: 0.12.2
 platform: ruby
 authors:
 - Bernard Lambeau
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2025-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.0.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.0.8
 - !ruby/object:Gem::Dependency
   name: path
   requirement: !ruby/object:Gem::Requirement
@@ -432,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
@@ -471,7 +486,7 @@ files:
 homepage: https://github.com/blambeau/finitio
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -486,8 +501,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Finitio - in Ruby
 test_files:
@@ -647,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