haveapi 0.29.4 → 0.29.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ea4a91d72110b964bf06310d13e19e2ac99629f842d8a7086b3ee8d1a060868
-  data.tar.gz: 26e7304458138efa50732b94f86c2de050e72539b07a7d6e6faa87ef4ecc5d5c
+  metadata.gz: 91faacf7a526f1d4a85e3ac834af09b31870084892a4fe423c89f788b785831f
+  data.tar.gz: 81ece8ab753c147e13401933bd8086e11c6a20f8e1991cb86ac80df6afbfccac
 SHA512:
-  metadata.gz: 38851b2f109fd4f502fd95237caa8c22a4bcb0c98171832ee88da356f61946234af9890a5c1565948db81a3186871b5c97eb68c2659ee9df5c28150f53e62b4a
-  data.tar.gz: 131e6a523d0147b10a1f0e7c399d2a879fbca04bf5b148eaf4639eff10abc0977c31323f7c74638dbb325440b9b1f32facf21986ec28e15eeb4bb1ab9d13b1d5
+  metadata.gz: 4d2c6c8cc96b841f645193d248023ea939f36a55af8e7dc2ed710ed770a15de89c34897cd9f3db969c4e1867b4e70ebcbcdf0c15f702d8acf917cee3cbc543a2
+  data.tar.gz: c7ff9c297474a183ba391e8567088494c0b98456f1cbb37b6a36599a955a4b6aca30ec2d5f631fc8d9fdc2c18319059eb5fda188fe75d2574d3875a52dda4544

data/haveapi.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= #{File.read('../../.ruby-version').strip}"
 
   s.add_dependency 'activesupport', '>= 7.1'
-  s.add_dependency 'haveapi-client', '~> 0.29.4'
+  s.add_dependency 'haveapi-client', '~> 0.29.5'
   s.add_dependency 'i18n', '>= 1.6', '< 2'
   s.add_dependency 'json'
   s.add_dependency 'mail'

data/lib/haveapi/version.rb

@@ -1,4 +1,4 @@
 module HaveAPI
   PROTOCOL_VERSION = '2.0'.freeze
-  VERSION = '0.29.4'.freeze
+  VERSION = '0.29.5'.freeze
 end

data/spec/validators/inclusion_spec.rb

@@ -12,30 +12,32 @@ describe HaveAPI::Validators::Inclusion do
     end
   end
 
-  [
-    %w[one two three],
-    {
-      one: 'Fancy one',
-      two: 'Fancy two',
-      three: 'Fancy three'
-    }
-  ].each do |include|
-    context "with include as a '#{include.class}'" do
-      context 'with short form' do
-        let(:validator) { described_class.new(:include, %w[one two three]) }
-
-        it_behaves_like 'all'
-      end
-
-      context 'with full form' do
-        let(:validator) do
-          described_class.new(:include, {
-            values: %w[one two three]
-          })
-        end
-
-        it_behaves_like 'all'
-      end
+  context 'with include as an Array' do
+    let(:values) { %w[one two three] }
+
+    context 'with short form' do
+      let(:validator) { described_class.new(:include, values) }
+
+      it_behaves_like 'all'
+    end
+
+    context 'with full form' do
+      let(:validator) { described_class.new(:include, { values: }) }
+
+      it_behaves_like 'all'
     end
   end
+
+  context 'with include as a Hash' do
+    let(:values) do
+      {
+        one: 'Fancy one',
+        two: 'Fancy two',
+        three: 'Fancy three'
+      }
+    end
+    let(:validator) { described_class.new(:include, { values: }) }
+
+    it_behaves_like 'all'
+  end
 end

data/test_support/client_test_api.rb

@@ -519,6 +519,31 @@ module HaveAPI
           end
         end
 
+        define_action(:EchoChoice) do
+          extend DocFilter
+
+          route 'echo_choice'
+          http_method :post
+          input(:hash) do
+            string :format,
+                   required: true,
+                   choices: {
+                     values: {
+                       archive: 'Archive',
+                       stream: 'Stream'
+                     }
+                   }
+          end
+          output(:hash) do
+            string :format
+          end
+          authorize { allow }
+
+          def exec
+            input
+          end
+        end
+
         define_action(:EchoOptional) do
           extend DocFilter
 
@@ -692,10 +717,32 @@ module HaveAPI
       HaveAPI.implicit_version = '1.0'
 
       reset!
+      ::I18n.backend.store_translations(
+        :cs,
+        client_test: {
+          resources: {
+            test: {
+              actions: {
+                echo_choice: {
+                  input: {
+                    format: {
+                      choices: {
+                        archive: { label: 'Archiv' },
+                        stream: { label: 'Proud' }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      )
 
       api = HaveAPI::Server.new(Resources)
       api.use_version(:all)
       api.default_version = '1.0'
+      api.parameter_i18n_scope = 'client_test'
       api.auth_chain << BasicProvider
       api.auth_chain << TokenProvider
       api.action_state = ActionStateBackend

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haveapi
 version: !ruby/object:Gem::Version
-  version: 0.29.4
+  version: 0.29.5
 platform: ruby
 authors:
 - Jakub Skokan
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.4
+        version: 0.29.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.4
+        version: 0.29.5
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement