easy_html_generator 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 875237a17ac5b7d76c3cb441fd2a7e896864f464
-  data.tar.gz: 2bff580b44cbc05125ac28f6d3936c190b885ff7
+  metadata.gz: bc54c42e3b8dbf0a17a5e8c9230c9cb41b142823
+  data.tar.gz: 0549d73e2cf263dafe4721a8dd3a45e7d0a64f0f
 SHA512:
-  metadata.gz: f7bed40940a5329e3669605abd96e37bbe6d28cc2ececcda8f88c5fc224daf9b44d6ccf15873247b083971ec8a4300fbe40b6e12e3f4a5296ed6e4e608c1d501
-  data.tar.gz: 1704ff7de57756fef01cf1388eafb55fa1ace160a61399261f13fd698ccee0150991ed861189f19e2ea7ec514d27f43b448d82a442c05ceb09a9ef0a56e073d7
+  metadata.gz: c07365b28f8aaf47c7d8d63ec863fef847cb1cab3d9747d13affa36915687d68555b17649d40d3f1742c9fdb0a2b82f1d2b311d463cddc2d36b1c4510119930b
+  data.tar.gz: 5fdef7471df56eaa4bf8cb1408ea6c09752035ad2f77288bf54e91923b6d4a63db8aebe2b00b8b65cb05cec5f9dca26fba9b6573dfe6eeca563c8934a5076c14

data/README.md

@@ -59,34 +59,34 @@ Run in terminal
 Now you should see the following folder structure with `ls -alR`
 
     my_workspace
-      ├── dist                    # the generated result will be stored here
-      └── src                     # the generation input is stored here
-          ├── demo
-          ├── my_project            # this is a project and will be available via http://localhost:9292/my_project
-          │   ├── assets
-          │   │   ├── images          # content will be copied to `dist/my_project/images`
-          │   │   ├── public            # public content gets directly copied to `dist/my_project/`
-          │   │   ├── scripts           # content will be copied to `dist/my_project/scripts`
-          │   │   └── styles            # content will be copied to `dist/my_project/styles`
-          │   ├── lib
-          │   │   ├── generators        # project specific generators
-          │   │   └── helper            # project specific view helpers you can use in haml files
-          │   ├── project.yml         # project specific generators config
-          │   └── views
-          │       ├── index.html.haml   # the ham file for index.html
-          │       └── layout.haml       # the layout file index.html will use
-          |
-          └── shared                # shared content over all projects
-              ├── assets              # shared assets over all projects
-              │   ├── images
-              │   ├── public
-              │   ├── scripts
-              │   └── styles
-              │       └── mixins        # here are css helpers for bootstrap and head js
-              ├── lib
-              │   ├── generators        # generators shared over all projects
-              │   └── helper            # view helpers you can use in haml files
-              └── project.yml        # if a project doesnt have a `project.yml` this config will be used
+    ├── dist                    # the generated result will be stored here
+    └── src                     # the generation input is stored here
+        ├── demo
+        ├── my_project            # this is a project and will be available via http://localhost:9292/my_project
+        │   ├── assets
+        │   │   ├── images          # content will be copied to `dist/my_project/images`
+        │   │   ├── public            # public content gets directly copied to `dist/my_project/`
+        │   │   ├── scripts           # content will be copied to `dist/my_project/scripts`
+        │   │   └── styles            # content will be copied to `dist/my_project/styles`
+        │   ├── lib
+        │   │   ├── generators        # project specific generators
+        │   │   └── helper            # project specific view helpers you can use in haml files
+        │   ├── project.yml         # project specific generators config
+        │   └── views
+        │       ├── index.html.haml   # the ham file for index.html
+        │       └── layout.haml       # the layout file index.html will use
+        |
+        └── shared                # shared content over all projects
+            ├── assets              # shared assets over all projects
+            │   ├── images
+            │   ├── public
+            │   ├── scripts
+            │   └── styles
+            │       └── mixins        # here are css helpers for bootstrap and head js
+            ├── lib
+            │   ├── generators        # generators shared over all projects
+            │   └── helper            # view helpers you can use in haml files
+            └── project.yml        # if a project doesnt have a `project.yml` this config will be used
 
 Now run
 

data/lib/easy_html_generator.rb

@@ -8,6 +8,7 @@ require 'bootstrap-sass'
 require 'bundler'
 require 'colorize'
 require 'rack'
+require 'thin'
 
 # main module loads projects and dispatches rack requests
 module EasyHtmlGenerator
@@ -73,28 +74,34 @@ module EasyHtmlGenerator
   end
 
   def self.generate_all
-    Workspace.projects.each(&:generate)
+    Workspace.projects.each{|name, project| project.generate }
   end
 
   def self.generate_project(project)
     Workspace.projects[project].generate
   end
 
-  def self.start_server(host, port)
-    app = Rack::Builder.new do
+  def self.rack_app
+    Rack::Builder.new do
       use Rack::Reloader, 0
+      use EasyHtmlGenerator::RackDispatcher
+      use Rack::Static,
+        urls: [''],
+        root: EasyHtmlGenerator::DIST_PATH,
+        index: 'index.html'
+
       use Rack::ContentLength
-      use Rack::AbstractFormat
       use Rack::Deflater
       use Rack::ETag
 
-      run EasyHtmlGenerator::Rackapp
+      run lambda { |env| [404, {'Content-Type' => 'text/plain'}, ['404 File not found!']] }
     end
+  end
 
-    config = { app: app,
-               Host: host,
+  def self.start_server(host, port)
+    config = { Host: host,
                Port: port}
 
-    Rack::Server.start config
+    Rack::Handler.get('thin').run(rack_app, config)
   end
 end

data/lib/easy_html_generator/{rackapp.rb → rack_dispatcher.rb}

@@ -1,12 +1,8 @@
 # encoding: utf-8
 require 'rack'
-require 'rack/abstract_format'
-require 'rack/respond_to'
 
 # this is the rack application for ehg
-class EasyHtmlGenerator::Rackapp
-  include Rack::RespondTo
-
+class EasyHtmlGenerator::RackDispatcher
   EHG_URL   = 'https://github.com/creative-workflow/easy-html-generator'
   LIST_BODY = "<!DOCTYPE html><html><head>
   <style>*{ font-size: 20px;
@@ -17,35 +13,22 @@ class EasyHtmlGenerator::Rackapp
     {CONTENT}
     <a target='_blank' href='#{EHG_URL}'>ehc on Github</a></body></html>"
 
-  def self.call(env)
-    Rack::RespondTo.env = env
-    request = Rack::Request.new(env)
+  def initialize(app)
+    @app = app
+  end
 
+  def call(env)
+    request = Rack::Request.new(env)
     case request.path_info
     when '/'
-      list_dir
-    else
-      dispatch(request)
-    end
-  end
-
-  def self.respond(body, status_code = 200)
-    content_type = Rack::RespondTo.selected_media_type || 'text/html'
-
-    [status_code, { 'Content-Type' => "#{content_type}; charset=UTF-8" }, [body || '']]
-  end
-
-  def self.dispatch(request)
-    file = EasyHtmlGenerator.dispatch(request)
-
-    if File.exist? file
-      respond(File.read(file))
+      create_directory_listening_index_file
     else
-      respond("404 not found #{file}", 404)
+      EasyHtmlGenerator.dispatch(request)
     end
+    @app.call(env)
   end
 
-  def self.list_dir
+  def create_directory_listening_index_file
     content = ''
     EasyHtmlGenerator.projects.each do |_name, project|
       content += "<h3>#{project.name}</h3>"
@@ -55,10 +38,10 @@ class EasyHtmlGenerator::Rackapp
     end
     content = LIST_BODY.sub('{CONTENT}', "<ul>#{content}</ul>")
 
-    respond(content)
+    File.write("#{EasyHtmlGenerator::DIST_PATH}/index.html", content)
   end
 
-  def self.build_list_dir_row(file)
+  def build_list_dir_row(file)
     f = File.path(file)
     f_name = File.basename(f)
     f_path = File.dirname(f)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_html_generator
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Tom Hanoldt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -25,21 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-respond_to
-  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: rack-abstract-format
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -315,7 +301,7 @@ files:
 - lib/easy_html_generator/generator/structure.rb
 - lib/easy_html_generator/generators.rb
 - lib/easy_html_generator/project.rb
-- lib/easy_html_generator/rackapp.rb
+- lib/easy_html_generator/rack_dispatcher.rb
 - lib/easy_html_generator/workspace.rb
 - src/demo/assets/images/demo.png
 - src/demo/assets/public/robots.txt
@@ -380,4 +366,3 @@ specification_version: 4
 summary: This gem is a powerful and easy to use web development tool that helps developing
   modern web sites by generating static html pages.
 test_files: []
-has_rdoc: