yarrow 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ac7d475a5d695a78ef24f94d64637deae4b2c70
-  data.tar.gz: 243ea4a6f7db3dd7b9f2e414b2d2b6bb9e20963f
+  metadata.gz: 71cc6bb31451de567a4dc5f5ef84df45855d3a21
+  data.tar.gz: 7ad6ffae5eeaec2084b50a295a10b07610f2fb5f
 SHA512:
-  metadata.gz: 286765ed5b70e517868705c25cc545fa31ff109bcbcd3f727e323be6e858bae8e8c9175f6d536cf422ed523516f9c457e79faaca65414e3ea5155d8a0f992f8a
-  data.tar.gz: 2dc1154778db5e8ffc6656f0af62f1e7604ae0ba2ec0dde0d65fcb75af8ff8a7a796964e6493a21454dca9289d6222396c3a91510f7b4c01e6588fa1cbf2cff2
+  metadata.gz: 8b5e08f3edca9b08b59e7ed777e50b0e5b7e738a7e7c1f5a14440919e9d93c84ab4b5b5b55b46061d520deaebd7cee84c43dc7c6beff160c23a4b2c4643ff850
+  data.tar.gz: 378379ec11cb8944230afc693ca8b1df083e192e6ad53ddebc70d083bd26b2e63fc58b9c4690f7d848aa741edb86071c0f8f404cb34aa7c9264cfd29a18226c5

data/lib/yarrow/defaults.yml

@@ -16,4 +16,9 @@ assets:
   append_paths:
     - css
     - js
-  manifest_file: manifest.json
+  manifest_file: manifest.json
+server:
+  port: 8888
+  host: localhost
+  handler: thin
+

data/lib/yarrow/server.rb

@@ -8,7 +8,7 @@ module Yarrow
 
     def initialize
       if config.server.nil?
-        config.server = default_server_config
+        raise ConfigurationError.new('Missing server entry')
       end
     end
 
@@ -25,9 +25,9 @@ module Yarrow
       end
 
       def call(env)
-        index_path =  ::File.join(@root, Rack::Request.new(env).path.split('/'), @index_file)
-        if ::File.exists?(index_path)
-          return [200, {"Content-Type" => "text/html"}, [::File.read(index_path)]]
+        index_path = File.join(@root, Rack::Request.new(env).path.split('/'), @index_file)
+        if File.exists?(index_path)
+          return [200, {"Content-Type" => "text/html"}, [File.read(index_path)]]
         else
           @app.call(env)
         end
@@ -43,12 +43,13 @@ module Yarrow
     # @return [Yarrow::Server::StaticFiles]
     def app
       root = docroot
+      index = @index_file || 'index.html'
 
       Rack::Builder.new do
         use Rack::ShowExceptions
         use Rack::CommonLogger
         use Rack::ContentLength
-        use DirectoryIndex, root: root, index: 'index.html'
+        use DirectoryIndex, root: root, index: index
         run Rack::Directory.new(root)
       end
     end
@@ -72,16 +73,6 @@ module Yarrow
       config.output_dir || Dir.pwd
     end
 
-    ##
-    # @return [Hash]
-    def default_server_config
-      {
-        port: 8888,
-        host: 'localhost',
-        handler: :thin
-      }
-    end
-
     ##
     # Stub to fill in default Rack options that will eventually be
     # provided by config.
@@ -91,7 +82,7 @@ module Yarrow
       rack_options = {
         :Port => config.server.port,
         :Host => config.server.port,
-        :server => config.server.handler,
+        :server => config.server.handler.to_sym,
         :daemonize => false,
         :quiet => false,
         :warn => true,

data/lib/yarrow/version.rb

@@ -1,4 +1,4 @@
 module Yarrow
   APP_NAME = 'Yarrow'.freeze
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yarrow
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie