simple-httpd 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc1dda6853c5b404f0e0fc39e99a683ab07e2c0fbe1b1b1652d4fc435795478a
-  data.tar.gz: cea28ea197759a048180cb96a8b7bac0f05e2ce9bdc6e77cb568bfcd0f19f230
+  metadata.gz: e552a1dc3cc22d3fa1e614a440e86820ec7f95157711f77cfb5b2492966a4414
+  data.tar.gz: d014f9712b6493403d09a35b650467070dd46079a6bf401f22aa2da9edcb79a3
 SHA512:
-  metadata.gz: a78da1bd982ab52563ec1032f5ad678fbdf73019e02eaa21552cfc48783303aa715a9eecaa626687ea44a81177e91e1b39c29ee84ec317f7b929e43b181989c8
-  data.tar.gz: 25bd47a6a122d648d351b3fac73c3938d0e42eb556869cd6c618a096225e3e09d218f2cfbf8994fae1657ecce38e9978d94f27db48adbf820c9dd0bc1d845186
+  metadata.gz: 6c258058969660cf9c45a6a1fb5193b1f5fdba24cda123bd77257531251da295082c5c71af48af16aa01fae9f28539c66409b8900d005ba525ad4ab52aa70ad8
+  data.tar.gz: 5bf9584a2c7be956483792568aa19e8996ec116ae8c49998da39e104c5943414ed3b6fb8ef6d3664958c851037292ef769f6b4248b7cca894a21d43c03d1aa11

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/simple/httpd.rb

@@ -7,18 +7,22 @@ class Simple::Httpd
 end
 
 require "simple/service"
-
 require "simple/httpd/helpers"
 require "simple/httpd/base_controller"
 require "simple/httpd/version"
 require "simple/httpd/mount"
 require "simple/httpd/server"
-
 require "simple/httpd/service_adapter"
 
 class Simple::Httpd
   SELF = self
 
+  class << self
+    attr_accessor :env
+  end
+
+  self.env = "development"
+
   # returns a logger for Simple::Httpd.
   #
   # Initially we default to <tt>::Simple::CLI.logger</tt>. This gives colored

data/lib/simple/httpd/cli.rb

@@ -1,8 +1,5 @@
 module Simple
   class Httpd
-    class << self
-      attr_accessor :env
-    end
   end
 end
 
@@ -78,11 +75,11 @@ module Simple::Httpd::CLI
   private
 
   def prepare_environment!(environment:)
-    ::Simple::Httpd.env = environment
     start_simplecov if environment == "test"
 
     # late loading simple/httpd, for simplecov support
     require "simple/httpd"
+    ::Simple::Httpd.env = environment
   end
 
   def build_app!(mounts:, services:)

data/lib/simple/httpd/service_adapter.rb

@@ -72,7 +72,7 @@ module Simple::Httpd::ServiceAdapter
     # define sinatra route.
     route(verb, path) do
       ::Simple::Service.with_context(context) do
-        result = ::Simple::Service.invoke2(service, action_name, args: self.parsed_body, flags: self.params)
+        result = ::Simple::Service.invoke(service, action_name, args: self.parsed_body, flags: stringified_params)
         encode_result(result)
       end
     end
@@ -91,6 +91,12 @@ module Simple::Httpd::ServiceAdapter
   end
 
   module Helpers
+    def stringified_params
+      params.each_with_object({}) do |(k,v), hsh|
+        hsh[k.to_s] = v
+      end
+    end
+
     def context
       # We return nil here. nil *is* a valid value for Simple::Service.with_context.
       # Important is that with_context is being called.

data/simple-httpd.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "sinatra", "~> 2"
   # gem.add_dependency "sinatra-reloader", "~> 1"
   gem.add_dependency "expectation", "~> 1"
-  gem.add_dependency "simple-cli", "~> 0.3.3"
-  gem.add_dependency "simple-service", "~> 0.1.3"
+  gem.add_dependency "simple-cli", "~> 0.3.5"
+  gem.add_dependency "simple-service", "~> 0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-httpd
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: simple-service
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.5
 description: Super-simple HTTPD server - sinatra w/gimmiks
 email: eno@radiospiel.org
 executables: