swaggable 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ba12b2dc9c54ce2f6920b7d6fd6c45fe056ff5
-  data.tar.gz: 27874e95a2cfcdd88f67c3ef2bbd024660c979a3
+  metadata.gz: bf18bc08944dd205e9633c7e85a69ac1e0fe9908
+  data.tar.gz: 10a0e3fb8a88842000cd28b29838609106b7c7a4
 SHA512:
-  metadata.gz: bf44a0e08c55b0f6e948f73d711d7c758b77ae00a90dad0007451c1102265f0c44a928c868827be588504f380797f6c548826af5ab68c260bfcae7e4014712e2
-  data.tar.gz: faab31754af448942d0e7f9012c233a28e004c718a750c2adbd450082ecdd5c1f3b40fa1c3921e199ed6b6a20b5f52537a6c7953b0e6c689c50d08b820088cbd
+  metadata.gz: d5e0e8fdd32d892ffe06e0b5d801db1d7286a9e67dd64d3edbbc339636b8e3ab652d8cbf5b12ace2e9e9587feb288bbe93dee5089a4e7590939cb79514c68a03
+  data.tar.gz: 42f21abe51eb383ff37bbdc8c018d19f2246a2f78d59a9b66fb045d9a48c3d6f93283a1e5799c2c0d55aae4fd413179c41e47de9083ed201a2b8c49a60c3ef56

data/lib/swaggable.rb

@@ -16,4 +16,5 @@ module Swaggable
   autoload :EnumerableAttributes, 'swaggable/enumerable_attributes'
   autoload :SchemaDefinition, 'swaggable/schema_definition'
   autoload :AttributeDefinition, 'swaggable/attribute_definition'
+  autoload :RackRedirect, 'swaggable/rack_redirect'
 end

data/lib/swaggable/rack_redirect.rb

@@ -0,0 +1,47 @@
+module Swaggable
+  class RackRedirect
+    attr_accessor(
+      :to, 
+      :from, 
+      :next_app,
+    )
+
+    def initialize(first_arg, second_arg = nil)
+      if second_arg
+        next_app = first_arg
+        options = second_arg.dup
+      else
+        next_app = nil
+        options = first_arg.dup
+      end
+
+      @next_app = next_app
+      @from = options.delete(:from)
+      @to = options.delete(:to) || raise(ArgumentError.new(":to option is mandatory"))
+
+      if options.any?
+        raise ArgumentError.new "Unsupported options #{options.keys.inspect}"
+      end
+    end
+
+    def call env
+      if from.nil?
+       redirect
+      elsif from.is_a?(String) && env['PATH_INFO'] == from
+        redirect
+      elsif from.is_a?(Regexp) && env['PATH_INFO'] =~ from
+        redirect
+      elsif next_app.nil?
+        raise('No application defined to forward the request to')
+      else
+        next_app.call env
+      end
+    end
+
+    private
+
+    def redirect
+      [301, {'Location' => to}, []]
+    end
+  end
+end

data/lib/swaggable/version.rb

@@ -1,3 +1,3 @@
 module Swaggable
-  VERSION = '0.5.3'
+  VERSION = '0.6.0'
 end

data/spec/swaggable/rack_redirect_spec.rb

@@ -0,0 +1,81 @@
+require_relative '../spec_helper'
+require 'rack/test'
+
+RSpec.describe 'Swaggable::RackRedirect' do
+  include Rack::Test::Methods
+
+  let(:subject_class) { Swaggable::RackRedirect }
+  let(:subject_instance) { Swaggable::RackRedirect.new }
+  subject { subject_instance }
+
+  let(:next_app) { double('next_app', call: [200, {}, []]) }
+
+  it 'fails if not expected options are given' do
+    expect { Swaggable::RackRedirect.new to: '/', unexpected: nil }.to raise_error ArgumentError
+  end
+
+  it 'fails if :to is not given' do
+    expect { Swaggable::RackRedirect.new from: '/'}.to raise_error ArgumentError
+  end
+
+  describe 'within map' do
+    def app
+      @app ||= Rack::Builder.new do
+        map('/origin') { run Swaggable::RackRedirect.new to: '/destination' }
+      end
+    end
+
+    it 'redirects /origin to /destination' do
+      get '/origin'
+      expect(last_response.status).to eq 301
+      expect(last_response.headers['Location']).to eq '/destination'
+    end
+  end
+
+  describe 'with use' do
+    describe 'with /origin as a string' do
+      def app
+        @app ||= Rack::Builder.new.tap do |r|
+          r.use Swaggable::RackRedirect, from: '/origin', to: '/destination'
+          r.run next_app
+        end
+      end
+
+      it 'redirects /origin to /destination' do
+        get '/origin'
+        expect(last_response.status).to eq 301
+        expect(last_response.headers['Location']).to eq '/destination'
+      end
+
+      it 'forwards the request to the next app if path is not /origin' do
+        expect(next_app).to receive :call
+        get '/other'
+      end
+
+      it 'forwards the request to the next app if path is /origin/something_else' do
+        expect(next_app).to receive :call
+        get '/origin/something_else'
+      end
+    end
+
+    describe 'with /origin as a regex' do
+      def app
+        @app ||= Rack::Builder.new.tap do |r|
+          r.use Swaggable::RackRedirect, from: /origin/, to: '/destination'
+          r.run next_app
+        end
+      end
+
+      it 'redirects /origin to /destination if the regex matches' do
+        get '/match_origin'
+        expect(last_response.status).to eq 301
+        expect(last_response.headers['Location']).to eq '/destination'
+      end
+
+      it 'forwards the request to the next app if the regex doesn\'t match' do
+        expect(next_app).to receive :call
+        get '/no_match'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swaggable
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Manuel Morales
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forwarding_dsl
@@ -117,6 +117,7 @@ files:
 - lib/swaggable/grape_entity_translator.rb
 - lib/swaggable/parameter_definition.rb
 - lib/swaggable/rack_app.rb
+- lib/swaggable/rack_redirect.rb
 - lib/swaggable/response_definition.rb
 - lib/swaggable/schema_definition.rb
 - lib/swaggable/swagger_2_serializer.rb
@@ -133,6 +134,7 @@ files:
 - spec/swaggable/integration_spec.rb
 - spec/swaggable/parameter_definition_spec.rb
 - spec/swaggable/rack_app_spec.rb
+- spec/swaggable/rack_redirect_spec.rb
 - spec/swaggable/response_definition_spec.rb
 - spec/swaggable/schema_definition_spec.rb
 - spec/swaggable/swagger_2_serializer_spec.rb
@@ -176,6 +178,7 @@ test_files:
 - spec/swaggable/integration_spec.rb
 - spec/swaggable/parameter_definition_spec.rb
 - spec/swaggable/rack_app_spec.rb
+- spec/swaggable/rack_redirect_spec.rb
 - spec/swaggable/response_definition_spec.rb
 - spec/swaggable/schema_definition_spec.rb
 - spec/swaggable/swagger_2_serializer_spec.rb