flame-flash 2.3.3 → 3.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9f5d38ded2a6652b2a52e66b1106dc7ca1a9ef4a
-  data.tar.gz: bf2f0f90d3197dc220be3ea4c79f0368398e6a1e
+SHA256:
+  metadata.gz: 770daf991964e0a25952e4af521a31a2830dccd7ea1d363c4b19dca4bd61889e
+  data.tar.gz: 9b1bb4bcce4b6b9d67332e265b7b11ff03d5199320a194536c60ae591a42cc10
 SHA512:
-  metadata.gz: 962a3d06b24372dff6c6e7e25c727048f67e3ddfbc1c8a90c74ca3dcea69e276f286d630052e0fc2b1046b3fa0bf7e47e12ca9146be963c78a1b4e0598ec5df6
-  data.tar.gz: ecd21f4f4f8e9db3be37db04ebca8719b82a49c3a20b3afdb5872de8a42a31fc5bacf8ba60825e8044ad338bf4387179348cae940a0b78471950975adee6cbf1
+  metadata.gz: b9cc0dbd38c1de71cb1089342371cd8cf329b49e25d7bea25cf3b005ded22a783fd85b26aa5aa5d33214b5e7d798a9edfcc2c0bbea7c66eac8ced81fb567f516
+  data.tar.gz: 24d38202f36ac1c08d34d165e3e9f870f936aceb68cfdaf37e26a9a9c426baf297665d51305f505907f82c05587582217109fb5851d8f6746f6677aa2a3eedb2

data/CHANGELOG.md

@@ -0,0 +1,79 @@
+# Changelog
+
+## master (unreleased)
+
+## 3.0.1.rc1 (2021-04-16)
+
+*   Support Flame 5
+*   Forward flashes on redirect
+*   Replace `Array` check with `Enumerable`
+*   Take flashes only from reserved keys (error, warning, notice) or `flash` key
+    Don't extract parameters for controller's path as flashes.
+    Reference: <http://guides.rubyonrails.org/action_controller_overview.html#the-flash>
+*   Change `FlashArray` to `FlashObject` with `now` and `next` as `FlashArray`
+*   Add `FlashArray#delete` method
+*   Fix calls of redefined `view` without parameters
+*   Make `execute` and methods below `protected`
+*   Make `FlashObject` private, test `Flame::Flash` better.
+*   Remove `flash.scope` method.
+    It was taken not from Rails, but from (abandoned) `sinatra-flash`.
+    But we can add it later in more correct way if somebody's needing!
+*   Fix requiring by `path` in `Gemfile`
+*   Drop Ruby 2.3 and 2.4 support (after Flame)
+*   Support Ruby 3.
+*   Add MIT license file
+*   Add tests, 100% coverage
+*   Fix RuboCop warnings, and RuboCop configuration file
+    With `rubocop-performance` and `rubocop-rspec`.
+*   Improve documentation of methods
+*   Add Cirrus CI
+*   Add `remark` CI task.
+*   Replace `rake` with `toys`.
+*   Update development dependencies.
+*   Add more meta-information to gem specs.
+*   Add "Development", "Contributing" and "License" sections to README.
+*   Add CHANGELOG file.
+*   Move gem version to a separate file (and constant).
+
+## 2.3.3 (2016-11-16)
+
+*   Flashes extracting fixed for `params` key
+*   Migrate from GitLab to GitHub
+
+## 2.3.2 (2016-08-09)
+
+*   Fixed `fix_messages_as_array` method
+
+## 2.3.1 (2016-03-11)
+
+*   Trying to fix messages as `Array`
+
+## 2.3.0 (2016-03-11)
+
+*   Capture `halt` method and take out flash-recording to private method
+*   Adding ability to add `Array` as many flashes
+
+## 2.2.0 (2016-02-11)
+
+*   Allowing assign array to `FlashArray`
+
+## 2.1.1 (2016-02-04)
+
+*   Support `String` redirects
+
+## 2.1.0 (2016-02-02)
+
+*   Add flash-options for redirect method of controller
+
+## 2.0.0 (2016-01-29)
+
+*   Support Flame 4.0
+
+## 1.0.1 (2015-12-10)
+
+*   Add `flame` as runtime dependency
+*   Update after-hook for Flame 3.3.4
+
+## 1.0.0 (2015-12-07)
+
+*   Initial release.

