simple-httpd 0.0.4 → 0.3.0

data/simple-httpd.gemspec

@@ -1,10 +1,5 @@
-# This file is part of the sinatra-sse ruby gem.
-#
-# Copyright (c) 2016, 2017 @radiospiel, mediapeers Gem
-# Distributed under the terms of the modified BSD license, see LICENSE.BSD
-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+# lib = File.expand_path('../lib', __FILE__)
+# $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name     = "simple-httpd"
@@ -26,16 +21,11 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '~> 2.5'
 
-  # -- dependencies for postjob httpd
-  gem.add_runtime_dependency "neatjson", "~> 0.8.4"
-  gem.add_runtime_dependency "sinatra", "~> 2"
-  gem.add_runtime_dependency "sinatra-reloader", "~> 1"
-  
-  # development gems
-  gem.add_development_dependency "rspec-httpd", "~> 0.0.14"
-  gem.add_development_dependency 'rake', '~> 11'
-  gem.add_development_dependency 'rspec', '~> 3.7'
-  gem.add_development_dependency 'rubocop', '~> 0.61.1'
-  gem.add_development_dependency 'simplecov', '~> 0'
-  gem.add_development_dependency 'awesome_print', '~> 0'
+  # dependencies
+  gem.add_dependency "neatjson", "~> 0.8.4"
+  gem.add_dependency "sinatra", "~> 2"
+  # gem.add_dependency "sinatra-reloader", "~> 1"
+  gem.add_dependency "expectation", "~> 1"
+  gem.add_dependency "simple-cli", "~> 0.3.0"
 end
+#require "expectation"

data/spec/simple/httpd/base_controller/httpd_cors_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe Simple::Httpd do
+  describe "CORS headers" do
+    it "returns CORS headers on dynamic responses" do
+      http.get "/"
+      expect(http.response.headers.keys).to include("access-control-allow-origin")
+    end
+
+    it "returns CORS headers" do
+      http.get "/README.txt"
+      expect(http.response.headers.keys).not_to include("access-control-allow-origin")
+    end
+  end
+end

data/spec/simple/httpd/base_controller/httpd_debug_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe Simple::Httpd do
+  describe "debug feature" do
+    it "returns CORS headers on dynamic responses" do
+      http.get "/debug?foo"
+      expect_response '{"foo"=>nil}' + "\n"
+      expect(http.response.headers["content-type"]).to match(/text\/plain/)
+    end
+  end
+end

data/spec/simple/httpd/base_controller/httpd_x_processing_copy.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe Simple::Httpd do
+  describe "X-Processing headers" do
+    it "returns X-Processing headers on dynamic responses" do
+      http.get "/"
+      expect(http.response.headers.keys).to include("x-processing")
+    end
+
+    it "returns X-Processing headers on static responses" do
+      http.get "/README.txt"
+      expect(http.response.headers.keys).not_to include("x-processing")
+    end
+  end
+end

data/spec/simple/httpd/base_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe Simple::Httpd do
+  describe "VERSION" do
+    it "defines a version string" do
+      expect(Simple::Httpd::VERSION).to match(/^\d+\.\d+\.\d+/)
+    end
+  end
+
+  describe "root routing" do
+    it "resolves routes from root.rb" do
+      http.get "/"
+      expect_response "root"
+    end
+  end
+end

data/spec/simple/httpd/dynamic_mounting_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+describe "dynamic mounting" do
+  it "resolves routes from root.rb" do
+    http.get "/"
+    expect_response "root"
+  end
+
+  # mounting not at root level
+  it "gets deep route from a root.rb file not mounted at /" do
+    http.get "/api/v2"
+    expect(http.content).to eq("version" => "v2")
+    expect(http.response.headers["content-type"]).to match(/application\/json/)
+  end
+
+  it "gets deep route from static file" do
+    http.get "/api/v2/api.js"
+    expect_response /API example file/
+    expect(http.response.headers["content-type"]).to match(/application\/javascript/)
+  end
+
+  it "gets deep route from non-root.rb file" do
+    http.get "/api/v2/jobs/info"
+    expect_response "info"
+    expect(http.response.headers["content-type"]).to match(/text\/plain/)
+  end
+
+  it "gets deep route with params from non-root.rb file" do
+    http.get "/api/v2/jobs/12/events"
+    expect(http.response.headers["content-type"]).to match(/application\/json/)
+    expect(http.content).to eq([{ "job_id" => "12", "id" => "event1" }, { "job_id" => "12", "id" => "event2" }])
+  end
+end

data/spec/simple/httpd/helpers_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe Simple::Httpd do
+  describe "helpers" do
+    it "loads helpers from the same directory tree" do
+      http.get "/helpers/ex2"
+      expect_response "ex2_helper"
+    end
+
+    it "does not load helpers from other directory tree even on the same URL tree" do
+      http.get "/helpers/ex1"
+      expect_response status: 404
+    end
+  end
+end

data/spec/simple/httpd/rspec_httpd_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe "RSpec::Httpd features" do
+  it "sends proper headers" do
+    http.get "/info/inspect?qux"
+
+    result_lines = http.content.split("\n")
+
+    expect(result_lines).to include("QUERY_STRING=qux")
+    expect(result_lines).to include("REQUEST_METHOD=GET")
+    expect(result_lines).to include("REQUEST_PATH=/info/inspect")
+    expect(result_lines).to include("SERVER_NAME=127.0.0.1")
+    expect(result_lines).to include("SERVER_PORT=12345")
+
+    expect(http.response.headers["content-type"]).to match(/text\/plain/)
+  end
+end

data/spec/simple/httpd/services/service_explicit_spec.rb

@@ -0,0 +1,34 @@
+require "spec_helper"
+
+describe "explicit mounting of service" do
+  # mounting not at root level
+  it "mounts the file" do
+    http.get "/example_service/check"
+    expect_response("ok: explicit_service")
+  end
+
+  it "properly extracts an argument from the path" do
+    http.post "/example_service/echo/1?b=2", { one: "foo", two: "bar" }
+    expect_response "one: [foo]/two: [bar]/a: [1]/b: [2]"
+  end
+
+  it "ignores extra body arguments and extra parameters" do
+    http.post "/example_service/echo/1?b=2&c=3", { one: "foo", two: "bar", three: "baz" }
+    expect_response "one: [foo]/two: [bar]/a: [1]/b: [2]"
+  end
+
+  it "complains on missing body arguments" do
+    http.post "/example_service/echo/1?b=2&c=3", { two: "bar" }
+    expect_response 422
+  end
+
+  it "ignores missing parameters arguments" do
+    http.post "/example_service/echo/1", { one: "foo", two: "bar" }
+    expect_response "one: [foo]/two: [bar]/a: [1]/b: []"
+  end
+
+  it "properly extracts arguments and parameters" do
+    http.put "/example_service/echo_context"
+    expect_response /Simple::Service::Context/
+  end
+end

data/spec/simple/httpd/services/service_spec.rb

@@ -0,0 +1,34 @@
+require "spec_helper"
+
+describe "service file" do
+  # mounting not at root level
+  it "returns value from mapped function" do
+    http.post "/service/example/test?a=1&b=2"
+    expect_response("hello from ExampleService#test")
+  end
+
+  it "properly extracts arguments and parameters" do
+    http.post "/service/example/echo?a=1&b=2", { one: "foo", two: "bar" }
+    expect_response "one: [foo]/two: [bar]/a: [1]/b: [2]"
+  end
+
+  it "ignores extra body arguments and extra parameters" do
+    http.post "/service/example/echo?a=1&b=2&c=3", { one: "foo", two: "bar", three: "baz" }
+    expect_response "one: [foo]/two: [bar]/a: [1]/b: [2]"
+  end
+
+  it "complains on missing body arguments" do
+    http.post "/service/example/echo?a=1&b=2&c=3", { two: "bar" }
+    expect_response 422
+  end
+
+  it "ignores missing parameters arguments" do
+    http.post "/service/example/echo?b=2", { one: "foo", two: "bar" }
+    expect_response "one: [foo]/two: [bar]/a: []/b: [2]"
+  end
+
+  it "properly extracts arguments and parameters" do
+    http.post "/service/example/echo_context"
+    expect_response /Simple::Service::Context/
+  end
+end

data/spec/simple/httpd/static_mounting_spec.rb

@@ -0,0 +1,13 @@
+require "spec_helper"
+
+describe "static mounting" do
+  it "returns a static file" do
+    http.get "/README.txt"
+    expect_response "This is a README file\n"
+  end
+
+  it "does not return a forbidden static file" do
+    http.get "/root.rb"
+    expect_response 404
+  end
+end

data/spec/spec_helper.rb

@@ -1,14 +1,36 @@
-%w(auth authentication authorization).each do |library_name|
-  path = File.expand_path("../../#{library_name}/lib", __FILE__)
-  $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
-end
-
 ENV["RACK_ENV"] = "test"
 ENV["RAILS_ENV"] = "test"
 
 require "byebug"
 require "rspec"
-require "awesome_print"
+require "rspec-httpd"
+
+if ENV["PRELOAD_SERVER_GEM"]
+  require ENV["PRELOAD_SERVER_GEM"]
+end
+
+# You can comment parts of the command below by prepending the line with a '#'
+HTTPD_COMMAND = <<~CMD
+  PORT=12345
+  bin/simple-httpd
+  --environment=test
+  examples/ex1
+  examples/ex2
+  examples/ex3
+  examples/v2:api/v2
+  --services=examples/services
+  Example::Service:service/example
+  2> log/test.log
+CMD
+
+RSpec::Httpd.configure do |config|
+  config.host = "127.0.0.1"
+  config.port = 12_345
+
+  # remove commented parts from HTTPD_COMMAND
+  config.command = HTTPD_COMMAND.split(/\s*\n\s*/m).grep(/^\s*[^#]/).join(" ")
+end
+
 Dir.glob("./spec/support/**/*.rb").sort.each { |path| load path }
 
 require "simple/httpd"
@@ -24,6 +46,8 @@ RSpec.configure do |config|
   config.backtrace_exclusion_patterns << /spec_helper/
   config.backtrace_exclusion_patterns << /database_cleaner/
 
+  config.include ::RSpec::Httpd
+
   # config.around(:each) do |example|
   #   example.run
   # end

data/spec/support/004_simplecov.rb

@@ -1,22 +1,13 @@
 require "simplecov"
 
-# make sure multiple runs result in multiple result set. SimpleCov will take
-# care of merging these results automatically.
-SimpleCov.command_name "test:#{ENV['USE_ACTIVE_RECORD']}"
-
-USE_ACTIVE_RECORD = ENV["USE_ACTIVE_RECORD"] == "1"
-
 SimpleCov.start do
-  # return true to remove src from coverage 
+  # return true to remove src from coverage
   add_filter do |src|
     next true if src.filename =~ /\/spec\//
-    next true if src.filename =~ /\/immutable\.rb/
-
-    next true if USE_ACTIVE_RECORD  && src.filename =~ /\/sql\/connection\/raw_connection\.rb/
-    next true if !USE_ACTIVE_RECORD && src.filename =~ /\/sql\/connection\/active_record_connection\.rb/
+    next true if src.filename =~ /\/version.rb$/
 
     false
   end
 
-  minimum_coverage 90
+  # minimum_coverage 90
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-httpd
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.3.0
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-16 00:00:00.000000000 Z
+date: 2019-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: sinatra-reloader
+  name: expectation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -53,89 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: rspec-httpd
+  name: simple-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.14
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.14
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.61.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.61.1
-- !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: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.3.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 description: Super-simple HTTPD server - sinatra w/gimmiks
 email: eno@radiospiel.org
 executables: []
@@ -144,7 +74,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".tm_properties"
 - Gemfile
+- Makefile
 - README.md
 - Rakefile
 - VERSION
@@ -153,11 +85,26 @@ files:
 - bin/rake
 - bin/rspec
 - bin/rubocop
+- bin/simple-httpd
+- examples/README.md
+- examples/ex1/ex1_helpers.rb
+- examples/ex1/root.rb
+- examples/ex2/README.txt
+- examples/ex2/ex2_helpers.rb
+- examples/ex2/helpers.rb
+- examples/ex2/info.rb
+- examples/ex2/root.rb
+- examples/ex3/example_service.rb
+- examples/services/example_service.rb
+- examples/services/explicit_example_service.rb
+- examples/v2/api.js
+- examples/v2/jobs.rb
+- examples/v2/root.rb
+- examples/v2/v2_helpers.rb
 - lib/simple-httpd.rb
+- lib/simple-service.rb
 - lib/simple.rb
 - lib/simple/httpd.rb
-- lib/simple/httpd/app.rb
-- lib/simple/httpd/app/file_server.rb
 - lib/simple/httpd/base_controller.rb
 - lib/simple/httpd/base_controller/build_url.rb
 - lib/simple/httpd/base_controller/cors.rb
@@ -165,15 +112,37 @@ files:
 - lib/simple/httpd/base_controller/error_handling.rb
 - lib/simple/httpd/base_controller/json.rb
 - lib/simple/httpd/base_controller/x_processing.rb
+- lib/simple/httpd/cli.rb
+- lib/simple/httpd/helpers.rb
+- lib/simple/httpd/mount_spec.rb
+- lib/simple/httpd/rack.rb
+- lib/simple/httpd/rack/dynamic_mount.rb
+- lib/simple/httpd/rack/merger.rb
+- lib/simple/httpd/rack/static_mount.rb
+- lib/simple/httpd/server.rb
+- lib/simple/httpd/service.rb
 - lib/simple/httpd/version.rb
+- lib/simple/service.rb
+- lib/simple/service/action.rb
+- lib/simple/service/context.rb
 - log/.gitkeep
+- scripts/release
+- scripts/release.rb
 - scripts/stats
 - scripts/watch
 - simple-httpd.gemspec
-- spec/simple/httpd/version_spec.rb
+- spec/simple/httpd/base_controller/httpd_cors_spec.rb
+- spec/simple/httpd/base_controller/httpd_debug_spec.rb
+- spec/simple/httpd/base_controller/httpd_x_processing_copy.rb
+- spec/simple/httpd/base_spec.rb
+- spec/simple/httpd/dynamic_mounting_spec.rb
+- spec/simple/httpd/helpers_spec.rb
+- spec/simple/httpd/rspec_httpd_spec.rb
+- spec/simple/httpd/services/service_explicit_spec.rb
+- spec/simple/httpd/services/service_spec.rb
+- spec/simple/httpd/static_mounting_spec.rb
 - spec/spec_helper.rb
 - spec/support/004_simplecov.rb
-- tasks/release.rake
 homepage: http://github.com/radiospiel/simple-httpd
 licenses: []
 metadata: {}
@@ -192,12 +161,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Super-simple HTTPD server
 test_files:
-- spec/simple/httpd/version_spec.rb
+- spec/simple/httpd/base_controller/httpd_cors_spec.rb
+- spec/simple/httpd/base_controller/httpd_debug_spec.rb
+- spec/simple/httpd/base_controller/httpd_x_processing_copy.rb
+- spec/simple/httpd/base_spec.rb
+- spec/simple/httpd/dynamic_mounting_spec.rb
+- spec/simple/httpd/helpers_spec.rb
+- spec/simple/httpd/rspec_httpd_spec.rb
+- spec/simple/httpd/services/service_explicit_spec.rb
+- spec/simple/httpd/services/service_spec.rb
+- spec/simple/httpd/static_mounting_spec.rb
 - spec/spec_helper.rb
 - spec/support/004_simplecov.rb