flame 4.4.3 → 4.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da8e0831b223b7cf9ebc4fda84f1f1ec35657bfc
-  data.tar.gz: e4948c0c37d21e07f1f47076730ab98d99a00109
+  metadata.gz: 69d780427429f1d54ad4a9f1928f3ccb8907527f
+  data.tar.gz: e8c23f6d69b272f635795ba25eea31145417dfe6
 SHA512:
-  metadata.gz: cce9431bba7287a87e1e5e34e9aca8a501b8e37cafdd566cd39d269681caa10d224474772fbbae3e6cf3a54af92cc3dd60748ccc36aaee10eaa8f6b10b805bad
-  data.tar.gz: b9bff22f4bec9d063ba3e668e4b53cf50a8811f243d177ec04e2f7d963bc87aac4d2445b7d8d7d47d6437cccfbbfd05eb3d71d750dd1490e18d50dd157ba8a05
+  metadata.gz: 21f9592e84f11005b3db6d0a60c34dd2eac8ef76c31611be27de607ad2908083e59397818aa8492c2e0e517e9054eaceefa461d9840f6b65021f54000b822036
+  data.tar.gz: 678c93cdd80f814a2e5026cc53e9e9df8e2240fce0edea7d18df838e9854c5fb4ff4554afa129e72d57899c109d11a844b61c5c9035d6fa57e31c61c7bd82b99

data/lib/flame/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flame
-	VERSION = '4.4.3'.freeze
+	VERSION = '4.4.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.4.3
+  version: 4.4.4
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,21 +16,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -92,7 +92,6 @@ files:
 - lib/flame/application.rb
 - lib/flame/controller.rb
 - lib/flame/cookies.rb
-- lib/flame/dispatcher.bak.rb
 - lib/flame/dispatcher.rb
 - lib/flame/errors.rb
 - lib/flame/render.rb

data/lib/flame/dispatcher.bak.rb

@@ -1,191 +0,0 @@
-require 'gorilla-patch/hash'
-
-require_relative 'cookies'
-require_relative 'request'
-require_relative 'response'
-require_relative 'static'
-
-module Flame
-	## Helpers for dispatch Flame::Application#call
-	class Dispatcher
-		attr_reader :request, :response
-
-		using GorillaPatch::HashExt
-
-		include Flame::Dispatcher::Static
-
-		## Initialize Dispatcher from Application#call
-		## @param app [Flame::Application] application object
-		## @param env Rack-environment object
-		def initialize(app, env)
-			@app = app
-			@env = env
-			@request = Flame::Request.new(env)
-			@response = Flame::Response.new
-		end
-
-		## Start of execution the request
-		def run!
-			catch :halt do
-				try_route ||
-				  try_static ||
-				  try_static(File.join(__dir__, '..', '..', 'public')) ||
-				  not_found
-			end
-			response.write body
-			response.finish
-		end
-
-		## Acccess to the status of response
-		## @param value [Ineger, nil] integer value for new status
-		## @return [Integer] current status
-		## @example Set status value
-		##   status 200
-		def status(value = nil)
-			response.status ||= 200
-			response.headers['X-Cascade'] = 'pass' if value == 404
-			value ? response.status = value : response.status
-		end
-
-		## Acccess to the body of response
-		## @param value [String, nil] string value for new body
-		## @return [String] current body
-		## @example Set body value
-		##   body 'Hello World!'
-		def body(value = nil)
-			value ? @body = value : @body ||= ''
-		end
-
-		## Parameters of the request
-		def params
-			@params ||= request.params.merge(request.params.keys_to_sym(deep: true))
-		end
-
-		## Session object as Hash
-		def session
-			request.session
-		end
-
-		## Cookies object as Hash
-		def cookies
-			@cookies ||= Cookies.new(request.cookies, response)
-		end
-
-		## Application-config object as Hash
-		def config
-			@app.config
-		end
-
-		## Access to Content-Type header of response
-		def content_type(ext = nil)
-			return response[Rack::CONTENT_TYPE] unless ext
-			response[Rack::CONTENT_TYPE] = Rack::Mime.mime_type(ext)
-		end
-
-		## Build a path to the given controller and action, with any expected params
-		##
-		## @param ctrl [Flame::Controller] class of controller
-		## @param action [Symbol] method of controller
-		## @param args [Hash] parameters for method of controller
-		## @return [String] path for requested method, controller and parameters
-		## @example Path for `show(id)` method of `ArticlesController` with `id: 2`
-		##   path_to ArticlesController, :show, id: 2 # => "/articles/show/2"
-		def path_to(ctrl, action = :index, args = {})
-			route = @app.class.router.find_route(controller: ctrl, action: action)
-			raise Errors::RouteNotFoundError.new(ctrl, action) unless route
-			path = route.assign_arguments(args)
-			path.empty? ? '/' : path
-		end
-
-		## Interrupt the execution of route, and set new optional data
-		##   (otherwise using existing)
-		## @param new_status_or_body [Integer, String]
-		##   set new HTTP status code or new body
-		## @param new_body [String] set new body
-		## @param new_headers [String] merge new headers
-		## @example Halt with 500, no change body
-		##   halt 500
-		## @example Halt with 404, render template
-		##   halt 404, render('errors/404')
-		## @example Halt with 200, set new headers
-		##   halt 200, 'Cats!', 'Content-Type' => 'animal/cat'
-		def halt(new_status_or_body = nil, new_body = nil, new_headers = {})
-			case new_status_or_body
-			when String then new_body = new_status_or_body
-			when Integer then status new_status_or_body
-			end
-			# new_status.is_a?(String) ? () : (status new_status)
-			new_body = default_body if new_body.nil? && body.empty?
-			body new_body if new_body
-			response.headers.merge!(new_headers)
-			throw :halt
-		end
-
-		## Add error's backtrace to @env['rack.errors'] (terminal or file)
-		## @param error [Exception] exception for class, message and backtrace
-		def dump_error(error)
-			@error_message = [
-				"#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} - " \
-				"#{error.class} - #{error.message}:",
-				*error.backtrace
-			].join("\n\t")
-			@env['rack.errors'].puts(@error_message)
-		end
-
-		private
-
-		## Generate default body of error page
-		def default_body
-			## Return nil if must be no body for current HTTP status
-			return if Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(status)
-			response.headers[Rack::CONTENT_TYPE] = 'text/html'
-			"<h1>#{Rack::Utils::HTTP_STATUS_CODES[status]}</h1>"
-		end
-
-		## Find route and try execute it
-		def try_route
-			route = @app.class.router.find_route(
-				method: request.http_method,
-				path_parts: request.path_parts
-			)
-			return nil unless route
-			execute_route(route)
-		end
-
-		## Execute route
-		## @param route [Flame::Route] route that must be executed
-		def execute_route(route)
-			status 200
-			params.merge!(route.arguments(request.path_parts))
-			# route.execute(self)
-			route_exec(route)
-		rescue => exception
-			# p 'rescue from dispatcher'
-			dump_error(exception) unless @error_message
-			halt 500
-
-			# p 're raise exception from dispatcher'
-			# raise exception
-		end
-
-		## Generate a response if the route is not found
-		def not_found
-			# p 'not found from dispatcher'
-			## Change the status of response to 404
-			status 404
-			## Find the nearest route by the parts of requested path
-			route = @app.router.find_nearest_route(request.path_parts)
-			## Halt with default body if the route not found
-			##   or it's `not_found` method not defined
-			return halt unless route && route.controller.method_defined?(:not_found)
-			## Execute `not_found` method for the founded route
-			route_exec(route, :not_found)
-		end
-
-		## Create controller object and execute method
-		def route_exec(route, method = nil)
-			method ||= route.action
-			route.controller.new(self).send(:execute, method)
-		end
-	end
-end