flame 4.12.2 → 4.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b3c22d674ae570e3f8f2fd8874ec54f87dfb39b
-  data.tar.gz: a8ab56284dc70eb6babcf86a2dd80281757278dd
+  metadata.gz: 4ed5d54f5f6821749a7324ead082677cb04d669e
+  data.tar.gz: 228dbe656d57d35ab38a75780ead602461a73827
 SHA512:
-  metadata.gz: affe6a9c49a9eb2bd31ea0ed63540451e66a9986a35ed5a2d65cfd66363b13e0452eef7f8f194a00552203dfabfde31cd06550ac033256d04421b14d9398fe72
-  data.tar.gz: c40433fa6ef393e1d3630ea4817aeb490639cdb2c16934849947c88705b063c18ca452db88d5b5ee8091ab5acd3e7dee37c3e2bae946e6d74b0dc82914a95e37
+  metadata.gz: d702039c0a51e0041d5bc41fb8b15c62bb1c9eb943fd2c6bfa74b88a8024f310921c9c22445fd8270e23a43815412fa9508ee42413aed7407a83b7efb89b93b2
+  data.tar.gz: 5347d0bc63a7c39d725369de0d1c8afa7707ef41cd95ea18aa282d8d61379903cb28b4353c0f731d6f45ddba853fc7603deb9c4a4cc41e19dd10004de2f8e5de

data/lib/flame/application.rb

@@ -79,6 +79,10 @@ module Flame
 			result
 		end
 
+		def self.cached_tilts
+			@cached_tilts ||= {}
+		end
+
 		## Class for Flame::Application.config
 		class Config < Hash
 			def initialize(app, hash = {})

data/lib/flame/controller.rb

@@ -17,7 +17,7 @@ module Flame
 		def_delegators(
 			:@dispatcher,
 			:config, :request, :params, :halt, :session, :response, :status, :body,
-			:default_body
+			:default_body, :cached_tilts
 		)
 
 		## Initialize the controller for request execution
@@ -44,19 +44,33 @@ module Flame
 		##   @param path [String] path
 		##   @example Redirect to '/hello'
 		##     redirect '/hello'
+		## @overload redirect(uri)
+		##   Redirect to the URI location
+		##   @param uri [URI] URI object
+		##   @example Redirect to 'http://example.com'
+		##     redirect URI::HTTP.build(host: 'example.com')
 		## @overload redirect(*args)
 		##   Redirect to the path of `path_to` method
 		##   @param args arguments for `path_to` method
 		##   @example Redirect to `show` method of `ArticlesController` with id = 2
 		##     redirect ArticlesController, :show, id: 2
 		def redirect(*params)
+			probably_url = params.first
+			probably_url = probably_url.to_s if probably_url.is_a? URI
 			response.redirect(
-				params[0].is_a?(String) ? params[0] : path_to(*params)
+				probably_url.is_a?(String) ? probably_url : path_to(*params)
 			)
 		end
 
-		# Set the Content-Disposition to "attachment" with the specified filename,
-		# instructing the user agents to prompt to save.
+		## Set the Content-Disposition to "attachment" with the specified filename,
+		## instructing the user agents to prompt to save,
+		## and set Content-Type by filename.
+		## @param filename [String, nil] filename of attachment
+		## @param disposition [Symbol, String] main content for Content-Disposition
+		## @example Set Content-Disposition header without filename
+		##   attachment
+		## @example Set Content-Disposition header with filename and Content-Type
+		##   attachment 'style.css'
 		def attachment(filename = nil, disposition = :attachment)
 			content_dis = 'Content-Disposition'
 			response[content_dis] = disposition.to_s
@@ -88,7 +102,7 @@ module Flame
 		## @param method [Symbol] name of the controller method
 		def execute(method)
 			# send method
-			body send(method, *select_args(method).values)
+			body send(method, *extract_params_for(method).values)
 		end
 
 		## Default method for Internal Server Error, can be inherited
@@ -98,7 +112,7 @@ module Flame
 
 		private
 
-		def select_args(action)
+		def extract_params_for(action)
 			# p action, params, parameters
 			method(action).parameters.each_with_object({}) do |parameter, result|
 				key = parameter.last

data/lib/flame/dispatcher.rb

@@ -137,6 +137,11 @@ module Flame
 			"<h1>#{Rack::Utils::HTTP_STATUS_CODES[status]}</h1>"
 		end
 
+		## All cached tilts (views) for application by Flame::Render
+		def cached_tilts
+			@app.class.cached_tilts
+		end
+
 		private
 
 		## Find route and try execute it
@@ -161,7 +166,7 @@ module Flame
 			# p 'rescue from dispatcher'
 			dump_error(exception)
 			status 500
-			controller.send(:server_error, exception)
+			controller&.send(:server_error, exception)
 			# p 're raise exception from dispatcher'
 			# raise exception
 		end

data/lib/flame/render.rb

@@ -11,17 +11,17 @@ require 'gorilla-patch/inflections'
 module Flame
 	## Helper for render functionality
 	class Render
-		def initialize(ctrl, path, options = {})
+		def initialize(controller, path, options = {})
 			## Take options for rendering
-			@ctrl = ctrl
-			@scope = options.delete(:scope) || @ctrl
+			@controller = controller
+			@scope = options.delete(:scope) || @controller
 			@layout = options.delete(:layout)
 			@layout = 'layout.*' if @layout.nil?
 			## And get the rest variables to locals
 			@locals = options.merge(options.delete(:locals) || {})
 			## Find filename
 			@filename = find_file(path)
-			# @ctrl.instance_exec { halt 404 } unless @filename
+			# @controller.instance_exec { halt 404 } unless @filename
 			return unless @filename
 			@layout = nil if File.basename(@filename)[0] == '_'
 		end
@@ -39,25 +39,17 @@ module Flame
 
 		private
 
-		class << self
-			# private
-
-			def tilts
-				@tilts ||= {}
-			end
-		end
-
 		def views_dir
-			@ctrl.config[:views_dir]
+			@controller.config[:views_dir]
 		end
 
 		## Compile file with Tilt engine
 		## @param filename [String] filename
 		def compile_file(filename = @filename)
-			cached = self.class.tilts[filename]
+			cached = @controller.cached_tilts[filename]
 			return cached if @cache && cached
 			compiled = Tilt.new(filename)
-			self.class.tilts[filename] ||= compiled if @cache
+			@controller.cached_tilts[filename] ||= compiled if @cache
 			compiled
 		end
 
@@ -95,8 +87,12 @@ module Flame
 
 		## Find possible directories for the controller
 		def controller_dirs
-			parts = @ctrl.class.underscore.split('/').map do |part|
-				(part.split('_') - %w[controller controllers ctrl]).join('_')
+			parts = @controller.class.underscore.split('/').map do |part|
+				%w[_controller _ctrl]
+					.find { |suffix| part.chomp! suffix }
+				part
+				## Alternative, but slower by ~50%:
+				# part.sub(/_(controller|ctrl)$/, '')
 			end
 			combine_parts(parts).map! { |path| path.join('/') }
 		end

data/lib/flame/route.rb

@@ -73,7 +73,15 @@ module Flame
 
 			## Compare by path parts count (more is matter)
 			def <=>(other)
-				other.path_parts.size <=> path_parts.size
+				self_parts, other_parts = [self, other].map(&:path_parts)
+				path_parts_size = other_parts.size <=> self_parts.size
+				return path_parts_size unless path_parts_size.zero?
+				other_parts.zip(self_parts)
+					.reduce(0) do |result, (other_part, self_part)|
+						break 1 if part_arg?(self_part) && !part_arg?(other_part)
+						break -1 if part_arg?(other_part) && !part_arg?(self_part)
+						result
+					end
 			end
 
 			def self.path_merge(*parts)
@@ -82,6 +90,10 @@ module Flame
 
 			private
 
+			def part_arg?(part)
+				part.start_with? ARG_CHAR
+			end
+
 			## Helpers for `compare_attributes`
 			def compare_attribute(name, value)
 				case name
@@ -117,7 +129,7 @@ module Flame
 			def request_contain_required_path_parts?(request_parts)
 				req_path_parts = @path_parts.reject { |part| part[1] == ARG_CHAR_OPT }
 				fixed_path_parts = @path_parts.reject { |part| part[0] == ARG_CHAR }
-				(request_parts & fixed_path_parts) == fixed_path_parts &&
+				(fixed_path_parts - request_parts).empty? &&
 					request_parts.count >= req_path_parts.count
 			end
 

data/lib/flame/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flame
-	VERSION = '4.12.2'
+	VERSION = '4.12.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.12.2
+  version: 4.12.4
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -127,6 +127,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -134,6 +137,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement