escher 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d7c8a7236299d04d8b414435631a7e8c166580b
-  data.tar.gz: a091fdb0bb8573b040baae2f0b58265bfb1c1349
+  metadata.gz: 681df740040b4efceff281b94ad161ca37be4819
+  data.tar.gz: de47b720014006d07a4d84d9bc178032f76c03f8
 SHA512:
-  metadata.gz: 660597e1a9c2cf47a9fe57545ac30e126b028c6f1012e90207b2346cdd67a347d2dee4a9f0443af34d82d75c163a33ee1f6f29a5911918680af008c0e00c9fb9
-  data.tar.gz: fbe5c0eda83ea7b74bc8123e6812a845e6d55fe4a6a7fe2f96c8b9de533727555d68d0ae5c7e51299588443014e57ed3110d83c7587a732788d711af76568d63
+  metadata.gz: 0bcbd87cde7db30cc2aee5ed5f230890d08aefa8ad1274cd63fcf2bafe99130f3806ca71f939accb69b2a9b6677eda37790d4e50b6e56f9e6e3973da726d83ed
+  data.tar.gz: e894f5ffb2c9611ec221e10d1347dae7aba8746266359aad18a98258786601f3aaeda9570fee1eb161fa107a84d2833329199c62a6d03199d9195fe707e9306d

data/lib/escher.rb

@@ -2,6 +2,11 @@ require 'addressable/uri'
 require 'time'
 require 'openssl'
 
-require 'escher/version'
-require 'escher/request/factory'
-require 'escher/auth'
+module Escher
+  require 'escher/version'
+
+  require 'escher/auth'
+  require 'escher/request'
+  require 'escher/escher_error'
+
+end

data/lib/escher/auth.rb

@@ -341,9 +341,4 @@ module Escher
     end
 
   end
-
-
-  class EscherError < RuntimeError
-  end
-
 end

data/lib/escher/escher_error.rb

@@ -0,0 +1,2 @@
+class Escher::EscherError < RuntimeError
+end

data/lib/escher/request.rb

@@ -0,0 +1,13 @@
+module Escher::Request
+
+  require 'escher/request/dci'
+
+  require 'escher/request/base'
+  require 'escher/request/hash_request'
+  require 'escher/request/rack_request'
+  require 'escher/request/legacy_request'
+  require 'escher/request/action_dispatch_request'
+
+  require 'escher/request/factory'
+
+end

data/lib/escher/request/action_dispatch_request.rb

@@ -2,10 +2,10 @@ module Escher
   module Request
     class ActionDispatchRequest < Base
 
+      include Escher::Request::DCI::RackEnv
+
       def headers
-        request.env.
-          select { |header_name, _| header_name.start_with? "HTTP_" }.
-          map { |header_name, value| [header_name[5..-1].tr('_', '-'), value] }
+        get_headers_by_rack_env(request.env)
       end
 
 

data/lib/escher/request/dci.rb

@@ -0,0 +1,3 @@
+module Escher::Request::DCI
+  require 'escher/request/dci/rack_env'
+end

data/lib/escher/request/dci/rack_env.rb

@@ -0,0 +1,27 @@
+module Escher::Request::DCI::RackEnv
+
+  CUSTOM_HTTP_HEADER_MATCHER = /^HTTP_/
+  CONSTANT_HTTP_HEADER_KEYS = %w[CONTENT_LENGTH CONTENT_TYPE]
+
+  protected
+
+  def get_headers_by_rack_env(env)
+    format_headers(get_custom_http_headers(env) + get_constant_http_headers(env))
+  end
+
+  private
+
+  def get_custom_http_headers(env)
+    env.select { |env_str_key, _| env_str_key =~ CUSTOM_HTTP_HEADER_MATCHER }.to_a
+  end
+
+  def get_constant_http_headers(env)
+    CONSTANT_HTTP_HEADER_KEYS.map { |env_key| [env_key, env[env_key]] }.select { |k, v| !v.nil? }
+  end
+
+  def format_headers(array)
+    array.map { |header_name, value| [header_name.sub(CUSTOM_HTTP_HEADER_MATCHER, '').tr('_', '-'), value] }
+  end
+
+
+end

data/lib/escher/request/factory.rb

@@ -1,9 +1,3 @@
-require 'escher/request/base'
-require 'escher/request/hash_request'
-require 'escher/request/rack_request'
-require 'escher/request/legacy_request'
-require 'escher/request/action_dispatch_request'
-
 module Escher
   module Request
     class Factory

data/lib/escher/request/rack_request.rb

@@ -1,5 +1,7 @@
 class Escher::Request::RackRequest < Escher::Request::Base
 
+  include Escher::Request::DCI::RackEnv
+
   def initialize(request_env)
     super(request_env)
     @rack_request = request_env
@@ -26,7 +28,7 @@ class Escher::Request::RackRequest < Escher::Request::Base
   end
 
   def headers
-    @headers ||= @rack_request.env.select { |k, v| k =~ /^HTTP_/i }.map { |k, v| [k.sub(/^HTTP_/i, '').gsub('_', '-'), v] }
+    @headers ||= get_headers_by_rack_env(@rack_request.env)
   end
 
   def method

data/lib/escher/version.rb

@@ -1,3 +1,3 @@
 module Escher
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/spec/escher/request/action_dispatch_request_spec.rb

@@ -29,6 +29,12 @@ describe Escher::Request::ActionDispatchRequest do
 
       expect(subject.headers).to eq [['HOST-NAME', 'some host']]
     end
+
+    it 'should add the content-type and content-length to the headers' do
+      request_params.merge!( 'CONTENT_LENGTH' => '123', 'CONTENT_TYPE' => 'text/plain' )
+
+      expect(subject.headers).to eq [%w(CONTENT-LENGTH 123), %w(CONTENT-TYPE text/plain)]
+    end
   end
 
 

data/spec/escher/request/rack_request_spec.rb

@@ -31,6 +31,13 @@ describe Escher::Request::RackRequest do
 
       expect(subject.headers).to eq [['HOST-NAME', 'some host']]
     end
+
+
+    it 'should add the content-type and content-length to the headers' do
+      request_params.merge!( 'CONTENT_LENGTH' => '123', 'CONTENT_TYPE' => 'text/plain' )
+
+      expect(subject.headers).to eq [%w(CONTENT-LENGTH 123), %w(CONTENT-TYPE text/plain)]
+    end
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escher
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Andras Barthazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,8 +111,12 @@ files:
 - escher.gemspec
 - lib/escher.rb
 - lib/escher/auth.rb
+- lib/escher/escher_error.rb
+- lib/escher/request.rb
 - lib/escher/request/action_dispatch_request.rb
 - lib/escher/request/base.rb
+- lib/escher/request/dci.rb
+- lib/escher/request/dci/rack_env.rb
 - lib/escher/request/factory.rb
 - lib/escher/request/hash_request.rb
 - lib/escher/request/legacy_request.rb