flame 4.7.2 → 4.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab488062e7501eb5290974a958bf6de4e5155082
-  data.tar.gz: 1023f92030c825712fd8012cca03f549fe68ca66
+  metadata.gz: db65a3c8ddcc20b17eba7c861d4e3312c50c4de3
+  data.tar.gz: 0dedc0d40dd716a783d7f8902f72b7850de4413c
 SHA512:
-  metadata.gz: 0d1e7d18113dcba5782f5911347e08b94c3676e2975256602ab103874c3cd333227e99669b438a40e305f9d15c02489cbfeeb7c66b621a72f8975a8eee83722f
-  data.tar.gz: 655a14d5ec396973bb11384ca32214af292a37d1e051b0c8ba61fbced35ceb65fa84e2d2497cce9b85f43219674d45c3d8a84e96549f880e94d41b16367c9d2b
+  metadata.gz: 67a398ed323183b5d49750ed8f7220993b2dd607e6ce6a2d3004716eb1928b71a7cb18256d3f7dee063913447d1f8df3397751c85293934bd487302fc2090510
+  data.tar.gz: c357eeb4004523028079a6ef602449e0d92751fd408b83e5b9c3bc04ad6679e3b0cadd4744911dc5a4c5d85c02a501129a9e493ff0d9576ac3f77b7e50c6fc02

data/bin/flame

@@ -2,7 +2,7 @@
 
 require 'thor'
 require 'fileutils'
-require 'gorilla-patch/letters_case'
+require 'gorilla-patch/inflections'
 require 'erb'
 
 ## CLI Application
@@ -25,7 +25,7 @@ class FlameCLI < Thor
 		module New
 			module_function
 
-			using GorillaPatch::LettersCase
+			using GorillaPatch::Inflections
 
 			def build(app_name)
 				@app_name = app_name

data/lib/flame/controller.rb

@@ -6,6 +6,11 @@ module Flame
 	## Class initialize when Dispatcher found route with it
 	## For new request and response
 	class Controller
+		## Shortcut for not-inherited public methods: actions
+		def self.actions
+			public_instance_methods(false)
+		end
+
 		## Initialize the controller for request execution
 		## @param dispatcher [Flame::Dispatcher] dispatcher object
 		def initialize(dispatcher)
@@ -91,6 +96,11 @@ module Flame
 			@dispatcher.send(m, *args, &block)
 		end
 
+		## Respond to Dispatcher methods
+		def respond_to_missing?(m, *)
+			@dispatcher.respond_to?(m) || super
+		end
+
 		private
 
 		def add_controller_class(args)
@@ -99,7 +109,7 @@ module Flame
 		end
 
 		class << self
-			using GorillaPatch::LettersCase
+			using GorillaPatch::Inflections
 
 			## Default root path of the controller for requests
 			def default_path
@@ -133,7 +143,7 @@ module Flame
 			end
 
 			def define_parent_actions
-				superclass.public_instance_methods(false).each do |public_method|
+				superclass.actions.each do |public_method|
 					um = superclass.public_instance_method(public_method)
 					define_method public_method, um
 				end

data/lib/flame/dispatcher.rb

@@ -26,9 +26,9 @@ module Flame
 		def run!
 			catch :halt do
 				try_route ||
-				  try_static ||
-				  try_static(File.join(__dir__, '..', '..', 'public')) ||
-				  halt(404)
+					try_static ||
+					try_static(File.join(__dir__, '..', '..', 'public')) ||
+					halt(404)
 			end
 			response.write body
 			response.finish

data/lib/flame/render.rb

@@ -4,7 +4,7 @@ require 'tilt'
 require 'tilt/plain'
 require 'tilt/erb'
 
-require 'gorilla-patch/letters_case'
+require 'gorilla-patch/inflections'
 
 module Flame
 	## Helper for render functionality
@@ -79,11 +79,12 @@ module Flame
 
 		## Find layout-files by path
 		def find_layouts(path)
-			find_files(path, layout_dirs).select { |file| Tilt[file] }
+			find_files(path, layout_dirs)
+				.select { |file| Tilt[file] }
 				.sort! { |a, b| b.split('/').size <=> a.split('/').size }
 		end
 
-		using GorillaPatch::LettersCase
+		using GorillaPatch::Inflections
 
 		## Find possible directories for the controller
 		def controller_dirs

data/lib/flame/router.rb

@@ -20,9 +20,8 @@ module Flame
 
 			## Add routes from controller to glob array
 			route_refine = RouteRefine.new(self, ctrl, path, block)
-			if Validators::ActionsValidator.new(route_refine).valid?
-				concat_routes(route_refine)
-			end
+			return unless Validators::ActionsValidator.new(route_refine).valid?
+			concat_routes(route_refine)
 		end
 
 		## Find route by any attributes
@@ -58,10 +57,6 @@ module Flame
 			attr_accessor :rest_routes
 			attr_reader :ctrl, :routes
 
-			def self.http_methods
-				[:GET, :POST, :PUT, :PATCH, :DELETE]
-			end
-
 			## Defaults REST routes (methods, pathes, controllers actions)
 			def rest_routes
 				@rest_routes ||= [
@@ -81,7 +76,7 @@ module Flame
 				execute(&block)
 			end
 
-			http_methods.each do |request_method|
+			%i(GET POST PUT PATCH DELETE).each do |request_method|
 				## Define refine methods for all HTTP methods
 				## @overload post(path, action)
 				##   Execute action on requested path and HTTP method
@@ -115,7 +110,7 @@ module Flame
 			##   to defaults pathes and HTTP methods
 			def defaults
 				rest
-				@ctrl.public_instance_methods(false).each do |action|
+				@ctrl.actions.each do |action|
 					next if find_route_index(action: action)
 					send(:GET.downcase, action)
 				end
@@ -125,8 +120,8 @@ module Flame
 			def rest
 				rest_routes.each do |rest_route|
 					action = rest_route[:action]
-					next unless @ctrl.public_instance_methods.include?(action) &&
-					   find_route_index(action: action).nil?
+					next if !@ctrl.actions.include?(action) ||
+					        find_route_index(action: action)
 					send(*rest_route.values.map(&:downcase), prefix: true)
 				end
 			end

data/lib/flame/static.rb

@@ -19,9 +19,9 @@ module Flame
 				halt 304 if static_cached?(file_time)
 				content_type File.extname(file)
 				response['Last-Modified'] = file_time.httpdate
-					# 'Content-Disposition' => 'attachment;' \
-					#	"filename=\"#{File.basename(static_file)}\"",
-					# 'Content-Length' => File.size?(static_file).to_s
+				# 'Content-Disposition' => 'attachment;' \
+				# 	"filename=\"#{File.basename(static_file)}\"",
+				# 'Content-Length' => File.size?(static_file).to_s
 				halt 200, File.read(file)
 			end
 		end

data/lib/flame/validators.rb

@@ -65,10 +65,6 @@ module Flame
 			def initialize(route_refine)
 				@routes_actions = route_refine.routes.map(&:action)
 				@ctrl = route_refine.ctrl
-				@ctrl_actions = {
-					public: @ctrl.public_instance_methods(false),
-					all: @ctrl.instance_methods + @ctrl.private_instance_methods
-				}
 			end
 
 			def valid?
@@ -78,7 +74,7 @@ module Flame
 			private
 
 			def no_extra_routes_actions?
-				extra_routes_actions = @routes_actions - @ctrl_actions[:public]
+				extra_routes_actions = @routes_actions - @ctrl.actions
 				return true if extra_routes_actions.empty?
 				raise Errors::RouterError::ExtraRoutesActionsError.new(
 					@ctrl, extra_routes_actions
@@ -86,7 +82,7 @@ module Flame
 			end
 
 			def no_extra_controller_actions?
-				extra_ctrl_actions = @ctrl_actions[:public] - @routes_actions
+				extra_ctrl_actions = @ctrl.actions - @routes_actions
 				return true if extra_ctrl_actions.empty?
 				raise Errors::RouterError::ExtraControllerActionsError.new(
 					@ctrl, extra_ctrl_actions

data/lib/flame/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.7.2
+  version: 4.7.4
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -50,20 +50,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use controller's classes with instance methods as routing actions, mounting
   its in application class.
 email:
@@ -141,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Web-framework, based on MVC-pattern