flatrack 1.3.3 → 1.4.1

data/lib/flatrack/request.rb

@@ -13,6 +13,10 @@ class Flatrack
 
     # the path of the incoming request
     def path
+      env['ORIGINAL_PATH_INFO'] || env['PATH_INFO']
+    end
+
+    def page
       env['PATH_INFO']
     end
 
@@ -33,12 +37,22 @@ class Flatrack
     # the processed response for an inbound request
     def response
       Response.new(self).render
-    rescue TemplateNotFound
+    rescue TemplateNotFound => e
+      raise e if config.raise_errors
       respond_with_error(500)
-    rescue FileNotFound
+    rescue FileNotFound => e
+      raise e if config.raise_errors
       respond_with_error(404)
     end
 
+    def config
+      env['flatrack.config']
+    end
+
+    def mount_path
+      env['SCRIPT_NAME'].present? ? env['SCRIPT_NAME'] : '/'
+    end
+
     private
 
     def respond_with_error(code)

data/lib/flatrack/response.rb

@@ -6,7 +6,7 @@ class Flatrack
 
     attr_accessor :layout
     attr_reader :request
-    delegate :format, to: :request
+    delegate :mount_path, :config, :format, to: :request
 
     # Initializes a response
     # @param request [Flatrack::Request]
@@ -20,7 +20,7 @@ class Flatrack
     # @option opts [Fixnum] :status
     # @option opts [Symbol] :layout
     # @return [Array] the rack response
-    def render(file: file_for(request.path), status: 200, layout: :layout)
+    def render(file: file_for(request.page), status: 200, layout: :layout)
       @file, @status, @layout = file, status, layout
       page_content            = pre_render_page
       body << begin
@@ -57,19 +57,18 @@ class Flatrack
     end
 
     def file_for(path)
-      if File.directory?(File.join 'pages', path)
-        File.join(path, DEFAULT_FILE)
-      else
-        path
+      if File.directory?(File.join config.site_root, 'pages', path)
+        path = File.join(path, DEFAULT_FILE)
       end
+      path
     end
 
     def renderer_for_page(file)
-      Template.find :page, format, file
+      Template.find config.site_root, :page, format, file
     end
 
     def renderer_for_layout(file)
-      Template.find :layout, format, file
+      Template.find config.site_root, :layout, format, file
     end
 
     def view

data/lib/flatrack/rewriter.rb

@@ -0,0 +1,32 @@
+class Flatrack
+  def Rewriter(source, opts={})
+    to    = opts.delete(:to)
+    klass = Class.new(Rewriter)
+    klass.send(:define_method, :initialize) do |app, mw_opts|
+      mapping = { source => to }
+      super app, mapping, mw_opts
+    end
+    klass
+  end
+
+  class Rewriter
+
+    def initialize(app, mapping = {}, opts = {})
+      @if      = opts[:if] || Proc.new { true }
+      @unless  = opts[:unless] || Proc.new { false }
+      @app     = app
+      @mapping =
+        Hash[mapping.map { |paths| paths.map { |p| File.join '', p } }]
+    end
+
+    def call(env)
+      allow = @if.call(env) && !@unless.call(env)
+      if allow && @mapping.keys.include?(env['PATH_INFO'])
+        env['ORIGINAL_PATH_INFO'] = env['PATH_INFO']
+        env['PATH_INFO']          = @mapping[env['PATH_INFO']]
+      end
+      @app.call env
+    end
+
+  end
+end

data/lib/flatrack/sass/functions.rb

@@ -148,16 +148,16 @@ module Sass::Script::Functions
     defined?(@signatures) && @signatures.delete(method)
   end
 
-  declare :asset_path,     [:source], :var_kwargs => true
+  declare :asset_path,     [:source], var_kwargs: true
   declare :asset_path,     [:source, :kind]
-  declare :asset_url,      [:source], :var_kwargs => true
+  declare :asset_url,      [:source], var_kwargs: true
   declare :asset_url,      [:source, :kind]
