flatrack 1.0.0.alpha5 → 1.0.0

data/lib/flatrack/request.rb

@@ -1,24 +1,16 @@
-module Flatrack
+class Flatrack
   class Request
-
     DEFAULT_FORMAT = 'html'
 
     attr_reader :env, :rack_request
 
     def initialize(env)
       @rack_request = Rack::Request.new(env)
-      @env = env
+      @env          = env
     end
 
     def path
-      env['REQUEST_PATH']
-    end
-
-    def headers
-      env.reduce({}) do |hash, (key, value)|
-        next hash unless /^HTTP_(?<name>.+)/ =~ key
-        hash.merge name.downcase.to_sym => value
-      end
+      env['PATH_INFO']
     end
 
     def params
@@ -42,8 +34,8 @@ module Flatrack
     def respond_with_error(code)
       Response.new(self).render(file: "#{code}.html", status: code)
     rescue FileNotFound
-      Response.new(self).render(text: code, status: code)
+      file = File.join Flatrack.gem_root, '../templates', "#{code}.html"
+      Response.new(self).render(file: file, status: code)
     end
-
   end
-end
+end

data/lib/flatrack/response.rb

@@ -1,9 +1,8 @@
-module Flatrack
+class Flatrack
   class Response
-
     autoload :ViewContext, 'flatrack/response/view_context'
 
-    DEFAULT_FILE   = 'index'
+    DEFAULT_FILE  = 'index'
     CONTENT_TYPES = {
       html: 'text/html',
       rb:   'text/html'
@@ -15,17 +14,6 @@ module Flatrack
       @request = request
     end
 
-    def render(options={})
-      file, text, status, layout = options.values_at(:file, :text, :status, :layout)
-      set_content_type
-      status ||= 200
-      if text
-        render_text text, status: status
-      else
-        render_file file, status: status, layout: layout
-      end
-    end
-
     def headers
       @headers ||= {}
     end
@@ -34,29 +22,29 @@ module Flatrack
       @body ||= []
     end
 
+    def render(file: file_for(request.path), status: 200, layout: :layout)
+      page_content = proc { renderer_for(file).render(view_context) }
+      set_content_type
+      body << begin
+        layout_for(layout).render(view_context, &page_content)
+      rescue Flatrack::FileNotFound
+        page_content.call
+      end
+      [status, headers, body]
+    end
+
     def set_content_type
       headers['Content-Type'] = CONTENT_TYPES[request.format.to_sym]
     end
 
     private
 
-    def render_file(file = nil, options={})
-      status, layout = options.values_at(:status, :layout)
-      layout ||= :layout
-      file ||= file_for(request.path)
-      contents = renderer_for(file).render(view_context)
-      contents = layout_for(layout).render(view_context){ contents } if layout
-      self.body << contents
-      [status, headers, body]
-    end
-
-    def render_text(text = '', options={})
-      status = options[:status]
-      [status, headers, [text.to_s]]
-    end
-
     def file_for(path)
-      File.directory?(File.join 'pages', path) ? File.join(path, DEFAULT_FILE) : path
+      if File.directory?(File.join 'pages', path)
+        File.join(path, DEFAULT_FILE)
+      else
+        path
+      end
     end
 
     def renderer_for(file)
@@ -70,6 +58,5 @@ module Flatrack
     def view_context
       @view_context ||= ViewContext.new(self)
     end
-
   end
-end
+end

data/lib/flatrack/response/view_context.rb

@@ -1,4 +1,4 @@
-module Flatrack
+class Flatrack
   class Response
     class ViewContext
       include AssetExtensions
@@ -11,64 +11,51 @@ module Flatrack
         binding(&block)
       end
 
-      def path
-        @response.request.path
-      end
-
-      def params
-        @response.request.params
-      end
-
-      def files
-        Dir.glob(File.join 'pages', path, '*').map do |file|
-          File.basename File.basename(file, '.*'), '.*'
-        end - [DEFAULT_FILE]
+      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 = File.join('/assets', uri.to_s) + '.js' if uri.is_a? Symbol
+        uri = asset_path(uri)
         html_tag(:img, { src: uri }.merge(options))
       end
 
       def javascript_tag(uri)
-        uri = File.join('/assets', uri.to_s) + '.js' if uri.is_a? Symbol
-        html_tag(:script, src: uri){ nil }
+        uri = asset_path(uri) + '.js' if uri.is_a? Symbol
+        html_tag(:script, src: uri) { nil }
       end
 
-      def stylesheet_tag(uri)
-        uri = File.join('/assets', uri.to_s) + '.css' if uri.is_a? Symbol
-        html_tag(:link, rel: 'stylesheet', type: 'text/css', href: uri)
+      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 page_stylesheet_tag
-        file = @response.send(:file_for, path.to_s)
-        base_path = File.join File.dirname(file), File.basename(file,  '.*')
-        stylesheet_tag base_path if stylesheet_exists?(base_path)
+      def params
+        @response.request.params
       end
 
-      def link_to(name, link, options={})
-        link = [link, options.delete(:params).to_param].join('?') if options[:params].is_a?(Hash) && options[:params].present?
-        html_tag(:a, { href: link }.merge(options) ){ name }
+      def path
+        @response.request.path
       end
 
-      def html_tag(tag, options={}, &block)
-        [].tap do |lines|
-          lines << "<#{tag} " + options.map{ |k, v| "#{k}=\"#{v}\"" }.join(' ') + (block_given? ? ">" : "/>")
-          if block_given?
-            lines << yield
-            lines << "</#{tag}>"
-          end
-        end.compact.join("\n")
+      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 stylesheet_exists?(name)
-        Flatrack.assets[name]
-      end
-
-      def javascript_exists?(name)
-        Flatrack.assets[name]
+      def link_to_options(link, opts={})
+        link << '?' + opts.delete(:params).to_param if opts[:params].present?
+        { href: link }.merge(opts)
       end
 
     end

data/lib/flatrack/site.rb

@@ -1,15 +1,33 @@
-module Flatrack
+require 'rack/server'
 
-  register_format :html, 'text/html'
+class Flatrack
+  module Site
 
-  Site = Rack::Builder.app do
-    map '/assets' do
-      run Flatrack.assets
+    def self.call(env)
+      builder.call(env)
     end
 
-    map '/' do
-      use Rack::Static, urls: ["/favicon.ico", "assets"], root: "public"
-      run ->(env){ Request.new(env).response }
+    private
+
+    def self.builder
+      mapping = self.mapping
+      Rack::Builder.app do
+        use Rack::Static, urls: ['/favicon.ico', 'assets'], root: 'public'
+        Flatrack.middleware.each { |mw| use(*mw) }
+        mapping.each { |path, app| map(path) { run app } }
+      end
+    end
+
+    def self.site
+      ->(env) { Request.new(env).response }
     end
+
+    def self.mapping
+      {
+        '/assets' => Flatrack.assets,
+        '/'       => site
+      }
+    end
+
   end
-end
+end

data/lib/flatrack/version.rb

@@ -1,3 +1,3 @@
-module Flatrack
-  VERSION = "1.0.0.alpha5"
+class Flatrack
+  VERSION = '1.0.0'
 end

data/lib/rake/asset_tasks.rb

@@ -9,11 +9,10 @@ module Rake
   #   Rake::AssetTasks.new
   #
   class AssetTasks < Rake::TaskLib
-
-    attr_reader :environment
+    attr_accessor :output
+    attr_accessor :environment
     attr_reader :index
     attr_reader :manifest
-    attr_reader :output
     attr_reader :keep
 
     # Number of old assets to keep.
@@ -46,8 +45,9 @@ module Rake
       @environment  = Flatrack.assets
       @logger       = Logger.new($stderr)
       @logger.level = Logger::INFO
+      @output       = './public/assets'
+      yield self
       @index        = environment.index
-      @output       = "./public/assets"
       @manifest     = Sprockets::Manifest.new(index, output)
       @keep         = 2
       define
@@ -56,8 +56,9 @@ module Rake
     def assets
       Dir['assets/**/*.*'].map do |file|
         file_basename = File.basename file
-        file = file.split('.').tap(&:pop).join('.') if file_basename.split('.').size > 2
-        File.expand_path(file).sub(/(#{environment.paths.join('|')})\//,'')
+        parts         = file_basename.split('.').size
+        file          = file.split('.').tap(&:pop).join('.') if parts > 2
+        File.expand_path(file).sub(/(#{environment.paths.join('|')})\//, '')
       end
     end
 
@@ -71,20 +72,19 @@ module Rake
           end
         end
 
-        desc "Remove all assets"
+        desc 'Remove all assets'
         task :clobber do
           with_logger do
             manifest.clobber
           end
         end
 
-        desc "Clean old assets"
+        desc 'Clean old assets'
         task :clean do
           with_logger do
             manifest.clean(keep)
           end
         end
-
       end
     end
 
@@ -93,7 +93,8 @@ module Rake
     # Sub out environment logger with our rake task logger that
     # writes to stderr.
     def with_logger
-      if env = manifest.environment
+      env = manifest.environment
+      if env
         old_logger = env.logger
         env.logger = @logger
       end
@@ -101,6 +102,5 @@ module Rake
     ensure
       env.logger = old_logger if env
     end
-
   end
-end
+end

data/public/assets/manifest-6d7e78baa6d2c0670a82be957315fcbc.json

@@ -0,0 +1 @@
+{}

data/renderers/erb.rb

@@ -1,11 +1,9 @@
 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
+end

data/renderers/html.rb

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

data/renderers/rb.rb

@@ -1,17 +1,19 @@
 require 'flatrack/renderer/base'
 
 class Flatrack::Renderer::Rb < Flatrack::Renderer::Base
-
   renders :rb
 
   def render(context)
-    result = nil
-    evaluator = Thread.start do
-      $SAFE = 3
-      result = eval contents, context
-    end
-    nil while evaluator.alive?
-    result
+    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/fixtures/assets/application.js.coffee

@@ -0,0 +1,2 @@
+#= require_self
+#= require_tree

data/spec/lib/flatrack/asset_extensions_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Flatrack::AssetExtensions do
+
+  subject(:instance){ double.extend described_class }
+
+  describe '#asset_path' do
+    it 'should be a path to the asset' do
+      expect(instance.asset_path :foo).to eq '/assets/foo'
+    end
+  end
+
+end

data/spec/lib/flatrack/cli_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Flatrack::CLI do
+  extend FileUtils
+  include SiteHelper
+
+  describe '#new' do
+    it 'should create a new site' do
+      in_temp_sites do
+        sha = SecureRandom.hex
+        Flatrack::CLI.start(['new', sha, '--verbose', 'false'])
+        expect(File.directory? sha).to be true
+        cleanup(sha)
+      end
+    end
+  end
+
+  describe '#start' do
+    it 'should start the rack server' do
+      expect do
+        site do
+          thread  = Thread.new do
+            Flatrack::CLI.start(['start', '--verbose', 'false'])
+          end
+          retries = 0
+          begin
+            Net::HTTP.get URI.parse 'http://localhost:5959'
+            thread.kill
+          rescue Errno::ECONNREFUSED => error
+            retries += 1
+            sleep 0.1 and retry unless retries > 100
+            raise error
+          end
+        end
+      end.to_not raise_error
+    end
+
+    it 'should start a server on a custom port' do
+      expect do
+        site do
+          thread  = Thread.new do
+            Flatrack::CLI.start(['start', '--port', '8282', '--verbose', 'false'])
+          end
+          retries = 0
+          begin
+            Net::HTTP.get URI.parse 'http://localhost:8282'
+            thread.kill
+          rescue Errno::ECONNREFUSED => error
+            retries += 1
+            sleep 0.1 and retry unless retries > 100
+            raise error
+          end
+        end
+      end.to_not raise_error
+    end
+  end
+
+end