rack-app 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32f29dd3c7583a4e67a8d7d120490ab60d8525aa
-  data.tar.gz: 7b038445705c0b9f610b0b1d43eef0238ddd18b1
+  metadata.gz: d997c9befda0175c0b2b1c176a9e26ed16610608
+  data.tar.gz: 262f5320b2e82ea7330694dd02d0b66bc1699cd0
 SHA512:
-  metadata.gz: 6ed668e4f0f109ed99554c18f99d2e0a73869498d0e4632d9ba63817599c0fa33e2e5a81f914b6563338621f68dbc468d430c33b5ef957d67378d9111db1faae
-  data.tar.gz: e2c2d8b39453daaeaaf3646b56bb41879372f0caad64c578ce54c388e20d26b7312e7e7c358d78546be41c6c0ef8f0f734c014dbf811166c1b4114bf5b41f775
+  metadata.gz: 641be2541ffe9cca5a775a3f691678db4685ef6c99c4f31584266e229123b3c6d3bea85e511724c7bb8880c6cb84d55cf52a6f48f5498f0bb8b2a876b78b4f13
+  data.tar.gz: 0c2c35043330ab3b389cb97d1d05104cff383b7bd5b96b875ab0fe012c07919491bf06b624053aa8a8b13873ac362985e08bc256a71d705cfa3a5464d517ece7

data/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
-gemspec
-
-gem 'grape'
+gemspec

data/Gemfile.lock

@@ -0,0 +1,37 @@
+PATH
+  remote: .
+  specs:
+    rack-app (0.2.0)
+      rack
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    rack (1.6.4)
+    rake (10.4.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.10)
+  rack-app!
+  rake (~> 10.0)
+  rspec
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -6,6 +6,7 @@ The idea behind is simple.
 Have a little framework that can allow you write pure rack apps,
 that will do nothing more than what you defined.
 
+This includes that it do not depend on fat libs like activesupport. 
  
 ## Installation
 
@@ -56,7 +57,10 @@ run YourAwesomeApp
 
 * benchmark for rails, padrino, sinatra, grape etc to prove awesomeness
 * more verbose readme
-* drink less coffee 
+* drink less coffee
+* support restful endpoints
+  * params
+  * route-matching
 
 ## Development
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/example/config.ru

@@ -1,11 +1,11 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),'..','lib'))
 require 'rack/app'
 
-require_relative 'first_controller'
+require_relative 'mounted_controller'
 
-class SampleApp < Rack::APP
+class YourAwesomeApp < Rack::APP
 
-  mount FirstController
+  mount MountedController
 
   get '/hello' do
     'Hello World!'
@@ -13,9 +13,12 @@ class SampleApp < Rack::APP
 
   get '/nope' do
     response.write 'nope nope nope...'
+  end
 
+  get '/users/:user_id' do
+    params['user_id']
   end
 
 end
 
-run SampleApp
+run YourAwesomeApp

data/example/{first_controller.rb → mounted_controller.rb}

@@ -1,4 +1,4 @@
-class FirstController < Rack::APP
+class MountedController < Rack::APP
 
   get '/first' do
     first

data/example/ping.sh

@@ -0,0 +1,5 @@
+faraday-cli http://localhost:9292/nope 
+faraday-cli http://localhost:9292/hello 
+faraday-cli http://localhost:9292/first 
+faraday-cli http://localhost:9292/users/123
+faraday-cli http://localhost:9292/not_found

data/lib/rack/app.rb

@@ -5,27 +5,31 @@ class Rack::APP
 
   require 'rack/app/version'
 
+  require 'rack/app/utils'
+  require 'rack/app/router'
   require 'rack/app/endpoint'
   require 'rack/app/endpoint/not_found'
-
   require 'rack/app/runner'
 
-  require 'rack/app/syntax_sugar'
-  extend Rack::APP::SyntaxSugar
+  require 'rack/app/class_methods'
+  extend Rack::APP::ClassMethods
 
   require 'rack/app/request_helpers'
 
   include Rack::APP::RequestHelpers
 
+  def self.call(request_env)
+    Rack::APP::Runner.response_for(self,request_env)
+  end
+
   attr_reader :request, :response
 
-  def initialize(request, response)
+  protected
+
+  def initialize(request, response,options = {})
     @response = response
     @request = request
-  end
-
-  def self.call(request_env)
-    Rack::APP::Runner.response_for(self,request_env)
+    @options = options
   end
 
 end

data/lib/rack/app/{syntax_sugar.rb → class_methods.rb}

@@ -1,4 +1,4 @@
-module Rack::APP::SyntaxSugar
+module Rack::APP::ClassMethods
 
   def description(*description_texts)
     @last_description = description_texts.join("\n")
@@ -32,10 +32,13 @@ module Rack::APP::SyntaxSugar
     add_route('PATCH', path, &block)
   end
 
+  def router
+    @static_router ||= Rack::APP::Router.new
+  end
+
   def add_route(request_method, request_path, &block)
-    request_key = [request_method, request_path]
 
-    endpoint = endpoints[request_key]= Rack::APP::Endpoint.new(
+    endpoint = Rack::APP::Endpoint.new(
         self,
         {
             request_method: request_method,
@@ -45,13 +48,12 @@ module Rack::APP::SyntaxSugar
         &block
     )
 
+    router.add_endpoint(request_method,request_path,endpoint)
+
     @last_description = nil
     endpoint
   end
 
-  def endpoints
-    @endpoints ||= {}
-  end
 
   def mount(api_class)
 
@@ -59,7 +61,7 @@ module Rack::APP::SyntaxSugar
       raise(ArgumentError, 'Invalid class given for mount, must be a Rack::APP')
     end
 
-    endpoints.merge!(api_class.endpoints)
+    router.merge!(api_class.router)
 
     nil
   end

data/lib/rack/app/endpoint.rb

@@ -4,6 +4,7 @@ class Rack::APP::Endpoint
     @properties = properties
     @logic_block = logic_block
     @api_class = api_class
+    @path_params_matcher = {}
   end
 
   def execute(request_env)
@@ -11,7 +12,7 @@ class Rack::APP::Endpoint
     request = Rack::Request.new(request_env)
     response = Rack::Response.new
 
-    request_handler = @api_class.new(request, response)
+    request_handler = @api_class.new(request, response,{path_params_matcher: @path_params_matcher})
     call_return = request_handler.instance_exec(&@logic_block)
 
     return call_return if is_a_rack_response_finish?(call_return)
@@ -21,6 +22,10 @@ class Rack::APP::Endpoint
 
   end
 
+  def register_path_params_matcher(params_matcher)
+    @path_params_matcher.merge!(params_matcher)
+  end
+
   protected
 
   def add_response_body_if_missing(call_return, response)

data/lib/rack/app/request_helpers.rb

@@ -2,15 +2,36 @@ require 'cgi'
 module Rack::APP::RequestHelpers
 
   def params
-    @__request_params__ ||= CGI.parse(request.env['QUERY_STRING']).freeze.reduce({}) do |params_collection, (k, v)|
-      if v.is_a?(Array) and v.length === 1
-        params_collection[k]= v[0]
-      else
-        params_collection[k]= v
+    @__request_params__ ||= -> {
+
+      raw_params = CGI.parse(request.env['QUERY_STRING'].to_s).freeze.reduce({}) do |params_collection, (k, v)|
+        if v.is_a?(Array) and v.length === 1
+          params_collection[k]= v[0]
+        else
+          params_collection[k]= v
+        end
+
+        params_collection
       end
 
-      params_collection
-    end
+      if @options[:path_params_matcher].is_a?(Hash) and not @options[:path_params_matcher].empty?
+
+        request_path_parts = Rack::APP::Utils.normalize_path(request.env['REQUEST_PATH']).split('/')
+
+        path_params = request_path_parts.each.with_index.reduce({}) do |params_col,(path_part,index)|
+          if @options[:path_params_matcher][index]
+            params_col[@options[:path_params_matcher][index]]= path_part
+          end
+          params_col
+        end
+
+        raw_params.merge!(path_params)
+
+      end
+
+      raw_params
+
+    }.call
   end
 
   def status(new_status=nil)

data/lib/rack/app/router.rb

@@ -0,0 +1,38 @@
+class Rack::APP::Router
+
+  require 'rack/app/router/static'
+  require 'rack/app/router/dynamic'
+
+  def add_endpoint(request_method, request_path, endpoint)
+    if defined_path_is_dynamic?(Rack::APP::Utils.normalize_path(request_path))
+      @dynamic_router.add_endpoint(request_method, request_path, endpoint)
+    else
+      @static_router.add_endpoint(request_method, request_path, endpoint)
+    end
+  end
+
+  def fetch_endpoint(request_method, request_path)
+    @static_router.fetch_endpoint(request_method, request_path) or
+        @dynamic_router.fetch_endpoint(request_method, request_path) or
+        Rack::APP::Endpoint::NOT_FOUND
+  end
+
+  def merge!(router)
+    raise(ArgumentError, "invalid router object, must be instance of #{self.class}") unless router.is_a?(self.class)
+    @static_router.merge!(router.instance_variable_get(:@static_router))
+    @dynamic_router.merge!(router.instance_variable_get(:@dynamic_router))
+    nil
+  end
+
+  protected
+
+  def initialize
+    @static_router = Rack::APP::Router::Static.new
+    @dynamic_router = Rack::APP::Router::Dynamic.new
+  end
+
+  def defined_path_is_dynamic?(path_str)
+    !!(path_str.to_s =~ /\/:\w+/i)
+  end
+
+end

data/lib/rack/app/router/dynamic.rb

@@ -0,0 +1,76 @@
+class Rack::APP::Router::Dynamic
+
+  ANY = 'Rack::APP::Router::Dynamic::ANY'.freeze
+
+  def add_endpoint(request_method, request_path, endpoint)
+    request_path = Rack::APP::Utils.normalize_path(request_path)
+
+    current_cluster = main_cluster(request_method)
+    path_params = {}
+    request_path.split('/').each.with_index do |path_part, index|
+
+      new_cluster_name = if path_part_is_dynamic?(path_part)
+                           path_params[index]= path_part.sub(/^:/,'')
+                           ANY
+                         else
+                           path_part
+                         end
+
+      current_cluster = (current_cluster[new_cluster_name] ||= {})
+
+    end
+
+    current_cluster[:endpoint]= endpoint
+    current_cluster[:endpoint].register_path_params_matcher(path_params)
+
+    endpoint
+  end
+
+  def fetch_endpoint(request_method, request_path)
+    normalized_request_path = Rack::APP::Utils.normalize_path(request_path)
+
+    current_cluster = main_cluster(request_method)
+    normalized_request_path.split('/').each do |path_part|
+      current_cluster = current_cluster[path_part] || current_cluster[ANY]
+      return nil if current_cluster.nil?
+    end
+
+    current_cluster[:endpoint]
+  end
+
+  def merge!(router)
+    raise(ArgumentError,"invalid route object, must be instance of #{self.class.to_s}") unless router.is_a?(self.class)
+    deep_merge!(@http_method_cluster,router.instance_variable_get(:@http_method_cluster))
+    nil
+  end
+
+  protected
+
+  def initialize
+    @http_method_cluster = {}
+  end
+
+  def path_part_is_dynamic?(path_part_str)
+    !!(path_part_str.to_s =~ /^:\w+$/i)
+  end
+
+  def deep_merge!(hash,other_hash)
+    other_hash.each_pair do |current_key, other_value|
+
+      this_value = hash[current_key]
+
+      hash[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
+                            deep_merge!(this_value,other_value)
+                          else
+                              other_value
+                          end
+    end
+
+    hash
+  end
+
+  def main_cluster(request_method)
+    (@http_method_cluster[request_method.to_s.upcase] ||= {})
+  end
+
+end

data/lib/rack/app/router/static.rb

@@ -0,0 +1,23 @@
+class Rack::APP::Router::Static
+
+  def add_endpoint(request_method, request_path, endpoint)
+    @endpoints[[request_method.to_s.upcase, Rack::APP::Utils.normalize_path(request_path)]]= endpoint
+  end
+
+  def fetch_endpoint(request_method, request_path)
+    @endpoints[[request_method, request_path]]
+  end
+
+  def merge!(static_router)
+    raise(ArgumentError,"Invalid argument given, must be instance of a #{self.class.to_s}") unless static_router.is_a?(self.class)
+    @endpoints.merge!(static_router.instance_variable_get(:@endpoints))
+    nil
+  end
+
+  protected
+
+  def initialize
+    @endpoints = {}
+  end
+
+end

data/lib/rack/app/runner.rb

@@ -9,7 +9,7 @@ module Rack::APP::Runner
   protected
 
   def fetch_endpoint(api_class, request_method, request_path)
-    api_class.endpoints[[request_method, request_path]] || Rack::APP::Endpoint::NOT_FOUND
+    api_class.router.fetch_endpoint(request_method, request_path)
   end
 
 end

data/lib/rack/app/utils.rb

@@ -0,0 +1,20 @@
+module Rack::APP::Utils
+  extend self
+
+  # Normalizes URI path.
+  #
+  # Strips off trailing slash and ensures there is a leading slash.
+  #
+  #   normalize_path("/foo")  # => "/foo"
+  #   normalize_path("/foo/") # => "/foo"
+  #   normalize_path("foo")   # => "/foo"
+  #   normalize_path("")      # => "/"
+  def normalize_path(path)
+    path = "/#{path}"
+    path.squeeze!('/')
+    path.sub!(%r{/+\Z}, '')
+    path = '/' if path == ''
+    path
+  end
+
+end

data/spike/routing_time.rb

@@ -0,0 +1,40 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rack/app'
+require 'securerandom'
+
+static_router =  Rack::APP::Router::Static.new
+dynamic_router = Rack::APP::Router::Dynamic.new
+
+classic_router = []
+
+endpoint_paths = []
+10000.times do
+  endpoint_paths << ('/' + 7.times.map { SecureRandom.uuid }.join('/'))
+
+  static_router.add_endpoint('GET', endpoint_paths.last, -> {})
+  static_router.add_endpoint('GET', endpoint_paths.last, -> {})
+  classic_router << ['GET',endpoint_paths.last,->{}]
+
+end
+
+start_time = Time.now
+endpoint_paths.each do |request_path|
+  static_router.fetch_endpoint('GET',request_path)
+end
+finish_time_of_static = Time.now - start_time
+
+start_time = Time.now
+endpoint_paths.each do |request_path|
+  dynamic_router.fetch_endpoint('GET',request_path)
+end
+finish_time_of_dynamic = Time.now - start_time
+
+start_time = Time.now
+endpoint_paths.each do |request_path|
+  classic_router.find{|ary| ary[0] == 'GET' and ary[1] == request_path }
+end
+finish_time_of_classic = Time.now - start_time
+
+puts "time taken by static: #{finish_time_of_static}",
+     "time taken by dynamic: #{finish_time_of_dynamic}",
+     "time taken by classic(mock): #{finish_time_of_classic}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,20 +78,27 @@ files:
 - ".rspec"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - VERSION
 - bin/setup
 - example/config.ru
-- example/first_controller.rb
+- example/mounted_controller.rb
+- example/ping.sh
 - lib/rack/app.rb
+- lib/rack/app/class_methods.rb
 - lib/rack/app/endpoint.rb
 - lib/rack/app/endpoint/not_found.rb
 - lib/rack/app/request_helpers.rb
+- lib/rack/app/router.rb
+- lib/rack/app/router/dynamic.rb
+- lib/rack/app/router/static.rb
 - lib/rack/app/runner.rb
-- lib/rack/app/syntax_sugar.rb
+- lib/rack/app/utils.rb
 - lib/rack/app/version.rb
 - rack-app.gemspec
+- spike/routing_time.rb
 homepage: https://github.com/adamluzsi/rack-app.rb
 licenses: []
 metadata: {}