-  declare :image_path,     [:source], :var_kwargs => true
-  declare :image_url,      [:source], :var_kwargs => true
+  declare :image_path,     [:source], var_kwargs: true
+  declare :image_url,      [:source], var_kwargs: true
   declare :image_url,      [:source, :only_path]
   declare :image_url,      [:source, :only_path, :cache_buster]
-  declare :font_path,      [:source], :var_kwargs => true
-  declare :font_url,       [:source], :var_kwargs => true
+  declare :font_path,      [:source], var_kwargs: true
+  declare :font_url,       [:source], var_kwargs: true
   declare :font_url,       [:source, :only_path]
   declare :asset_data_uri, [:source]
 end

data/lib/flatrack/sass/importer.rb

@@ -48,9 +48,9 @@ class Flatrack
         pathname = resolve(context, path, base_path) or return nil
         context.depend_on pathname
         ::Sass::Engine.new evaluate(context, pathname), options.merge(
-          :filename => pathname.to_s,
-          :syntax   => syntax(pathname),
-          :importer => self
+          filename: pathname.to_s,
+          syntax: syntax(pathname),
+          importer: self
         )
       end
 
@@ -65,9 +65,9 @@ class Flatrack
         end
         return nil if imports.empty?
         ::Sass::Engine.new imports, options.merge(
-          :filename => base_path.to_s,
-          :syntax   => :scss,
-          :importer => self
+          filename: base_path.to_s,
+          syntax: :scss,
+          importer: self
         )
       end
 
@@ -135,7 +135,7 @@ class Flatrack
         attributes = context.environment.attributes_for(path)
         processors = context.environment.preprocessors(attributes.content_type) + attributes.engines.reverse
         processors.delete_if { |processor| processor < Tilt::SassTemplate }
-        context.evaluate(path, :processors => processors)
+        context.evaluate(path, processors: processors)
       end
     end
   end

data/lib/flatrack/sass/sass_template.rb

@@ -66,12 +66,12 @@ class Flatrack
       # Assemble the options for the `Sass::Engine`
       def sass_options
         merge_sass_options(default_sass_options, options).merge(
-          :filename    => eval_file,
-          :line        => line,
-          :syntax      => syntax,
-          :cache_store => cache_store,
-          :importer    => Importer.new,
-          :custom      => { :sprockets_context => context }
+          filename: eval_file,
+          line: line,
+          syntax: syntax,
+          cache_store: cache_store,
+          importer: Importer.new,
+          custom: { sprockets_context: context }
         )
       end
 

data/lib/flatrack/site.rb

@@ -3,32 +3,7 @@ require 'rack/server'
 class Flatrack
   # Provides a rake wrapper for encapsulating a flatrack site
   module Site
-    # Call the site with a rack env
-    # @param env [Hash] the rack env
-    def self.call(env)
-      builder.call(env)
-    end
-
-    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
+    extend self
+    delegate :call, to: Flatrack
   end
 end

data/lib/flatrack/template.rb

@@ -9,32 +9,47 @@ class Flatrack
     # @private
     DEFAULT_FORMAT = 'html'
 
-    attr_reader :type, :file, :format
+    attr_reader :base_path, :type, :file, :format
     delegate :render, to: :@renderer
 
+    def self.register_path(path)
+      classes.each do |klass|
+        files = Dir.glob File.join path, '**', "*.#{klass::RENDERS}"
+        Tilt.register klass, *files
+      end
+    end
+
     # Creates a new template instance and invokes find
     # @param type [Symbol] the type of template
     # @param format [String] the format e.g. html
     # @param file [String] the location of the file
-    def self.find(type, format, file)
-      new(type, format, file)
+    def self.find(base_path, type, format, file)
+      new(base_path, type, format, file)
     end
 
     # Creates a new template instance
     # @param type [Symbol] the type of template
     # @param format [String] the format e.g. html
     # @param file [String] the location of the file
-    def initialize(type, format, file)
+    def initialize(base_path, type, format, file)
+      @base_path   = base_path
       @format      = format || DEFAULT_FORMAT
       @type, @file = type, file.to_s
-      @renderer = find
+      @renderer    = find
     end
 
     private
 
+    def self.classes
+      constants.map { |k| const_get k }.select do |klass|
+        klass.is_a?(Class) && klass < Tilt::Template
+      end
+    end
+
     def find
       template = find_by_type
       fail FileNotFound, "could not find #{file}" unless template
+      template = File.expand_path template
       Tilt.new template, options
     rescue RuntimeError
       raise TemplateNotFound, "could not find a renderer for #{file}"
@@ -48,11 +63,15 @@ class Flatrack
     end
 
     def find_by_type
-      if File.exist?(file)
+      paths = [base_path, Flatrack.gem_root]
+
+      # To support direct html files
+      if paths.any? { |path| file.start_with? path } && File.exist?(file)
         file
       else
-        file_with_format = [file, format].compact.join('.')
-        Dir[File.join type.to_s.pluralize, "#{file_with_format}*"].first
+        file_without_format = File.join(File.dirname(file), File.basename(file, ".#{format}"))
+        file_with_format = [file_without_format, format].compact.join('.')
+        Dir[File.join base_path, type.to_s.pluralize, "#{file_with_format}*"].first
       end
     end
   end

data/lib/flatrack/template/erubis.rb

@@ -2,6 +2,8 @@ class Flatrack
   class Template
     # The tilt template for rendering ERB in flatrack
     class Erubis < Tilt::ErubisTemplate
+      RENDERS = 'erb'
+
       extend ActiveSupport::Autoload
       autoload :Handler
 
@@ -19,5 +21,3 @@ class Flatrack
     end
   end
 end
-
-Tilt.prefer Flatrack::Template::Erubis, 'erb'

data/lib/flatrack/template/html.rb

@@ -2,6 +2,8 @@ class Flatrack
   class Template
     # The tilt template for rendering HTML in flatrack
     class Html < Tilt::PlainTemplate
+      RENDERS = 'html'
+
       private
 
       def evaluate(scope, locals, &block)
@@ -10,5 +12,3 @@ class Flatrack
     end
   end
 end
-
-Tilt.prefer Flatrack::Template::Html, 'html'

data/lib/flatrack/template/rb.rb

@@ -4,6 +4,8 @@ class Flatrack
   class Template
     # The tilt template for rendering Ruby in flatrack
     class Rb < Tilt::ErubisTemplate
+      RENDERS = 'rb'
+
       private
 
       def data
@@ -12,5 +14,3 @@ class Flatrack
     end
   end
 end
-
-Tilt.prefer Flatrack::Template::Rb, 'rb'

data/lib/flatrack/version.rb

@@ -1,5 +1,5 @@
 # Version
 class Flatrack
   # @private
-  VERSION = '1.3.3'
+  VERSION = '1.4.1'
 end

data/lib/flatrack/view.rb

@@ -19,7 +19,7 @@ class Flatrack
     include ERB::Util
 
     attr_accessor :output_buffer
-    delegate :use_layout, to: :@response
+    delegate :mount_path, :config, :use_layout, to: :@response
 
     # initializes a flatrack view
     # @param response [Flatrack::Response]

data/lib/flatrack/view/capture_helper.rb

@@ -9,8 +9,7 @@ class Flatrack
       def capture(*args)
         value  = nil
         buffer = with_output_buffer { value = yield(*args) }
-        string = buffer.presence || value
-        html_escape string if string.is_a?(String)
+        buffer.presence || value
       end
 
       # Use an alternate output buffer for the duration of the block.

data/lib/flatrack/view/link_helper.rb

@@ -32,7 +32,14 @@ class Flatrack
       #   @return [String]
       def link_to(*args, &block)
         href, options, block = link_to_options(*args, &block)
-        html_tag :a, link_to_tag_options(href, options || {}), &block
+        if href.start_with?('/') && !href.start_with?('//') && mount_path != '/'
+          href = File.join '', mount_path, href
+        end
+        tag_opts = link_to_tag_options(href, options || {})
+        if current_path == tag_opts[:href]
+          ((tag_opts[:class] ||= '') << ' active').strip!
+        end
+        html_tag(:a, tag_opts, false, &block)
       end
 
       private

data/lib/flatrack/view/render_helper.rb

@@ -6,7 +6,7 @@ class Flatrack
       # @param file [Symbol, String]
       # @return [String]
       def render(file, *args)
-        Template.find(:partial, nil, file.to_s).render(self, *args)
+        Template.find(config.site_root, :partial, nil, file.to_s).render(self, *args)
       end
     end
   end

data/lib/flatrack/view/request_helper.rb

@@ -8,11 +8,32 @@ class Flatrack
         @response.request.params
       end
 
-      # Returns the path
+      # Returns the path before rewrites
       # @return [String]
-      def path
+      def current_path
         @response.request.path
       end
+      alias path current_path
+
+      # Returns the page being displayed
+      # @return [String]
+      def current_page
+        @response.request.page
+      end
+      alias page current_page
+
+      # Returns the IP address for the request
+      # @return [String]
+      def request_ip
+        @response.request.env['REMOTE_ADDR']
+      end
+
+      # Returns the cookies
+      # @return [Hash]
+      def cookies
+        @response.request.env['rack.cookies']
+      end
+
     end
   end
 end

data/lib/flatrack/view/tag_helper.rb

@@ -7,11 +7,11 @@ class Flatrack
 
       # @private
       PRE_CONTENT_STRINGS = {
-        textarea: "\n"
+          textarea: "\n"
       }
 
       # @private
-      BOOLEAN_ATTRIBUTES = %w(disabled readonly multiple checked autobuffer
+      BOOLEAN_ATTRIBUTES  = %w(disabled readonly multiple checked autobuffer
                               autoplay controls loop selected hidden scoped
                               async defer reversed ismap seamless muted
                               required autofocus novalidate formnovalidate open
@@ -37,16 +37,17 @@ class Flatrack
       #   @param options [Hash] the html options for the tag
       #   @yield the tag content
       #   @return [String]
-      def html_tag(name, content_or_options_with_block = nil, options = nil,
-        escape = true, &block)
+      def html_tag(name, *args, &block)
+        content, options, escape = args
         if block_given?
-          if content_or_options_with_block.is_a?(Hash)
-            options = content_or_options_with_block
-          end
-          html_tag_string(name, capture(&block), options, escape)
+          check_arguments [name, *args], 1..3
+          options, escape = content, options
+          content = capture(&block)
         else
-          html_tag_string(name, content_or_options_with_block, options, escape)
+          check_arguments [name, *args], 2..4
         end
+        escape = true if escape.nil?
+        html_tag_string(name, content, options, escape)
       end
 
       # Returns an HTML image tag
@@ -77,6 +78,13 @@ class Flatrack
 
       private
 
+      def check_arguments(args, number_or_range)
+        range = number_or_range.is_a?(Fixnum) ? [number_or_range] : number_or_range
+        unless range.include? args.size
+          raise ArgumentError, "wrong number of arguments (#{args.count} for #{number_or_range.inspect})"
+        end
+      end
+
       def html_tag_string(name, content, options, escape = true)
         tag_options = tag_options(options, escape) if options
         content     = h(content) if escape && !content.nil?
@@ -115,8 +123,8 @@ class Flatrack
       def data_tag_option(key, value, escape)
         key   = "data-#{key.to_s.dasherize}"
         value = value.to_json unless value.is_a?(String) ||
-          value.is_a?(Symbol) ||
-          value.is_a?(BigDecimal)
+            value.is_a?(Symbol) ||
+            value.is_a?(BigDecimal)
         tag_option(key, value, escape)
       end