frameit/lib/frameit/config_parser.rb in fastlane-2.106.0 vs frameit/lib/frameit/config_parser.rb in fastlane-2.106.1

@@ -24,15 +24,18 @@
     end
 
     # Fetches the finished configuration for a given path. This will try to look for a specific value
     # and fallback to a default value if nothing was found
     def fetch_value(path)
-      specific = @data['data'].find { |a| path.include?(a['filter']) }
+      specifics = @data['data'].select { |a| path.include?(a['filter']) }
 
       default = @data['default']
 
-      values = default.fastlane_deep_merge(specific || {})
+      values = default.clone
+      specifics.each do |specific|
+        values = values.fastlane_deep_merge(specific)
+      end
 
       change_paths_to_absolutes!(values)
       validate_values(values)
 
       values
@@ -80,18 +83,26 @@
           when 'background'
             UI.user_error!("Could not find background image at path '#{File.expand_path(value)}'") unless File.exist?(value)
           when 'color'
             UI.user_error!("Invalid color '#{value}'. Must be valid Hex #123123") unless value.include?("#")
           when 'padding'
-            unless value.kind_of?(Integer) || value.split('x').length == 2 || (value.end_with?('%') && value.to_f > 0)
-              UI.user_error!("padding must be type integer or pair of integers of format 'AxB' or a percentage of screen size")
+            unless integer_or_percentage(value) || value.split('x').length == 2
+              UI.user_error!("padding must be an integer, or pair of integers of format 'AxB', or a percentage of screen size")
             end
+          when 'title_min_height'
+            unless integer_or_percentage(value)
+              UI.user_error!("padding must be an integer, or a percentage of screen size")
+            end
           when 'show_complete_frame', 'title_below_image'
             UI.user_error!("'#{key}' must be a Boolean") unless [true, false].include?(value)
           when 'font_scale_factor'
             UI.user_error!("font_scale_factor must be numeric") unless value.kind_of?(Numeric)
           end
         end
       end
+    end
+
+    def integer_or_percentage(value)
+      value.kind_of?(Integer) || (value.end_with?('%') && value.to_f > 0)
     end
   end
 end