flame 4.18.0 → 4.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb50e9412146b4ff8539c37a33078d360bd7414
-  data.tar.gz: 80a08f804d28d61dd8bf6cfcd9681d923b23cb41
+  metadata.gz: 9fbe52ed5ac3bee05b2739396b58c83dce8f6969
+  data.tar.gz: b54f7a5c830967546d696a4fcccf93e22dcab9c5
 SHA512:
-  metadata.gz: 9680f9cd7ddca87d9024211c0c98c20e611061b2a6934c16a364e083f57076a92dbe5e15d14ce97f090450658517bec0fb3b84a8a3800ccc9da5a7532efdbda9
-  data.tar.gz: 50d5041a23247616a53dd3e605def07edef86705c89cda45dc8f988e55d7f439fde677fef0fca088dcd0265f582556a812581863bc9f7920556ae656f280ecbc
+  metadata.gz: 2c384ad693932e066041d145885cace94ebe75a3eaa1830853df0bb6ddacbcb423f9f69c36d5c2bcca2297079ab636529f9aa6294c1389378a43444b16dd72c1
+  data.tar.gz: 4747eaf2eb6651776abf63ccd809e174ff747006be9289e1ff6aa564e55e4f7aa475ffbe7dee6d1b3b21fa382dbe69d787c452c183fceacbab7a48052472d1c9

data/lib/flame/controller.rb

@@ -19,7 +19,7 @@ module Flame
 		def_delegators(
 			:@dispatcher,
 			:config, :request, :params, :halt, :session, :response, :status, :body,
-			:default_body, :cached_tilts
+			:default_body, :cached_tilts, :find_static
 		)
 
 		## Initialize the controller for request execution
@@ -35,13 +35,14 @@ module Flame
 		end
 
 		## Build a URI to the given controller and action, or path
-		def url_to(*args)
+		def url_to(*args, **options)
 			first_arg = args.first
 			path =
 				if first_arg.is_a?(String) || first_arg.is_a?(Flame::Path)
-					first_arg
+					static_file = find_static(first_arg)
+					static_file.path(with_version: options[:version])
 				else
-					path_to(*args)
+					path_to(*args, **options)
 				end
 			"#{request.scheme}://#{request.host_with_port}#{path}"
 		end

data/lib/flame/dispatcher.rb

@@ -33,7 +33,7 @@ module Flame
 		def run!
 			catch :halt do
 				try_static ||
-					try_static(GEM_STATIC_FILES) ||
+					try_static(dir: GEM_STATIC_FILES) ||
 					try_route ||
 					halt(404)
 			end

data/lib/flame/dispatcher/static.rb

@@ -4,27 +4,58 @@ module Flame
 	class Dispatcher
 		## Module for working with static files
 		module Static
+			def find_static(filename = request.path_info, dir: config[:public_dir])
+				StaticFile.new(filename, dir)
+			end
+
 			private
 
 			## Find static files and try return it
-			def try_static(dir = config[:public_dir])
-				file = File.join(dir, URI.decode(request.path_info))
-				return nil unless File.exist?(file) && File.file?(file)
+			def try_static(*args)
+				file = find_static(*args)
+				return nil unless file.exist?
 				return_static(file)
 			end
 
-			def static_cached?(file_time)
-				since = request.env['HTTP_IF_MODIFIED_SINCE']
-				since && Time.httpdate(since).to_i >= file_time.to_i
-			end
-
 			def return_static(file)
-				file_time = File.mtime(file)
-				halt 304 if static_cached?(file_time)
-				response.content_type = File.extname(file)
+				halt 304 if file.newer? request.env['HTTP_IF_MODIFIED_SINCE']
+				response.content_type = file.extname
 				response[Rack::CACHE_CONTROL] = 'no-cache'
-				response['Last-Modified'] = file_time.httpdate
-				body File.read(file)
+				response['Last-Modified'] = file.mtime.httpdate
+				body file.content
+			end
+
+			## Class for static files with helpers methods
+			class StaticFile
+				def initialize(filename, dir)
+					@filename = filename.to_s
+					@path = File.join dir, URI.decode(@filename)
+				end
+
+				def exist?
+					File.exist?(@path) && File.file?(@path)
+				end
+
+				def mtime
+					File.mtime(@path)
+				end
+
+				def extname
+					File.extname(@path)
+				end
+
+				def newer?(http_since)
+					http_since && Time.httpdate(http_since).to_i >= mtime.to_i
+				end
+
+				def content
+					File.read(@path)
+				end
+
+				def path(with_version: false)
+					path = @filename
+					with_version ? "#{path}?v=#{mtime.to_i}" : path
+				end
 			end
 		end
 	end

data/lib/flame/errors/route_arguments_order_error.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Flame
+	module Errors
+		## Error for Route initialization
+		class RouteArgumentsOrderError < StandardError
+			def initialize(path, wrong_ordered_arguments)
+				@path = path
+				@wrong_ordered_arguments = wrong_ordered_arguments
+			end
+
+			def message
+				"Path '#{@path}' should have" \
+					" '#{@wrong_ordered_arguments.first}' argument before" \
+					" '#{@wrong_ordered_arguments.last}'"
+			end
+		end
+	end
+end

data/lib/flame/errors/{route_arguments_error.rb → route_extra_arguments_error.rb}

@@ -3,7 +3,7 @@
 module Flame
 	module Errors
 		## Error for Route initialization
-		class RouteArgumentsError < StandardError
+		class RouteExtraArgumentsError < StandardError
 			def initialize(ctrl, action, path, extra)
 				@ctrl = ctrl
 				@action = action

