navigable-server 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3238ea73512027978b85f41e2c6c43b3af251f3290beb980356f568a8f95702
-  data.tar.gz: 226b37a18f21fec58e6cf87492ccb9e9867371848545c38b822f51dad7b40a81
+  metadata.gz: c771752d4b34288dd0f2966832963e02c508cd4c5c6acdb2821c711e4d860f31
+  data.tar.gz: f1cc6c1f393481d756a68c07d02b126a326b672490ef3ce2c66f8d72db663134
 SHA512:
-  metadata.gz: 5301252d54622cd12f6438f11b2e9cb5b7960833559aab0fd6fdcd61525905359a7167ac98404b3bcf0a3f7d7c579e7074dc389accdbcb93ce68a904fd2facdb
-  data.tar.gz: 4cb4ea7f3ba6bad54a31da6535e7dc633779757f0471c9a44db64b57434a4b2217dd753e3cde52d06ee81c3743f4b2a5053d98cbaa984aff080b2ea9f1d35f1f
+  metadata.gz: 508ed86c09a35f38a5401fddbb48e27dfdabb034e920d3d00578ac3d88059742c9954b872fa6275c6b79e81961940759a5ffb9434f7d96f3cd65e25a62de3b9f
+  data.tar.gz: 179a44935ec22b2505de42cc90f10d9c4f64d9b42c88a5e6389667808365eaeb34ee0674dd495ead7e30114c6ae9a0868db4f9e9bf909b47df43a1b1811802aa

data/lib/navigable/server.rb

@@ -6,10 +6,12 @@ require 'navigable'
 require 'rack'
 require 'rack/accept_media_types'
 require 'rack/abstract_format'
-require 'rack/bodyparser'
 
 require 'navigable/server'
 require 'navigable/server/version'
+require 'navigable/server/parsers/json'
+require 'navigable/server/parsers/null'
+require 'navigable/server/parsers/factory'
 require 'navigable/server/request'
 require 'navigable/server/response'
 require 'navigable/server/rack_adapter'
@@ -26,7 +28,6 @@ module Navigable
     def self.rack_app
       @server ||= Rack::Builder.new(Server.router) do
         use Navigable::Server::CORS::Middleware
-        use Rack::BodyParser, :parsers => BODY_PARSERS
         use Rack::AbstractFormat
       end
     end

data/lib/navigable/server/parsers/factory.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Navigable
+  module Server
+    module Parsers
+      class Factory
+        def self.build(media_type:)
+          case media_type
+          when /application\/json/
+            Parsers::JSON
+          else
+            Parsers::Null
+          end
+        end
+      end
+    end
+  end
+end

data/lib/navigable/server/parsers/json.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Navigable
+  module Server
+    module Parsers
+      class JSON
+        def self.parse(text)
+          text ? ::JSON.parse(text) : {}
+        rescue ::JSON::ParserError
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/navigable/server/parsers/null.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Navigable
+  module Server
+    module Parsers
+      class Null
+        def self.parse(*args); end
+      end
+    end
+  end
+end

data/lib/navigable/server/request.rb

@@ -38,7 +38,19 @@ module Navigable
       end
 
       def body_params
-        symbolize_keys(env[PARSED_BODY] || {})
+        symbolize_keys(parsed_body || {})
+      end
+
+      def parsed_body
+        Parsers::Factory.build(media_type: media_type).parse(body)
+      end
+
+      def body
+        @body ||= rack_request.body.read.tap { rack_request.body.rewind }
+      end
+
+      def media_type
+        rack_request.media_type
       end
 
       def url_params
@@ -54,4 +66,4 @@ module Navigable
       end
     end
   end
-end
+end

data/lib/navigable/server/version.rb

@@ -2,6 +2,6 @@
 
 module Navigable
   module Server
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
   end
 end

data/navigable-server.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack', '~> 2.2'
   spec.add_dependency 'rack-abstract-format', '~> 0.9.9'
   spec.add_dependency 'rack-accept-media-types', '~> 0.9'
-  spec.add_dependency 'rack-bodyparser', '~> 1.0'
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 12.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navigable-server
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Alan Ridlehoover
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2020-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -95,20 +95,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rack-bodyparser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +185,9 @@ files:
 - lib/navigable/server.rb
 - lib/navigable/server/cors.rb
 - lib/navigable/server/endpoint.rb
+- lib/navigable/server/parsers/factory.rb
+- lib/navigable/server/parsers/json.rb
+- lib/navigable/server/parsers/null.rb
 - lib/navigable/server/rack_adapter.rb
 - lib/navigable/server/request.rb
 - lib/navigable/server/response.rb