data/LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2015 Alexander Popov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -0,0 +1,91 @@
+# Flame Flash
+
+[![Cirrus CI - Base Branch Build Status](https://img.shields.io/cirrus/github/AlexWayfer/flame-flash?style=flat-square)](https://cirrus-ci.com/github/AlexWayfer/flame-flash)
+[![Codecov branch](https://img.shields.io/codecov/c/github/AlexWayfer/flame-flash/master.svg?style=flat-square)](https://codecov.io/gh/AlexWayfer/flame-flash)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/AlexWayfer/flame-flash.svg?style=flat-square)](https://codeclimate.com/github/AlexWayfer/flame-flash)
+![Depfu](https://img.shields.io/depfu/AlexWayfer/flame-flash?style=flat-square)
+[![Inline docs](https://inch-ci.org/github/AlexWayfer/flame-flash.svg?branch=master)](https://inch-ci.org/github/AlexWayfer/flame-flash)
+[![license](https://img.shields.io/github/license/AlexWayfer/flame-flash.svg?style=flat-square)](https://github.com/AlexWayfer/flame-flash/blob/master/LICENSE.txt)
+[![Gem](https://img.shields.io/gem/v/flame-flash.svg?style=flat-square)](https://rubygems.org/gems/flame-flash)
+
+[Flashes](http://guides.rubyonrails.org/action_controller_overview.html#the-flash)
+for [Flame](https://github.com/AlexWayfer/flame).
+
+## Usage
+
+```ruby
+# Gemfile
+gem 'flame-flash'
+
+# config.ru
+require 'flame-flash' # or `Bundler.require`
+
+# _controller.rb
+include Flame::Flash
+```
+
+```erb
+<!-- layout.html.erb -->
+
+<%
+  %i[error warning notice].each do |type|
+    flash[type].each do |text|
+%>
+      <p class="flash <%= type %>">
+        <%= text %>
+      </p>
+<%
+    end
+  end
+%>
+```
+
+## Examples
+
+```ruby
+class PostsController < Flame::Controller
+  def update
+    flash[:error] = "You don't have permissions"
+    redirect :show
+  end
+
+  def delete
+    redirect :show, notice: 'Deleted'
+  end
+
+  def move
+    redirect :index, flash: { success: 'Moved' }
+  end
+
+  def create
+    flash.now[:error] = 'Not enought permissions'
+    view :new
+  end
+end
+```
+
+### Reserved keys
+
+*   `error`
+*   `warning`
+*   `notice`
+
+## Development
+
+After checking out the repo, run `bundle install` to install dependencies.
+
+Then, run `toys rspec` to run the tests.
+
+To install this gem onto your local machine, run `toys gem install`.
+
+To release a new version, run `toys gem release %version%`.
+See how it works [here](https://github.com/AlexWayfer/gem_toys#release).
+
+## Contributing
+
+Bug reports and pull requests are welcome on [GitHub](https://github.com/AlexWayfer/flame-flash).
+
+## License
+
+The gem is available as open source under the terms of the
+[MIT License](https://opensource.org/licenses/MIT).

data/lib/flame/flash.rb

@@ -1,8 +1,17 @@
-require_relative 'flash_array'
+# frozen_string_literal: true
+
+require 'gorilla_patch/deep_dup'
+require 'gorilla_patch/slice'
+
+require_relative 'flash/version'
+
+require_relative 'flash/flash_object'
 
 module Flame
 	# Module for Flame::Flash extension with helper methods and base class
 	module Flash
+		protected
+
 		## After hook
 		def execute(method)
 			super
@@ -10,21 +19,32 @@ module Flame
 		end
 
 		## Upgrade redirect method
+		## TODO: write `@see`
 		## @example Redirect to show method of Articles controller with error
 		##   redirect ArticlesController, :show, id: 2, error: 'Access required'
 		def redirect(*args)
-			if args.last.is_a? Hash
-				if args[0].is_a? String
-					flashes = args.pop
-				else
-					args[-1], flashes = extract_flashes(args)
-				end
-				flash.merge(flashes)
-			end
-			super
+			args, flashes = extract_flashes_for_redirect(args)
+			flash.merge flashes
+			flash.next.concat(flash.now) ## for multiple redirects
+			super(*args)
+		end
+
+		## Upgrade view method
+		## TODO: write `@see`
+		## @example Render view with error
+		##   view :show, error: 'Access required'
+		def view(path = nil, options = {}, &block)
+			options, flashes = extract_flashes(options)
+			flash.now.merge flashes
+			super(
+				path || caller_locations(1, 1)[0].label.to_sym,
+				options,
+				&block
+			)
 		end
 
-		## Capture halt method
+		## Record flashes before halting
+		## TODO: write `@see`
 		def halt(*args)
 			record_flashes
 			super
@@ -33,21 +53,36 @@ module Flame
 		private
 
 		## Main helper method
-		def flash(key = nil)
-			(
-				@flash ||= FlashArray.new(
-					(session ? session[:flash] : [])
-				)
-			).scope(key)
+		def flash
+			@flash ||= FlashObject.new(
+				(session ? session[:flash] : [])
+			)
 		end
 
+		RESERVED_FLASH_KEYS = %i[error warning notice].freeze
+
+		using GorillaPatch::DeepDup
+		using GorillaPatch::Slice
+
 		## Split Hash-argument to parameters and flashes
-		def extract_flashes(args)
+		def extract_flashes(options)
+			options = options.deep_dup
+			flashes = options.delete(:flash) { {} }
+			## Yeah, `RESERVED_FLASH_KEYS` will be deleted from `options`
+			## and will not be passed into parent's `redirect` or `view`.
+			## But I don't see a problem cause of it for now.
+			## If you see - please, send a PR, or create an issue.
+			flashes.merge! options.slice_reverse!(*RESERVED_FLASH_KEYS)
+			[options, flashes]
+		end
+
+		def extract_flashes_for_redirect(args)
+			return [args, {}] unless args.last.is_a? Hash
+			return [args, args.pop] if args.first.is_a?(String)
+
 			add_controller_class(args)
-			parameters = args[0].instance_method(args[1]).parameters.map(&:last)
-			args.last.partition do |key, _value|
-				parameters.include?(key) || key == :params
-			end.map(&:to_h)
+			options, flashes = extract_flashes(args.last)
+			[args[0..-2].push(options), flashes]
 		end
 
 		## Move flash.next to session

data/lib/flame/flash/flash_array.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Flame
+	## https://github.com/bbatsov/rubocop/issues/5831
+	module Flash
+		## Just contains flashes
+		class FlashArray
+			## Initialize Flash Array from regular Array
+			## @param array [Array<Hash>] initial Array with raw data
+			def initialize(array = [])
+				@array = []
+				concat(array)
+			end
+
+			## Go through internal Array
+			def each(&block)
+				@array.each(&block)
+			end
+
+			## Write text by type
+			def push(type, text)
+				if text.is_a?(Enumerable)
+					text.each { |el| push(type, el) }
+					return
+				end
+				hash = { type: type, text: text }
+				@array.push(hash)
+			end
+
+			alias []= push
+
+			## Delete text in type
+			def delete(type, text)
+				@array.delete(type: type, text: text)
+			end
+
+			## Select values by text or type
+			def select(**options)
+				@array.select do |hash|
+					options.reject { |key, val| hash[key] == val || val.nil? }.empty?
+				end
+			end
+
+			## Concat with other Array-like
+			def concat(array)
+				array.each do |hash|
+					push(hash[:type], hash[:text])
+				end
+			end
+
+			## Merge with other Hash-like
+			def merge(hash)
+				hash.each { |type, text| self[type] = text }
+			end
+
+			## Return internal Array
+			def to_a
+				@array
+			end
+		end
+
+		private_constant :FlashArray
+	end
+end

data/lib/flame/flash/flash_object.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative 'flash_array'
+
+module Flame
+	## https://github.com/bbatsov/rubocop/issues/5831
+	module Flash
+		## Contains info about current and next flashes
+		class FlashObject
+			attr_reader :now, :next
+
+			## Initialize Flash Object with specific session
+			## @param session [Rack::Session::Abstract::Persisted] Rack's session convertible to an Array
+			def initialize(session)
+				@now = FlashArray.new(session.to_a)
+				@next = FlashArray.new
+			end
+
+			## Add entry with type and text
+			def []=(type, text)
+				self.next.push type, text
+			end
+
+			## Get entries by type
+			def [](type = nil)
+				now.select(type: type).map { |hash| hash[:text] }
+			end
+
+			## Mass adding to next
+			def merge(hash)
+				hash.each { |type, text| self[type] = text }
+			end
+		end
+
+		private_constant :FlashObject
+	end
+end

data/lib/flame/flash/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Flame
+	module Flash
+		VERSION = '3.0.1.rc1'
+	end
+end

metadata

@@ -1,50 +1,234 @@
 --- !ruby/object:Gem::Specification
 name: flame-flash
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 3.0.1.rc1
 platform: ruby
 authors:
 - Alexander Popov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flame
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.rc6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.rc6
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '6'
+- !ruby/object:Gem::Dependency
+  name: gorilla_patch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
-    - - ">="
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: gem_toys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: toys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.4
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
-description: Show messages (notifies, errors, warnings) in current or next routes
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.2
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+description: 'Show messages (notifies, errors, warnings) in current or next routes
   after redirect.
+
+  '
 email:
 - alex.wayfer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE.txt
+- README.md
 - lib/flame/flash.rb
-- lib/flame/flash_array.rb
+- lib/flame/flash/flash_array.rb
+- lib/flame/flash/flash_object.rb
+- lib/flame/flash/version.rb
 homepage: https://github.com/AlexWayfer/flame-flash
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/AlexWayfer/flame-flash
+  homepage_uri: https://github.com/AlexWayfer/flame-flash
+  changelog_uri: https://github.com/AlexWayfer/flame-flash/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -52,16 +236,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Flash plugin for Flame-framework
 test_files: []

data/lib/flame/flash_array.rb

@@ -1,73 +0,0 @@
-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 || []
-				fix_messages_as_array
-				@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)
-				return text.each { |el| self[type] = el } if text.is_a?(Array)
-				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
-
-			## Mass adding to next
-			def merge(hash)
-				hash.each { |type, text| self[type] = text }
-			end
-
-			private
-
-			def condition(hash, options = {}) # kind, section)
-				options.reject { |key, val| hash[key] == val || val.nil? }.empty?
-			end
-
-			def fix_messages_as_array
-				@now.each_with_index do |hash, ind|
-					next unless hash[:text].is_a?(Array)
-					hash = @now.delete(hash)
-					@now.insert(ind, hash[:text].map { |text| hash.merge(text: text) })
-				end
-			end
-		end
-	end
-end