easy_html_generator 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc54c42e3b8dbf0a17a5e8c9230c9cb41b142823
-  data.tar.gz: 0549d73e2cf263dafe4721a8dd3a45e7d0a64f0f
+  metadata.gz: 4121de001c06afef8a4674c5027e2327efc693c9
+  data.tar.gz: c67d23e2d49c758f6278ee9a1dc88cb9fb19cef8
 SHA512:
-  metadata.gz: c07365b28f8aaf47c7d8d63ec863fef847cb1cab3d9747d13affa36915687d68555b17649d40d3f1742c9fdb0a2b82f1d2b311d463cddc2d36b1c4510119930b
-  data.tar.gz: 5fdef7471df56eaa4bf8cb1408ea6c09752035ad2f77288bf54e91923b6d4a63db8aebe2b00b8b65cb05cec5f9dca26fba9b6573dfe6eeca563c8934a5076c14
+  metadata.gz: 65d9714558acef3e3feaf91b4e9904225529fee83f4b293fec3717cd2acd2d099a0c10f0f28ac1ee9d97b6315ae795e7775b62a5572268b4511b1ef75fe2e348
+  data.tar.gz: e48670c042579af8ebbf2a4690ff75cbbf4a42eaf7d6faefb2bf336f9b7ea238a89500308d44095abe69ae4715ec9260fdeb04922cf5351047cca8086a9e47b2

data/README.md

@@ -146,7 +146,8 @@ generators:
 
 #### Copy
 * operates on: `dist` and `src`
-* copies folder or files from dist to src
+* copies folder or files from dist to src per default
+* supports `src://` and `dist://`
 * config:
 
 ```
@@ -159,14 +160,15 @@ generators:
           target: 'styles'
           selector: '**/*.css'
         -
-          source: 'assets/scripts'
-          target: 'scripts'
+          source: 'src://assets/scripts'
+          target: 'dist://scripts'
           selector: '**/*.js'
 ```
 
 #### Combine
 * operates on: `dist`
-* combines merges files on dist
+* combines merges files on dist per default
+* supports `src://` and `dist://`
 * config:
 
 ```
@@ -179,14 +181,15 @@ generators:
           files:
             - 'scripts/**/*.js'
         -
-          file: 'styles/combined.css'
+          file: 'dist://styles/combined.css'
           files:
-            - 'styles/**/*.css'
+            - 'src://styles/**/*.css'
 ```
 
 #### Delete
 * operates on: `dist`
-* deletes files or folders on dist
+* deletes files or folders on dist per default
+* supports `src://` and `dist://`
 * config:
 
 ```
@@ -195,6 +198,7 @@ generators:
       enabled: false
       files:
         - '*'
+        - 'src://bower_components'
 ```
 
 ### Compile-Generators

data/lib/easy_html_generator.rb

@@ -8,6 +8,7 @@ require 'bootstrap-sass'
 require 'bundler'
 require 'colorize'
 require 'rack'
+require 'rack/contrib'
 require 'thin'
 
 # main module loads projects and dispatches rack requests
@@ -83,17 +84,17 @@ module EasyHtmlGenerator
 
   def self.rack_app
     Rack::Builder.new do
+      use Rack::ShowExceptions
       use Rack::Reloader, 0
       use EasyHtmlGenerator::RackDispatcher
+      use Rack::Deflater
+      use Rack::ContentLength
+      use Rack::StaticCache, urls: [''], root: EasyHtmlGenerator::DIST_PATH
       use Rack::Static,
         urls: [''],
         root: EasyHtmlGenerator::DIST_PATH,
         index: 'index.html'
 
-      use Rack::ContentLength
-      use Rack::Deflater
-      use Rack::ETag
-
       run lambda { |env| [404, {'Content-Type' => 'text/plain'}, ['404 File not found!']] }
     end
   end

data/lib/easy_html_generator/generator/base.rb

@@ -80,4 +80,16 @@ class EasyHtmlGenerator::Generator::Base
     STDERR.puts "  | #{msg.sub(@project.src_path, '')
       .sub('EasyHtmlGenerator::', '')}"
   end
+
+  def resolve_path_prefix(path, default_prefix = '')
+    if path.include? 'src://'
+      default_prefix = @project.src_path
+      path.sub!('src://', '')
+    end
+    if path.include? 'dist://'
+      default_prefix = @project.dist_path
+      path.sub!('dist://', '')
+    end
+    File.join(default_prefix, path)
+  end
 end

data/lib/easy_html_generator/generator/combine.rb

@@ -17,12 +17,15 @@ class EasyHtmlGenerator::Generator::Combine <
   end
 
   def do_config(config)
+    target_file = resolve_path_prefix(config.file, @project.dist_path)
     o = ''
     config.files.each do |file_pattern|
-      Dir[File.join(@project.dist_path, file_pattern)].each do |file|
+      resolved_pattern = resolve_path_prefix(file_pattern, @project.dist_path)
+      Dir[resolved_pattern].each do |file|
+        next if target_file == file
         o += File.read(file) + "\n"
       end
     end
-    File.write(File.join(@project.dist_path, config.file), o)
+    File.write(target_file, o)
   end
 end

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

@@ -43,9 +43,7 @@ class EasyHtmlGenerator::Generator::Compile::Haml::Context
       # Use it if it's there.
       file_to_render = scope_file if File.exist? scope_file
     end
-    if File.exist? file_to_render
-      Haml::Engine.new(File.read(file_to_render), @config).render self
-    end
+    Haml::Engine.new(File.read(file_to_render), @config).render self
   rescue StandardError => e
     raise e, "#{e.message} in #{file_name} ", e.backtrace
   end

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

@@ -26,23 +26,16 @@ module ActivesupportOverride
 
   def path_to_css(path)
     return path if external_path?(path)
-    test = @project.uri_path_to(:styles, path)
-    file_exists?(test) ? test : path
+    @project.uri_path_to(:styles, path)
   end
 
   def path_to_js(path)
     return path if external_path? path
-    test = @project.uri_path_to(:scripts, path)
-    file_exists?(test) ? test : path
+    @project.uri_path_to(:scripts, path)
   end
 
   def path_to_image(path)
     return path if external_path? path
-    test = @project.uri_path_to(:images, path)
-    file_exists?(test) ? test : path
+    @project.uri_path_to(:images, path)
   end
-
-  #  def url_for(options = '')
-  #  return options
-  #  end
 end

data/lib/easy_html_generator/generator/copy.rb

@@ -10,8 +10,8 @@ class EasyHtmlGenerator::Generator::Copy < EasyHtmlGenerator::Generator::Base
     log_running
 
     @config.dirs.each do |config|
-      src_path  = "#{@project.src_path}/#{config.source}"
-      dest_path = "#{@project.dist_path}/#{config.target}"
+      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

data/lib/easy_html_generator/generator/delete.rb

@@ -10,7 +10,8 @@ class EasyHtmlGenerator::Generator::Delete < EasyHtmlGenerator::Generator::Base
     log_running
 
     @config.files.each do |file_pattern|
-      Dir[File.join(@project.dist_path, file_pattern)].each do |file|
+      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

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

@@ -15,7 +15,7 @@ class EasyHtmlGenerator::Generator::Service::Bower <
 
   def do_file(bower_file, *_args)
     input_folder  = File.dirname(bower_file)
-    output_folder = File.join(@project.dist_path_to(:scripts), @config.target)
+    output_folder = File.join(@project.dist_path, @config.target)
 
     cmd = "cd #{input_folder} && bower install"
     cmd = "if which bower >/dev/null; then echo '\e[32mrunning bower\e[0m' \

data/lib/easy_html_generator/project.rb

@@ -23,7 +23,9 @@ class EasyHtmlGenerator::Project
   end
 
   def uri_path_to(type, relative_path = '')
-    File.join('/', @name, @config.paths.dist[type.to_sym], relative_path)
+    uri_path   = File.join(@config.paths.dist[type.to_sym], relative_path)
+    local_path = File.join(@dist_path, uri_path)
+    File.exist?(local_path) ? uri_path : relative_path
   end
 
   def generate

data/lib/easy_html_generator/rack_dispatcher.rb

@@ -22,10 +22,17 @@ class EasyHtmlGenerator::RackDispatcher
     case request.path_info
     when '/'
       create_directory_listening_index_file
+      env['PATH_INFO'] = '/index.html'
     else
       EasyHtmlGenerator.dispatch(request)
     end
-    @app.call(env)
+    status, headers, body = @app.call(env)
+
+    headers['Connection']    = 'Keep-Alive'
+    headers['Charset']       = 'UTF-8'
+    headers['Vary']          = 'Accept-Encoding'
+
+    [status, headers, body]
   end
 
   def create_directory_listening_index_file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_html_generator
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Tom Hanoldt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement