flame 4.17.0 → 4.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6ccec989786ef96d130c6526ac47ef646defd74
-  data.tar.gz: 20f122fcea6d8eebeb420eb58e93d00f85243084
+  metadata.gz: ebb50e9412146b4ff8539c37a33078d360bd7414
+  data.tar.gz: 80a08f804d28d61dd8bf6cfcd9681d923b23cb41
 SHA512:
-  metadata.gz: bdcedf23fb41f2cab59be449f0daa40dc529e3b832bf11fe04fa4d1d01c0e008b199580bd107bc7dec5a2935554b5b9016d0277b7c63439b229c37e9bb02275e
-  data.tar.gz: 07e37694dd64ab3da6a0ca659fccc3c4832b620a4be57ef13a512b7694acc963e778aeaabb4cf20f7934b75ef92340d0a40b195caa31a9aa581fb91f4770b0e2
+  metadata.gz: 9680f9cd7ddca87d9024211c0c98c20e611061b2a6934c16a364e083f57076a92dbe5e15d14ce97f090450658517bec0fb3b84a8a3800ccc9da5a7532efdbda9
+  data.tar.gz: 50d5041a23247616a53dd3e605def07edef86705c89cda45dc8f988e55d7f439fde677fef0fca088dcd0265f582556a812581863bc9f7920556ae656f280ecbc

data/lib/flame/controller.rb

@@ -9,6 +9,8 @@ module Flame
 	class Controller
 		extend Forwardable
 
+		FORBIDDEN_ACTIONS = [].freeze
+
 		## Shortcut for not-inherited public methods: actions
 		def self.actions
 			public_instance_methods(false)
@@ -121,8 +123,7 @@ module Flame
 		## Execute the method of the controller with hooks (may be overloaded)
 		## @param method [Symbol] name of the controller method
 		def execute(method)
-			# send method
-			body send(method, *extract_params_for(method).values)
+			body send(method, *extract_params_for(method))
 		end
 
 		## Default method for Internal Server Error, can be inherited
@@ -148,12 +149,18 @@ module Flame
 		end
 
 		def extract_params_for(action)
-			# p action, params, parameters
-			method(action).parameters.each_with_object({}) do |parameter, result|
-				key = parameter.last
-				next if params[key].nil?
-				result[key] = params[key]
+			# Take parameters from action method
+			parameters = method(action).parameters
+			# Fill variables with values from params
+			req_values, opt_values = %i[req opt].map! do |type|
+				params.values_at(
+					*parameters.select { |key, _value| key == type }.map!(&:last)
+				)
 			end
+			# Remove nils from the end of optional values
+			opt_values.pop while opt_values.last.nil? && !opt_values.empty?
+			# Concat values
+			req_values + opt_values
 		end
 
 		def add_controller_class(args)
@@ -201,8 +208,10 @@ module Flame
 		end
 
 		## Module for public instance methods re-defining from superclass
-		## @example Inherit controller with parent actions by `extend`
+		## @example Inherit controller with parent actions without forbidden
+		## actions by `extend`
 		##   class MyController < BaseController
+		##     FORBIDDEN_ACTIONS = %[foo bar baz].freeze
 		##     extend Flame::Controller::ParentActions
 		##   end
 		module ParentActions
@@ -215,7 +224,7 @@ module Flame
 			end
 
 			def define_parent_actions
-				superclass.actions.each do |public_method|
+				(superclass.actions - self::FORBIDDEN_ACTIONS).each do |public_method|
 					um = superclass.public_instance_method(public_method)
 					define_method public_method, um
 				end

data/lib/flame/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.17.0
+  version: 4.18.0
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack