haveapi 0.27.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8307e5e40983cf927641fd3d4052058406209093520a83d89121883f64a9ba0e
-  data.tar.gz: b2d80c7621b7f8870e89dff0ae78c3f4f2d5587ddc9151733d795df0c279fbb7
+  metadata.gz: c1d65a2661353ff707b5b33f0bf8df446bfd4dcc6c669b5af8fdc46dbbf8a0a5
+  data.tar.gz: ddb0c92670d615f22468c91c96f8e83e34cf53a3680cf55c588936aa95a34df7
 SHA512:
-  metadata.gz: b93b9411fb84cf5e67763e9384746da97f32903126e802ca2a47f545f68c9d37f66c54c280e78bc7b25e9abad19ca99e3a6d9ed68a985daa8c053119d459ed6d
-  data.tar.gz: 06fff468dc3e939c838689fbd515ae280cf590c9a05d1c36dc81ba7c2723ab344acadee67ece39fb782ff10c75baf7be906fa2e786e5f7cf9a9ae47fe110d9f1
+  metadata.gz: 908348858c2829a57531813ceb696c47768ec9a5e29133e8fb64e2c33613949ef70dd52468480a5a2e33c25c9c204541946ccfb982a17cec27656f4b184c2724
+  data.tar.gz: 82e5b873d368caf4914895b24fa4e57d6b0b39c55357910c307496c535cacbdfebb35cd4036b2d07bb1627625a951f5e04fa440416f1eaa141980a22e943468e

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.27.0'
+  s.add_dependency 'haveapi-client', '~> 0.27.1'
   s.add_dependency 'json'
   s.add_dependency 'mail'
   s.add_dependency 'nesty', '~> 1.0'

data/lib/haveapi/model_adapters/active_record.rb

@@ -148,7 +148,12 @@ module HaveAPI::ModelAdapters
 
         if raw.is_a?(String)
           stripped = raw.strip
-          raise HaveAPI::ValidationError, "not a valid id #{original.inspect}" if stripped.empty?
+
+          if stripped.empty?
+            return nil if extra && extra[:optional]
+
+            raise HaveAPI::ValidationError, "not a valid id #{original.inspect}"
+          end
 
           raw = stripped
 

data/lib/haveapi/parameters/resource.rb

@@ -92,9 +92,16 @@ module HaveAPI::Parameters
     end
 
     def clean(raw)
+      if raw.is_a?(String)
+        stripped = raw.strip
+        return nil if stripped.empty? && optional?
+      end
+
+      extra = @extra.merge(optional: optional?)
+
       ::HaveAPI::ModelAdapter.for(
         show_action.input.layout, @resource.model
-      ).input_clean(@resource.model, raw, @extra)
+      ).input_clean(@resource.model, raw, extra)
     end
 
     def validate(v, params)

data/lib/haveapi/version.rb

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

data/spec/model_adapters/active_record_spec.rb

@@ -343,6 +343,8 @@ describe HaveAPI::ModelAdapters::ActiveRecord do
     expect(described_class::Input.clean(ARAdapterSpec::Environment, 1, {})).to eq(environment)
     expect(described_class::Input.clean(ARAdapterSpec::Environment, '1', {})).to eq(environment)
     expect(described_class::Input.clean(ARAdapterSpec::Environment, 1.0, {})).to eq(environment)
+    expect(described_class::Input.clean(ARAdapterSpec::Environment, '', { optional: true })).to be_nil
+    expect(described_class::Input.clean(ARAdapterSpec::Environment, '   ', { optional: true })).to be_nil
 
     expect do
       described_class::Input.clean(ARAdapterSpec::Environment, 'abc', {})

data/test_support/client_test_api.rb

@@ -473,6 +473,30 @@ module HaveAPI
             { project: input[:project] }
           end
         end
+
+        define_action(:EchoResourceOptional) do
+          extend DocFilter
+          route 'echo_resource_optional'
+          http_method :get
+          input(:hash) do
+            resource HaveAPI::ClientTestAPI::Resources::Project, required: false
+          end
+          output(:hash) do
+            bool :project_provided, required: true
+            bool :project_nil, required: true
+            integer :project
+          end
+          authorize { allow }
+
+          def exec
+            ret = {
+              project_provided: input.has_key?(:project),
+              project_nil: input[:project].nil?
+            }
+            ret[:project] = input[:project] unless input[:project].nil?
+            ret
+          end
+        end
       end
     end
 

metadata

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