flatrack 1.1.1 → 1.2.0

data/spec/support/site_helper.rb

@@ -1,52 +1,56 @@
-module SiteHelper
-  extend FileUtils
-  include FileUtils
-
-  DIR = File.join Flatrack.gem_root, '../tmp/flatrack-sites'
-  mkdir_p DIR
+class Flatrack
+  module SiteHelper
+    extend FileUtils
+    include FileUtils
+
+    DIR = File.join Flatrack.gem_root, '../tmp/flatrack-sites'
+    mkdir_p DIR
+
+    def site(clean: true, &block)
+      sha = SecureRandom.hex
+      in_temp_sites do
+        create_site(sha, &block)
+      end
+      clean ? cleanup(sha) : sha
+    rescue => error
+      cleanup sha
+      raise error
+    end
 
-  def site(clean: true)
-    sha = SecureRandom.hex
-    in_temp_sites do
-      Flatrack::CLI.start(
-        ['new', sha, '--verbose', 'false', '--bundle', 'false']
-      )
-      Dir.chdir(sha) do
+    def in_temp_sites
+      Dir.chdir DIR do
         yield
       end
     end
-    clean ? cleanup(sha) : sha
-  rescue => error
-    cleanup sha
-    raise error
-  end
 
-  def in_temp_sites
-    Dir.chdir DIR do
-      yield
+    def write(type, filename, contents)
+      Dir.chdir(type.to_s.pluralize) do
+        File.open(filename, 'w') do |file|
+          file.write(contents)
+        end
+      end
     end
-  end
 
-  def write(type, filename, contents)
-    Dir.chdir(type.to_s.pluralize) do
-      File.open(filename, 'w') do |file|
-        file.write(contents)
-      end
+    def get_page_response(page)
+      env = Rack::MockRequest.env_for "http://example.org/#{page}.html"
+      Flatrack::Site.call(env)
     end
-  end
 
-  def get_page_response(page)
-    env = Rack::MockRequest.env_for "http://example.org/#{page}.html"
-    Flatrack::Site.call(env)
-  end
+    private
 
-  private
+    def create_site(sha)
+      Flatrack::CLI.start(
+        ['new', sha, '--verbose', 'false', '--bundle', 'false']
+      )
+      Dir.chdir(sha) do
+        yield
+      end
+    end
 
-  def cleanup(sha)
-    Dir.chdir(DIR) do
-      rmtree sha
+    def cleanup(sha)
+      Dir.chdir(DIR) do
+        rmtree sha
+      end
     end
   end
-
-
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flatrack
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Jason Waldrip
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +260,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: inch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: |+
   A rack based static site builder with templates, layouts and project structure
   based routing.
@@ -255,50 +311,71 @@ files:
 - README.md
 - Rakefile
 - bin/flatrack
+- error_pages/404.html
+- error_pages/500.html
 - flatrack.gemspec
 - lib/flatrack.rb
 - lib/flatrack/asset_extensions.rb
 - lib/flatrack/cli.rb
-- lib/flatrack/renderer.rb
-- lib/flatrack/renderer/base.rb
+- lib/flatrack/cli/templates/.gitignore
+- lib/flatrack/cli/templates/.keep
+- lib/flatrack/cli/templates/Gemfile.erb
+- lib/flatrack/cli/templates/Rakefile
+- lib/flatrack/cli/templates/boot.rb
+- lib/flatrack/cli/templates/config.ru
+- lib/flatrack/cli/templates/javascript.js.coffee
+- lib/flatrack/cli/templates/layout.html.erb
+- lib/flatrack/cli/templates/logo.png
+- lib/flatrack/cli/templates/page.html.erb
+- lib/flatrack/cli/templates/stylesheet.css.scss
 - lib/flatrack/request.rb
 - lib/flatrack/response.rb
-- lib/flatrack/response/view_context.rb
 - lib/flatrack/site.rb
+- lib/flatrack/template.rb
+- lib/flatrack/template/erubis.rb
+- lib/flatrack/template/erubis/handler.rb
+- lib/flatrack/template/html.rb
+- lib/flatrack/template/rb.rb
 - lib/flatrack/version.rb
+- lib/flatrack/view.rb
+- lib/flatrack/view/capture_helper.rb
+- lib/flatrack/view/link_helper.rb
+- lib/flatrack/view/output_buffer.rb
+- lib/flatrack/view/render_helper.rb
+- lib/flatrack/view/request_helper.rb
+- lib/flatrack/view/tag_helper.rb
 - lib/rake/asset_tasks.rb
-- logo.png
 - public/assets/manifest-6d7e78baa6d2c0670a82be957315fcbc.json
-- renderers/erb.rb
-- renderers/html.rb
-- renderers/rb.rb
-- spec/fixtures/assets/application.js.coffee
+- spec/fixtures/assets/sample.css.scss
+- spec/fixtures/assets/sample.js.coffee
+- spec/fixtures/templates/html_tag.html
+- spec/fixtures/templates/html_tag.html.erb
+- spec/fixtures/templates/html_tag.html.rb
+- spec/fixtures/templates/image_tag.html
+- spec/fixtures/templates/image_tag.html.erb
+- spec/fixtures/templates/image_tag.html.rb
+- spec/fixtures/templates/javascript_tag.html
+- spec/fixtures/templates/javascript_tag.html.erb
+- spec/fixtures/templates/javascript_tag.html.rb
+- spec/fixtures/templates/link_to.html
+- spec/fixtures/templates/link_to.html.erb
+- spec/fixtures/templates/link_to.html.rb
+- spec/fixtures/templates/stylesheet_tag.html
+- spec/fixtures/templates/stylesheet_tag.html.erb
+- spec/fixtures/templates/stylesheet_tag.html.rb
 - spec/lib/flatrack/asset_extensions_spec.rb
 - spec/lib/flatrack/cli_spec.rb
-- spec/lib/flatrack/renderer/base_spec.rb
 - spec/lib/flatrack/request_spec.rb
-- spec/lib/flatrack/response/view_context_spec.rb
 - spec/lib/flatrack/response_spec.rb
 - spec/lib/flatrack/site_spec.rb
+- spec/lib/flatrack/view/link_helper_spec.rb
+- spec/lib/flatrack/view/tag_helper_spec.rb
+- spec/lib/flatrack/view_spec.rb
 - spec/lib/flatrack_spec.rb
 - spec/lib/rake/asset_tasks_spec.rb
-- spec/renderers/erb_spec.rb
-- spec/renderers/html_spec.rb
-- spec/renderers/rb_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixture_helper.rb
 - spec/support/site_helper.rb
-- templates/.gitignore
-- templates/.keep
-- templates/404.html
-- templates/500.html
-- templates/Gemfile.erb
-- templates/Rakefile
-- templates/boot.rb
-- templates/config.ru
-- templates/javascript.js.coffee
-- templates/layout.html.erb
-- templates/page.html.erb
-- templates/stylesheet.css.scss
 homepage: https://github.com/jwaldrip/flatrack
 licenses:
 - MIT
@@ -324,18 +401,34 @@ signing_key:
 specification_version: 4
 summary: Deliver static files with style.
 test_files:
-- spec/fixtures/assets/application.js.coffee
+- spec/fixtures/assets/sample.css.scss
+- spec/fixtures/assets/sample.js.coffee
+- spec/fixtures/templates/html_tag.html
+- spec/fixtures/templates/html_tag.html.erb
+- spec/fixtures/templates/html_tag.html.rb
+- spec/fixtures/templates/image_tag.html
+- spec/fixtures/templates/image_tag.html.erb
+- spec/fixtures/templates/image_tag.html.rb
+- spec/fixtures/templates/javascript_tag.html
+- spec/fixtures/templates/javascript_tag.html.erb
+- spec/fixtures/templates/javascript_tag.html.rb
+- spec/fixtures/templates/link_to.html
+- spec/fixtures/templates/link_to.html.erb
+- spec/fixtures/templates/link_to.html.rb
+- spec/fixtures/templates/stylesheet_tag.html
+- spec/fixtures/templates/stylesheet_tag.html.erb
+- spec/fixtures/templates/stylesheet_tag.html.rb
 - spec/lib/flatrack/asset_extensions_spec.rb
 - spec/lib/flatrack/cli_spec.rb
-- spec/lib/flatrack/renderer/base_spec.rb
 - spec/lib/flatrack/request_spec.rb
-- spec/lib/flatrack/response/view_context_spec.rb
 - spec/lib/flatrack/response_spec.rb
 - spec/lib/flatrack/site_spec.rb
+- spec/lib/flatrack/view/link_helper_spec.rb
+- spec/lib/flatrack/view/tag_helper_spec.rb
+- spec/lib/flatrack/view_spec.rb
 - spec/lib/flatrack_spec.rb
 - spec/lib/rake/asset_tasks_spec.rb
-- spec/renderers/erb_spec.rb
-- spec/renderers/html_spec.rb
-- spec/renderers/rb_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixture_helper.rb
 - spec/support/site_helper.rb
+has_rdoc: 

data/lib/flatrack/renderer/base.rb

@@ -1,19 +0,0 @@
-class Flatrack
-  module Renderer
-    class Base
-      attr_reader :contents
-
-      def self.renders(ext = nil)
-        @renders = ext.to_sym
-      end
-
-      def self.renders?(ext)
-        @renders == ext.to_sym
-      end
-
-      def initialize(file)
-        @contents = File.read file
-      end
-    end
-  end
-end

data/lib/flatrack/renderer.rb

@@ -1,30 +0,0 @@
-class Flatrack
-  module Renderer
-    extend ActiveSupport::Autoload
-
-    autoload :Base
-
-    def find(type, file)
-      template = find_by_type type, file
-      fail FileNotFound, "could not find #{file}" unless template
-      ext = File.extname(template).sub(/\./, '')
-      renderer = Base.descendants.find do |descendant|
-        descendant.renders?(ext)
-      end || fail(RendererNotFound, "could not find a renderer for #{file}")
-
-      renderer.new template
-    end
-
-    private
-
-    def find_by_type(type, file)
-      if File.exists?(file)
-        file
-      else
-        Dir[File.join type.to_s.pluralize, "#{file}*"].first
-      end
-    end
-
-    module_function :find, :find_by_type
-  end
-end

data/lib/flatrack/response/view_context.rb

@@ -1,67 +0,0 @@
-class Flatrack
-  class Response
-    class ViewContext
-      include AssetExtensions
-
-      def initialize(response)
-        @response = response
-      end
-
-      def get_binding(&block)
-        binding(&block)
-      end
-
-      def html_tag(tag, options = {}, &block)
-        meta   = options.map { |k, v| "#{k}=\"#{v}\"" }
-        prefix = [tag, *meta].join(' ')
-        "<#{prefix}" + (block_given? ? ">#{yield}</#{tag}>" : '/>')
-      end
-
-      def image_tag(uri, options = {})
-        uri = asset_path(uri)
-        html_tag(:img, { src: uri }.merge(options))
-      end
-
-      def javascript_tag(uri)
-        uri = asset_path(uri) + '.js' if uri.is_a? Symbol
-        html_tag(:script, src: uri) { nil }
-      end
-
-      def link_to(link_or_name, link_or_options=nil, options={})
-        name = link_or_name
-        link, options = if link_or_options.is_a?(Hash)
-                          [name, link_or_options]
-                        else
-                          [link_or_options, options]
-                        end
-
-        html_tag(:a, link_to_options(link, options)) { name }
-      end
-
-      def params
-        @response.request.params
-      end
-
-      def path
-        @response.request.path
-      end
-
-      def render(file)
-        Renderer.find(:partial, file.to_s).render(self)
-      end
-
-      def stylesheet_tag(uri)
-        uri = asset_path(uri) + '.css' if uri.is_a? Symbol
-        html_tag(:link, rel: 'stylesheet', type: 'text/css', href: uri)
-      end
-
-      private
-
-      def link_to_options(link, opts={})
-        link << '?' + opts.delete(:params).to_param if opts[:params].present?
-        { href: link }.merge(opts)
-      end
-
-    end
-  end
-end

data/renderers/erb.rb

@@ -1,9 +0,0 @@
-require 'flatrack/renderer/base'
-
-class Flatrack::Renderer::ERB < Flatrack::Renderer::Base
-  renders :erb
-
-  def render(context = binding, &block)
-    ::ERB.new(contents).result context.get_binding(&block)
-  end
-end

data/renderers/html.rb

@@ -1,9 +0,0 @@
-require 'flatrack/renderer/base'
-
-class Flatrack::Renderer::Html < Flatrack::Renderer::Base
-  renders :html
-
-  def render(*args)
-    contents
-  end
-end

data/renderers/rb.rb

@@ -1,19 +0,0 @@
-require 'flatrack/renderer/base'
-
-class Flatrack::Renderer::Rb < Flatrack::Renderer::Base
-  renders :rb
-
-  def render(context)
-    eval <<-RUBY, context.get_binding
-      r = nil
-      evaluator = Thread.start do
-        $SAFE  = 3
-        r = begin
-          #{contents}
-        end
-      end
-      nil while evaluator.alive?
-      r
-    RUBY
-  end
-end

data/spec/lib/flatrack/renderer/base_spec.rb

@@ -1,4 +0,0 @@
-require 'spec_helper'
-
-describe Flatrack::Renderer::Base do
-end

data/spec/lib/flatrack/response/view_context_spec.rb

@@ -1,93 +0,0 @@
-require 'spec_helper'
-
-describe Flatrack::Response::ViewContext do
-  include SiteHelper
-
-  let(:uri) { URI.parse 'http://example.org/index.html' }
-  let(:env){ Rack::MockRequest.env_for uri.to_s }
-  let(:request){ Flatrack::Request.new env }
-  let(:response){ Flatrack::Response.new request }
-  subject(:view){ described_class.new response }
-
-  describe '#initialize' do
-    it 'should set the response' do
-      view = described_class.allocate
-      expect {
-        view.send :initialize, response
-      }.to change {
-        view.instance_variable_get :@response
-      }.to response
-    end
-  end
-
-  describe '#get_binding' do
-    it 'should yield to the view_context' do
-      view.get_binding do
-        expect(self.class).to be_a described_class
-      end
-    end
-  end
-
-  describe '#image_tag' do
-    it 'should be a proper image tag' do
-      expect(view.image_tag 'test.png')
-      .to eq "<img src=\"/assets/test.png\"/>"
-    end
-  end
-
-  describe '#javascript_tag' do
-    it 'should be a proper javascript tag' do
-      expect(view.javascript_tag :test)
-      .to eq "<script src=\"/assets/test.js\"></script>"
-    end
-  end
-
-  describe '#link_to' do
-    it 'should be a proper link tag with a name' do
-      expect(view.link_to 'test', '/test.html', params: { foo: 'bar' }, class: 'test')
-      .to eq "<a href=\"/test.html?foo=bar\" class=\"test\">test</a>"
-    end
-
-    it 'should be a proper link tag without a name' do
-      expect(view.link_to '/test.html', params: { foo: 'bar' }, class: 'test')
-      .to eq "<a href=\"/test.html?foo=bar\" class=\"test\">/test.html?foo=bar</a>"
-    end
-  end
-
-  describe '#params' do
-    let(:uri) { URI.parse 'http://example.org/index.html?foo=bar' }
-    it 'should be extracted from the uri path' do
-      expect(view.params).to include foo: 'bar'
-    end
-  end
-
-  describe '#path' do
-    it 'should be extracted from the uri path' do
-      expect(view.path).to eq uri.path
-    end
-  end
-
-  describe '#render' do
-    let(:template) do
-      <<-ERB
-<%= 'Hello World'.reverse %>
-      ERB
-    end
-
-    it 'should properly render a partial' do
-      site do
-        write(:partial, 'sample.erb', template)
-        result = view.render(:sample)
-        expect(result).to include 'Hello World'.reverse
-      end
-    end
-  end
-
-  describe '#stylesheet_tag' do
-    it 'should be a proper stylesheet tag' do
-      expect(view.stylesheet_tag :test)
-      .to eq "<link rel=\"stylesheet\" type=\"text/css\" href=\"/assets/test.css\"/>"
-    end
-  end
-
-end

data/spec/renderers/erb_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe Flatrack::Renderer::ERB do
-  include SiteHelper
-
-  let(:template) do
-  <<-ERB
-<%= 'Hello World'.reverse %>
-  ERB
-  end
-
-  it 'should render properly' do
-    sha = SecureRandom.hex
-    site do
-      write(:page, "#{sha}.html.erb", template)
-      status, headers, body = get_page_response(sha)
-      expect(body.first).to include 'Hello World'.reverse
-    end
-  end
-
-end

data/spec/renderers/html_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe Flatrack::Renderer::Html do
-  include SiteHelper
-
-  let(:template) do
-    <<-HTML
-<body>Hello World</body>
-    HTML
-  end
-
-  it 'should render properly' do
-    sha = SecureRandom.hex
-    site do
-      write(:page, "#{sha}.html.html", template)
-      status, headers, body = get_page_response(sha)
-      expect(body.first).to include template
-    end
-  end
-
-end

data/spec/renderers/rb_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe Flatrack::Renderer::Rb do
-  include SiteHelper
-
-  let(:template) do
-    <<-RUBY
-'Hello World'.reverse
-    RUBY
-  end
-
-  it 'should render properly' do
-    sha = SecureRandom.hex
-    site do
-      write(:page, "#{sha}.html.rb", template)
-      status, headers, body = get_page_response(sha)
-      expect(body.first).to include 'Hello World'.reverse
-    end
-  end
-
-end