rack-app 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 657c3f30f9056e50b3fe23c9ff0eb15b921f9828
-  data.tar.gz: fd681b8d00dff5cb31a25217e2868861c3ae2235
+  metadata.gz: e8f30ea2966178d44130dd772b67065dedc3dc16
+  data.tar.gz: b711bfd0492d8c1d53ed280fa46fd5b7bd5e93e3
 SHA512:
-  metadata.gz: a2a0dda2158f2a2c328c30bdaeac5d0e730781de5fc8d654937796fd681b9da24546aad6afa397052bfb35731c99addb0256f81a58334c687a9e17683c5f1004
-  data.tar.gz: dad53fa0a014e003153179ed8c67b9e56c9f1177c592bcde190dce0f93df41247db95627a184a0c219198d92a02ab65476ccf123b730858e5e4bad3552366a7c
+  metadata.gz: df68e6acce0723868caf5f6f8f88aa52a9113763f9b0d7c71fc233558955f627f905309cbe505adb7ba2cdf615d5a6a0c58215c623192f2a9d12d6d77fe3256b
+  data.tar.gz: 46c05c5677227ae13983f81cf75c0215dbb061b7ef4805ac8add5ce011587606acfc9377d8d2c0c3e15ed29972978641d3c94f2edb6eb9a4dd7a7c8f9545c5a9

data/README.md

@@ -88,13 +88,17 @@ class App < Rack::App
     return 'Hello World!'
   end
 
-  desc 'some restful endpoint'
-  get '/users/:user_id' do
-    response.status = 201
-    params['user_id'] #=> restful parameter :user_id
-    say #=> "hello world!"
+  namespace '/users' do 
+  
+    desc 'some restful endpoint'
+    get '/:user_id' do
+      response.status = 201
+      params['user_id'] #=> restful parameter :user_id
+      say #=> "hello world!"
+    end
+    
   end
-
+   
   desc 'some endpoint that has error and will be rescued'
   get '/make_error' do
     raise(StandardError,'error block rescued')
@@ -176,23 +180,15 @@ end
 
 ## [Benchmarking](https://github.com/adamluzsi/rack-app.rb-benchmark)
 
-* Dump duration with zero business logic or routing: 2.4184169999892074e-06 s
-  * no routing
-  * return only a static array with static values
-* Rack::App duration with routing lookup: 2.9978291999967683e-05 s
-  * with routing 
-  * with value parsing and reponse object building
-* Grape::API duration with routing lookup: 0.0002996424499999746 s
-  * with routing 
-  * with value parsing and reponse object building
-
-* Rack::App 9.995314276086763x faster (0.00026966415800000693 sec) that Grape::API
-* returning a simple rack response array without any logic is 12.395832480544698x faster (2.7559874999978477e-05 sec) that Rack::App
-* the same dumb empty proc call is 123.90024135676842x faster than Grape::API (0.0002972240329999854 sec)
+RackSkeleton avg duration: 5.2298899999950066e-06 s
+Rack::App avg duration: 3.323366999999523e-05 s
+Grape::API avg duration: 0.00031554329000000426 s
+
+Rack::App 9.494686864256929x faster (0.000282309620000009 sec) that Grape::API
+RackSkeleton 6.354563862725021x faster (2.800378000000022e-05 sec) that Rack::App
+RackSkeleton 60.33459403549703x faster (0.00031031340000000924 sec) than Grape::API
   
-This was measured with multiple endpoints like that would be in real life example.
-I feared do this for Rails that is usually slower than Grape :S
-To be honest, I measured with grape because that is one of my favorite micro framework
+To be honest, I measured with grape because that is one of my favorite micro framework!
 
 ## Roadmap 
 

data/VERSION

@@ -1 +1 @@
-0.20.0
+0.21.0

data/lib/rack/app.rb

@@ -89,6 +89,8 @@ class Rack::App
 
     def add_route(request_method, request_path, &block)
 
+      request_path = ::Rack::App::Utils.join(@namespaces, request_path)
+
       properties = endpoint_properties.merge(
           {
               :user_defined_logic => block,
@@ -108,18 +110,19 @@ class Rack::App
     def serve_files_from(relative_path, options={})
       options.merge!(endpoint_properties)
       file_server = Rack::App::File::Server.new(relative_path, options)
-      request_path = Rack::App::Utils.join(file_server.namespace, '**', '*')
+      request_path = Rack::App::Utils.join(@namespaces, options[:to], file_server.namespace, '**', '*')
       router.register_endpoint!('GET', request_path, @last_description, file_server)
       @last_description = nil
     end
 
-    def mount(api_class)
+    def mount(api_class, mount_prop={})
 
       unless api_class.is_a?(Class) and api_class <= Rack::App
         raise(ArgumentError, 'Invalid class given for mount, must be a Rack::App')
       end
 
-      router.merge!(api_class.router)
+      merge_prop = {:namespaces => [@namespaces, mount_prop[:to]].flatten}
+      router.merge_router!(api_class.router, merge_prop)
 
       return nil
     end
@@ -140,6 +143,15 @@ class Rack::App
       @headers
     end
 
+    def namespace(request_path_namespace)
+      return unless block_given?
+      @namespaces ||= []
+      @namespaces.push(request_path_namespace)
+      yield
+      @namespaces.pop
+      nil
+    end
+
     protected
 
     def endpoint_properties

data/lib/rack/app/file/server.rb

@@ -4,16 +4,21 @@ class Rack::App::File::Server
 
   def initialize(root_folder, options={})
     require 'rack/file'
-
-    @properties = options
-    @namespace = formatted_namespace(options).freeze
-    @namespace_rgx = /#{Regexp.escape(@namespace)}/.freeze
-    @rack_file_server = ::Rack::File.new(Rack::App::Utils.pwd(root_folder), {})
-
+    @raw_root_folder = root_folder
+    @root_folder = Rack::App::Utils.pwd(@raw_root_folder)
+    @relative_file_paths = Dir.glob(File.join(@root_folder,'**','*')).map{|file_path| file_path.sub(@root_folder,'') }.sort_by{|str| str.length }.reverse
+    @rack_file_server = ::Rack::File.new(@root_folder, {})
   end
 
   def call(env)
-    env[::Rack::PATH_INFO]= clean_path_info(env).sub(@namespace_rgx, '')
+    path_info = clean_path_info(env)
+
+    @relative_file_paths.each do |relative_file_path|
+      if path_info =~ /#{Regexp.escape(relative_file_path)}$/
+        env[::Rack::PATH_INFO]= relative_file_path
+      end
+    end
+
     @rack_file_server.call(env)
   end
 
@@ -22,16 +27,6 @@ class Rack::App::File::Server
 
   protected
 
-  def raw_namespace(options)
-    options[:to] || '/'
-  end
-
-  def formatted_namespace(options)
-    namespace = raw_namespace(options).to_s.sub(/^\//, '').sub(/\/$/, '')
-    namespace += '/' unless namespace.empty?
-    namespace
-  end
-
   def clean_path_info(env)
     path_info = ::Rack::Utils.unescape(env[::Rack::PATH_INFO])
     return clean_path_info = ::Rack::Utils.clean_path_info(path_info)

data/lib/rack/app/router.rb

@@ -37,10 +37,17 @@ class Rack::App::Router
 
   end
 
-  def merge!(router)
+  def merge_router!(router,prop={})
     raise(ArgumentError, 'invalid router object, must implement :endpoints interface') unless router.respond_to?(:endpoints)
     router.endpoints.each do |endpoint|
-      register_endpoint!(endpoint[:request_method], endpoint[:request_path], endpoint[:description], endpoint[:endpoint])
+      request_path = ::Rack::App::Utils.join(prop[:namespaces], endpoint[:request_path])
+
+      register_endpoint!(
+          endpoint[:request_method],
+          request_path,
+          endpoint[:description],
+          endpoint[:endpoint]
+      )
     end
     nil
   end

data/lib/rack/app/utils.rb

@@ -38,6 +38,7 @@ module Rack::App::Utils
   end
 
   def join(*url_path_parts)
+    url_path_parts = [url_path_parts].flatten.compact
     File.join(*url_path_parts).gsub(File::Separator,'/').sub(/^\/?(.*)$/,'/\1')
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler