middleman-redirects 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e6d8e9f845a8cc57f8f303557f82600e52f4ed8
-  data.tar.gz: aaa494ed37ee623e3fbe37e598453d0c67c95b4c
+  metadata.gz: 22d25b0d40674b666d6c1ce99606bbbe1d5f69b1
+  data.tar.gz: a701875e1f23b7a2c352795320832869b47040e1
 SHA512:
-  metadata.gz: be1178019d46ea3c9d65196686c9db76cd17c2cfdf7111bb509ec960a2ede0019259dee5ff3954ca155ad7ee29b42107e5296edb895b142ecc120d5e007c60ee
-  data.tar.gz: 375a9ef39314dbb9c7612467df2823a8f334a79a50a36eb74534fd5fdeaae5f6bfc5d774488a5e23c84f461831dcc6cd2db90216c480f78162cb61aae2916309
+  metadata.gz: 391822e486f5a15a861e314d5b0b864861264bae5ad2873f4fdb16d83a44b74def6e6ede46fba6e1816991e2b2fd7750d31a6c130bafc4b3a0e87f34917cae34
+  data.tar.gz: 5ad22b77be206c310e953d511f4fac6ef364342accade4a485af74e855742f581bc7f53fac78f3bea893578627229fe1d6509844586c1e82c28d563cda6bd684

data/README.md

@@ -5,10 +5,15 @@ Makes middleman parse `REDIRECTS` files during development and perform the redir
 ```
 # REDIRECTS
 #
-# Syntax:
+# Syntax for "Found" (302) redirects:
 #
 # <source> <destination>
 /github https://github.com/PSPDFKit-labs/middleman-redirects
+
+# Syntax for "Moved Permanently" (301) redirects:
+#
+# <source> <destination> permanent
+/github https://github.com/PSPDFKit-labs/middleman-redirects permanent
 ```
 
 ## Development

data/lib/middleman/redirects.rb

@@ -23,11 +23,11 @@ module Middleman
 
       def call(env)
         source = env['PATH_INFO']
-        if destination = ::Middleman::Redirects.redirects[source]
-          [302, {"Location" => destination}, []]
-        else
-          @app.call(env)
-        end
+        destination, redirect_code = ::Middleman::Redirects.redirects[source]
+
+        return @app.call(env) unless destination
+
+        [redirect_code, {"Location" => destination}, []]
       end
     end
 
@@ -53,28 +53,37 @@ module Middleman
 
     def self.read_redirects
       @mtime = self.redirects_file_path.mtime
-      @redirects = Hash[self.redirects_file_path.each_line.map do |line|
+      @redirects = {}
+
+      self.redirects_file_path.each_line.map do |line|
         next if line =~ /^#/ # ignore comments
         next if line.empty?
         next if BLANK_RE === line
 
-        source, destination = line.split.map { |s| URI.parse(s) }
+        parts = line.split
+        source = URI.parse(parts[0])
+        destination = URI.parse(parts[1])
+        redirect_code = if parts[2] =~ /permanent/
+                          301
+                        else
+                          302
+                        end
 
         # don't allow a single / or * as source
         next if source.path == '/'
         next if source.path == '.*'
         next if source.path == '*' # invalid
 
-        [source.to_s, destination.to_s]
-      end.compact]
+        @redirects[source.to_s] = [destination.to_s, redirect_code]
+      end
 
       autogenerated_redirects = {}
 
       # duplicate redirect so it also matches URIs with a trailing slash
       if self.match_trailing_slashes
-        @redirects.each do |source, destination|
+        @redirects.each do |source, destination_and_code|
           next if source[-1] == '/'
-          autogenerated_redirects["#{source}/"] = destination
+          autogenerated_redirects["#{source}/"] = destination_and_code
         end
       end
 

data/lib/middleman/redirects/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Redirects
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-redirects
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Martin Schurrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler