easy_html_generator 1.0.4 → 1.0.5

data/lib/easy_html_generator/generator/compile/haml/helper/activesupport_override.rb

@@ -2,11 +2,6 @@
 
 # this module overrides some active support methods for working paths etc.
 module ActivesupportOverride
-  def stylesheet_link_tag(path, media = 'screen')
-    '<link href="' + path_to_css(path) + '" media="' + media +
-      '" rel="stylesheet" type="text/css" />'
-  end
-
   def javascript_include_tag(path)
     '<script src="' + path_to_js(path) + '"></script>'
   end
@@ -24,7 +19,7 @@ module ActivesupportOverride
     '<link rel="' + relation + '" href="' + source + '"' + type + '/>'
   end
 
-  def path_to_css(path)
+  def path_to_stylesheet(path, _options = {})
     return path if external_path?(path)
     @project.uri_path_to(:styles, path)
   end

data/lib/easy_html_generator/generator/compile/haml/helper/asset_helper.rb

@@ -17,14 +17,14 @@ module AssetHelper
   def with_coffee(&block)
     input = capture_haml(&block)
     content_tag :script do
-      raw @project.generators.compile_coffee.do_input input
+      raw @project.generators.compile_coffee.do_input! input
     end
   end
 
   def with_sass(&block)
     input = capture_haml(&block)
     content_tag :style do
-      raw @project.generators.compile_sass.do_input input
+      raw @project.generators.compile_sass.do_input! input
     end
   end
 
@@ -43,21 +43,21 @@ module AssetHelper
   end
 
   def headjs_stylesheet_link_tag(tag, path)
-    headjs_javascript_include_tag(tag, path_to_css(path))
+    headjs_javascript_include_tag(tag, path_to_stylesheet(path))
   end
 
   def inline_stylesheet_link_tag(path)
     return path if external_path?(path)
 
     styles_path = @project.dist_path_to(:styles, path)
-    if File.exists? styles_path
+    if File.exist? styles_path
       path = styles_path
     else
       path = File.join(@project.dist_path, path)
     end
 
     content_tag :style do
-      raw @project.generators.minimize_css.do_input File.read(path)
+      raw @project.generators.minimize_css.do_input! File.read(path)
     end
   end
 
@@ -65,14 +65,14 @@ module AssetHelper
     return path if external_path?(path)
 
     scripts_path = @project.dist_path_to(:scripts, path)
-    if File.exists? scripts_path
+    if File.exist? scripts_path
       path = scripts_path
     else
       path = File.join(@project.dist_path, path)
     end
 
     content_tag :script do
-      raw @project.generators.minimize_js.do_input File.read(path)
+      raw @project.generators.minimize_js.do_input! File.read(path)
     end
   end
 end

data/lib/easy_html_generator/generator/compile/haml.rb

@@ -1,28 +1,31 @@
 # encoding: utf-8
-require 'fileutils'
 require 'haml'
-require 'easy_html_generator/generator/base'
+require 'easy_html_generator/generator/compile/base'
 
 # this generator compiles haml files from src folder and copies them
 # to the dist folder
 class EasyHtmlGenerator::Generator::Compile::Haml <
-  EasyHtmlGenerator::Generator::Base
+  EasyHtmlGenerator::Generator::Compile::Base
 
   require 'easy_html_generator/generator/compile/haml/context'
   require 'easy_html_generator/generator/compile/haml/layout'
 
-  def initialize(project, config)
-    super(project, config)
-    @config.src  = project.config.paths.src.views
-    @config.dest = project.config.paths.dist.views
+  def do_input!(input, input_file, *_args)
+    file_name = File.basename input_file
+    scope     = file_name.split('.').first
+    context   = Context.new(@project, @config, scope)
+    layout    = Layout.layout_from_file(@project.src_path_to(:views),
+                                        input_file, @config.renderer)
+
+    do_input(input, layout, context, scope)
+
+  rescue StandardError => e
+    raise e, "#{e.message} in #{input_file} ", e.backtrace
   end
 
-  def do_input(input, layout, context, scope, _input_file)
-    # If the file being processed by Haml contains a yield statement,
-    # the block passed to "render" will be called when it's hit.
+  def do_input(input, layout, context, scope)
     result = layout.render(context, body_class: scope) do
-      # Render the actual page contents in place of the call to "yield".
-      body   = Haml::Engine.new(input, @config.renderer)
+      body = Haml::Engine.new(input, @config.renderer)
       body.render(context)
     end
 
@@ -31,40 +34,12 @@ class EasyHtmlGenerator::Generator::Compile::Haml <
     EasyHtmlGenerator::Generator::Minimize::Html.compress result
   end
 
-  def should_do_file?(i)
-    # dont check if file changed, because partials could have changed
-    !File.basename(i).start_with? '_'
+  def file_changed?(file)
+    # regenerate all haml files except imported once
+    !File.basename(file).start_with? '_'
   end
 
-  def input_to_output_file(i)
-    super(i).gsub('.html.haml', '.html')
-  end
-
-  def generate
-    return unless @config.enabled
-
-    log_running
-
-    FileUtils.mkdir_p dest_path
-
-    walk_files(File.join(src_path, @config.selector)) do |i, o|
-      next unless should_do_file? i
-
-      compile_file i, o
-    end
-  end
-
-  def compile_file(src, target)
-    file_name = File.basename src
-    scope     = file_name.split('.').first
-    context   = Context.new(@project, @config, scope)
-    layout    = Layout.layout_from_file(@project.src_path_to(:views),
-                                        src, @config.renderer)
-
-    begin
-      do_file(src, target, layout, context, scope)
-    rescue StandardError => e
-      raise e, "#{e.message} in #{src} ", e.backtrace
-    end
+  def input_to_output_file(input_file, config)
+    super(input_file, config).gsub('.html.haml', '.html')
   end
 end

data/lib/easy_html_generator/generator/compile/sass.rb

@@ -2,12 +2,12 @@
 require 'sass'
 
 require 'easy_html_generator'
-require 'easy_html_generator/generator/base'
+require 'easy_html_generator/generator/compile/base'
 
 # this generator compiles sass files from src folder and copies them
 # to the dist folder
 class EasyHtmlGenerator::Generator::Compile::Sass <
-  EasyHtmlGenerator::Generator::Base
+  EasyHtmlGenerator::Generator::Compile::Base
 
   def self.add_load_path(path)
     ::Sass.load_paths << path unless ::Sass.load_paths.include?(path)
@@ -19,12 +19,9 @@ class EasyHtmlGenerator::Generator::Compile::Sass <
     super(project, config)
 
     self.class.add_load_path "#{@project.src_path_to :styles}"
-
-    @config.src  = project.config.paths.src.styles
-    @config.dest = project.config.paths.dist.styles
   end
 
-  def do_input(input, src='inline')
+  def do_input!(input, input_file = 'inline', *_args)
     renderer = ::Sass::Engine.new(input)
     result   = renderer.render
 
@@ -32,16 +29,15 @@ class EasyHtmlGenerator::Generator::Compile::Sass <
 
     EasyHtmlGenerator::Generator::Minimize::Css.compress result
   rescue StandardError => e
-    raise e, "#{e.message} in #{src} ", e.backtrace
+    raise e, "#{e.message} in #{input_file} ", e.backtrace
   end
 
-
-  def should_do_file?(i)
-    # dont check if file changed, because partials could have changed
-    !File.basename(i).start_with? '_'
+  def file_changed?(file)
+    # regenerate all sass files except imported once
+    !File.basename(file).start_with? '_'
   end
 
-  def input_to_output_file(i)
-    super(i).gsub('.css.sass', '.css')
+  def input_to_output_file(input_file, config)
+    super(input_file, config).gsub('.css.sass', '.css')
   end
 end

data/lib/easy_html_generator/generator/copy.rb

@@ -3,33 +3,26 @@ require 'fileutils'
 require 'easy_html_generator/generator/base'
 
 # this generator copies files from src ro dist folder
-class EasyHtmlGenerator::Generator::Copy < EasyHtmlGenerator::Generator::Base
-  def generate
-    return unless @config.enabled
+class EasyHtmlGenerator::Generator::Copy <
+  EasyHtmlGenerator::Generator::Base
 
-    log_running
+  def generate!(config)
+    selector = config.key?(:selector) ? config[:selector] : '**/*'
 
-    @config.dirs.each do |config|
-      src_path  = resolve_path_prefix(config.source, @project.src_path)
-      dest_path = resolve_path_prefix(config.target, @project.dist_path)
-
-      self.class.copy_r(src_path, dest_path, config.selector)
-    end
+    self.class.copy_r(config.source, config.target, selector)
   end
 
   # cannot use copy_entry or cp_r with symbolic existent links in target
-  # FileUtils::copy_entry(src_dir, output_folder, true, false, true)
-  # if File.directory? src_dir
   def self.copy_r(src_path, dest_path, selector)
     return unless File.exist? src_path
 
-    FileUtils.mkdir_p dest_path
-
     Dir[File.join(src_path, selector)].each do |input_file|
       next if input_file.empty?
 
       output_file = input_file.sub(src_path, dest_path)
 
+      FileUtils.mkdir_p File.dirname(output_file)
+
       copy(input_file, output_file)
     end
   end

data/lib/easy_html_generator/generator/delete.rb

@@ -3,19 +3,10 @@ require 'fileutils'
 require 'easy_html_generator/generator/base'
 
 # this generator deletes in the dest folder
-class EasyHtmlGenerator::Generator::Delete < EasyHtmlGenerator::Generator::Base
-  def generate
-    return unless @config.enabled
+class EasyHtmlGenerator::Generator::Delete <
+  EasyHtmlGenerator::Generator::Base
 
-    log_running
-
-    @config.files.each do |file_pattern|
-      resolved_pattern = resolve_path_prefix(file_pattern, @project.dist_path)
-      Dir[resolved_pattern].each do |file|
-        EasyHtmlGenerator::Checksum.invalidate_file file
-
-        FileUtils.rm_rf file
-      end
-    end
+  def generate!(config)
+    FileUtils.rm_rf Dir[config.source]
   end
 end

data/lib/easy_html_generator/generator/minimize/css.rb

@@ -1,25 +1,18 @@
 # encoding: utf-8
 require 'cssminify'
-require 'easy_html_generator/generator/base'
+require 'easy_html_generator/generator/compile/base'
 
 # this generator minifies css files from src folder and copies them
 # to the dist folder
 class EasyHtmlGenerator::Generator::Minimize::Css <
-  EasyHtmlGenerator::Generator::Base
+  EasyHtmlGenerator::Generator::Compile::Base
 
-  def initialize(project, config)
-    super(project, config)
-
-    @config.src  = project.config.paths.src.styles
-    @config.dest = project.config.paths.dist.styles
-  end
-
-  def do_input(input, *_args)
+  def do_input!(input, *_args)
     self.class.compress input
   end
 
-  def input_to_output_file(i)
-    super(i).gsub('.css', "#{@config.prefix_extension}.css")
+  def input_to_output_file(input_file, config)
+    super(input_file, config).gsub('.css', "#{config.prefix_extension}.css")
   end
 
   def self.compress(input)

data/lib/easy_html_generator/generator/minimize/html.rb

@@ -1,25 +1,18 @@
 # encoding: utf-8
 require 'htmlcompressor'
-require 'easy_html_generator/generator/base'
+require 'easy_html_generator/generator/compile/base'
 
 # this generator minifies html files from src folder and copies them
 # to the dist folder
 class EasyHtmlGenerator::Generator::Minimize::Html <
-  EasyHtmlGenerator::Generator::Base
+  EasyHtmlGenerator::Generator::Compile::Base
 
-  def initialize(project, config)
-    super(project, config)
-
-    @config.src  = project.config.paths.src.views
-    @config.dest = project.config.paths.dist.views
-  end
-
-  def do_input(input, *_args)
+  def do_input!(input, *_args)
     self.class.compress input
   end
 
-  def input_to_output_file(i)
-    super(i).gsub('.html', "#{@config.prefix_extension}.html")
+  def input_to_output_file(input_file, config)
+    super(input_file, config).gsub('.html', "#{config.prefix_extension}.html")
   end
 
   def self.compressor

data/lib/easy_html_generator/generator/minimize/images.rb

@@ -1,32 +1,18 @@
 # encoding: utf-8
 require 'piet'
-require 'easy_html_generator/generator/base'
+require 'easy_html_generator/generator/compile/base'
 
 # this generator minifies image files from src folder and copies them
 # to the dist folder
 class EasyHtmlGenerator::Generator::Minimize::Images <
-  EasyHtmlGenerator::Generator::Base
+  EasyHtmlGenerator::Generator::Compile::Base
 
-  def initialize(project, config)
-    super(project, config)
+  def do_input!(_input, input_file, output_file, config)
+    FileUtils.copy(input_file, output_file) unless input_file == output_file
 
-    @config.src  = project.config.paths.src.images
-    @config.dest = project.config.paths.dist.images
-  end
-
-  def do_file(src, target, *args)
-    return unless File.exist?(src) && File.file?(src)
-    log "-> do_file #{src}"
-
-    FileUtils.mkdir_p File.dirname(target)
-
-    args.push target
-
-    FileUtils.copy(src, target)
-
-    Piet.optimize(target, @config.options)
+    Piet.optimize(output_file, config.options)
 
-    EasyHtmlGenerator::Checksum.store_file(src)
+    nil
   rescue StandardError
     log '-> you have to install "optipng" and "jpegoptim"'.red
   end

data/lib/easy_html_generator/generator/minimize/js.rb

@@ -1,25 +1,18 @@
 # encoding: utf-8
 require 'uglifier'
-require 'easy_html_generator/generator/base'
+require 'easy_html_generator/generator/compile/base'
 
 # this generator minifies js files from src folder and copies them
 # to the dist folder
 class EasyHtmlGenerator::Generator::Minimize::Js <
-  EasyHtmlGenerator::Generator::Base
+  EasyHtmlGenerator::Generator::Compile::Base
 
-  def initialize(project, config)
-    super(project, config)
-
-    @config.src  = project.config.paths.src.scripts
-    @config.dest = project.config.paths.dist.scripts
-  end
-
-  def do_input(input, *_args)
+  def do_input!(input, *_args)
     self.class.compress input
   end
 
-  def input_to_output_file(i)
-    super(i).gsub('.js', "#{@config.prefix_extension}.js")
+  def input_to_output_file(input_file, config)
+    super(input_file, config).gsub('.js', "#{config.prefix_extension}.js")
   end
 
   def self.compress(input)

data/lib/easy_html_generator/generator/service/analytics.rb

@@ -1,34 +1,34 @@
 # encoding: utf-8
-require 'easy_html_generator/generator/base'
+
+require 'easy_html_generator/generator/compile/base'
 
 # this generator adds web tracking snippets to files in the dist folder
 class EasyHtmlGenerator::Generator::Service::Analytics <
-  EasyHtmlGenerator::Generator::Base
+  EasyHtmlGenerator::Generator::Compile::Base
 
-  def generate
-    return unless @config.enabled
+  def do_input!(input, _input_file, _output_file, config)
+    return if input.include? begin_marker(config)
 
-    log_running
+    analytics_code = build_content(config)
 
-    selector = File.join(@project.dist_path_to(:views),
-                         @config.append_to_files)
-    Dir[selector].each do |file|
-      do_google file
-    end
+    input.sub('</head>', "#{analytics_code}</head>")
   end
 
-  def do_google(file)
-    return unless @config.google.enabled
-
-    content = File.read(file)
-    return if file.include? '<!-- Google Analytics -->'
+  def begin_marker(config)
+    "<!-- #{config.name} Analytics -->"
+  end
 
-    code = @config.google.code.sub('{GOOGLE_UA_ID}', @config.google.id)
+  def end_marker(config)
+    "<!-- End #{config.name} Analytics -->"
+  end
 
-    code = "<!-- Google Analytics -->#{code}<!-- End Google Analytics -->"
+  def build_content(config)
+    content = config.code
 
-    content = content.sub('</head>', "#{code}</head>")
+    config.params.each do |key, value|
+      content.sub!("{#{key}}", value)
+    end
 
-    File.write(file, content)
+    "#{begin_marker(config)} #{content} #{end_marker(config)}"
   end
 end

data/lib/easy_html_generator/generator/service/bower.rb

@@ -6,29 +6,33 @@ require 'easy_html_generator/generator/base'
 class EasyHtmlGenerator::Generator::Service::Bower <
   EasyHtmlGenerator::Generator::Base
 
-  def initialize(project, config)
-    super(project, config)
+  def generate!(_config)
+    return unless File.exist? bower_file
+    return unless file_changed? bower_file
 
-    @config.src  = ''
-    @config.dest = ''
-  end
+    log `  #{bower_command}  `
 
-  def do_file(bower_file, *_args)
-    input_folder  = File.dirname(bower_file)
-    output_folder = File.join(@project.dist_path, @config.target)
+    FileUtils.mkdir_p @config.target
 
-    cmd = "cd #{input_folder} && bower install"
-    cmd = "if which bower >/dev/null; then echo '\e[32mrunning bower\e[0m' \
-           && #{cmd}; else echo '\e[31mplease install bower \
-           \"npm install -g bower\" http://bower.io/ \e[0m'; fi"
+    EasyHtmlGenerator::Generator::Copy.copy_r(
+      bower_storage, @config.target, '**/*')
 
-    log ` #{cmd} `
+    store_file_hash(bower_file)
+  end
 
-    FileUtils.mkdir_p output_folder
+  def bower_storage
+    File.join(@config.source, 'bower_components')
+  end
 
-    EasyHtmlGenerator::Generator::Copy.copy_r(
-      "#{input_folder}/bower_components", output_folder, '**/*')
+  def bower_file
+    File.join(@config.source, 'bower.json')
+  end
+
+  def bower_command
+    command = "cd #{@config.source} && bower install --force-latest"
 
-    EasyHtmlGenerator::Checksum.store_file(bower_file)
+    "if which bower >/dev/null; then echo '\e[32mrunning bower\e[0m' \
+    && #{command}; else echo '\e[31mplease install bower \
+    \"npm install -g bower\" http://bower.io/ \e[0m'; fi"
   end
 end

data/lib/easy_html_generator/generator/service/grunt.rb

@@ -5,20 +5,21 @@ require 'easy_html_generator/generator/base'
 class EasyHtmlGenerator::Generator::Service::Grunt <
   EasyHtmlGenerator::Generator::Base
 
-  def initialize(project, config)
-    super(project, config)
+  def generate!(config)
+    return unless File.exist? config.source
+    log `  #{grunt_command(config)}  `
+  end
 
-    @config.src  = ''
-    @config.dest = ''
+  def grunt_folder(config)
+    File.dirname(config.source)
   end
 
-  def do_file(grunt_file, *_args)
-    input_folder = File.dirname(grunt_file)
+  def grunt_command(config)
+    command = "cd #{grunt_folder(config)} \
+               && npm install && grunt #{config.task}"
 
