flame-flash 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab31089be121a3137cf52b0fa191fb929293e523
-  data.tar.gz: b50a7d89e7266fa290ea6e930df99fae77c32389
+  metadata.gz: cc6d4eba7a43b4d9f517a88640c0d0d12144f2c6
+  data.tar.gz: 2d4afb0d9cea7ee3fc7292ba21297dd2bd50d19b
 SHA512:
-  metadata.gz: 9af4b013aa622fefa59b2a86a7bc9833bbade6ff88e4b62130ed846c728b2e21fc32199d59903528ae8dcbbc930923b580146b6627145fb68918b7f5ed6c4eb2
-  data.tar.gz: d979a528bf3a204ae302080db1a4077fe75e4bb528758cb566593e321e990a07a2470b87372e3b86e0861a8f416c7b30e7ebc8cc7076693c0b0679d0c733482a
+  metadata.gz: 448eea08643b3d48a7a071c708d824b362779c0c0ca9703444f43347c06b4b22e3095bd7c20bf7f61a30c7276a30b68f2628fa5d07ce817b8abb2816316f0109
+  data.tar.gz: 4e4d0d712ee78590da93426046c3c16c371ba05d320601f642da8ab6b01eb9e875d6819eb9e00fb2eecdfc65acbb6761995daee357422dc8aed6cbdbacb2c044

data/lib/flame/flash.rb

@@ -1,16 +1,11 @@
-# Dir[File.join(__dir__, 'flash', '*.rb')].each { |file| require file }
+require_relative 'flash_array'
 
 module Flame
 	# Module for Flame::Flash extension with helper methods and base class
 	module Flash
-		def self.mount
-			proc do
-				# This callback rotates any flash structure we referenced,
-				# placing the 'next' hash into the session for the next request.
-				after do
-					session[:flash] = flash.next
-				end
-			end
+		def execute(method)
+			super
+			session[:flash] = flash.next
 		end
 
 		private
@@ -22,60 +17,5 @@ module Flame
 				)
 			).scope(key)
 		end
-
-		# A subclass of Array that "remembers forward" by exactly one action.
-		# Tastes just like the API of Rails's ActionController::Flash::FlashHash,
-		# but with fewer calories.
-		class FlashArray
-			attr_reader :now, :next
-
-			# Builds a new FlashHash. It takes the hash for this action's values
-			# as an initialization variable.
-			def initialize(session, parent = nil, scope = nil)
-				@now = session || []
-				@next = []
-				@parent = parent || self
-				@scope = scope
-			end
-
-			def scope(scope = nil)
-				# p 'scope', scope
-				return self unless scope
-				self.class.new(
-					@now.select { |hash| condition(hash, scope: scope) },
-					self,
-					scope
-				)
-			end
-
-			# We assign to the _next_ hash, but retrieve values
-			# from the _now_ hash. Freaky, huh?
-			def []=(type, text)
-				hash = { type: type, text: text }
-				# p @parent == self, @scope
-				hash.merge!(scope: @scope) if @parent != self
-				# p hash
-				@parent.next.push(hash)
-				# p @parent.next
-			end
-
-			def [](type = nil)
-				selected = @parent.now.select do |hash|
-					condition(hash, type: type, scope: @scope)
-				end
-				# p 'flash[]', type, @scope, selected
-				selected.map { |hash| hash[:text] }
-			end
-
-			def each(&block)
-				@now.each(&block)
-			end
-
-			private
-
-			def condition(hash, options = {}) # kind, section)
-				options.reject { |key, val| hash[key] == val || val.nil? }.empty?
-			end
-		end
 	end
 end

data/lib/flame/flash_array.rb

@@ -0,0 +1,58 @@
+module Flame
+	module Flash
+		# A subclass of Array that "remembers forward" by exactly one action.
+		# Tastes just like the API of Rails's ActionController::Flash::FlashHash,
+		# but with fewer calories.
+		class FlashArray
+			attr_reader :now, :next
+
+			# Builds a new FlashHash. It takes the hash for this action's values
+			# as an initialization variable.
+			def initialize(session, parent = nil, scope = nil)
+				@now = session || []
+				@next = []
+				@parent = parent || self
+				@scope = scope
+			end
+
+			def scope(scope = nil)
+				# p 'scope', scope
+				return self unless scope
+				self.class.new(
+					@now.select { |hash| condition(hash, scope: scope) },
+					self,
+					scope
+				)
+			end
+
+			# We assign to the _next_ hash, but retrieve values
+			# from the _now_ hash. Freaky, huh?
+			def []=(type, text)
+				hash = { type: type, text: text }
+				# p @parent == self, @scope
+				hash[:scope] = @scope if @parent != self
+				# p hash
+				@parent.next.push(hash)
+				# p @parent.next
+			end
+
+			def [](type = nil)
+				selected = @parent.now.select do |hash|
+					condition(hash, type: type, scope: @scope)
+				end
+				# p 'flash[]', type, @scope, selected
+				selected.map { |hash| hash[:text] }
+			end
+
+			def each(&block)
+				@now.each(&block)
+			end
+
+			private
+
+			def condition(hash, options = {}) # kind, section)
+				options.reject { |key, val| hash[key] == val || val.nil? }.empty?
+			end
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame-flash
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flame
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.4
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.4
+        version: 4.0.0
 description: Show messages (notifies, errors, warnings) in current or next routes
   after redirect.
 email:
@@ -39,6 +39,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/flame/flash.rb
+- lib/flame/flash_array.rb
 homepage: https://gitlab.com/AlexWayfer/flame-flash
 licenses:
 - MIT
@@ -59,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Flash plugin for Flame-framework