flame 1.1.2 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b56fd48d39f7cd483088a41de87bb4efb5d32dc
-  data.tar.gz: 020ef14b9ba4dcfefcf8665bbd1e72a2ee0c158c
+  metadata.gz: 0c3b246233ec03fd89c4c0acaabef54f9a21cfd8
+  data.tar.gz: a9a8ab0206466032532d763cf842a6a3cdbd831b
 SHA512:
-  metadata.gz: 1587bd9681b7090cd9a5d5a1d735bffc437bac135466f814f741a74a1e8cd9deda8cf9b14dc4ada09b3f16f108a86947a1ab22c0faf37957cfba70bc30f6fb89
-  data.tar.gz: 27053231630630b48848ddd759a803399b89ad8d5dbb0a20f07c64bd81a3f83bf48b3815bb24bfb762b090701a8f8bbe9065b93ba82dd9aefdf498adc1c52752
+  metadata.gz: 13ee2d5fa5407d377d8370f445e454acf058108450945df5f79b711d02eea628732627ac2c725f579fcefc4460beddcff1d268c3816a7ce3bf3c179ffc2e388b
+  data.tar.gz: d497b609ddc7635cee5b510fa7f04842371463676c07f5f169e6821d9f27fd23a31e1385d70694046d0b356cfa6c54a0d4ad6839a2ea0324845044d8908c8fff

data/lib/flame/controller.rb

@@ -3,8 +3,6 @@ require_relative 'render'
 module Flame
 	## Class for controllers helpers, like Framework::Controller
 	class Controller
-		include Flame::Render
-
 		def initialize(dispatcher)
 			@dispatcher = dispatcher
 		end
@@ -17,10 +15,19 @@ module Flame
 			@dispatcher.request
 		end
 
+		def response
+			@dispatcher.response
+		end
+
 		def params
 			@dispatcher.params
 		end
 
+		def view(path, options = {})
+			Flame::Render.new(self, path, options).render
+		end
+		alias_method :render, :view
+
 		def halt(*params)
 			@dispatcher.halt(*params)
 		end
@@ -29,6 +36,18 @@ module Flame
 			@dispatcher.path_to(*params)
 		end
 
+		def redirect(*params)
+			@dispatcher.redirect(*params)
+		end
+
+		def session
+			@dispatcher.session
+		end
+
+		def cookies
+			@dispatcher.cookies
+		end
+
 		## TODO: Add more helpers
 	end
 end

data/lib/flame/dispatcher.rb

@@ -61,7 +61,22 @@ module Flame
 		def path_to(ctrl, action, args = {})
 			route = @app.router.find_route(controller: ctrl, action: action)
 			fail RouteNotFoundError.new(ctrl, action) unless route
-			route.assign_arguments(args)
+			path = route.assign_arguments(args)
+			path.empty? ? '/' : path
+		end
+
+		def redirect(*params)
+			throw :halt, response.redirect(
+				params[0].is_a?(String) ? params[0] : path_to(*params)
+			)
+		end
+
+		def session
+			request.session
+		end
+
+		def cookies
+			@cookies ||= Cookies.new(request.cookies, response)
 		end
 
 		private
@@ -102,5 +117,22 @@ module Flame
 		def file_mime_type(file)
 			Rack::Mime.mime_type(File.extname(file))
 		end
+
+		## Helper class for cookies
+		class Cookies
+			def initialize(request_cookies, response)
+				@request_cookies = request_cookies
+				@response = response
+			end
+
+			def [](key)
+				@request_cookies[key] || @request_cookies[key.to_s]
+			end
+
+			def []=(key, new_value)
+				return @response.delete_cookie(key) if new_value.nil?
+				@response.set_cookie(key, new_value)
+			end
+		end
 	end
 end

data/lib/flame/render.rb

@@ -4,26 +4,35 @@ require 'tilt/erb'
 
 module Flame
 	## Helper for render functionality
-	module Render
-		def view(path, options = {})
+	class Render
+		def initialize(ctrl, path, options = {})
 			## Take options for rendering
-			scope = options.delete(:scope) || self
-			layout = options.delete(:layout) || 'layout.*'
+			@ctrl = ctrl
+			@scope = options.delete(:scope) || @ctrl
+			@layout = options.delete(:layout) || 'layout.*'
 			## And get the rest variables to locals
-			locals = options.merge(options.delete(:locals) || {})
+			@locals = options.merge(options.delete(:locals) || {})
 			## Find filename
-			filename = find_file(path)
+			@filename = find_file(path)
 			## Compile Tilt to instance hash
-			@tilts ||= {}
-			@tilts[filename] ||= Tilt.new(filename)
-			## Render Tilt from instance hash with new options
-			layout_render layout, @tilts[filename].render(scope, locals)
+			tilts[@filename] ||= Tilt.new(@filename)
 		end
 
-		alias_method :render, :view
+		def render
+			## Render Tilt from instance hash with new options
+			layout_render tilts[@filename].render(@scope, @locals)
+		end
 
 	private
 
+		def self.tilts
+			@tilts ||= {}
+		end
+
+		def tilts
+			self.class.tilts
+		end
+
 		using GorillaPatch::StringExt
 
 		## TODO: Add `views_dir` for Application and Controller
@@ -31,7 +40,7 @@ module Flame
 		def find_file(path)
 			## Get full filename
 			Dir[File.join(
-				config[:views_dir],
+				@ctrl.config[:views_dir],
 				"{#{controller_dirs.join(',')},}",
 				"#{path}.*"
 			)].find do |file|
@@ -42,18 +51,18 @@ module Flame
 		def controller_dirs
 			## Build controller_dirs
 			controller_dir = (
-				self.class.name.underscore.split('_') - %w(controller ctrl)
+				@ctrl.class.name.underscore.split('_') - %w(controller ctrl)
 			).join('_')
 			[controller_dir, controller_dir.split('/').last]
 		end
 
-		def layout_render(layout, result)
-			layout_filename = find_file(layout)
+		def layout_render(result)
+			layout_filename = find_file(@layout)
 			## Compile layout to hash
 			return result unless layout_filename
-			@tilts[layout_filename] ||= Tilt.new(layout_filename)
-			return result unless @tilts[layout_filename]
-			@tilts[layout_filename].render { result }
+			tilts[layout_filename] ||= Tilt.new(layout_filename)
+			return result unless tilts[layout_filename]
+			tilts[layout_filename].render(@scope, @locals) { result }
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.8
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack