rack-app 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8f30ea2966178d44130dd772b67065dedc3dc16
-  data.tar.gz: b711bfd0492d8c1d53ed280fa46fd5b7bd5e93e3
+  metadata.gz: dc6e00653368212644684d6ba3c19c409eee6bad
+  data.tar.gz: 165212d0e3eaba27ff27f0b3e2534d70864be7dc
 SHA512:
-  metadata.gz: df68e6acce0723868caf5f6f8f88aa52a9113763f9b0d7c71fc233558955f627f905309cbe505adb7ba2cdf615d5a6a0c58215c623192f2a9d12d6d77fe3256b
-  data.tar.gz: 46c05c5677227ae13983f81cf75c0215dbb061b7ef4805ac8add5ce011587606acfc9377d8d2c0c3e15ed29972978641d3c94f2edb6eb9a4dd7a7c8f9545c5a9
+  metadata.gz: 09b60839ee3b5a49f95c891f0b2c8a93be41503572c6943b313d42d0925e7be2a7c75625262da893c49bf2eac9707f53ad8ddae25d6c87fe0c8439fcb975c660
+  data.tar.gz: 5e808fc8b28adde7e389fd97f219ab9fde05d0a67d44bdab870e5e5aa18093f23f85aa5e1cfb9f1c5063dad9caf161d83792220704b60a571e6ade5dcc3d1134

data/README.md

@@ -180,15 +180,20 @@ end
 
 ## [Benchmarking](https://github.com/adamluzsi/rack-app.rb-benchmark)
 
-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
-  
-To be honest, I measured with grape because that is one of my favorite micro framework!
+| name             |      user                  | system                 | total                 | real                   |
+|------------------|----------------------------|------------------------|-----------------------|------------------------|
+| rack             |      3.150000000000001e-05 | 1.3000000000000003e-06 | 3.280000000000001e-05 | 3.602101e-05           |
+| rack-app         |      0.0005159999999999999 | 1.4000000000000005e-05 | 0.0005300000000000001 | 0.0005141295           |
+| ramaze           |      0.0005166999999999999 | 1.98e-05               | 0.0005365             | 0.0005347348           |
+| brooklyn         |      0.0007564             | 3.700000000000001e-06  | 0.0007601000000000001 | 0.0007743060099999998  |
+| nancy            |      0.000812              | 5.900000000000001e-06  | 0.0008179000000000001 | 0.0008314749300000001  |
+| scorched         |      0.0008451000000000001 | 4.699999999999999e-06  | 0.0008498000000000001 | 0.00085131501          |
+| sinatra          |      0.0008465000000000001 | 7.000000000000001e-06  | 0.0008535000000000001 | 0.00086448211          |
+| hobbit           |      0.0013664             | 4.5e-06                | 0.0013709             | 0.0013804752700000004  |
+| grape            |      0.0018807             | 2.7800000000000005e-05 | 0.0019085             | 0.0019229531400000001  |
+| rails            |      0.0018995000000000001 | 7.06e-05               | 0.0019701             | 0.00198401458          |
+| camping          |      0.002921              | 7.24e-05               | 0.0029934000000000002 | 0.0030896778800000003  |
+| cuba             |      0.0034559000000000005 | 2.8600000000000004e-05 | 0.0034845             | 0.00349655002          |
 
 ## Roadmap 
 

data/VERSION

@@ -1 +1 @@
-0.21.0
+0.22.0

data/lib/rack/app.rb

@@ -91,13 +91,18 @@ class Rack::App
 
       request_path = ::Rack::App::Utils.join(@namespaces, request_path)
 
-      properties = endpoint_properties.merge(
-          {
-              :user_defined_logic => block,
-              :request_method => request_method,
-              :request_path => request_path,
-          }
-      )
+      properties = {
+          :user_defined_logic => block,
+          :request_method => request_method,
+          :request_path => request_path,
+
+          :default_headers => headers,
+          :error_handler => error,
+          :description => @last_description,
+          :serializer => serializer,
+          :app_class => self
+      }
+
 
       endpoint = Rack::App::Endpoint.new(properties)
       router.register_endpoint!(request_method, request_path, @last_description, endpoint)
@@ -107,10 +112,9 @@ class Rack::App
 
     end
 
-    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(@namespaces, options[:to], file_server.namespace, '**', '*')
+    def serve_files_from(file_path, options={})
+      file_server = Rack::App::File::Server.new(Rack::App::Utils.expand_path(file_path))
+      request_path = Rack::App::Utils.join(@namespaces, options[:to], '**', '*')
       router.register_endpoint!('GET', request_path, @last_description, file_server)
       @last_description = nil
     end
@@ -152,18 +156,6 @@ class Rack::App
       nil
     end
 
-    protected
-
-    def endpoint_properties
-      {
-          :default_headers => headers,
-          :error_handler => error,
-          :description => @last_description,
-          :serializer => serializer,
-          :app_class => self
-      }
-    end
-
   end
 
   def params

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

@@ -1,11 +1,8 @@
 class Rack::App::File::Server
 
-  attr_reader :namespace, :properties
-
-  def initialize(root_folder, options={})
+  def initialize(root_folder)
     require 'rack/file'
-    @raw_root_folder = root_folder
-    @root_folder = Rack::App::Utils.pwd(@raw_root_folder)
+    @root_folder = 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

data/lib/rack/app/utils.rb

@@ -18,15 +18,26 @@ module Rack::App::Utils
     path
   end
 
+  # Based on ActiveSupport, removed inflections.
+  # https://github.com/rails/rails/blob/v4.1.0.rc1/activesupport/lib/active_support/inflector/methods.rb
+  def underscore(camel_cased_word)
+    word = camel_cased_word.to_s.gsub('::', '/')
+    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
+  end
+
   def pwd(*path_parts)
 
-    root_folder =if ENV['BUNDLE_GEMFILE']
-                   ENV['BUNDLE_GEMFILE'].split(File::Separator)[0..-2].join(File::Separator)
-                 else
-                   Dir.pwd.to_s
-                 end
+    root_folder = if ENV['BUNDLE_GEMFILE']
+                    ENV['BUNDLE_GEMFILE'].split(File::Separator)[0..-2].join(File::Separator)
+                  else
+                    Dir.pwd.to_s
+                  end
 
-    return File.join(root_folder,*path_parts)
+    return File.join(root_folder, *path_parts)
 
   end
 
@@ -39,7 +50,22 @@ module Rack::App::Utils
 
   def join(*url_path_parts)
     url_path_parts = [url_path_parts].flatten.compact
-    File.join(*url_path_parts).gsub(File::Separator,'/').sub(/^\/?(.*)$/,'/\1')
+    File.join(*url_path_parts).gsub(File::Separator, '/').sub(/^\/?(.*)$/, '/\1')
+  end
+
+  def expand_path(file_path)
+    case file_path
+
+      when /^\.\//
+        File.expand_path(File.join(File.dirname(caller[1]),file_path))
+
+      when /^[^\/]/
+        File.join(caller[1].split(/\.(?:rb|ru)/)[0],file_path)
+
+      when /^\//
+        pwd(file_path)
+
+    end
   end
 
 end

metadata

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