html_email_creator 1.0.8 → 1.0.9

data/lib/html_email_creator/email.rb

@@ -90,12 +90,7 @@ module HtmlEmailCreator
         filled_layout.gsub!(/\{\{\s*#{key}\s*\}\}/, value)
       end
 
-      # fill also global settings content to layout
-      @settings.extension_data.each_pair do |key, value|
-        filled_layout.gsub!(/\{\{\s*#{key}\s*\}\}/, value)
-      end
-
-      filled_layout
+      @settings.fill_extension_data(filled_layout)
     end
 
   end

data/lib/html_email_creator/settings.rb

@@ -2,13 +2,13 @@ module HtmlEmailCreator
   class Settings
 
     # Create settings configuration file.
-    # 
+    #
     # If the root is not set, the configuration is not searched from the file system
     # but instead the defaults are used.
     def initialize(root = nil)
       @root = root
       @root ||= File.expand_path('~')
-      @config = create_configuration      
+      @config = create_configuration
     end
 
     def layouts_path
@@ -22,7 +22,7 @@ module HtmlEmailCreator
     def emails_path
       @config["emails_path"]
     end
-    
+
     def includes_path
       @config["includes_path"]
     end
@@ -31,6 +31,16 @@ module HtmlEmailCreator
       @config["cdn_url"]
     end
 
+    def fill_extension_data(source)
+      filled = source.dup
+
+      extension_data.each_pair do |key, value|
+        filled.gsub!(/\{\{\s*#{key}\s*\}\}/, value)
+      end
+
+      filled
+    end
+
     def extension_data
       return @extension_data if @extension_data
       extensions = HtmlEmailCreator::Extensions.new(self)
@@ -43,7 +53,7 @@ module HtmlEmailCreator
     def built_in_extensions
       (@config["extensions"] || {})["built_in"] || []
     end
-    
+
     private
 
     def custom_extensions
@@ -56,23 +66,23 @@ module HtmlEmailCreator
         config_root_dir = File.dirname(config_file)
         loaded_config = YAML.load_file(config_file)
         # fill missing values with defaults if missing
-        default_config.each_pair do |key, value|          
+        default_config.each_pair do |key, value|
           loaded_config[key] = value unless loaded_config[key]
         end
-        
+
         # make absolute paths if is relative for all _path ending keys
         loaded_config.each_pair do |key, value|
           if key.match(/_path$/) && !value.match(/^\//)
             loaded_config[key] = File.join(config_root_dir, value)
           end
         end
-        
+
         loaded_config
       else
         default_config
       end
     end
-    
+
     def default_config
       {
         "layouts_path" => find_dir("Layouts"),
@@ -83,11 +93,11 @@ module HtmlEmailCreator
         "extensions" => {}
       }
     end
-    
+
     def find_dir(dir)
       HtmlEmailCreator::Helper.find_recursively(@root, dir, File.join(@root, dir))
     end
-              
+
     def find_config_file
       HtmlEmailCreator::Helper.find_recursively(@root, ".html_config.yaml")
     end

data/lib/html_email_creator/tags/include_tag.rb

@@ -60,7 +60,7 @@ module HtmlEmailCreator
       if File.exists?(template)
         # run through a formatter
         formatter = HtmlEmailCreator::Formatter.new(IO.read(template), settings)
-        formatter.find_by_filename(template).format
+        settings.fill_extension_data(formatter.find_by_filename(template).format)
       else
         "Included file '#{template}' not found."
       end

data/lib/html_email_creator/version.rb

@@ -1,3 +1,3 @@
 module HtmlEmailCreator
-  VERSION = "1.0.8" unless defined?(::HtmlEmailCreator::VERSION)
+  VERSION = "1.0.9" unless defined?(::HtmlEmailCreator::VERSION)
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 8
-  version: 1.0.8
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - Pekka Mattila
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-06 00:00:00 +02:00
+date: 2011-11-21 00:00:00 +02:00
 default_executable: html_email_creator
 dependencies: 
 - !ruby/object:Gem::Dependency