-    cmd = "cd #{input_folder} && npm install && grunt #{@config.task}"
-    cmd = "if which grunt >/dev/null; then echo '\e[32m  | ->running grunt \
-           \e[0m' && #{cmd}; else echo '\e[31mplease install grunt \
-           \"npm install -g grunt\" http://gruntjs.com/ \e[0m'; fi"
-    log ` #{cmd} `
+    "if which grunt >/dev/null; then echo '\e[32m  | ->running grunt \
+    \e[0m' && #{command}; else echo '\e[31mplease install grunt \
+    \"npm install -g grunt\" http://gruntjs.com/ \e[0m'; fi"
   end
 end

data/lib/easy_html_generator/generator/service/sitemap.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+require 'fileutils'
+require 'xml-sitemap'
+require 'easy_html_generator/generator/base'
+
+# this generator combines files in the dist folder
+class EasyHtmlGenerator::Generator::Service::Sitemap <
+  EasyHtmlGenerator::Generator::Base
+
+  def generate!(config)
+    files = Dir[config.selector]
+
+    files.map! do |file|
+      file.sub(@project.dist_path, '').sub(@project.name, '')
+    end
+    generate_sitemap(files, config)
+  end
+
+  def generate_sitemap(files, config)
+    map = XmlSitemap::Map.new(config.domain) do |m|
+      files.each do |file|
+        next if blacklisted?(file, config)
+        m.add file, updated: Date.today, period: :daily
+      end
+    end
+    map.render_to(config.target)
+  end
+
+  def blacklisted?(file, config)
+    return false if config.blacklist.nil?
+    config.blacklist.any? { |entry| file.include?(entry) }
+  end
+end

data/lib/easy_html_generator/generator/structure.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'find'
 require 'fileutils'
 require 'easy_html_generator/generator/base'
 
@@ -7,13 +6,10 @@ require 'easy_html_generator/generator/base'
 class EasyHtmlGenerator::Generator::Structure <
   EasyHtmlGenerator::Generator::Base
 
-  def generate
-    return unless @config.enabled
-
-    log_running
-
+  def generate!(_config)
     @project.config.paths.dist.each do |_index, dir|
       next if dir.empty?
+
       FileUtils.mkdir_p("#{@project.dist_path}/#{dir}")
     end
   end

data/lib/easy_html_generator/generator.rb

@@ -5,12 +5,6 @@ module EasyHtmlGenerator::Generator
   Dir[File.dirname(__FILE__) + '/generator/*.rb']
     .each { |file| require file }
 
-  # this is a wrapper module for generator services
-  module Service
-    Dir[File.dirname(__FILE__) + '/generator/service/*.rb']
-      .each { |file| require file }
-  end
-
   # this is a wrapper module for compiling generators
   module Compile
     Dir[File.dirname(__FILE__) + '/generator/compile/*.rb']
@@ -22,4 +16,10 @@ module EasyHtmlGenerator::Generator
     Dir[File.dirname(__FILE__) + '/generator/minimize/*.rb']
       .each { |file| require file }
   end
+
+  # this is a wrapper module for generator services
+  module Service
+    Dir[File.dirname(__FILE__) + '/generator/service/*.rb']
+      .each { |file| require file }
+  end
 end

data/lib/easy_html_generator/project.rb

@@ -62,6 +62,9 @@ class EasyHtmlGenerator::Project
   def load_config(file)
     @config = EasyHtmlGenerator::Config.from_file file
     @config[:generate_on_request_path_match].map! { |p| Regexp.new(p) }
+    @config =
+      EasyHtmlGenerator::ProjectPathResolver.new(self).resolve_config @config
+
     EasyHtmlGenerator::Checksum.store_file file
   end
 
@@ -73,6 +76,8 @@ class EasyHtmlGenerator::Project
     return unless EasyHtmlGenerator::Checksum.file_changed? @config_file
     STDERR.puts "  | -> reloading config(#{@config_file.green})"
 
+    EasyHtmlGenerator::Checksum.invalidate_all
+
     load_config @config_file
     load_generators
   end