rack_dispatch 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15e33270181787eb3d17cea8b09e04c5a88af3c0
-  data.tar.gz: 1db328a2ce599bf593509acff02f55ed11a6461e
+  metadata.gz: 31fa12b35c055e0baf7ec860d3b182ab13d212c5
+  data.tar.gz: 9156c852f833047b140ac948cf12e6ccaeeb01a7
 SHA512:
-  metadata.gz: 77f8e79cd8582be4a2c76755176432e3ad6d1acd33eafddd5af6b7b52480883e05ca68f795bf50996d0a236c5601dad5305677309085287c95408f7e6f29ba50
-  data.tar.gz: 8de067fec021d7dfd9d22b541c431bb8476201f4ed108d172cb9af43d4c3330c924b8362b13c34912ed9eb18c1142b7d7c69c28ef07d287214ab5a52782f7fbe
+  metadata.gz: e30572451eea34e3766f7771cb7f28f67295883232cdab4f97048faf6c6c20d0bb54eb570b6713005bbb956d721b3070b28bfeda80419dcdc7d9bb738de2fb52
+  data.tar.gz: 5efd2bcd376e8ae5c82a8032b06f101e76f873d437fda8a2ccabb374ff0459574636595e0dc335e241fb940931e7fbcbe77345ec3cd4e38393c4ed5ca1698a13

data/README.md

@@ -1,3 +1,3 @@
 # RackDispatch
 
-A simple toolkit for building Ruby web application with Rack.
+A simple toolkit for building Ruby web applications with Rack.

data/lib/rack_dispatch.rb

@@ -1,5 +1,6 @@
+require 'liquid'
 require 'rack'
-require 'rack_dispatch/application'
-require 'rack_dispatch/redirect_handler'
-require 'rack_dispatch/template_handler'
-require 'rack_dispatch/version'
+require_relative 'rack_dispatch/application'
+require_relative 'rack_dispatch/redirect_destination'
+require_relative 'rack_dispatch/template_destination'
+require_relative 'rack_dispatch/version'

data/lib/rack_dispatch/application.rb

@@ -1,44 +1,80 @@
 module RackDispatch
   class Application
-    class << self
-      %i[get post put patch delete head options].each do |http_method|
-	define_method(http_method) do |*args|
-	  match(http_method, *args)
+    def self.as(role)
+      _previous_role = @role ; @role = role ; yield ; @role = _previous_role
+    end
+
+    def self.route(method, path, with: {}, thereupon: nil, redirect: nil, template: nil)
+      builders = []
+      handlers = {}
+
+      pattern_scan = path.scan(/(\:([a-z_]+))/).flatten.map do |value|
+	if value.match(':')
+	  value
+	else
+	  builder_class = Object.const_get("#{value}_builder".split('_').map(&:capitalize).join)
+	  builders << builder_class.new
+	  builder_class.regexp
 	end
       end
 
-      def default(options = {})
-	@default_handler = handler(options)
+      pattern_keys = pattern_scan.select.with_index { |_, i| i.even? }
+      pattern = /\A#{path.gsub(Regexp.union(pattern_keys), Hash[*pattern_scan])}\z/
+
+      with.each do |handler_name, condition|
+	handler = Object.const_get("#{handler_name}_handler".split('_').map(&:capitalize).join).new
+	handlers[handler] = condition
       end
+
+      tasks = Array(thereupon).map do |task_name|
+	Object.const_get("#{task_name}_task".split('_').map(&:capitalize).join).new
+      end
+
+      destination = template ? TemplateDestination.new(template) : RedirectDestination.new(redirect)
+
+      ((@routes ||= {})[method.to_s.downcase] ||= []) << [pattern, builders, handlers, tasks, destination]
     end
 
     def call(env)
-      route(Rack::Request.new(env))
-    end
+      request = Rack::Request.new(env)
+      response = Rack::Response.new
+      computed_handlers = {}
 
-    private
+      routes = self.class.instance_variable_get(:@routes)[request.request_method.downcase].select do |pattern, builders, handlers, tasks, destination|
+	pattern.match(request.path) do |matches|
+	  # user matching
 
-    def self.match(method, path, options = {})
-      ((@routes ||= {})[[String(method), String(path)]] ||= []) << [options.delete(:with), handler(options)]
-    end
+	  builders.zip(matches[1..-1]).all? do |builder, value|
+	    builder_name = builder.class.name.sub(/Builder\z/, '').gsub(/(.)([A-Z])/,'\1_\2').downcase
 
-    def self.handler(options = {})
-      redirect, template, to = options.delete(:redirect), options.delete(:template), options.delete(:to)
-      raise ArgumentError, 'must provide :template, :redirect or :to option' unless [redirect, template, to].compact.one?
+	    if request.params[builder_name]
+	      true
+	    elsif result = builder.call(value)
+	      request.update_param(builder_name, result) ; true
+	    end
+	  end
+	end
+      end
 
-      if redirect
-	RedirectHandler.new(redirect, options)
-      elsif template
-	TemplateHandler.new(template, options)
+      route = routes.find do |pattern, builders, handlers, tasks, destination|
+	handlers.all? do |handler, condition|
+	  (computed_handlers.key?(handler) && computed_handlers[handler] == condition) ||
+	    ((computed_handlers[handler] = handler.call(request)) == condition)
+	end
+      end
+
+      if route
+	route[3].each do |task|
+	  task.call(response)
+	end
+
+	route.last.call(request, response)
       else
-	to
+	response.status = 404
+	response.write 'Not Found'
       end
-    end
 
-    def route(request)
-      self.class.instance_variable_get(:@routes)&.[]([request.request_method.downcase, request.path]).find do |constraint, _|
-	constraint.nil? || constraint.call(*constraint.parameters.map(&:last).map { |key| request.params[key.to_s] })
-      end&.last&.call or self.class.instance_variable_get(:@default_handler)&.call
+      response.finish
     end
   end
 end

data/lib/rack_dispatch/redirect_destination.rb

@@ -0,0 +1,12 @@
+module RackDispatch
+  class RedirectDestination
+    def initialize(path, status: 302)
+      @path = path
+      @status = status
+    end
+
+    def call(request, response)
+      response.redirect(@path, @status)
+    end
+  end
+end

data/lib/rack_dispatch/template_destination.rb

@@ -0,0 +1,16 @@
+module RackDispatch
+  class TemplateDestination
+    def initialize(path)
+      @path = File.expand_path(File.join('templates', String(path)), Dir.pwd) + '.liquid'
+    end
+
+    def call(request, response)
+      response['Content-Type'] = 'text/html'
+      response.write(render(request.params))
+    end
+
+    def render(data = {})
+      Liquid::Template.parse(File.read(@path)).render(data)
+    end
+  end
+end

data/lib/rack_dispatch/version.rb

@@ -1,3 +1,3 @@
 module RackDispatch
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rack_dispatch
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Theodore Kimble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -39,8 +53,8 @@ files:
 - README.md
 - lib/rack_dispatch.rb
 - lib/rack_dispatch/application.rb
-- lib/rack_dispatch/redirect_handler.rb
-- lib/rack_dispatch/template_handler.rb
+- lib/rack_dispatch/redirect_destination.rb
+- lib/rack_dispatch/template_destination.rb
 - lib/rack_dispatch/version.rb
 homepage: https://github.com/theodorekimble/rack_dispatch
 licenses:
@@ -65,5 +79,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A simple toolkit for building Ruby web application with Rack
+summary: A simple toolkit for building Ruby web applications with Rack
 test_files: []

data/lib/rack_dispatch/redirect_handler.rb

@@ -1,19 +0,0 @@
-module RackDispatch
-  class RedirectHandler
-    def initialize(path, status: 302)
-      @path = path
-      @status = status
-    end
-
-    def call
-      [
-	@status,
-	{
-	  'Content-Type' => 'text/html',
-	  'Location' => @path,
-	},
-	["Redirect to <a href=\"#@path\">#@path</a>"],
-      ]
-    end
-  end
-end

data/lib/rack_dispatch/template_handler.rb

@@ -1,28 +0,0 @@
-module RackDispatch
-  class TemplateHandler
-    def initialize(path, status: 200, content_type: 'text/html', error: nil)
-      @path = File.expand_path(File.join('templates', path), Dir.pwd)
-      @status = Integer(status)
-      @content_type = String(content_type)
-      @error = error
-    end
-
-    def call
-      [
-	@status,
-	{
-	  'Content-Type' => @content_type,
-	},
-	[ERB.new(File.read(@path)).result(OpenStruct.new(template_variables).instance_eval { binding })],
-      ]
-    end
-
-    private
-
-    def template_variables
-      {
-	error: @error,
-      }
-    end
-  end
-end