data/lib/flame/errors/template_not_found_error.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Flame
+	module Errors
+		## Error for not found template file in Render
+		class TemplateNotFoundError < StandardError
+			def initialize(controller, path)
+				@controller = controller
+				@controller = @controller.class unless @controller.is_a? Class
+				@path = path
+			end
+
+			def message
+				"Template '#{@path}' not found for '#{@controller}'"
+			end
+		end
+	end
+end

data/lib/flame/path.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 require_relative 'errors/argument_not_assigned_error'
 
 module Flame
@@ -53,7 +55,7 @@ module Flame
 				path_part = PathPart.new parameter_name, arg: parameter_type
 				path_part unless parts.include? path_part
 			end
-			self.class.new @path.empty? ? "/#{action}" : self, *parameters
+			self.class.new @path.empty? ? "/#{action}" : self, *parameters.compact
 		end
 
 		## Can recieve other as String

data/lib/flame/render.rb

@@ -8,6 +8,8 @@ require 'tilt/erb'
 
 require 'gorilla-patch/inflections'
 
+require_relative 'errors/template_not_found_error'
+
 module Flame
 	## Helper for render functionality
 	class Render
@@ -21,8 +23,9 @@ module Flame
 			@locals = options.merge(options.delete(:locals) || {})
 			## Find filename
 			@filename = find_file(path)
-			# @controller.instance_exec { halt 404 } unless @filename
-			return unless @filename
+			unless @filename
+				raise Flame::Errors::TemplateNotFoundError.new(controller, path)
+			end
 			@layout = nil if File.basename(@filename)[0] == '_'
 		end
 

data/lib/flame/validators.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'errors/route_arguments_error'
+require_relative 'errors/route_extra_arguments_error'
+require_relative 'errors/route_arguments_order_error'
 
 module Flame
 	module Validators
@@ -13,21 +14,28 @@ module Flame
 			end
 
 			def valid?
-				## Get hash of any extra arguments
-				extra = %i[req opt].find do |type|
-					found = extra_arguments(type).find do |place, args|
-						break { place: place, type: type, args: args } if args.any?
-					end
-					break found if found
-				end
-				## Return true if no any extra argument
-				return true unless extra
-				## Raise error with extra arguments
-				raise Errors::RouteArgumentsError.new(@ctrl, @action, @path, extra)
+				extra_valid? && order_valid?
 			end
 
 			private
 
+			def extra_valid?
+				extra_arguments = first_extra_arguments
+				## Raise error if extra arguments
+				return true unless extra_arguments
+				raise Errors::RouteExtraArgumentsError.new(
+					@ctrl, @action, @path, extra_arguments
+				)
+			end
+
+			def order_valid?
+				wrong_ordered_arguments = first_wrong_ordered_arguments
+				return true unless wrong_ordered_arguments
+				raise Errors::RouteArgumentsOrderError.new(
+					@path, wrong_ordered_arguments
+				)
+			end
+
 			## Split path to args array
 			def path_arguments
 				@path_arguments ||= @path.parts
@@ -41,10 +49,9 @@ module Flame
 
 			## Take args from controller's action
 			def action_arguments
-				return @action_arguments if @action_arguments
 				## Get all parameters (arguments) from method
 				## Than collect and sort parameters into hash
-				@ctrl.instance_method(@action).parameters
+				@action_arguments ||= @ctrl.instance_method(@action).parameters
 					.each_with_object(req: [], opt: []) do |param, hash|
 						## Only required parameters must be in `:req`
 						hash[param[0]] << param[1]
@@ -52,11 +59,33 @@ module Flame
 			end
 
 			## Calculate path and action extra arguments
-			def extra_arguments(type)
-				{
-					ctrl: action_arguments[type] - path_arguments[type],
-					path: path_arguments[type] - action_arguments[type]
-				}
+			def all_extra_arguments
+				%i[req opt].each_with_object({}) do |type, extra_arguments|
+					extra_arguments[type] = {
+						ctrl: action_arguments[type] - path_arguments[type],
+						path: path_arguments[type] - action_arguments[type]
+					}
+				end
+			end
+
+			def first_extra_arguments
+				## Get hash of any extra arguments
+				all_extra_arguments.find do |type, extra_arguments|
+					found = extra_arguments.find do |place, args|
+						break { place: place, type: type, args: args } if args.any?
+					end
+					break found if found
+				end
+			end
+
+			def first_wrong_ordered_arguments
+				opt_arguments = action_arguments[:opt].zip(path_arguments[:opt])
+				opt_arguments.map! do |args|
+					args.map { |arg| Flame::Path::PathPart.new(arg, arg: :opt) }
+				end
+				opt_arguments.find do |action_argument, path_argument|
+					action_argument != path_argument
+				end
 			end
 		end
 	end

data/lib/flame/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.18.0
+  version: 4.18.1
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -230,8 +230,10 @@ files:
 - lib/flame/dispatcher/response.rb
 - lib/flame/dispatcher/static.rb
 - lib/flame/errors/argument_not_assigned_error.rb
-- lib/flame/errors/route_arguments_error.rb
+- lib/flame/errors/route_arguments_order_error.rb
+- lib/flame/errors/route_extra_arguments_error.rb
 - lib/flame/errors/route_not_found_error.rb
+- lib/flame/errors/template_not_found_error.rb
 - lib/flame/path.rb
 - lib/flame/render.rb
 - lib/flame/router.rb