flame 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5878fea74c5c10e10b235d28652f1443563d174f
-  data.tar.gz: ea1edb1402a414b601952ef852c2aa00d043f41b
+  metadata.gz: 7e3eff2ff95d66cad8d31d30b8938ee7f7936726
+  data.tar.gz: c8b3793fab9614b8c710f71e01f22f2c25dde926
 SHA512:
-  metadata.gz: 7e448213ec77f57a6014c315f4dd3cbc5a6477ac8c805820da9bba4c4c13a78bc72a9bdc0c55c3f24fdd2fb06b2aacbfa2891b7bd0dd95412522d62b9e48c401
-  data.tar.gz: a23c186cb889b2473d339e02232e6d52b1d2a30480222e726acd0facd0590d703fb2363667642758cc702d530c4dfe08d3448648e868f3b7c675b23bcb8b215e
+  metadata.gz: 98e65d7b60f888c271b83e987b4cbf5c56a800f0fcf30678d29f1df5546d835194728656c9bcf0808ded1e278e897a116f90ead91899f05cde915cb1d053cff8
+  data.tar.gz: 5d7e63b49ad424fa33d3319daaa585e038a0942cc633489a3d139f0557b59d035f1f4787b4459375713a42f2ac2e8791de020d4f05c3ff2165de4c7484c25bb6

data/lib/flame/dispatcher.rb

@@ -86,7 +86,7 @@ module Flame
 		##   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)
-			fail RouteNotFoundError.new(ctrl, action) unless route
+			fail Errors::RouteNotFoundError.new(ctrl, action) unless route
 			path = route.assign_arguments(args)
 			path.empty? ? '/' : path
 		end
@@ -152,7 +152,7 @@ module Flame
 			status 200
 			params.merge!(route.arguments(request.path_parts))
 			# route.execute(self)
-			route[:controller].new(self).execute(route[:action])
+			route_exec(route)
 		rescue => exception
 			# p 'rescue from dispatcher'
 			dump_error(exception) unless @error_message
@@ -173,7 +173,13 @@ module Flame
 			##   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[:controller].new(self).execute(:not_found)
+			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

data/lib/flame/render.rb

@@ -41,7 +41,7 @@ module Flame
 			end
 		end
 
-		using GorillaPatch::StringExt
+		using GorillaPatch::ModuleExt
 
 		## Compile file with Tilt engine
 		## @param filename [String] filename
@@ -64,7 +64,7 @@ module Flame
 
 		## Find possible directories for the controller
 		def controller_dirs
-			controller_dir_parts = @ctrl.class.name.underscore.split('/').map do |part|
+			controller_dir_parts = @ctrl.class.underscore.split('/').map do |part|
 				(part.split('_') - %w(controller controllers ctrl)).join('_')
 			end
 			controller_dir = controller_dir_parts.join('/')

data/lib/flame/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -53,7 +53,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 description: Use controller's classes with instance methods as routing actions, mounting
   its in application class.
 email: