flame 4.0.13 → 4.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f41dc0384cfa7bc014de1d10b94866bee6631d13
-  data.tar.gz: d1c18264ecf5b6f332c5f9a33a7313c8b948ae30
+  metadata.gz: 9ebfba77382bd98558f39f7086507b361d5fd460
+  data.tar.gz: 9f236cda861c1a8164928fceb42c2489584704a8
 SHA512:
-  metadata.gz: 4e3a91ce022115c917b2244c1123b81bc5ee5ed5be7b0ad815d1481bf3600fc8006ced9ed326157f9e8742d14bd23a615c7bfc24bb4cf16f80e05acf8543312f
-  data.tar.gz: 85830efbb1d57c4b361d9d84adbbe54cab72d60eca59e7da900d33e0ce83e97d2d0d0fffe1d55bb5bc389baf72908f70238e6b19f9cc58fff2a422f3e491ae17
+  metadata.gz: c5a02962ba976c1da5927a4b90130f370853df66e3293380b2c767d30085b54b01a4eba908d16230e4e02d04b0c74dc2c89b8c49af8d7316c489e28c271766bb
+  data.tar.gz: 4471ad147dc5d85cb349274cea264689381e926f97b4c1cc3923df68e76067f0816a4a380a180e824d236b91c85ec145e84513d8d1eb614841f45242b8ee3287

data/lib/flame/controller.rb

@@ -88,7 +88,8 @@ module Flame
 		private
 
 		def add_controller_class(args)
-			args.unshift self.class if args[0].is_a? Symbol
+			args.unshift(self.class) if args[0].is_a?(Symbol)
+			args.insert(1, :index) if args[0].is_a?(Class) && !args[1].is_a?(Symbol)
 		end
 
 		class << self

data/lib/flame/render.rb

@@ -86,10 +86,10 @@ module Flame
 		##          ['namespace']
 		##        ]
 		def combine_parts(parts)
-			variants = parts.size.times.with_object([]) do |i, arr|
-				arr.push parts[i..-1], parts[0..-(i + 1)], parts[i..-(i + 1)]
+			parts.size.downto(1).with_object([]) do |i, arr|
+				arr.push(*parts.combination(i).to_a)
 			end
-			variants.uniq!.reject!(&:empty?)
+			# variants.uniq!.reject!(&:empty?)
 		end
 
 		def layout_dirs

data/lib/flame/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame
 version: !ruby/object:Gem::Version
-  version: 4.0.13
+  version: 4.0.15
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack