rack-app 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 287ab34c8649763c80531a5028f4014eddb24020
-  data.tar.gz: bd7e5137d8bb0d85b35b2a3ecbf82228d92e9334
+  metadata.gz: 657c3f30f9056e50b3fe23c9ff0eb15b921f9828
+  data.tar.gz: fd681b8d00dff5cb31a25217e2868861c3ae2235
 SHA512:
-  metadata.gz: e36d1a38769f610ea78e4c8f742b6b9440145a685cca414bb19997b413a030fb3c19b7a2af548fd9bb729babb15bfa59969e3d5a7911bd0f40c9fa61bfccd809
-  data.tar.gz: fc985cf781a91b2c6df694be3ef875eac1c20e16e51a196770a41e9c8ccec6e3fdcc9d2c40744907e49a4e93905867e02c90add0f0e0e2665035127fb580acdb
+  metadata.gz: a2a0dda2158f2a2c328c30bdaeac5d0e730781de5fc8d654937796fd681b9da24546aad6afa397052bfb35731c99addb0256f81a58334c687a9e17683c5f1004
+  data.tar.gz: dad53fa0a014e003153179ed8c67b9e56c9f1177c592bcde190dce0f93df41247db95627a184a0c219198d92a02ab65476ccf123b730858e5e4bad3552366a7c

data/README.md

@@ -53,7 +53,7 @@ config.ru
 
 ```ruby
 
-require './bootstrap.rb'
+require 'rack/app'
 
 class App < Rack::App
 
@@ -70,7 +70,7 @@ end
 
 ```ruby
 
-require './bootstrap.rb' 
+require 'rack/app'
 
 class App < Rack::App
 

data/VERSION

@@ -1 +1 @@
-0.19.0
+0.20.0

data/lib/rack/app.rb

@@ -62,12 +62,14 @@ class Rack::App
     end
 
     def root(endpoint_path)
+      normalized_path = Rack::App::Utils.normalize_path(endpoint_path)
+
       options '/' do
-        endpoint = self.class.router.fetch_endpoint('OPTIONS', Rack::App::Utils.normalize_path(endpoint_path))
+        endpoint = self.class.router.fetch_endpoint('OPTIONS', normalized_path)
         endpoint.get_response_body(request, response)
       end
       get '/' do
-        endpoint = self.class.router.fetch_endpoint('GET', Rack::App::Utils.normalize_path(endpoint_path))
+        endpoint = self.class.router.fetch_endpoint('GET', normalized_path)
         endpoint.get_response_body(request, response)
       end
     end
@@ -96,7 +98,7 @@ class Rack::App
       )
 
       endpoint = Rack::App::Endpoint.new(properties)
-      router.add_endpoint(request_method, request_path, endpoint)
+      router.register_endpoint!(request_method, request_path, @last_description, endpoint)
 
       @last_description = nil
       return endpoint
@@ -107,7 +109,8 @@ class Rack::App
       options.merge!(endpoint_properties)
       file_server = Rack::App::File::Server.new(relative_path, options)
       request_path = Rack::App::Utils.join(file_server.namespace, '**', '*')
-      router.add_endpoint('GET', request_path, file_server)
+      router.register_endpoint!('GET', request_path, @last_description, file_server)
+      @last_description = nil
     end
 
     def mount(api_class)
@@ -171,7 +174,7 @@ class Rack::App
 
       payload = ''
       while chunk = @request.body.gets
-        payload += chunk
+        payload << chunk
       end
       @request.body.rewind
 

data/lib/rack/app/endpoint.rb

@@ -38,6 +38,7 @@ class Rack::App::Endpoint
   end
 
   def register_path_params_matcher(params_matcher)
+    @path_params_matcher.clear
     @path_params_matcher.merge!(params_matcher)
   end
 

data/lib/rack/app/router.rb

@@ -1,43 +1,47 @@
 class Rack::App::Router
 
+  require 'rack/app/router/base'
   require 'rack/app/router/static'
   require 'rack/app/router/dynamic'
 
+  def endpoints
+    (@static.endpoints + @dynamic.endpoints)
+  end
+
   def show_endpoints
-    endpoints = (@static.show_endpoints + @dynamic.show_endpoints)
 
-    wd0 = endpoints.map { |row| row[0].to_s.length }.max
-    wd1 = endpoints.map { |row| row[1].to_s.length }.max
-    wd2 = endpoints.map { |row| row[2].to_s.length }.max
+    endpoints = self.endpoints
+    wd0 = endpoints.map { |endpoint| endpoint[:request_method].to_s.length }.max
+    wd1 = endpoints.map { |endpoint| endpoint[:request_path].to_s.length }.max
+    wd2 = endpoints.map { |endpoint| endpoint[:description].to_s.length }.max
 
-    return endpoints.map do |row|
+    return endpoints.sort_by { |endpoint| [endpoint[:request_method], endpoint[:request_path]] }.map do |endpoint|
       [
-          row[0].to_s.ljust(wd0),
-          row[1].to_s.ljust(wd1),
-          row[2].to_s.ljust(wd2)
+          endpoint[:request_method].to_s.ljust(wd0),
+          endpoint[:request_path].to_s.ljust(wd1),
+          endpoint[:description].to_s.ljust(wd2)
       ].join('   ')
     end
 
   end
 
-  def add_endpoint(request_method, request_path, endpoint)
-    if defined_path_is_dynamic?(Rack::App::Utils.normalize_path(request_path))
-      @dynamic.add_endpoint(request_method, request_path, endpoint)
-    else
-      @static.add_endpoint(request_method, request_path, endpoint)
-    end
+  def register_endpoint!(request_method, request_path, description, endpoint)
+    router = defined_path_is_dynamic?(request_path) ? @dynamic : @static
+    router.register_endpoint!(request_method, request_path, description, endpoint)
   end
 
   def fetch_endpoint(request_method, request_path)
     @static.fetch_endpoint(request_method, request_path) or
         @dynamic.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.merge!(router.instance_variable_get(:@static))
-    @dynamic.merge!(router.instance_variable_get(:@dynamic))
+    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])
+    end
     nil
   end
 
@@ -49,6 +53,7 @@ class Rack::App::Router
   end
 
   def defined_path_is_dynamic?(path_str)
+    path_str = Rack::App::Utils.normalize_path(path_str)
     !!(path_str.to_s =~ /\/:\w+/i) or !!(path_str.to_s =~ /\/\*/i)
   end
 

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

@@ -0,0 +1,31 @@
+class Rack::App::Router::Base
+
+  def endpoints
+    @endpoints ||= []
+  end
+
+  def register_endpoint!(request_method, request_path, description, endpoint)
+    endpoints.push(
+        {
+            :request_method => request_method.to_s.upcase,
+            :request_path => Rack::App::Utils.normalize_path(request_path),
+            :description => description,
+            :endpoint => endpoint
+        }
+    )
+
+    compile_registered_endpoints!
+    return endpoint
+  end
+
+  def fetch_endpoint(request_method, request_path)
+    raise('IMPLEMENTATION MISSING ERROR')
+  end
+
+  protected
+
+  def compile_registered_endpoints!
+    raise('IMPLEMENTATION MISSING ERROR')
+  end
+
+end

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

@@ -1,44 +1,8 @@
-class Rack::App::Router::Dynamic
+class Rack::App::Router::Dynamic < Rack::App::Router::Base
 
   PATH_PARAM = :"#{self}::PATH_PARAM".freeze
   PARTIAL = :"#{self}::PARTIAL".freeze
 
-  # def endpoint_paths
-  # end
-
-  def add_endpoint(request_method, request_path, endpoint)
-    request_path = Rack::App::Utils.normalize_path(request_path)
-    @endpoint_paths << [request_method, request_path, endpoint.properties[:description]]
-
-    current_cluster = main_cluster(request_method)
-    path_params = {}
-    break_build = false
-
-    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(/^:/, '')
-                           PATH_PARAM
-
-                         elsif path_part_is_a_partial?(path_part)
-                           break_build = true
-                           PARTIAL
-
-                         else
-                           path_part
-                         end
-
-      current_cluster = (current_cluster[new_cluster_name] ||= {})
-      break if break_build
-
-    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)
 
@@ -59,21 +23,10 @@ class Rack::App::Router::Dynamic
     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
-
-  def show_endpoints
-    @endpoint_paths
-  end
-
   protected
 
   def initialize
     @http_method_cluster = {}
-    @endpoint_paths = []
   end
 
   def path_part_is_dynamic?(path_part_str)
@@ -103,4 +56,42 @@ class Rack::App::Router::Dynamic
     (path_part == '**' or path_part == '*')
   end
 
+  def compile_registered_endpoints!
+    @http_method_cluster.clear
+    endpoints.each do |endpoint_prop|
+      compile_endpoint(endpoint_prop[:request_method],endpoint_prop[:request_path],endpoint_prop[:endpoint])
+    end
+  end
+
+  def compile_endpoint(request_method, request_path, endpoint)
+
+    current_cluster = main_cluster(request_method)
+    path_params = {}
+    break_build = false
+
+    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(/^:/, '')
+                           PATH_PARAM
+
+                         elsif path_part_is_a_partial?(path_part)
+                           break_build = true
+                           PARTIAL
+
+                         else
+                           path_part
+                         end
+
+      current_cluster = (current_cluster[new_cluster_name] ||= {})
+      break if break_build
+
+    end
+
+    current_cluster[:endpoint]= endpoint
+    current_cluster[:endpoint].register_path_params_matcher(path_params)
+
+    endpoint
+  end
+
 end

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

@@ -1,32 +1,21 @@
-class Rack::App::Router::Static
-
-  #TD
-  attr_reader :endpoints
-
-  def add_endpoint(request_method, request_path, endpoint)
-    @endpoints[[request_method.to_s.upcase, Rack::App::Utils.normalize_path(request_path)]]= endpoint
-  end
+class Rack::App::Router::Static < Rack::App::Router::Base
 
   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
+    mapped_endpoint_routes[[request_method, request_path]]
   end
 
-  def show_endpoints
-    @endpoints.map do |identifiers, endpoint|
-      [identifiers, endpoint.properties[:description]].flatten
+  def compile_registered_endpoints!
+    mapped_endpoint_routes.clear
+    endpoints.each do |endpoint|
+      request_method, request_path, endpoint_object = endpoint[:request_method], endpoint[:request_path], endpoint[:endpoint]
+      mapped_endpoint_routes[[request_method.to_s.upcase, request_path]]= endpoint_object
     end
   end
 
   protected
 
-  def initialize
-    @endpoints = {}
+  def mapped_endpoint_routes
+    @mapped_endpoint_routes ||= {}
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,7 @@ files:
 - lib/rack/app/params.rb
 - lib/rack/app/request_configurator.rb
 - lib/rack/app/router.rb
+- lib/rack/app/router/base.rb
 - lib/rack/app/router/dynamic.rb
 - lib/rack/app/router/static.rb
 - lib/rack/app/serializer.rb