tigefa 1.1.2 → 1.1.3

data/lib/tigefa/commands/build.rb

@@ -31,33 +31,27 @@ module Tigefa
       #
       # Returns nothing.
       def self.watch(site, options)
-        require 'listen'
+        require 'directory_watcher'
 
         source = options['source']
         destination = options['destination']
 
-        begin
-          dest = Pathname.new(destination).relative_path_from(Pathname.new(source)).to_s
-          ignored = Regexp.new(Regexp.escape(dest))
-        rescue ArgumentError
-          # Destination is outside the source, no need to ignore it.
-          ignored = nil
-        end
-
         Tigefa.logger.info "Auto-regeneration:", "enabled"
 
-        listener = Listen::Listener.new(source, :ignore => ignored) do |modified, added, removed|
+        dw = DirectoryWatcher.new(source, :glob => self.globs(source, destination), :pre_load => true)
+        dw.interval = 1
+
+        dw.add_observer do |*args|
           t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          n = modified.length + added.length + removed.length
-          print Tigefa.logger.formatted_topic("Regenerating:") + "#{n} files at #{t} "
+          print Tigefa.logger.formatted_topic("Regenerating:") + "#{args.size} files at #{t} "
           self.process_site(site)
           puts  "...done."
         end
-        listener.start
+
+        dw.start
 
         unless options['serving']
           trap("INT") do
-            listener.stop
             puts "     Halting auto-regeneration."
             exit 0
           end

data/lib/tigefa/commands/new.rb

@@ -23,7 +23,7 @@ module Tigefa
           end
         end
 
-        puts "New tigefa site installed in #{new_blog_path}."
+        puts "New jekyll site installed in #{new_blog_path}."
       end
 
       def self.create_blank_site(path)

data/lib/tigefa/commands/serve.rb

@@ -18,8 +18,6 @@ module Tigefa
 
         s.mount(options['baseurl'], HTTPServlet::FileHandler, destination, fh_option)
 
-        Tigefa.logger.info "Server address:", "http://#{s.config[:BindAddress]}:#{s.config[:Port]}"
-
         if options['detach'] # detach the server
           pid = Process.fork { s.start }
           Process.detach(pid)

data/lib/tigefa/configuration.rb

@@ -10,14 +10,10 @@ module Tigefa
       'destination'   => File.join(Dir.pwd, '_site'),
       'plugins'       => '_plugins',
       'layouts'       => '_layouts',
-      'data_source'   =>  '_data',
       'keep_files'    => ['.git','.svn'],
-      'gems'          => [],
 
       'timezone'      => nil,           # use the local timezone
 
-      'encoding'      => nil,           # use the system encoding
-
       'safe'          => false,
       'detach'        => false,          # default to not detaching the server
       'show_drafts'   => nil,
@@ -27,7 +23,7 @@ module Tigefa
       'pygments'      => true,
 
       'relative_permalinks' => true,     # backwards-compatibility with < 1.0
-                                         # will be set to false once 2.0 hits
+                                         # will be set to false once 1.1 hits
 
       'markdown'      => 'maruku',
       'permalink'     => 'date',
@@ -45,7 +41,6 @@ module Tigefa
       'excerpt_separator' => "\n\n",
 
       'maruku' => {
-        'fenced_code_blocks' => true,
         'use_tex'    => false,
         'use_divs'   => false,
         'png_engine' => 'blahtex',
@@ -100,17 +95,6 @@ module Tigefa
       override['source'] || self['source'] || DEFAULTS['source']
     end
 
-    def safe_load_file(filename)
-      case File.extname(filename)
-      when '.toml'
-        TOML.load_file(filename)
-      when /\.y(a)?ml/
-        YAML.safe_load_file(filename)
-      else
-        raise ArgumentError, "No parser for '#{filename}' is available. Use a .toml or .y(a)ml file instead."
-      end
-    end
-
     # Public: Generate list of configuration files from the override
     #
     # override - the command-line options hash
@@ -133,8 +117,8 @@ module Tigefa
     #
     # Returns this configuration, overridden by the values in the file
     def read_config_file(file)
-      next_config = safe_load_file(file)
-      raise ArgumentError.new("Configuration file: (INVALID) #{file}".yellow) unless next_config.is_a?(Hash)
+      next_config = YAML.safe_load_file(file)
+      raise ArgumentError.new("Configuration file: (INVALID) #{file}".yellow) if !next_config.is_a?(Hash)
       Tigefa.logger.info "Configuration file:", file
       next_config
     rescue SystemCallError
@@ -143,7 +127,7 @@ module Tigefa
         {}
       else
         Tigefa.logger.error "Fatal:", "The configuration file '#{file}' could not be found."
-        raise LoadError, "The Configuration file '#{file}' could not be found."
+        raise LoadError
       end
     end
 
@@ -180,7 +164,7 @@ module Tigefa
     end
 
     # Public: Ensure the proper options are set in the configuration to allow for
-    # backwards-compatibility with Jekyll pre-1.0
+    # backwards-compatibility with Tigefa pre-1.0
     #
     # Returns the backwards-compatible configuration
     def backwards_compatibilize

data/lib/tigefa/converters/markdown/kramdown_parser.rb

@@ -16,7 +16,7 @@ module Tigefa
           if @config['kramdown']['use_coderay']
             %w[wrap line_numbers line_numbers_start tab_width bold_every css default_lang].each do |opt|
               key = "coderay_#{opt}"
-              @config['kramdown'][key] = @config['kramdown']['coderay'][key] unless @config['kramdown'].has_key?(key)
+              @config['kramdown'][key.to_sym] = @config['kramdown']['coderay'][key] unless @config['kramdown'].has_key?(key)
             end
           end
 

data/lib/tigefa/converters/markdown/maruku_parser.rb

@@ -8,7 +8,6 @@ module Tigefa
           @errors = []
           load_divs_library if @config['maruku']['use_divs']
           load_blahtext_library if @config['maruku']['use_tex']
-          enable_fenced_code_blocks if @config['maruku']['fenced_code_blocks']
         rescue LoadError
           STDERR.puts 'You are missing a library required for Markdown. Please run:'
           STDERR.puts '  $ [sudo] gem install maruku'
@@ -36,17 +35,13 @@ module Tigefa
           MaRuKu::Globals[:html_png_url] = @config['maruku']['png_url']
         end
 
-        def enable_fenced_code_blocks
-          MaRuKu::Globals[:fenced_code_blocks] = true
-        end
-
         def print_errors_and_fail
           print @errors.join
           raise MaRuKu::Exception, "MaRuKu encountered problem(s) while converting your markup."
         end
 
         def convert(content)
-          converted = Maruku.new(content, :error_stream => @errors).to_html.strip
+          converted = Maruku.new(content, :error_stream => @errors).to_html
           print_errors_and_fail unless @errors.empty?
           converted
         end

data/lib/tigefa/convertible.rb

@@ -20,23 +20,16 @@ module Tigefa
       self.content || ''
     end
 
-    # Returns merged optin hash for File.read of self.site (if exists)
-    # and a given param
-    def merged_file_read_opts(opts)
-      (self.site ? self.site.file_read_opts : {}).merge(opts)
-    end
-
     # Read the YAML frontmatter.
     #
     # base - The String path to the dir containing the file.
     # name - The String filename of the file.
-    # opts - optional parameter to File.read, default at site configs
     #
     # Returns nothing.
-    def read_yaml(base, name, opts = {})
+    def read_yaml(base, name)
       begin
-        self.content = File.read_with_options(File.join(base, name),
-                                              merged_file_read_opts(opts))
+        self.content = File.read(File.join(base, name))
+
         if self.content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
           self.content = $POSTMATCH
           self.data = YAML.safe_load($1)
@@ -84,13 +77,10 @@ module Tigefa
     # info    - the info for Liquid
     #
     # Returns the converted content
-    def render_liquid(content, payload, info, path = nil)
+    def render_liquid(content, payload, info)
       Liquid::Template.parse(content).render!(payload, info)
-    rescue Tags::IncludeTagError => e
-      Tigefa.logger.error "Liquid Exception:", "#{e.message} in #{e.path}, included in #{path || self.path}"
-      raise e
     rescue Exception => e
-      Tigefa.logger.error "Liquid Exception:", "#{e.message} in #{path || self.path}"
+      Tigefa.logger.error "Liquid Exception:", "#{e.message} in #{self.path}"
       raise e
     end
 
@@ -121,8 +111,7 @@ module Tigefa
 
         self.output = self.render_liquid(layout.content,
                                          payload,
-                                         info,
-                                         File.join(self.site.config['layouts'], layout.name))
+                                         info)
 
         if layout = layouts[layout.data["layout"]]
           if used.include?(layout)

data/lib/tigefa/core_ext.rb

@@ -69,22 +69,3 @@ module Enumerable
     any? { |exp| File.fnmatch?(exp, e) }
   end
 end
-
-# Ruby 1.8's File.read don't support option.
-# read_with_options ignore optional parameter for 1.8,
-# and act as alias for 1.9 or later.
-class File
-  if RUBY_VERSION < '1.9'
-    def self.read_with_options(path, opts = {})
-      self.read(path)
-    end
-
-    def self.realpath(filename)
-      Pathname.new(filename).realpath.to_s
-    end
-  else
-    def self.read_with_options(path, opts = {})
-      self.read(path, opts)
-    end
-  end
-end

data/lib/tigefa/deprecator.rb

@@ -19,7 +19,7 @@ module Tigefa
     def self.no_subcommand(args)
       if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first)
         Tigefa.logger.error "Deprecation:", "Tigefa now uses subcommands instead of just \
-                            switches. Run `jekyll help' to find out more."
+                            switches. Run `tigefa help' to find out more."
       end
     end
 

data/lib/tigefa/filters.rb

@@ -1,5 +1,4 @@
 require 'uri'
-require 'json'
 
 module Tigefa
   module Filters
@@ -10,7 +9,7 @@ module Tigefa
     # Returns the HTML formatted String.
     def textilize(input)
       site = @context.registers[:site]
-      converter = site.getConverterImpl(TigefaTigefa::Converters::Textile)
+      converter = site.getConverterImpl(Tigefa::Converters::Textile)
       converter.convert(input)
     end
 
@@ -21,7 +20,7 @@ module Tigefa
     # Returns the HTML formatted String.
     def markdownify(input)
       site = @context.registers[:site]
-      converter = site.getConverterImpl(TigefaTigefa::Converters::Markdown)
+      converter = site.getConverterImpl(Tigefa::Converters::Markdown)
       converter.convert(input)
     end
 
@@ -149,15 +148,6 @@ module Tigefa
       end
     end
 
-    # Convert the input into json string
-    #
-    # input - The Array or Hash to be converted
-    #
-    # Returns the converted json string
-    def jsonify(input)
-      input.to_json
-    end
-
     private
     def time(input)
       case input

data/lib/tigefa/generators/pagination.rb

@@ -4,9 +4,6 @@ module Tigefa
       # This generator is safe from arbitrary code execution.
       safe true
 
-      # This generator should be passive with regard to its execution
-      priority :lowest
-
       # Generate paginated pages if necessary.
       #
       # site - The Site.
@@ -17,7 +14,7 @@ module Tigefa
           if template = template_page(site)
             paginate(site, template)
           else
-            Tigefa.logger.warn "Pagination:", "Pagination is enabled, but I couldn't find " +
+            Tigefa.logger.warn "Pagination:", "Pagination is enabled, but I couldn't find" +
             "an index.html page to use as the pagination template. Skipping pagination."
           end
         end
@@ -98,7 +95,7 @@ module Tigefa
 
     # Determine if pagination is enabled the site.
     #
-    # site - the Jekyll::Site object
+    # site - the Tigefa::Site object
     #
     # Returns true if pagination is enabled, false otherwise.
     def self.pagination_enabled?(site)
@@ -111,7 +108,7 @@ module Tigefa
     #         between the site source and `paginate_path`.
     #
     # config - the site configuration hash
-    # page   - the Jekyll::Page about which we're inquiring
+    # page   - the Tigefa::Page about which we're inquiring
     #
     # Returns true if the
     def self.pagination_candidate?(config, page)
@@ -125,7 +122,7 @@ module Tigefa
     # Determine if the subdirectories of the two paths are the same relative to source
     #
     # source        - the site source
-    # page_dir      - the directory of the Jekyll::Page
+    # page_dir      - the directory of the Tigefa::Page
     # paginate_path - the absolute paginate path (from root of FS)
     #
     # Returns whether the subdirectories are the same relative to source
@@ -138,7 +135,7 @@ module Tigefa
 
     # Static: Return the pagination path of the page
     #
-    # site     - the Jekyll::Site object
+    # site     - the Tigefa::Site object
     # num_page - the pagination page number
     #
     # Returns the pagination path as a string
@@ -172,7 +169,7 @@ module Tigefa
 
     # Initialize a new Pager.
     #
-    # site     - the Jekyll::Site object
+    # site     - the Tigefa::Site object
     # page      - The Integer page number.
     # all_posts - The Array of all the site's Posts.
     # num_pages - The Integer number of pages or nil if you'd like the number

data/lib/tigefa/page.rb

@@ -133,7 +133,7 @@ module Tigefa
     #
     # Returns the destination file path String.
     def destination(dest)
-      path = File.join(dest, File.expand_path(self.url, "/"))
+      path = File.join(dest, self.url)
       path = File.join(path, "index.html") if self.url =~ /\/$/
       path
     end

data/lib/tigefa/post.rb

@@ -19,10 +19,10 @@ module Tigefa
     ]
 
     # Attributes for Liquid templates
-    ATTRIBUTES_FOR_LIQUID = EXCERPT_ATTRIBUTES_FOR_LIQUID + %w[
+    ATTRIBUTES_FOR_LIQUID = EXCERPT_ATTRIBUTES_FOR_LIQUID.concat(%w[
       content
       excerpt
-    ]
+    ])
 
     # Post name validator. Post filenames must be like:
     # 2008-11-05-my-awesome-post.textile
@@ -236,7 +236,7 @@ module Tigefa
     #
     # Returns an Array of related Posts.
     def related_posts(posts)
-      Tigefa::RelatedPosts.new(self).build
+      Jekyll::RelatedPosts.new(self).build
     end
 
     # Add any necessary layouts to this post.
@@ -266,7 +266,7 @@ module Tigefa
     # Returns destination file path String.
     def destination(dest)
       # The url needs to be unescaped in order to preserve the correct filename
-      path = File.join(dest, File.expand_path(CGI.unescape(self.url), "/"))
+      path = File.join(dest, CGI.unescape(self.url))
       path = File.join(path, "index.html") if path[/\.html$/].nil?
       path
     end

data/lib/tigefa/related_posts.rb

@@ -52,7 +52,7 @@ module Tigefa
 
     def display(output)
       $stdout.print("\n")
-      $stdout.print(Jekyll.logger.formatted_topic(output))
+      $stdout.print(Tigefa.logger.formatted_topic(output))
       $stdout.flush
     end
   end

data/lib/tigefa/site.rb

@@ -1,9 +1,9 @@
-module Tigefa
+module TigefaTigefa
   class Site
     attr_accessor :config, :layouts, :posts, :pages, :static_files,
                   :categories, :exclude, :include, :source, :dest, :lsi, :pygments,
                   :permalink_style, :tags, :time, :future, :safe, :plugins, :limit_posts,
-                  :show_drafts, :keep_files, :baseurl, :data, :file_read_opts, :gems
+                  :show_drafts, :keep_files, :baseurl
 
     attr_accessor :converters, :generators
 
@@ -13,7 +13,7 @@ module Tigefa
     def initialize(config)
       self.config          = config.clone
 
-      %w[safe lsi pygments baseurl exclude include future show_drafts limit_posts keep_files gems].each do |opt|
+      %w[safe lsi pygments baseurl exclude include future show_drafts limit_posts keep_files].each do |opt|
         self.send("#{opt}=", config[opt])
       end
 
@@ -22,9 +22,6 @@ module Tigefa
       self.plugins         = plugins_path
       self.permalink_style = config['permalink'].to_sym
 
-      self.file_read_opts = {}
-      self.file_read_opts[:encoding] = config['encoding'] if config['encoding']
-
       self.reset
       self.setup
     end
@@ -56,7 +53,6 @@ module Tigefa
       self.static_files    = []
       self.categories      = Hash.new { |hash, key| hash[key] = [] }
       self.tags            = Hash.new { |hash, key| hash[key] = [] }
-      self.data            = {}
 
       if self.limit_posts < 0
         raise ArgumentError, "limit_posts must be a non-negative number"
@@ -67,41 +63,31 @@ module Tigefa
     #
     # Returns nothing.
     def setup
-      ensure_not_in_dest
+      # Check that the destination dir isn't the source dir or a directory
+      # parent to the source dir.
+      if self.source =~ /^#{self.dest}/
+        raise FatalException.new "Destination directory cannot be or contain the Source directory."
+      end
 
       # If safe mode is off, load in any Ruby files under the plugins
       # directory.
       unless self.safe
         self.plugins.each do |plugins|
-            Dir[File.join(plugins, "**/*.rb")].sort.each do |f|
+            Dir[File.join(plugins, "**/*.rb")].each do |f|
               require f
             end
         end
-        self.gems.each do |gem|
-          require gem
-        end
       end
 
-      self.converters = instantiate_subclasses(Jekyll::Converter)
-      self.generators = instantiate_subclasses(Jekyll::Generator)
-    end
-
-    # Check that the destination dir isn't the source dir or a directory
-    # parent to the source dir.
-    def ensure_not_in_dest
-      dest = Pathname.new(self.dest)
-      Pathname.new(self.source).ascend do |path|
-        if path == dest
-          raise FatalException.new "Destination directory cannot be or contain the Source directory."
-        end
-      end
+      self.converters = instantiate_subclasses(Tigefa::Converter)
+      self.generators = instantiate_subclasses(Tigefa::Generator)
     end
 
     # Internal: Setup the plugin search path
     #
     # Returns an Array of plugin search paths
     def plugins_path
-      if (config['plugins'] == Jekyll::Configuration::DEFAULTS['plugins'])
+      if (config['plugins'] == Tigefa::Configuration::DEFAULTS['plugins'])
         [File.join(self.source, config['plugins'])]
       else
         Array(config['plugins']).map { |d| File.expand_path(d) }
@@ -114,7 +100,6 @@ module Tigefa
     def read
       self.read_layouts
       self.read_directories
-      self.read_data(config['data_source'])
     end
 
     # Read all the files in <source>/<layouts> and create a new Layout object
@@ -125,7 +110,7 @@ module Tigefa
       base = File.join(self.source, self.config['layouts'])
       return unless File.exists?(base)
       entries = []
-      Dir.chdir(base) { entries = filter_entries(Dir['**/*.*']) }
+      Dir.chdir(base) { entries = filter_entries(Dir['*.*']) }
 
       entries.each do |f|
         name = f.split(".")[0..-2].join(".")
@@ -169,14 +154,19 @@ module Tigefa
     #
     # Returns nothing.
     def read_posts(dir)
-      posts = read_things(dir, '_posts', Post)
+      entries = get_entries(dir, '_posts')
+
+      # first pass processes, but does not yet render post content
+      entries.each do |f|
+        if Post.valid?(f)
+          post = Post.new(self, self.source, dir, f)
 
-      posts.each do |post|
-        if post.published && (self.future || post.date <= self.time)
-          aggregate_post_info(post)
+          if post.published && (self.future || post.date <= self.time)
+            aggregate_post_info(post)
+          end
         end
       end
-   end
+    end
 
     # Read all the files in <source>/<dir>/_drafts and create a new Post
     # object with each one.
@@ -185,37 +175,15 @@ module Tigefa
     #
     # Returns nothing.
     def read_drafts(dir)
-      drafts = read_things(dir, '_drafts', Draft)
-
-      drafts.each do |draft|
-        aggregate_post_info(draft)
-      end
-    end
-
-    def read_things(dir, magic_dir, klass)
-      get_entries(dir, magic_dir).map do |entry|
-        klass.new(self, self.source, dir, entry) if klass.valid?(entry)
-      end.reject do |entry|
-        entry.nil?
-      end
-    end
-
-    # Read and parse all yaml files under <source>/<dir>
-    #
-    # Returns nothing
-    def read_data(dir)
-      base = File.join(self.source, dir)
-      return unless File.directory?(base) && (!self.safe || !File.symlink?(base))
+      entries = get_entries(dir, '_drafts')
 
-      entries = Dir.chdir(base) { Dir['*.{yaml,yml}'] }
-      entries.delete_if { |e| File.directory?(File.join(base, e)) }
-
-      entries.each do |entry|
-        path = File.join(self.source, dir, entry)
-        next if File.symlink?(path) && self.safe
+      # first pass processes, but does not yet render draft content
+      entries.each do |f|
+        if Draft.valid?(f)
+          draft = Draft.new(self, self.source, dir, f)
 
-        key = sanitize_filename(File.basename(entry, '.*'))
-        self.data[key] = YAML.safe_load_file(path)
+          aggregate_post_info(draft)
+        end
       end
     end
 
@@ -232,11 +200,14 @@ module Tigefa
     #
     # Returns nothing.
     def render
-      relative_permalinks_deprecation_method
-
       payload = site_payload
-      [self.posts, self.pages].flatten.each do |page_or_post|
-        page_or_post.render(self.layouts, payload)
+      self.posts.each do |post|
+        post.render(self.layouts, payload)
+      end
+
+      self.pages.each do |page|
+        relative_permalinks_deprecation_method if page.uses_relative_permalinks
+        page.render(self.layouts, payload)
       end
 
       self.categories.values.map { |ps| ps.sort! { |a, b| b <=> a } }
@@ -281,14 +252,6 @@ module Tigefa
       hash
     end
 
-    # Prepare site data for site payload. The method maintains backward compatibility
-    # if the key 'data' is already used in _config.yml.
-    #
-    # Returns the Hash to be hooked to site.data.
-    def site_data
-      self.config['data'] || self.data
-    end
-
     # The Hash payload containing site-wide data.
     #
     # Returns the Hash: { "site" => data } where data is a Hash with keys:
@@ -303,15 +266,14 @@ module Tigefa
     #   "tags"       - The Hash of tag values and Posts.
     #                  See Site#post_attr_hash for type info.
     def site_payload
-      {"jekyll" => { "version" => Tigefa::VERSION },
+      {"tigefa" => { "version" => Tigefa::VERSION },
        "site" => self.config.merge({
           "time"       => self.time,
           "posts"      => self.posts.sort { |a, b| b <=> a },
           "pages"      => self.pages,
           "html_pages" => self.pages.reject { |page| !page.html? },
           "categories" => post_attr_hash('categories'),
-          "tags"       => post_attr_hash('tags'),
-          "data"       => site_data})}
+          "tags"       => post_attr_hash('tags')})}
     end
 
     # Filter out any files/directories that are hidden or backup files (start
@@ -323,7 +285,14 @@ module Tigefa
     #
     # Returns the Array of filtered entries.
     def filter_entries(entries)
-      EntryFilter.new(self).filter(entries)
+      entries.reject do |e|
+        unless self.include.glob_include?(e)
+          ['.', '_', '#'].include?(e[0..0]) ||
+          e[-1..-1] == '~' ||
+          self.exclude.glob_include?(e) ||
+          (File.symlink?(e) && self.safe)
+        end
+      end
     end
 
     # Get the implementation class for the given Converter.
@@ -380,14 +349,15 @@ module Tigefa
     end
 
     def relative_permalinks_deprecation_method
-      if config['relative_permalinks'] && has_relative_page?
+      if config['relative_permalinks'] && !@deprecated_relative_permalinks
         $stderr.puts # Places newline after "Generating..."
-        Tigefa.logger.warn "Deprecation:", "Starting in 2.0, permalinks for pages" +
+        Tigefa.logger.warn "Deprecation:", "Starting in 1.1, permalinks for pages" +
                                             " in subfolders must be relative to the" +
                                             " site source directory, not the parent" +
                                             " directory. Check http://jekyllrb.com/docs/upgrading/"+
                                             " for more info."
         $stderr.print Tigefa.logger.formatted_topic("") + "..." # for "done."
+        @deprecated_relative_permalinks = true
       end
     end
 
@@ -401,10 +371,6 @@ module Tigefa
 
     private
 
-    def has_relative_page?
-      self.pages.any? { |page| page.uses_relative_permalinks }
-    end
-
     def has_yaml_header?(file)
       "---" == File.open(file) { |fd| fd.read(3) }
     end
@@ -417,11 +383,5 @@ module Tigefa
     def site_cleaner
       @site_cleaner ||= Cleaner.new(self)
     end
-
-    def sanitize_filename(name)
-      name = name.gsub(/[^\w\s_-]+/, '')
-      name = name.gsub(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
-      name = name.gsub(/\s+/, '_')
-    end
   end
 end