oaf 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 720ac500bd3afa837043ed6adff3b3e57d9e75a9
-  data.tar.gz: e3b3c50d97dd65860a2793ccb41db1ab80de1a79
+  metadata.gz: c8a01245a80af4f9a99bc7c2cb30a687ecf47225
+  data.tar.gz: a3facc728430cd4a3625ffb3a3b571739f7f6597
 SHA512:
-  metadata.gz: b282c4c90f970cbdd35d0cde3d0491687e9b66f1536eb4d0bf296dc319d7a6c8343b06b2d3502c02ec76b9fa24784f20e28790dd2dec322f85be8b233f7da4d1
-  data.tar.gz: d89e72758ca3113af24fe337ce8aa4e870ce5095fb52c3f71ba1048bd7450b21d008805412763e05bf86b365d3854c65627efc4c9d3171ecbe485d7e941e288c
+  metadata.gz: 973ea45b74b7078cc34b7977c158d04c366bad98a7d85e3eed22b6bba3adebd2ed95ea523ea45b01fe7d5716ceb69a39990c73495b242ce56ada7b0373760b7a
+  data.tar.gz: 415103896f41e9bfb869106bc176271833981876f354ef111c18afcaf4eff7ca64b1970882c8062bde57f2110d0d6a5720b86cb5e4704d6f047c01ea0881c6a0

data/bin/oaf

@@ -3,7 +3,10 @@
 require 'optparse'
 require 'oaf'
 
-options = {:port => 9000}
+options = {
+  :port => 9000,
+  :default_response => ''
+}
 
 begin
   OptionParser.new do |opts|
@@ -16,6 +19,11 @@ begin
         exit 1
       end
       options[:port] = v.to_s
+      ARGV.shift
+    end
+    opts.on('--default-response FILE', 'Path to default response file') do |v|
+      options[:default_response] = v.to_s
+      ARGV.shift
     end
     opts.on('--version', 'Show the version number') do
       puts Oaf::VERSION
@@ -40,4 +48,4 @@ else
   exit 1
 end
 
-Oaf::HTTPServer.serve options[:path], options[:port]
+Oaf::HTTPServer.serve options

data/lib/oaf/httphandler.rb

@@ -22,12 +22,12 @@ module Oaf
     # == Parameters:
     # server::
     #   A WEBrick::HTTPServer object
-    # path::
-    #   A string containing the root path
+    # options::
+    #   A hash of Oaf configuration options
     #
-    def initialize server, path
+    def initialize server, options
       super server
-      @path = path
+      @options = options
     end
 
     # Main server method. Oaf does not really differentiate between different
@@ -43,9 +43,10 @@ module Oaf
       req_headers = req.header
       req_query = req.query
       req_body = Oaf::HTTPServer.get_request_body req
-      file = Oaf::Util.get_request_file @path, req.path, req.request_method
+      file = Oaf::Util.get_request_file(@options[:path], req.path,
+        req.request_method, @options[:default_response])
       out = Oaf::Util.get_output(file, req.path, req_headers, req_body,
-                                 req_query)
+        req_query)
       res_headers, res_status, res_body = Oaf::HTTPServer.parse_response out
       Oaf::HTTPServer.set_response! res, res_headers, res_body, res_status
     end

data/lib/oaf/httpserver.rb

@@ -70,14 +70,12 @@ module Oaf::HTTPServer
   # routes them to the appropriate scripts if they exist on the filesystem.
   #
   # == Parameters:
-  # path::
-  #   The path in which to search for files
-  # port::
-  #   The TCP port to listen on
+  # options::
+  #   A hash of Oaf configuration options
   #
-  def serve path, port
-    server = WEBrick::HTTPServer.new :Port => port
-    server.mount '/', Oaf::HTTPHandler, path
+  def serve options
+    server = WEBrick::HTTPServer.new :Port => options[:port]
+    server.mount '/', Oaf::HTTPHandler, options
     trap 'INT' do server.shutdown end
     server.start
   end

data/lib/oaf/util.rb

@@ -204,28 +204,25 @@ module Oaf::Util
   #   The HTTP request path
   # method::
   #   The HTTP method of the request
+  # default::
+  #   An optional path to a default response file
   #
   # == Returns:
   # The path to a file to use, or `nil` if none is found.
   #
-  def get_request_file root, req_path, method
+  def get_request_file root, req_path, method, default=''
     path = File.join root, req_path
     file = "#{path}.#{method}"
 
-    if not File.exist? file
-      if File.directory? path
-        Dir.glob(File.join(path, "_*_.#{method}")).each do |f|
-          file = f
-          break
-        end
-      else
-        Dir.glob(File.join(File.dirname(file), "_*_.#{method}")).each do |f|
-          file = f
-          break
-        end
-      end
+    return file if File.file? file
+
+    Dir.glob(File.join(path, "_*_.#{method}")).each do |f|
+      return f
+    end
+    Dir.glob(File.join(File.dirname(file), "_*_.#{method}")).each do |f|
+      return f
     end
-    File.exist?(file) ? file : nil
+    File.file?(default.to_s) ? default : nil
   end
 
   # Fork a new process, in which we can safely modify the running environment

data/lib/oaf/version.rb

@@ -1,3 +1,3 @@
 module Oaf
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/oaf/http_spec.rb

@@ -81,19 +81,20 @@ module Oaf
     end
 
     it "should start an HTTP server" do
+      options = {:path => '/tmp', :port => 9000}
       @webrick = double()
       @webrick.should_receive(:start).once.and_return(true)
       WEBrick::HTTPServer.stub(:new).and_return(@webrick)
       @webrick.should_receive(:mount) \
-        .with('/', Oaf::HTTPHandler, '/tmp').once \
+        .with('/', Oaf::HTTPHandler, options).once \
         .and_return(true)
-      Oaf::HTTPServer.serve '/tmp', 9000
+      Oaf::HTTPServer.serve options
     end
 
     it "should parse the request properly" do
       req = Oaf::FakeReq.new :path => @f1request
       res = Oaf::FakeRes.new
-      handler = Oaf::HTTPHandler.new Oaf::FakeServlet.new, @tempdir1
+      handler = Oaf::HTTPHandler.new Oaf::FakeServlet.new, {:path => @tempdir1}
       handler.process_request req, res
       res.body.should eq("This is a test.\n")
       res.status.should eq(201)
@@ -103,7 +104,7 @@ module Oaf
     it "should accept containable methods properly" do
       req = Oaf::FakeReq.new({:path => @f2request, :method => 'PUT'})
       res = Oaf::FakeRes.new
-      handler = Oaf::HTTPHandler.new Oaf::FakeServlet.new, @tempdir1
+      handler = Oaf::HTTPHandler.new Oaf::FakeServlet.new, {:path => @tempdir1}
       handler.process_request req, res
       res.body.should eq("Containable Test\n")
       res.status.should eq(202)
@@ -114,7 +115,7 @@ module Oaf
       req = Oaf::FakeReq.new :path => @f1request
       res = Oaf::FakeRes.new
       Oaf::HTTPHandler.any_instance.stub(:process_request).and_return(true)
-      handler = Oaf::HTTPHandler.new Oaf::FakeServlet.new, @tempdir1
+      handler = Oaf::HTTPHandler.new Oaf::FakeServlet.new, {:path => @tempdir1}
       handler.should_receive(:process_request).with(req, res).once
       handler.respond_to?(:do_GET).should be_true
       handler.respond_to?(:do_get).should be_false
@@ -126,7 +127,7 @@ module Oaf
       req = Oaf::FakeReq.new :path => @f1request
       res = Oaf::FakeRes.new
       Oaf::HTTPHandler.any_instance.stub(:process_request).and_return(true)
-      handler = Oaf::HTTPHandler.new Oaf::FakeServlet.new, @tempdir1
+      handler = Oaf::HTTPHandler.new Oaf::FakeServlet.new, {:path => @tempdir1}
       handler.should_receive(:process_request).with(req, res).exactly(4).times
       handler.do_GET(req, res)
       handler.do_POST(req, res)
@@ -137,7 +138,7 @@ module Oaf
     it "should use directory default if no higher-level script exists" do
       req = Oaf::FakeReq.new :path => @f3request
       res = Oaf::FakeRes.new
-      handler = Oaf::HTTPHandler.new Oaf::FakeServlet.new, @tempdir2
+      handler = Oaf::HTTPHandler.new Oaf::FakeServlet.new, {:path => @tempdir2}
       handler.process_request req, res
       res.body.should eq("Directory wins\n")
     end
@@ -145,7 +146,7 @@ module Oaf
     it "should use a file if present with a similarly-named directory" do
       req = Oaf::FakeReq.new :path => @f4request
       res = Oaf::FakeRes.new
-      handler = Oaf::HTTPHandler.new Oaf::FakeServlet.new, @tempdir3
+      handler = Oaf::HTTPHandler.new Oaf::FakeServlet.new, {:path => @tempdir3}
       handler.process_request req, res
       res.body.should eq("File wins\n")
     end

data/spec/oaf/util_spec.rb

@@ -144,6 +144,7 @@ module Oaf
     before(:all) do
       @tempdir1 = Dir.mktmpdir
       @tempdir2 = Dir.mktmpdir
+      @tempdir3 = Dir.mktmpdir
 
       @f1 = Tempfile.new ['oaf', '.GET'], @tempdir1
       @f1.write "This is a test.\n"
@@ -160,6 +161,7 @@ module Oaf
       @f2.delete
       Dir.delete @tempdir1
       Dir.delete @tempdir2
+      Dir.delete @tempdir3
     end
 
     it "should find existing files correctly" do
@@ -168,12 +170,22 @@ module Oaf
     end
 
     it "should return the fall-through file if request file doesn't exist" do
-      result = Oaf::Util.get_request_file @tempdir1, 'nonexistent', 'GET'
+      result = Oaf::Util.get_request_file @tempdir1, 'na', 'GET'
       result.should eq(@f2.path)
     end
 
+    it "should return a custom default if configured" do
+      result = Oaf::Util.get_request_file @tempdir3, 'na', 'GET', @f1.path
+      result.should eq(@f1.path)
+    end
+
+    it "should still return the fall-through if default doesn't exist" do
+      result = Oaf::Util.get_request_file @tempdir3, 'na', 'GET', '/n0n3x1st3nt'
+      result.should eq(nil)
+    end
+
     it "should return nil if neither the requested or default file exist" do
-      result = Oaf::Util.get_request_file @tempdir2, 'nonexistent', 'GET'
+      result = Oaf::Util.get_request_file @tempdir2, 'na', 'GET'
       result.should be_nil
     end
   end
@@ -256,8 +268,9 @@ module Oaf
     end
 
     it "should error if the passed path does not exist" do
-      result = Oaf::Util.run_buffered '/nonexistent', {}, ''
-      result.should eq("No such file or directory - /nonexistent")
+      # /nonexistent exists occasionally on Travis CI, so use a weird directory
+      result = Oaf::Util.run_buffered '/n0n3x1st3nt', {}, ''
+      result.should eq("No such file or directory - /n0n3x1st3nt")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oaf
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ryan Uber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake