curly_bracket_parser 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e5f953c9b35c41ca0b623017a51fd7d9d122cdcd02654306a95bcd0b32d7a2e
-  data.tar.gz: cfb7e3120bb559ee8dcb2c4840c98dc8d741b18d1ad6a287b77e6930025462f0
+  metadata.gz: 378a04d38936fc44f74b1f4f970d098865a2a48c32cc61632c2fcf399fcec705
+  data.tar.gz: 68afedba437f8b335793bb45f1bb64c6c7b5a6846e33224b52eed05db042fe49
 SHA512:
-  metadata.gz: 67b58ee971ab43ffa2f2c5f71dc413c9ed9c96fdf61678eb4fa6dd1a3c5f20051cda50622c95bede909b27aeab94aa50a588372c9bd2171cd65374f2cc31d1da
-  data.tar.gz: 19c1dbddc62920667d6cfbdadaea54927b8402c3b7cc3ab0797e2d65fc4b0349fe9bbd5e0092fb0df600dcec5006b9eb166d54282e03e4d7a9b629ecae2af363
+  metadata.gz: 955864e2612341beb012f20e79aa439ec44c90e59e39bb0b54bcd813b0d680f22d8c24f23337697e1d4caabbed4dfdc5f2791ac8358afabd985d66914941b47c
+  data.tar.gz: 750d7cbd409660d96ad623c9b86d8fed53f9efae81cb268a2bf0b77454ad80abfd515f16bb6d15e1b9d4f7aca6c055bf6dee6e0a75fbdd6368d59292f3f0198d

data/lib/curly_bracket_parser.rb

@@ -104,6 +104,7 @@ module CurlyBracketParser
   # @param [String] filter name of the filter, also used then in your strings, e.g. {{var_name|my_filter_name}}
   # @param [Lambda] function of the filter to run the variable against
   # @raise [FilterAlreadyRegisteredError] if filter does already exist
+  # @return [Proc] given block
   def self.register_filter(filter, &block)
     @@registered_filters ||= {}
     filter = filter.to_s
@@ -112,7 +113,6 @@ module CurlyBracketParser
     else
       @@registered_filters[filter] = block
     end
-    nil
   end
 
   #----------------------------------------------------------------------------------------------------
@@ -158,36 +158,37 @@ module CurlyBracketParser
 
   #----------------------------------------------------------------------------------------------------
 
-  # Return the given default variable by processing its block/proc
+  # Register a default variable to be replaced automatically by the given block value in future
+  # If the variable exists already, it will raise an VariableAlreadyRegisteredError
   #
-  # @param [String] name of the variable to return
-  # @return [String] value of the variable
-  def self.process_default_var(name)
+  # @param [String] name of the default var
+  # @param [Proc] block
+  # @raise [VariableAlreadyRegisteredError] if variable is already registered
+  # @return [Proc] given block
+  def self.register_default_var(name, &block)
     @@registered_default_vars ||= {}
     name = name.to_s
-    if @@registered_default_vars[name]
-      @@registered_default_vars[name].call()
+    if registered_default_var?(name)
+      raise VariableAlreadyRegisteredError, "The given variable name '#{name}' is already registered. If you want to override that variable explicitly, call #register_default_var! instead!"
     else
-      message = "Invalid default variable '#{name}'. Valid registered default variables are: #{self.registered_default_vars.join(' ')}"
-      raise InvalidVariableError, message
+      @@registered_default_vars[name] = block
     end
   end
 
   #----------------------------------------------------------------------------------------------------
 
-  # Register a default variable to be replaced automatically by the given block value in future
-  # If the variable exists already, it will throw an VariableAlreadyRegisteredError
+  # Return the given default variable by returning the result of its block/proc
   #
-  # @param [String] name of the default var
-  # @param [Proc] block
-  # @return [Proc] given block
-  def self.register_default_var(name, &block)
+  # @param [String] name of the variable to return
+  # @return [String] value of the variable
+  def self.process_default_var(name)
     @@registered_default_vars ||= {}
     name = name.to_s
-    if registered_default_var?(name)
-      raise VariableAlreadyRegisteredError, "The given variable name '#{name}' is already registered. If you want to override that variable explicitly, call #register_default_var! instead!"
+    if @@registered_default_vars[name]
+      @@registered_default_vars[name].call()
     else
-      @@registered_default_vars[name] = block
+      message = "Invalid default variable '#{name}'. Valid registered default variables are: #{self.registered_default_vars.keys.join(' ')}"
+      raise InvalidVariableError, message
     end
   end
 
@@ -198,6 +199,7 @@ module CurlyBracketParser
   #
   # @param [String] name of the default var
   # @param [Proc] block
+  # @raise [VariableAlreadyRegisteredError] if variable is already registered
   # @return [Proc] given block
   def self.register_default_var!(name, &block)
     @@registered_default_vars ||= {}

data/lib/curly_bracket_parser/version.rb

@@ -1,3 +1,3 @@
 module CurlyBracketParser
-  VERSION = '0.9.1'.freeze
+  VERSION = '0.9.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curly_bracket_parser
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Matthäus Beyrle