escher 0.4.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbb2c924f14cb51125c9a2248c3363c44db153f6
-  data.tar.gz: 01990347371ae73f6e51b9f82f1c8912fd99d656
+  metadata.gz: f5d7892a58786fb9802e66a734ddc2f7f84a4b42
+  data.tar.gz: 18bf4433e019a4581eb6980f9819f2b336c3495a
 SHA512:
-  metadata.gz: 8627e0c6108b62f1ab72136bcd0f53362ec50af7cbffdbed37560b2d9ee55cd449e1c953445447e6d1c3774e09f46534b8e14e7a6efc386e1887965e3abe2e88
-  data.tar.gz: 8e7705c5395920085e166b1953db9433ad42db825acf1a733a4f70a6dfd640513f0f71034b115b1f1c8f6af5676a5293cdbccafefec4af40748bef7bf11e0097
+  metadata.gz: 006d627eddd82e86ef6e803019bee58183314d85b299a82a62da7e2579b069bd11e247d20d444822dd87acba7276612d19af415f608d5f55ccb88e532bdc36e4
+  data.tar.gz: 6d7cabbbaba10921751b255dcd9865f9bdc6abb08b1a7114190aac257f168f1118f9ea40b8399ac6502530ae3f04b38ebc7ef43cdc044eedf9f5eee9c4fcc71b

data/lib/escher/request/factory.rb

@@ -6,7 +6,7 @@ module Escher
         case request
 
           when defined?(ActionDispatch::Request) && ActionDispatch::Request
-            ActionDispatchRequest.new(request)
+            RackRequest.new(Rack::Request.new(request.env))
 
           when defined?(Rack::Request) && Rack::Request
             RackRequest.new(request)

data/lib/escher/request.rb

@@ -6,7 +6,6 @@ module Escher::Request
   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'
 

data/lib/escher/version.rb

@@ -1,3 +1,3 @@
 module Escher
-  VERSION = '0.4.3'
+  VERSION = '1.0.0'
 end

data/spec/escher/request/factory_spec.rb

@@ -7,19 +7,31 @@ require 'action_dispatch'
 describe Escher::Request::Factory do
 
   describe ".from_request" do
+    request_env = {Rack::PATH_INFO.to_s => "request-path"}
+
     {
 
-        {uri: "request uri"} => Escher::Request::HashRequest,
-        Struct.new(:uri) => Escher::Request::LegacyRequest,
-        Rack::Request.new({}) => Escher::Request::RackRequest,
-        ActionDispatch::Request.new({}) => Escher::Request::ActionDispatchRequest
+      {uri: "request-path"} => Escher::Request::HashRequest,
+      Struct.new("Request", :uri).new("request-path") => Escher::Request::LegacyRequest,
+      Rack::Request.new(request_env) => Escher::Request::RackRequest,
+      ActionDispatch::Request.new(request_env) => Escher::Request::RackRequest
 
     }.each do |request, expected_class|
 
-      it "should return a #{expected_class.name} when the request to be wrapped is a #{request.class.name}" do
-        expect(expected_class).to receive(:new).with(request).and_return "#{expected_class.name} wrapping request"
+      context "the request to be wrapped is a #{request.class.name}" do
+
+        it "returns a #{expected_class.name}" do
+          wrapped_request = described_class.from_request request
+
+          expect(wrapped_request).to be_an_instance_of expected_class
+        end
+
+        it "wraps the path from the original request" do
+          wrapped_request = described_class.from_request request
+
+          expect(wrapped_request.path).to eq "request-path"
+        end
 
-        expect(described_class.from_request request).to eq "#{expected_class.name} wrapping request"
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escher
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Andras Barthazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,6 @@ files:
 - 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
@@ -315,7 +314,6 @@ files:
 - spec/emarsys_testsuite/post-header-value-spaces.sreq
 - spec/emarsys_testsuite/post-header-value-spaces.sts
 - spec/escher/auth_spec.rb
-- spec/escher/request/action_dispatch_request_spec.rb
 - spec/escher/request/factory_spec.rb
 - spec/escher/request/hash_request_spec.rb
 - spec/escher/request/rack_request_spec.rb
@@ -343,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Library for HTTP request signing (Ruby implementation)
@@ -526,7 +524,6 @@ test_files:
 - spec/emarsys_testsuite/post-header-value-spaces.sreq
 - spec/emarsys_testsuite/post-header-value-spaces.sts
 - spec/escher/auth_spec.rb
-- spec/escher/request/action_dispatch_request_spec.rb
 - spec/escher/request/factory_spec.rb
 - spec/escher/request/hash_request_spec.rb
 - spec/escher/request/rack_request_spec.rb

data/lib/escher/request/action_dispatch_request.rb

@@ -1,47 +0,0 @@
-module Escher
-  module Request
-    class ActionDispatchRequest < Base
-
-      include Escher::Request::DCI::RackEnv
-
-      def headers
-        get_headers_by_rack_env(request.env)
-      end
-
-
-
-      def method
-        request.request_method
-      end
-
-
-
-      def body
-        case request.body
-        when StringIO
-          request.body.string
-        else
-          request.body.to_s
-        end
-      end
-
-
-
-      def path
-        request.env['REQUEST_PATH'] || request.path
-      end
-
-
-
-      def query_values
-        Addressable::URI.new(:query => request.env['QUERY_STRING']).query_values(Array) or []
-      end
-
-
-
-      def set_header(header_name, value)
-      end
-
-    end
-  end
-end

data/spec/escher/request/action_dispatch_request_spec.rb

@@ -1,120 +0,0 @@
-require 'spec_helper'
-
-require 'action_dispatch'
-
-describe Escher::Request::ActionDispatchRequest do
-
-  let(:request_params) { {"PATH_INFO" => "/", } }
-  let(:request) { ActionDispatch::Request.new(request_params) }
-
-  subject { described_class.new request }
-
-  describe "#request" do
-    it "should return the underlying request object" do
-      expect(subject.request).to eq request
-    end
-  end
-
-
-  describe "#headers" do
-    it "should return only the HTTP request headers" do
-      request_params.merge! 'HTTP_HOST' => 'some host',
-                            'SOME_HEADER' => 'some header'
-
-      expect(subject.headers).to eq [['HOST', 'some host']]
-    end
-
-    it "should replace underscores with dashes in the header name" do
-      request_params.merge! 'HTTP_HOST_NAME' => 'some host'
-
-      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
-
-
-  describe "#has_header?" do
-    it "should return true if request has specified header, false otherwise" do
-      request_params.merge! 'HTTP_HOST_NAME' => 'some host'
-
-      expect(subject.has_header? 'host-name').to be_truthy
-      expect(subject.has_header? 'no-such-header').to be_falsey
-    end
-  end
-
-
-  describe "#header" do
-    it "should return the value for the requested header" do
-      request_params.merge! 'HTTP_HOST' => 'some host'
-
-      expect(subject.header 'host').to eq 'some host'
-    end
-
-    it "should return nil if no such header exists" do
-      expect(subject.header 'host').to be_nil
-    end
-  end
-
-
-  describe "#method" do
-    it "should return the request method" do
-      request_params.merge! 'REQUEST_METHOD' => 'GET'
-
-      expect(subject.method).to eq 'GET'
-    end
-  end
-
-
-  describe "#body" do
-    it "should return the request body" do
-      request_params.merge! 'rack.input' => 'request body'
-
-      expect(subject.body).to eq 'request body'
-    end
-
-    it "should return empty string for no body" do
-      expect(subject.body).to eq ''
-    end
-  end
-
-
-  describe "#path" do
-    it "should return the request path" do
-      request_params.merge! 'REQUEST_PATH' => '/resources/id///'
-
-      expect(subject.path).to eq '/resources/id///'
-    end
-  end
-
-
-  describe "#query_values" do
-    it "should return the request query parameters as an array of key-value pairs" do
-      request_params.merge! 'QUERY_STRING' => 'search=query&param=value'
-
-      expect(subject.query_values).to eq [['search', 'query'], ['param', 'value']]
-    end
-
-    it "should return the query parameters regardless of fragments" do
-      request_params.merge! 'QUERY_STRING' => "@\#$%^&+=/,?><`\";:\\|][{}"
-
-      expect(subject.query_values).to eq [["@\#$%^"], ["+", "/,?><`\";:\\|][{}"]]
-    end
-
-    it "should return an empty array if the request has no query parameters" do
-      expect(subject.query_values).to eq []
-    end
-  end
-
-
-  describe "#set_header" do
-    it "should ignore calls" do
-      expect { subject.set_header 'test-header', 'test value' }.not_to raise_error
-    end
-  end
-
-end