yarrow 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 648a0f70b24617f5498150579e5c18775c1b4c8c
-  data.tar.gz: 25f8f7a1f34525764329e798169c0c430362f31a
+  metadata.gz: bc35279dd3d2e8d12c883c813391011aeb64656f
+  data.tar.gz: eb12a310c3fb88687d69e4602a4dbac50d6010d6
 SHA512:
-  metadata.gz: 887acaa6c3d7fe08fe3c8ef0ede960c825a312e47510a10b456f3170c052dfacfe041609fdf5d7d599d98efd6b49ba71d74b7fdb4aa84369911f42e5f4e6449a
-  data.tar.gz: fc1cfe571626692b46cf1946f54294e74c87dee9c81df8545e9585245756baf2caa84472021563331f21c68a15b1e239a025d3b30e9b2884148f450d97052b37
+  metadata.gz: b6d3cc965dcc26c80d564f776f2eeefc8e66e9db8c9bda124c15c2d1dbef2927c523656c6a93092ceaeb5fdc175b9fa3b9796ad7f84eee4444862998bbd8b5b6
+  data.tar.gz: 1b6f155d6b036f0ab25cb002fc83f2c0e82c647aa9520ef7f8c0d70c7b4b02e666d1ec0afa548fbc88d725fa7adf265d5644b978feedea6070a211e5ba50a82e

data/lib/yarrow/defaults.yml

@@ -18,6 +18,9 @@ assets:
     - js
   manifest_file: manifest.json
 server:
+  auto_index: true
+  default_index: index.html
+  default_type: text/plain
   port: 8888
   host: localhost
   handler: thin
@@ -25,4 +28,3 @@ server:
     - Rack::ShowExceptions
     - Rack::CommonLogger
     - Rack::ContentLength
-

data/lib/yarrow/server.rb

@@ -43,16 +43,26 @@ module Yarrow
     # @return [Yarrow::Server::StaticFiles]
     def app
       root = docroot
-      index = @index_file || 'index.html'
-      plugins = middleware || []
+      index = default_index
+      middleware_stack = middleware_map
+      auto_index = auto_index?
+      mime_type = default_type
 
       Rack::Builder.new do
-        plugins.each do |plugin|
-          puts plugin
-          use plugin
+        middleware_stack.each do |middleware|
+          use middleware
         end
+
         use DirectoryIndex, root: root, index: index
-        run Rack::Directory.new(root)
+
+        app_args = [root, {}].tap { |args| args.push(mime_type) if mime_type }
+        static_app = Rack::File.new(*app_args)
+
+        if auto_index
+          run Rack::Directory.new(root, static_app)
+        else
+          run static_app
+        end
       end
     end
 
@@ -63,8 +73,8 @@ module Yarrow
     # provided in the config.
     #
     def run
-      server = Rack::Handler.get(rack_options[:server])
-      server.run(app, rack_options)
+      server = Rack::Handler.get(run_options[:server])
+      server.run(app, run_options)
     end
 
     private
@@ -75,19 +85,37 @@ module Yarrow
       config.output_dir || Dir.pwd
     end
 
+    ##
+    # @return [String]
+    def default_index
+      config.server.default_index || 'index.html'
+    end
+
+    ##
+    # @return [TrueClass, FalseClass]
+    def auto_index?
+      return true if config.server.auto_index.nil?
+      config.server.auto_index
+    end
+
+    ##
+    # @return [String]
+    def default_type
+      config.server.default_type
+    end
+
     ##
     # @return [Array<Class>]
-    def middleware
-      plugins = config.server.middleware || []
-      plugins.map { |plugin| Kernel.const_get(plugin) }
+    def middleware_map
+      middleware = config.server.middleware || []
+      middleware.map { |class_name| Kernel.const_get(class_name) }
     end
 
     ##
-    # Stub to fill in default Rack options that will eventually be
-    # provided by config.
+    # Provides options required by the Rack server on startup.
     #
-    # TODO: remove this and use config.merge to build a single access point
-    def rack_options
+    # @return [Hash]
+    def run_options
       {
         :Port => config.server.port,
         :Host => config.server.port,

data/lib/yarrow/tools/output_file.rb

@@ -2,7 +2,7 @@ module Yarrow
   module Tools
     # TODO: consider renaming this to OutputDocument.
     class OutputFile
-      include ::Configurable
+      include Yarrow::Configurable
 
       WRITE_MODE = 'w+:UTF-8'.freeze
 
@@ -13,7 +13,7 @@ module Yarrow
 
       # @return [String] Docroot of the output target
       def docroot
-        @docroot ||= config.output_dir
+        @docroot ||= config.output_dir || 'public'
       end
 
       # Write an output file to the specified path under the docroot.
@@ -27,7 +27,7 @@ module Yarrow
           path = "#{path}#{index_name}"
         end
 
-        target_path = Pathname.new("docroot#{path}")
+        target_path = Pathname.new("#{docroot}#{path}")
 
         FileUtils.mkdir_p(target_path.dirname)
 

data/lib/yarrow/version.rb

@@ -1,4 +1,4 @@
 module Yarrow
   APP_NAME = 'Yarrow'.freeze
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.3.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yarrow
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -208,4 +208,3 @@ signing_key:
 specification_version: 4
 summary: Documentation generator based on a fluent data model.
 test_files: []
-has_rdoc: