fuse 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDNiOTM4NDIyZTA2ZjNkYWQ5MmViMGEwNzZhM2JkZmE1OWYxMGI4MA==
+    Yzc5OTM5ZjNmY2JjYzZhMjEzYzYwMmM4OTdlZGY2Mzg3OTA0MjkwOQ==
   data.tar.gz: !binary |-
-    YWY3MmY3YzEyOTY1ZDNhMDIwZTAzMzExN2FlYTMyZDY0NGJjYmYyNA==
+    NTY2ZTkzODk5MTNhOGJmNGQ0MGI5ZjA4NzAxODRmYzEwNjNkYjZhYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmMwNzExMGExNjVmZWEyYjY3ZmM2OTNiYzgwYTcxZGFjY2YzZDdkZTM5MGRj
-    ODI4ZTdmMzBhNDM0OWZkNTQ1M2ZkMDFiZTIzZjkyYTQwNTQwOTdjZmIwYmEz
-    NzlkNGZmMDUwYmM1NDQ3MGY3YmMzNTIyZjExYWQzNWY1Yzc5MDI=
+    MGE5YjliMTM1MDJkNzU3OTIxZWVjOTMwMDYwNTQxZDBhNGU4YzUxNjE5ZDJh
+    MjMyZGZlM2U3MmQ0NDNiN2RiYmM2YTBjOWZmNjRjZWQzZGVlOTQyODFmODUy
+    NjhiMjFkNmEyZTI5MjNmY2M3YzEwNzdkYTc5YTBiODNlZTZkYmM=
   data.tar.gz: !binary |-
-    MzJmNDEwOGIzYTBiNGVkMDNjYTk2Y2RlNDIxNWVjNjBhYzZkZjcyNjVkN2M1
-    ODg2YTM1Njc2YjNlNWI4NzkyMTcxNjMzM2E2Y2EzZWYyMmU1NGYxOTQyYjc5
-    YjU4NDE3YjY1NjVkNGI4NTdkMDVkOGYxY2IyMTA0OTk2ZGFkMDQ=
+    NDEwMmU5ODE4ZGFlYjIxODU4YjU0MmIwMzA1NmRmMjE4YWM5MDk0YTIxNWI4
+    YzNiMmYxNjYyOTBhYTJhYmZiNWMzMDAzNmZhNjc0OTIyMTFkZjJkMDYzZThm
+    ODZjNTgxMGQ3NDBmMTFhZTFjOWFmNGU5YTA2YjE1YTc1YjIxODU=

data/lib/fuse.rb

@@ -3,7 +3,7 @@ require 'thin'
 
 module Fuse
 
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 
   def self.root
     @root ||= File.expand_path File.dirname(__FILE__)

data/lib/fuse/server.rb

@@ -8,18 +8,19 @@ class Fuse::Server
 
   def call(env)
 
-    @env = env
+    request = Rack::Request.new(env)
 
     call_options = @options.merge Hash[request.GET.map{ |k, v| [k.to_sym, v] }]
 
-    if (asset = Fuse::Document::Asset.for(request.path, File.directory?(@options[:source]) ? @options[:source] : File.dirname(@options[:source])))
+    if @root && (asset = Fuse::Document::Asset.for(request.path))
       return asset.call(env)
     end
 
     begin
       doc = Fuse::Document.new(call_options)
+      @root = doc.root
     rescue Fuse::Exception::SourceUnknown::TooManySources
-      doc = render_list($!.options, $!.option_name)
+      doc = render_list($!.options, $!.option_name, request)
     rescue Fuse::Exception
       if $!.message
         doc = render_error($!.message)
@@ -34,17 +35,13 @@ class Fuse::Server
 
   private
 
-    def request
-      Rack::Request.new(@env)
-    end
-
     def render_error(text)
       render_body do |h|
         h.p { h.text text }
       end
     end
 
-    def render_list(assets, key)
+    def render_list(assets, key, request)
       render_body do |h|
         h.h3 { h.text "Choose #{key}:" }
         h.ul {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuse
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Neil E. Pearson
@@ -94,6 +94,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.2
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 description: ! 'Portable document authoring. Fuse HTML, JavaScript, CSS, images and
   fonts into standalone HTML files.