redirectly 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07d69d903b03e28e92766735ab44db1c243bbae86491a43b9ff0b24de325ebbc
-  data.tar.gz: f3f48ba2349caf72bd63613537d638558a0a0cac0374ba29931a6dd3b8b0cb20
+  metadata.gz: d11d303417a59a9ef3a9fd2c970233c31d2810ae52ca945600bd42ee129c8d5a
+  data.tar.gz: 82076365bdb96e6486a099573155fba968ddf2d6a03a6b1547d72afcb903bf7f
 SHA512:
-  metadata.gz: eff123b2ad167f2088cb7bbf9f4b66b450e17ad9eea457d3f201f4dde8819a9d8fcc9ec1e9997df0ec1ee5838ab0eeb536501d9f54f80490ac05d1c7b650d146
-  data.tar.gz: ce4b1c849af4cd096ae5caeca10ae92b873098f5c1890954b0eaa1930ef07fff1fc8c1e14666f3ddad940b75460d58fb3c78cb88a355ac9ea7bb2dfb06947437
+  metadata.gz: 8edef52f11f59f8f06cd76b36e9d7d8e293620f8e49c94183895c643c74d2d399b228a3a4b39b713e0cbc3b8d7a4e33aaeaac6c6b5e8ceac3f831b1642e6cb7a
+  data.tar.gz: 95cbace8f96efe12fa38f08347fd4565b7ab68c798829bcf39bd0919d2f99906a218474c73867fce9d726ebe8ca0fa0e7d0f5d24d5dcca17a4ceaa966ec56633

data/bin/redirectly

@@ -8,18 +8,15 @@ router = Redirectly::CLI.router
 
 begin
   exit router.run ARGV
-
 rescue Interrupt
   say "\nGoodbye"
-  exit 1  
-
+  exit 1
 rescue => e
   if ENV['DEBUG']
-    puts e.backtrace.reverse 
-    say ""
+    puts e.backtrace.reverse
+    say ''
   end
-  say "!undred!ERROR: #{e.class}"
+  say "ru`ERROR: #{e.class}`"
   say e.message
   exit 1
-
-end
+end

data/lib/redirectly/app.rb

@@ -6,58 +6,85 @@ module Redirectly
   class App
     using Refinements
 
-    attr_reader :config_path
+    attr_reader :config_path, :req
 
     def initialize(config_path)
       @config_path = config_path
     end
 
     def call(env)
-      req = Rack::Request.new(env)
-      found = match req
+      @req = Rack::Request.new env
+      found = match
 
       if found
-        if found.start_with? '!'
-          code, target = 301, found[1..-1] 
-        else
-          code, target = 302, found
-        end
-        
-        [code, {'Location' => target}, []]
-      
+        redirect_to found
       else
-        [404, {'Content-Type' => 'text/plain'}, ['Not Found']]
-      
+        not_found
       end
     end
 
   private
 
+    def redirect_to(target)
+      code = 302
+
+      if target.start_with? '!'
+        code = 301
+        target = target[1..]
+      end
+
+      [code, { 'Location' => target }, []]
+    end
+
+    def not_found
+      [404, { 'Content-Type' => 'text/plain' }, ['Not Found']]
+    end
+
     def redirects
       @redirects ||= ini_read(config_path)
     end
 
     def ini_read(path)
-      content = File.readlines(path, chomp:true).reject { |line| line.comment? }
-      content.map { |line| line.split(/\s*=\s*/, 2) }.to_h
+      content = File.readlines(path, chomp: true).reject(&:comment?)
+      content.to_h { |line| line.split(/\s*=\s*/, 2) }
     end
 
-    def match(req)
+    def match
       redirects.each do |pattern, target|
-        pattern = "#{pattern}/" unless pattern.include? "/" 
-        requested = "#{req.host}#{req.path}"
-        matcher = Mustermann.new(pattern)
-        params = matcher.params(requested)
-        if params
-          params.transform_keys! &:to_sym
-          params.delete :splat
-          params.transform_values! { |v| CGI.escape v }
-          return target % params
-        end
+        found = find_target pattern, target
+        return found if found
       end
 
       nil
     end
 
+    def find_target(pattern, target)
+      params = get_params pattern
+      params ? composite_target(target, params) : nil
+    end
+
+    def get_params(pattern)
+      pattern = "#{pattern}/" unless pattern.include? '/'
+      requested = "#{req.host}#{req.path}"
+      matcher = Mustermann.new pattern
+      params = matcher.params requested
+
+      if params
+        params.transform_keys!(&:to_sym)
+        params.delete :splat
+        params.transform_values! { |v| CGI.escape v }
+      end
+
+      params
+    end
+
+    def composite_target(target, params)
+      result = target % params
+      unless req.query_string.empty?
+        glue = result.include?('?') ? '&' : '?'
+        result = "#{result}#{glue}#{req.query_string}"
+      end
+      result
+    end
   end
 end

data/lib/redirectly/cli.rb

@@ -5,7 +5,7 @@ module Redirectly
   class CLI
     def self.router
       router = MisterBin::Runner.new version: VERSION,
-        header: "Redirectly Redirect Server"
+        header: 'Redirectly Redirect Server'
 
       router.route_all to: Command
       router

data/lib/redirectly/command.rb

@@ -1,41 +1,39 @@
-require "colsole"
-require "mister_bin"
+require 'colsole'
+require 'mister_bin'
 
 module Redirectly
   class Command < MisterBin::Command
     include Colsole
-    help "Start the redirect server"
+    help 'Start the redirect server'
     version Redirectly::VERSION
 
-    usage "redirectly [CONFIG --port PORT]"
-    usage "redirectly --init"
-    usage "redirectly --help | --version"
+    usage 'redirectly [CONFIG --port PORT]'
+    usage 'redirectly --init'
+    usage 'redirectly --help | --version'
 
-    option "-p --port PORT", "Listening port [default: 3000]"
-    option "-i --init", "Create a sample config file and exit"
+    option '-p --port PORT', 'Listening port [default: 3000]'
+    option '-i --init', 'Create a sample config file and exit'
 
-    param "CONFIG", "Path to config file [default: redirects.ini]"
+    param 'CONFIG', 'Path to config file [default: redirects.ini]'
 
-    example "redirectly --init"
-    example "redirectly config.ini"
+    example 'redirectly --init'
+    example 'redirectly config.ini'
 
     attr_reader :config_path, :port
 
     def run
       @port = args['--port'].to_i
-      @config_path = args['CONFIG'] || "redirects.ini"
+      @config_path = args['CONFIG'] || 'redirects.ini'
       args['--init'] ? init_file : start_server
     end
 
   private
 
     def init_file
-      if File.exist? config_path
-        raise ArgumentError, "#{config_path} already exists"
-      else
-        File.write config_path, template
-        say "Initialized #{config_path}"
-      end
+      raise ArgumentError, "#{config_path} already exists" if File.exist? config_path
+
+      File.write config_path, template
+      say "Initialized #{config_path}"
     end
 
     def template
@@ -50,6 +48,7 @@ module Redirectly
 
     def start_server
       raise ArgumentError, "Cannot find config file #{config_path}" unless File.exist? config_path
+
       Rack::Server.start(app: app, Port: port, environment: 'production')
     end
 

data/lib/redirectly/version.rb

@@ -1,3 +1,3 @@
 module Redirectly
-  VERSION = "0.1.1"
+  VERSION = '0.1.2'
 end

data/lib/redirectly.rb

@@ -1,5 +1,5 @@
-require "byebug" if ENV["BYEBUG"]
+require 'byebug' if ENV['BYEBUG']
 
-require "redirectly/refinements"
-require "redirectly/version"
-require "redirectly/app"
+require 'redirectly/refinements'
+require 'redirectly/version'
+require 'redirectly/app'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redirectly
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2023-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mister_bin
@@ -25,47 +25,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: mustermann
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: mustermann
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '5.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '5.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '2.2'
 description: Redirect server with dynamic URL and hostname support
 email: db@dannyben.com
 executables:
@@ -87,6 +99,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/DannyBen/redirectly/issues
   source_code_uri: https://github.com/dannyben/redirectly
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -95,14 +108,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.4.8
 signing_key: 
 specification_version: 4
 summary: Redirectly redirect server