easy_html_creator 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb0f39ca2c530d5ca60b51d263442720660620d3
-  data.tar.gz: fd4aad1e08e9331ae61c4a63999efe9fdde51d85
+  metadata.gz: 0ffb1a05306aef364bef3ea5ba23792013ae0bba
+  data.tar.gz: 8eb42ba87c612785469f215b7cb1cf673e4423c2
 SHA512:
-  metadata.gz: b6322b39c6a0c2aac2840c969a9948423cca1a7efc39c330de44964cbc2f9d986a7bd204252ebde03ec882bbe87f47cb2c54892bfb9d49b7325b53f37619ee11
-  data.tar.gz: 5aa3f89f474e2fa21c3a65032b994b3cdffe0e6334f80149a6c95524a40a90e69237fcb426e1cc78c077603b61b42d6ea4b9871f5ad3e3eae1dc7c1498c164f0
+  metadata.gz: c1b253ff31110de712f4bc30c6aac8b9558c773bfc6a9540d628990f6aa91b4f155e631ee40e63cd351a6ccee97a1bcb41e40fe01ced873be581c8493a92daeb
+  data.tar.gz: 131cb830d231b9ca8c8e60e084a49eca42292cbb7c3da79a0aff5160aae2442a235024fc7b0d898e9eaa24138c6e85af3569582b47ad26faf55d47ed5dbedf7b

data/CHANGELOG.md

@@ -1,12 +1,22 @@
+1.3.0
+=================
+- refactor generators
+- increase performance
+- regenerate file only if file hash changed
+- coffee inline available via = with_coffe do
+- sass inline available via = with_sass do
+- only generate requested project, to generate all projects use "ehc generate"
+- add integration tests
+
 1.2.0
 =================
 - Add mixins for reset, resize, buttons, arrows and extend existing helper mixins
 - Add bower.json resolving in public folder
 - Add offline demo website with bower dependencies
 - Add file_exists to helper methods
-- reload ruby helpers on each request, so you dont need to restart the server
+- reload ruby helpers on each request, so you don't need to restart the server
 - better exceptions for partials
-- sass inlcude path for shared sass files now starts from dev_root/shared/sass
+- sass include path for shared sass files now starts from dev_root/shared/sass
 - list directory contents if there is no index.html
 
 1.1.1

data/README.md

@@ -42,6 +42,7 @@ TODO
 ========
 - clean/refactor code
 - Add tests
+- Add Travis intigration (https://travis-ci.org)
 
 Stats
 ========
@@ -53,3 +54,12 @@ Credits
 *Files are located in the first commit and/or version 0.0.1*
 - ./ruby_files/generate.rb is based on: https://github.com/scarpenter/command_line_haml/blob/master/generate.rb
 - ./ruby_files/server.rb is based on: https://practicingruby.com/articles/implementing-an-http-file-server
+
+Contributing
+============
+1. Fork it ( https://github.com/dennisvandehoef/easy_gravatar/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Make sure the test walk trough (`rake test`)
+6. Create a new Pull Request

data/dev_root/demo-website/index.haml

@@ -107,3 +107,55 @@
         .arrow-up
           +arrow-up(60px, 20px, #62bc19)
           +inline-block
+
+
+%h2.semibold
+  inline coffee and sass
+
+.content-left
+  %h3
+    inline sass
+
+  %p.inline-sass
+    text styled from inline sass
+
+  = with_sass do
+    :plain
+      p.inline-sass
+        color: green
+
+  %pre.code
+    = preserve do
+      :escaped
+        = with_sass do
+          :plain
+            p.inline-sass
+              color: green
+
+.content-right
+  %h3
+    inline coffee
+
+  %p
+    %button.inline-coffee
+      click me
+
+  = with_coffee do
+    :plain
+      $('.inline-coffee').click ->
+        alert 'button clicked'
+
+  %pre.code
+    = preserve do
+      :escaped
+        = with_coffee do
+          :plain
+            $('.inline-coffee').click ->
+              alert 'button clicked'
+
+%h2.semibold
+  use bower in your projects
+
+%p
+  just put a bower.json into your public folder and it will be resolved at generation time. don't forget to install bower 'npm install -g bower\'
+  = link_to 'http://bower.io/', 'http://bower.io/', target: 'blank'

data/dev_root/shared/helper/shared_helper.rb

@@ -2,4 +2,12 @@ module SharedHelper
   def copyright(who)
     "© #{Time.new.year} by #{who}"
   end
+
+  def select_partials(dir='*', &block)
+    folder = "#{@input_folder}/partials/#{dir}"
+    Dir.glob("#{folder}").each do |partial|
+      partial = partial.sub("#{@input_folder}/partials/", '').sub('.haml', '')
+      block.call(partial) if block_given?
+    end
+  end
 end

data/lib/ehc_command_tasks.rb

@@ -51,12 +51,12 @@ class EhcCommandTasks
   end
 
   def init
-    puts "Creating dev_root and web_root with sample website"
+    puts "Creating dev_root and web_root with sample websites"
 
     init_dev_root
     init_web_root
 
-    puts "All done, use 'ehc server' to start the development server."
+    puts "All done, use \e[32m'ehc server'\e[0m to start the development server."
   end
 
   def generate

data/lib/generator/base.rb

@@ -0,0 +1,47 @@
+require 'digest/md5'
+
+module Generator
+  class Base
+    @@FILE_CHECKSUMS={}
+
+    def generate(input_folder, output_folder)
+
+    end
+
+    def compile_file(input_file, *args)
+      return unless self.class.changed? (input_file)
+
+      #if args[0] isset, it is a file, the output file
+      if args.length > 0
+        write(args[0], compile(File.read(input_file), *args))
+      else
+        compile(input_file, *args)
+      end
+
+      self.class.cache(input_file)
+    end
+
+    def compile(input)
+      input
+    end
+
+    def write(file, content)
+      File.open(file, "w") do |f|
+        f.write content
+      end
+    end
+
+    def self.checksum(file)
+      Digest::MD5.hexdigest(File.read(file))
+    end
+
+    def self.changed?(file)
+      return true unless @@FILE_CHECKSUMS.has_key? file
+      @@FILE_CHECKSUMS[file] != self.checksum(file)
+    end
+
+    def self.cache(file)
+      @@FILE_CHECKSUMS[file] = self.checksum(file)
+    end
+  end
+end

data/lib/generator/coffee_generator.rb

@@ -1,26 +1,33 @@
-require 'fileutils'
-require 'coffee-script'
+require 'coffee_script'
+require 'uglifier'
+
+require_relative 'base.rb'
 
 module Generator
-  class CoffeeGenerator
-    def generate input_folder, output_folder
-      Dir.glob("#{input_folder}/*.coffee").select do |file|
-        next unless File.file? file
+  class CoffeeGenerator < Generator::Base
+    def generate(input_folder, output_folder)
+      input_folder  = "#{input_folder}/coffee"
+      output_folder = "#{output_folder}/js"
 
-        result = compile(file)
-        file_name = file.split('/')[-1].gsub('.coffee', '.js')
-        write File.join(output_folder, file_name), result
-      end
-    end
+      Dir.glob("#{input_folder}/*.coffee").select do |input_file|
+        next unless File.file? input_file
 
-    def compile file
-      CoffeeScript.compile(File.read(file))
-    end
+        output_file_name = input_file.split('/')[-1].gsub('.coffee', '.js')
+        outpu_file       = File.join(output_folder, output_file_name)
 
-    def write file, content
-      File.open(file, "w") do |f|
-        f.write content
+        compile_file(input_file, outpu_file)
+
+        min_file_name = outpu_file.sub '.js', '.min.js'
+        File.write(min_file_name,
+                   Uglifier.compile(
+                      File.read(outpu_file)))
       end
     end
+
+    def compile(input, *args)
+      CoffeeScript.compile(input)
+    rescue Exception => e
+      raise $!, "#{$!} TEMPLATE::#{args.to_s} ", $!.backtrace
+    end
   end
 end

data/lib/generator/generator.rb

@@ -3,13 +3,16 @@ require_relative 'coffee_generator.rb'
 require_relative 'haml_generator.rb'
 require_relative 'structure_generator.rb'
 
+
 module Generator
+  SassGenerator::add_load_path('./dev_root/shared/sass')
+
   class Generator
     def initialize
-      @haml      = HamlGenerator.new
-      @sass      = SassGenerator.new
-      @coffee    = CoffeeGenerator.new
-      @structure = StructureGenerator.new
+      @generators = [ StructureGenerator.new,
+                      CoffeeGenerator.new,
+                      SassGenerator.new,
+                      HamlGenerator.new ]
     end
 
     def web_root
@@ -32,21 +35,24 @@ module Generator
       "#{web_root}/#{project}"
     end
 
-    def generate
-      FileUtils.rm_rf(Dir.glob("web_root/*"))
+    def generate(path=nil)
+      if path
+        files = [File.dirname(path)]
+      else
+        files = projects_folder
+      end
 
-      projects_folder.each do |project_folder|
+      files.each do |project_folder|
         next unless File.directory? project_folder
         next if project_folder.include? 'shared'
 
         project_name = project_folder.split('/')[-1]
         project_output_folder = project_web_folder(project_name)
 
-        @structure.generate project_folder, project_output_folder
-        @coffee.generate    "#{project_folder}/coffee", "#{project_output_folder}/js"
-        @sass.generate      "#{project_folder}/sass"  , "#{project_output_folder}/css"
-
-        @haml.generate      project_folder, project_output_folder
+        puts "generating: \e[32m#{project_output_folder}\e[0m"
+        @generators.each do |generator|
+          generator.generate(project_folder, project_output_folder)
+        end
       end
     end
   end

data/lib/generator/haml_generator.rb

@@ -1,48 +1,54 @@
 require 'fileutils'
 require 'haml'
 require 'action_view'
+require 'htmlcompressor'
 
 require_relative 'helper/activesupport_override.rb'
+require_relative 'helper/asset_helper.rb'
+require_relative 'base.rb'
 
 module Generator
-  class HamlGenerator
+  class HamlGenerator < Generator::Base
     def initialize()
       @example_boolean = false
       @haml_options = { attr_wrapper: '"', format: :html5 }
+      @compressor = HtmlCompressor::Compressor.new
     end
 
-    def generate input_folder, output_folder
-      layout = "#{input_folder}/layout.haml"
+    def generate(input_folder, output_folder)
+      layout_path = "#{input_folder}/layout.haml"
+      return unless File.file? layout_path
+      layout      = Haml::Engine.new(File.read(layout_path), @haml_options)
 
-      Dir.glob("#{input_folder}/*.haml").select do |file|
-        next unless File.file? file and !file.include? 'layout.haml'
+      Dir.glob("#{input_folder}/*.haml").select do |input_file|
+        next unless File.file? input_file and !input_file.include? 'layout.haml'
 
-        result    = compile(file, layout, input_folder, output_folder)
-        file_name = file.split('/')[-1].gsub('.haml', '.html')
-        write File.join(output_folder, file_name), result
+        output_file_name = input_file.split('/')[-1].gsub('.haml', '.html')
+        output_file      = File.join(output_folder, output_file_name)
+        scope            = output_file_name.split('.').first
+        context          = Context.new(@example_boolean, scope, @haml_options,
+                                      input_folder, output_folder)
+
+        compile_file(input_file, output_file, layout, context, scope)
       end
     end
 
-    def compile file, layout, input_folder, output_folder
-      scope = file.split('/')[-1].split('.').first
-      layout = Haml::Engine.new(File.read(layout), @haml_options)
-      c = Context.new(@example_boolean, scope, @haml_options, input_folder, output_folder)
-
+    def compile(input, output_file, layout, context, scope)
       # If the file being processed by Haml contains a yield statement, the block passed to
       # "render" will be called when it's hit.
-      layout.render c, body_class: scope do
+      result = layout.render(context, body_class: scope) do
         # Render the actual page contents in place of the call to "yield".
-        body = Haml::Engine.new(File.read(file), @haml_options)
-        body.render(c)
+        body = Haml::Engine.new(input, @haml_options)
+        body.render(context)
       end
+
+      @compressor.compress result
     rescue Exception => e
-      raise $!, "#{$!} TEMPLATE::#{file} ", $!.backtrace
+      raise $!, "#{$!} TEMPLATE::#{output_file} ", $!.backtrace
     end
 
-    def write file, content
-      File.open(file, "w") do |f|
-        f.write content
-      end
+    def self.changed?(path)
+      true #allways recompile haml because of partials etc.
     end
   end
 
@@ -53,13 +59,14 @@ module Generator
 
     include ActionView::Helpers
     include ActivesupportOverride
+    include AssetHelper
 
     def initialize(example_boolean, scope, options, input_folder, output_folder)
       @example_boolean = example_boolean
-      @scope = scope
-      @options = options
-      @input_folder = input_folder
-      @output_folder = output_folder
+      @scope           = scope
+      @options         = options
+      @input_folder    = input_folder
+      @output_folder   = output_folder
 
       load_helper('./dev_root/shared/helper/*.rb')
       load_helper("./#{input_folder}/helper/*.rb")
@@ -67,11 +74,13 @@ module Generator
 
     def load_helper(folder)
       Dir.glob(folder).each do |path|
+        next unless Base.changed? path
         load path
         file_without_ext = path.split('/')[-1].split('.').first
         module_name      = file_without_ext.classify
-        STDERR.puts 'loading project helper -> '+module_name
+        STDERR.puts "->loading project helper: \e[32m#{module_name}\e[0m"
         self.class.send(:include, module_name.constantize)
+        Base.cache path
       end
     end
 
@@ -95,7 +104,7 @@ module Generator
         nil
       end
     rescue Exception => e
-      raise $!, "#{$!} PARTIAL::#{file} ", $!.backtrace
+      raise $!, "#{$!} PARTIAL::#{file_name} ", $!.backtrace
     end
   end
 end

data/lib/generator/helper/activesupport_override.rb

@@ -45,8 +45,4 @@ module ActivesupportOverride
   def url_for(options = '')
    return options
   end
-
-  def file_exists?(relative_path)
-    File.exists?("#{@output_folder}/#{relative_path}")
-  end
 end

data/lib/generator/helper/asset_helper.rb

@@ -0,0 +1,63 @@
+require 'coffee-script'
+require 'uglifier'
+
+module AssetHelper
+  include ActionView::Context
+
+  def file_exists?(relative_path)
+    File.exists?("#{@output_folder}/#{relative_path}")
+  end
+
+  def with_coffee(&block)
+    input = capture_haml(&block)
+    content_tag :script do
+      raw Uglifier.compile(Generator::CoffeeGenerator.new.compile(input))
+    end
+  end
+
+  def with_sass(&block)
+    input = capture_haml(&block)
+    content_tag :style do
+      raw Generator::SassGenerator.new.compile(input)
+    end
+  end
+
+  def glyph_icon_classes(icon)
+    "glyphicon glyphicon-#{icon}"
+  end
+
+  def glyph_icon(icon, content='')
+    content_tag(:span, content, class: glyph_icon_classes(icon))
+  end
+
+  def select_partials(dir='*', &block)
+    folder = "#{@input_folder}/partials/#{dir}"
+    Dir.glob("#{folder}").each do |partial|
+      partial = partial.sub("#{@input_folder}/partials/", '').sub('.haml', '')
+      block.call(partial) if block_given?
+    end
+  end
+
+  def javascript_include_bower_tag(path)
+    '<script src="'+path_to_bower(path)+'"></script>'
+  end
+
+  def path_to_bower(path)
+    return "bower_components/#{path}"
+    path
+  end
+
+  def headjs_javascript_include_tag(tag, path)
+    content_tag :script do
+      raw "head.load({'#{tag}': '#{path_to_js(path)}'});"
+    end
+  end
+
+  def headjs_javascript_include_bower_tag(tag, path)
+    headjs_javascript_include_tag(tag, path_to_bower(path))
+  end
+
+  def headjs_stylesheet_link_tag(tag, path)
+    headjs_javascript_include_tag(tag, path_to_css(path))
+  end
+end