lhc 10.1.0 → 10.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5027043fdf2d3bd3354777f95b1dd21438f4068170634c5788a8d40120002f6
-  data.tar.gz: e7916e8fc0d2a55ecee4d2ceacc6372011ebdb6e809eddb25291089d7728b553
+  metadata.gz: a935eb47c744e10dd50006a973eff104e9716ade32ae443453aed8b198b41df8
+  data.tar.gz: '07126595ace009e7af40bb41da21a335eb30d0242d185af5792c2633435986d6'
 SHA512:
-  metadata.gz: e405825ed3e030dc051b3c26d6855ff6facf9745855b07b59aa7258885135a0443c6e84d27635413d3cae53c1613b708fe37dfb140a6f1358327199238ad0b88
-  data.tar.gz: 714d29fbd0b77416b6e2fa6a56d1189bea68311e14f8c516b84b129e7e3c0c3a45ff50eddc7e0244c3e22b878e888cb5006f7552c4ad7d8333316bfef16de1e0
+  metadata.gz: 8acc75ddd5efe4d61e10f5ff393c70dbe38c2a5319040b5481aa10773ff53cb017b8c04dd6a83480d29c4687e71764777266889a15e9e319f4a854f4cb177d1c
+  data.tar.gz: 69f88b7decaa58b3ee8137471232e66219f597c471cebf4e4ee234c7ed36ca48bedaf27f0023f09d9b0149545fc116ba3d810657bf4a598c722c6baebeb3ab75

data/lib/lhc.rb

@@ -113,6 +113,8 @@ module LHC
     'lhc/interceptors'
   autoload :Formats,
     'lhc/formats'
+  autoload :Format,
+    'lhc/format'
   autoload :Monitoring,
     'lhc/interceptors/monitoring'
   autoload :Request,

data/lib/lhc/format.rb

@@ -0,0 +1,16 @@
+class LHC::Format
+
+  private
+
+  def no_content_type_header!(options)
+    return if (options[:headers].keys & [:'Content-Type', 'Content-Type']).blank?
+
+    raise 'Content-Type header is not allowed for formatted requests!'
+  end
+
+  def no_accept_header!(options)
+    return if (options[:headers].keys & [:Accept, 'Accept']).blank?
+
+    raise 'Accept header is not allowed for formatted requests!'
+  end
+end

data/lib/lhc/formats/json.rb

@@ -1,13 +1,19 @@
 module LHC::Formats
-  class JSON
+  class JSON < LHC::Format
     include LHC::BasicMethodsConcern
 
     def self.request(options)
+      options[:format] = new
+      super(options)
+    end
+
+    def format_options(options)
       options[:headers] ||= {}
+      no_content_type_header!(options)
       options[:headers]['Content-Type'] = 'application/json; charset=utf-8'
+      no_accept_header!(options)
       options[:headers]['Accept'] = 'application/json; charset=utf-8'
-      options[:format] = new
-      super(options)
+      options
     end
 
     def as_json(input)

data/lib/lhc/formats/multipart.rb

@@ -1,14 +1,19 @@
 module LHC::Formats
-  class Multipart
+  class Multipart < LHC::Format
     include LHC::BasicMethodsConcern
 
     def self.request(options)
-      options[:headers] ||= {}
-      options[:headers]['Content-Type'] = 'multipart/form-data'
       options[:format] = new
       super(options)
     end
 
+    def format_options(options)
+      options[:headers] ||= {}
+      no_content_type_header!(options)
+      options[:headers]['Content-Type'] = 'multipart/form-data'
+      options
+    end
+
     def as_json(input)
       parse(input)
     end

data/lib/lhc/formats/plain.rb

@@ -1,5 +1,5 @@
 module LHC::Formats
-  class Plain
+  class Plain < LHC::Format
     include LHC::BasicMethodsConcern
 
     def self.request(options)
@@ -7,6 +7,10 @@ module LHC::Formats
       super(options)
     end
 
+    def format_options(options)
+      options
+    end
+
     def as_json(input)
       parse(input)
     end

data/lib/lhc/request.rb

@@ -14,9 +14,8 @@ class LHC::Request
 
   def initialize(options, self_executing = true)
     self.errors_ignored = options.fetch(:ignored_errors, [])
-    self.options = options.deep_dup || {}
+    self.options = format!(options.deep_dup || {})
     self.error_handler = options.delete :error_handler
-    self.format = options.delete(:format) || LHC::Formats::JSON.new
     use_configured_endpoint!
     generate_url_from_template!
     self.interceptors = LHC::Interceptors.new(self)
@@ -54,6 +53,11 @@ class LHC::Request
 
   attr_accessor :interceptors
 
+  def format!(options)
+    self.format = options.delete(:format) || LHC::Formats::JSON.new
+    format.format_options(options)
+  end
+
   def optionally_encoded_url(options)
     return options[:url] unless options.fetch(:url_encoding, true)
     encode_url(options[:url])

data/lib/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION ||= '10.1.0'
+  VERSION ||= '10.1.1'
 end

data/spec/basic_methods/request_without_rails_spec.rb

@@ -19,8 +19,7 @@ describe LHC do
       options = {
         url: "http://datastore/v2/feedbacks",
         method: :post,
-        body: {},
-        headers: { 'Content-Type' => 'application/json' }
+        body: {}
       }
       expect { LHC.request(options) }.not_to raise_error
     end

data/spec/formats/json_spec.rb

@@ -8,5 +8,53 @@ describe LHC do
         .to_return(body: {}.to_json)
       LHC.json.get('http://local.ch')
     end
+
+    context 'header key as symbol' do
+      it 'raises an error when trying to set content-type header even though the format is used' do
+        expect(lambda {
+          LHC.post(
+            'http://local.ch',
+            headers: {
+              'Content-Type': 'multipart/form-data'
+            }
+          )
+        }).to raise_error 'Content-Type header is not allowed for formatted requests!'
+      end
+
+      it 'raises an error when trying to set accept header even though the format is used' do
+        expect(lambda {
+          LHC.post(
+            'http://local.ch',
+            headers: {
+              'Accept': 'multipart/form-data'
+            }
+          )
+        }).to raise_error 'Accept header is not allowed for formatted requests!'
+      end
+    end
+
+    context 'header key as string' do
+      it 'raises an error when trying to set content-type header even though the format is used' do
+        expect(lambda {
+          LHC.post(
+            'http://local.ch',
+            headers: {
+              'Content-Type' => 'multipart/form-data'
+            }
+          )
+        }).to raise_error 'Content-Type header is not allowed for formatted requests!'
+      end
+
+      it 'raises an error when trying to set accept header even though the format is used' do
+        expect(lambda {
+          LHC.post(
+            'http://local.ch',
+            headers: {
+              'Accept' => 'multipart/form-data'
+            }
+          )
+        }).to raise_error 'Accept header is not allowed for formatted requests!'
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 10.1.0
+  version: 10.1.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
@@ -205,6 +205,7 @@ files:
 - lib/lhc/errors/server_error.rb
 - lib/lhc/errors/timeout.rb
 - lib/lhc/errors/unknown_error.rb
+- lib/lhc/format.rb
 - lib/lhc/formats.rb
 - lib/lhc/formats/json.rb
 - lib/lhc/formats/multipart.rb