oaf 0.3.1 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2M2YmMyNGY2Zjg4MmU2MWJjN2Y3ZDc0MzhjMDMxZmEyZjRkY2RkNw==
-  data.tar.gz: !binary |-
-    ZjY4YTM5NjdiYzg3YzA0NTk4NmFjMzdiOGMzYzYwYmZjZWM0NWJkMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OWQ0NzRhMGJiYjYxNGQxNmJmNjFmZTBiMDRhODc4NmU0ZDFjNGQyZTExZDI2
-    ZjJhMDkyM2NkMGRhZmU0NzZmYWY2M2IwYjM1NzI2YmQ3NWJkMzc1MzJiMjk5
-    NzQwYmJiMjMyN2I0NzJlOWRkMDU3ZjRiYmRhZDA4MDk3NGNjYWE=
-  data.tar.gz: !binary |-
-    YWVmMzQ5NWE1M2FiYzQ4YmQyM2E3YjdjMjkyOWZiMDkxMDJiMDA1NGI2YWU1
-    NTg0ODdlZGU0NTQ1NTljNjU5MGE2NjMwZGY0MTNjOTY4NDdkZmZiYjJmYjYx
-    MGVkMDZkMTg0MTlhMWYxZTUzMWI3YjMxMDJhY2M1ODM0MTdjZjM=
+SHA1:
+  metadata.gz: 720ac500bd3afa837043ed6adff3b3e57d9e75a9
+  data.tar.gz: e3b3c50d97dd65860a2793ccb41db1ab80de1a79
+SHA512:
+  metadata.gz: b282c4c90f970cbdd35d0cde3d0491687e9b66f1536eb4d0bf296dc319d7a6c8343b06b2d3502c02ec76b9fa24784f20e28790dd2dec322f85be8b233f7da4d1
+  data.tar.gz: d89e72758ca3113af24fe337ce8aa4e870ce5095fb52c3f71ba1048bd7450b21d008805412763e05bf86b365d3854c65627efc4c9d3171ecbe485d7e941e288c

data/bin/oaf

@@ -1,25 +1,4 @@
 #!/usr/bin/ruby
-# oaf - Care-free web app prototyping using files and scripts
-# Copyright 2013 Ryan Uber <ru@ryanuber.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'optparse'
 require 'oaf'

data/lib/oaf.rb

@@ -1,25 +1,3 @@
-# oaf - Care-free web app prototyping using files and scripts
-# Copyright 2013 Ryan Uber <ru@ryanuber.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 require 'oaf/version'
 require 'oaf/util'
 require 'oaf/httphandler'

data/lib/oaf/httphandler.rb

@@ -1,25 +1,3 @@
-# oaf - Care-free web app prototyping using files and scripts
-# Copyright 2013 Ryan Uber <ru@ryanuber.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 require 'oaf/util'
 require 'oaf/httpserver'
 require 'webrick'
@@ -35,7 +13,7 @@ module Oaf
     # Remove the predefined WEBrick methods. WEBrick comes with some defaults
     # for GET, POST, OPTIONS, and HEAD, but let's use our own instead.
     instance_methods.each do |method|
-      undef_method method if method.to_s =~ /^do_[A-Z]+/
+      undef_method method if method.to_s =~ /^do_[A-Z]+$/
     end
 
     # Creates a new abstract server object and allows passing in the root

data/lib/oaf/httpserver.rb

@@ -1,25 +1,3 @@
-# oaf - Care-free web app prototyping using files and scripts
-# Copyright 2013 Ryan Uber <ru@ryanuber.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 require 'oaf/util'
 require 'oaf/httphandler'
 require 'webrick'

data/lib/oaf/util.rb

@@ -1,25 +1,3 @@
-# oaf - Care-free web app prototyping using files and scripts
-# Copyright 2013 Ryan Uber <ru@ryanuber.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 module Oaf::Util
   extend self
 
@@ -231,11 +209,20 @@ module Oaf::Util
   # The path to a file to use, or `nil` if none is found.
   #
   def get_request_file root, req_path, method
-    file = File.join root, "#{req_path}.#{method}"
+    path = File.join root, req_path
+    file = "#{path}.#{method}"
+
     if not File.exist? file
-      Dir.glob(File.join(File.dirname(file), "_*_.#{method}")).each do |f|
-        file = f
-        break
+      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
     end
     File.exist?(file) ? file : nil
@@ -247,6 +234,8 @@ module Oaf::Util
   # the hard way to maintain compatibility with older rubies.
   #
   # == Parameters:
+  # path::
+  #   The base path where the script file exists
   # env::
   #   The environment data to use in the subprocess.
   # command::
@@ -255,7 +244,12 @@ module Oaf::Util
   # == Returns:
   # A string of stderr concatenated to stdout.
   #
-  def run_buffered env, command
+  def run_buffered path, env, command
+    begin
+      Dir.chdir path
+    rescue Errno::ENOENT => e
+      return e.message
+    end
     out, wout = IO.pipe
     pid = fork do
       out.close
@@ -291,7 +285,7 @@ module Oaf::Util
       out = Oaf::Util.get_default_response
     elsif File.executable? file
       env = Oaf::Util.prepare_environment req_path, headers, params, body
-      out = Oaf::Util.run_buffered env, file
+      out = Oaf::Util.run_buffered File.dirname(file), env, file
     else
       out = File.open(file).read
     end

data/lib/oaf/version.rb

@@ -1,25 +1,3 @@
-# oaf - Care-free web app prototyping using files and scripts
-# Copyright 2013 Ryan Uber <ru@ryanuber.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 module Oaf
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/spec/oaf/http_spec.rb

@@ -1,25 +1,3 @@
-# oaf - Care-free web app prototyping using files and scripts
-# Copyright 2013 Ryan Uber <ru@ryanuber.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 require 'spec_helper'
 
 module Oaf
@@ -77,12 +55,29 @@ module Oaf
       @f2.write "Containable Test\n---\n202\nx-powered-by: oaf"
       @f2.close
       @f2request = File.basename(@f2.path).sub!(/\.PUT$/, '')
+
+      @tempdir2 = Dir.mktmpdir
+      Dir.mkdir File.join(@tempdir2, 'sub')
+      @f3 = File.new File.join(@tempdir2, 'sub', '_default_.GET'), 'w'
+      @f3.write "Directory wins"
+      @f3.close
+      @f3request = 'sub'
+
+      @tempdir3 = Dir.mktmpdir
+      @f4 = File.new File.join(@tempdir3, 'sub.GET'), 'w'
+      @f4.write "File wins"
+      @f4.close
+      @f4request = 'sub'
+      Dir.mkdir File.join(@tempdir3, 'sub')
+      f5 = File.new File.join(@tempdir3, 'sub', '_default_.GET'), 'w'
+      f5.write "Directory wins"
+      f5.close
     end
 
     after(:all) do
-      @f1.delete
       @f2.delete
-      Dir.delete @tempdir1
+      FileUtils.rm_rf @tempdir1
+      FileUtils.rm_rf @tempdir2
     end
 
     it "should start an HTTP server" do
@@ -138,5 +133,21 @@ module Oaf
       handler.do_HEAD(req, res)
       handler.do_OPTIONS(req, res)
     end
+
+    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.process_request req, res
+      res.body.should eq("Directory wins\n")
+    end
+
+    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.process_request req, res
+      res.body.should eq("File wins\n")
+    end
   end
 end

data/spec/oaf/util_spec.rb

@@ -1,25 +1,3 @@
-# oaf - Care-free web app prototyping using files and scripts
-# Copyright 2013 Ryan Uber <ru@ryanuber.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 require 'spec_helper'
 
 module Oaf
@@ -223,6 +201,14 @@ module Oaf
                 "echo \"$oaf_param_myparam\"\necho \"$oaf_request_body\"\n" +
                 "echo \"$oaf_request_path\""
       @f4.close
+
+      @tempdir1 = Dir.mktmpdir
+      @tempdir2 = File.join @tempdir1, 'sub'
+      Dir.mkdir @tempdir2
+      @f5 = Tempfile.new 'oaf', @tempdir2
+      @f5.chmod 0755
+      @f5.write "#!/bin/bash\npwd"
+      @f5.close
     end
 
     after(:all) do
@@ -261,5 +247,17 @@ module Oaf
       result.should eq("#{headers['x-powered-by']}\n#{params['myparam']}\n" +
                        "#{body}\n#{path}\n")
     end
+
+    it "should chdir to the directory containing the script" do
+      result = Oaf::Util.get_output @f5.path
+      # If the temp dir is a symlink, we don't know about that here. Just
+      # compare the basename instead.
+      File.basename(result).should eq("#{File.basename(@tempdir2)}\n")
+    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")
+    end
   end
 end

data/spec/spec_helper.rb

@@ -11,3 +11,4 @@ end
 require 'oaf'
 require 'ostruct'
 require 'tempfile'
+require 'tmpdir'

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: oaf
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryan Uber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Care-free web app prototyping using files and scripts
@@ -93,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Web app prototyping