rack-app 6.7.1 → 6.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8f42d76eb784f1a62d8af4bf06aa1ea66108e01
-  data.tar.gz: 800d10c46212b0b5dcfef10c2068e6c67ec1bfb2
+  metadata.gz: 918146f8853c3deef7b9f56e1b01c5200e47f938
+  data.tar.gz: aafdf76c3b3f8346d3479dd97baeda137a50b112
 SHA512:
-  metadata.gz: 4398c1e9cfcc26857bec44f10065c6203aa4073c27184b5d3c04db3a3518662e7dae4726a7a542ce2fabe0ac9b90cbf35de6d137ea3cd0877df4b2b9fe55c281
-  data.tar.gz: 14d8f55f13638c6edbc546069961edd3b07d87aeeda6ecf5abc02b0bc4ba8ea610f4edebef7d392c0761fb4c7091c837ec719026dde6bf44aa3fd7de5349077d
+  metadata.gz: bfe4cd8db4e9b6753b402676f3a0f04f7a0377803b60d6bb1b08187e26754d397766766606704a19c492075f748a1fb573be521f92e64134a147ca808b9416de
+  data.tar.gz: 23d411aaed8a51cd0b0f34673f06718828c10b50929b3c05ac790d367c5fc258ec51c348b3739bd6372a9492b692c9f2f46ce9c1b241aa02d73ac668bf2658f0

data/VERSION

@@ -1 +1 @@
-6.7.1
+6.8.0

data/lib/rack/app/endpoint/builder.rb

@@ -24,7 +24,7 @@ class Rack::App::Endpoint::Builder
   end
 
   def apply_middleware_build_blocks(builder)
-    builder_blocks.each do |builder_block|
+    @config.middlewares.each do |builder_block|
       builder_block.call(builder)
     end
     builder.use(Rack::App::Middlewares::Configuration, @config)
@@ -43,8 +43,4 @@ class Rack::App::Endpoint::Builder
       builder.use(Rack::App::Middlewares::Hooks::After, after_block)
     end
   end
-
-  def builder_blocks
-    [@config.app_class.middlewares, @config.endpoint_specific_middlewares].flatten
-  end
 end

data/lib/rack/app/endpoint/config.rb

@@ -27,8 +27,21 @@ class Rack::App::Endpoint::Config
     @raw[:payload].parser_builder
   end
 
+  def ancestor_apps
+    [@raw[:ancestors]].flatten.compact
+  end
+
   def app_class
-    @raw[:app_class] || raise('missing app class')
+    ancestor_apps.first || raise('missing app class')
+  end
+
+  def middlewares
+    mws = []
+    ancestor_apps.reverse_each do |ancestors_app|
+      mws.push(*ancestors_app.middlewares)
+    end
+    mws.push(*endpoint_specific_middlewares)
+    return mws
   end
 
   def serializer
@@ -79,12 +92,6 @@ class Rack::App::Endpoint::Config
     @raw = raw
   end
 
-  def register_method_to_app_class
-    method_name = '__' + ::Rack::App::Utils.uuid
-    app_class.__send__(:define_method, method_name, &logic_block)
-    method_name
-  end
-
   def logic_block
     @raw[:user_defined_logic]
   end

data/lib/rack/app/router.rb

@@ -38,7 +38,8 @@ class Rack::App::Router
     raise(ArgumentError, 'invalid router object, must implement :endpoints interface') unless router.respond_to?(:endpoints)
     router.endpoints.each do |endpoint|
       new_request_path = ::Rack::App::Utils.join(prop[:namespaces], endpoint.request_path)
-      new_endpoint = endpoint.fork(:request_path => new_request_path)
+      new_ancestors = endpoint.config.ancestor_apps + [prop[:new_ancestor]]
+      new_endpoint = endpoint.fork(:request_path => new_request_path, :ancestors => new_ancestors)
       register_endpoint!(new_endpoint)
     end
     nil

data/lib/rack/app/singleton_methods/mounting.rb

@@ -20,7 +20,12 @@ module Rack::App::SingletonMethods::Mounting
     end
 
     cli.merge!(app.cli)
-    merge_prop = {:namespaces => [@namespaces, options[:to]].flatten}
+
+    merge_prop = {
+      :namespaces => [@namespaces, options[:to]].flatten,
+      :new_ancestor => self
+    }
+
     router.merge_router!(app.router, merge_prop)
 
     nil

data/lib/rack/app/singleton_methods/route_handling.rb

@@ -1,5 +1,4 @@
 module Rack::App::SingletonMethods::RouteHandling
-
   def router
     @router ||= Rack::App::Router.new
   end
@@ -15,30 +14,26 @@ module Rack::App::SingletonMethods::RouteHandling
   end
 
   def description(*description_texts)
-    route_registration_properties[:description]= description_texts.join("\n")
+    route_registration_properties[:description] = description_texts.join("\n")
   end
 
   alias desc description
 
   def add_route(request_method, request_path, callable)
-
     router.register_endpoint!(
-      Rack::App::Endpoint.new({
-        :app_class => self,
-        :callable => callable,
-        :payload => payload,
-        :error_handler => error,
-        :request_method => request_method,
-        :route => route_registration_properties.dup,
-        :endpoint_specific_middlewares => next_endpoint_middlewares.dup,
-        :request_path => ::Rack::App::Utils.join(namespace, request_path)
-      })
+      Rack::App::Endpoint.new(:ancestors => [self],
+                              :callable => callable,
+                              :payload => payload,
+                              :error_handler => error,
+                              :request_method => request_method,
+                              :route => route_registration_properties.dup,
+                              :endpoint_specific_middlewares => next_endpoint_middlewares.dup,
+                              :request_path => ::Rack::App::Utils.join(namespace, request_path))
     )
 
     next_endpoint_middlewares.clear
     route_registration_properties.clear
-    return nil
-
+    nil
   end
 
   def namespace(*namespace_paths)
@@ -48,5 +43,4 @@ module Rack::App::SingletonMethods::RouteHandling
     @namespaces.pop
     ::Rack::App::Utils.join(@namespaces.flatten)
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 6.7.1
+  version: 6.8.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler