rack-app 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 632e1777a182db0bdfc19b0fdd9afcf41d8f6ba7
-  data.tar.gz: d6b89d0e7444d94a0b0aff3423de437a7e7d3788
+  metadata.gz: 6883859ca0d72bc8fac97ac3b745a225bdbede0e
+  data.tar.gz: d53e14b3621d6290af628d6e11880629728eb206
 SHA512:
-  metadata.gz: 8a53d244b2e6fcfbfd32d766b3ce83b06e5c840040775644172d210745aef9c3adf0c38c07ed79fa1ae68b5b275578b017ef14393a1bb5c4b9ff4278568d363c
-  data.tar.gz: 32763b6832f209639396916a5ad5f7e7737586db7896d8dfd5f7ee3e2b144d00a0ae845744db8f20f3d8708b9d7b98aaa69f57b8fcc2bfb07dccd88c579b3361
+  metadata.gz: 80e9b3a47d3158c15837ca297e0a87f244859beae87ffbcedf59fc9a42987c19a63e7a2eab0c3c4b906bd5e66ed959b6461deb475dddca8e4772765211bfd587
+  data.tar.gz: da9cded93beb9b94645842ea4022f67b68633f0ee0c99355a53e217c6a79460ac375fbe43e3d73cbb63f5d082918b86594f5b64d9bdb30c8ec789096e0d336cb

data/VERSION

@@ -1 +1 @@
-1.4.0
+2.0.0

data/lib/rack/app.rb

@@ -8,240 +8,19 @@ class Rack::App
   require 'rack/app/constants'
 
   require 'rack/app/utils'
-  require 'rack/app/file'
-
   require 'rack/app/params'
   require 'rack/app/router'
   require 'rack/app/endpoint'
   require 'rack/app/serializer'
+  require 'rack/app/file_server'
   require 'rack/app/error_handler'
   require 'rack/app/endpoint/not_found'
   require 'rack/app/request_configurator'
 
-  class << self
-
-    def inherited(klass)
-
-      klass.serializer(&serializer.logic)
-      klass.headers.merge!(headers)
-      klass.middlewares.push(*middlewares)
-
-      on_inheritance.each do |block|
-        block.call(self, klass)
-        klass.on_inheritance(&block)
-      end
-
-      error.handlers.each do |ex_class, block|
-        klass.error(ex_class, &block)
-      end
-
-    end
-
-    def on_mounted(&block)
-      @on_mounted ||= []
-      @on_mounted << block unless block.nil?
-      @on_mounted
-    end
-
-    alias while_being_mounted on_mounted
-
-    def on_inheritance(&block)
-      @on_inheritance ||= []
-      @on_inheritance << block unless block.nil?
-      @on_inheritance
-    end
-
-    def serializer(&definition_how_to_serialize)
-      @serializer ||= Rack::App::Serializer.new
-
-      unless definition_how_to_serialize.nil?
-        @serializer.set_serialization_logic(definition_how_to_serialize)
-      end
-
-      return @serializer
-    end
-
-    def headers(new_headers=nil)
-      @headers ||= {}
-      @headers.merge!(new_headers) if new_headers.is_a?(Hash)
-      @headers
-    end
-
-    def middlewares(&block)
-      @middlewares ||= []
-      @middlewares << block unless block.nil?
-      @middlewares
-    end
-
-    alias middleware middlewares
-
-    def error(*exception_classes, &block)
-      @error_handler ||= Rack::App::ErrorHandler.new
-      unless block.nil?
-        @error_handler.register_handler(exception_classes, block)
-      end
-
-      return @error_handler
-    end
-
-    def namespace(request_path_namespace)
-      return unless block_given?
-      @namespaces ||= []
-      @namespaces.push(request_path_namespace)
-      yield
-      @namespaces.pop
-      nil
-    end
-
-    def router
-      @router ||= Rack::App::Router.new
-    end
-
-    def call(request_env)
-      Rack::App::RequestConfigurator.configure(request_env)
-      endpoint = router.fetch_endpoint(
-          request_env['REQUEST_METHOD'],
-          request_env[Rack::App::Constants::NORMALIZED_REQUEST_PATH])
-      endpoint.call(request_env)
-    end
-
-    def description(*description_texts)
-      @last_description = description_texts.join("\n")
-    end
-
-    alias desc description
-
-    def get(path = '/', &block)
-      add_route('GET', path, &block)
-    end
-
-    def post(path = '/', &block)
-      add_route('POST', path, &block)
-    end
-
-    def put(path = '/', &block)
-      add_route('PUT', path, &block)
-    end
-
-    def head(path = '/', &block)
-      add_route('HEAD', path, &block)
-    end
-
-    def delete(path = '/', &block)
-      add_route('DELETE', path, &block)
-    end
-
-    def options(path = '/', &block)
-      add_route('OPTIONS', path, &block)
-    end
-
-    def patch(path = '/', &block)
-      add_route('PATCH', path, &block)
-    end
-
-    def alias_endpoint(new_request_path, original_request_path)
-      router.endpoints.select { |ep| ep[:request_path] == original_request_path }.each do |endpoint|
-        router.register_endpoint!(endpoint[:request_method], new_request_path, endpoint[:description], endpoint[:endpoint])
-      end
-    end
-
-    def root(endpoint_path)
-      %W[GET POST PUT DELETE OPTIONS PATCH HEAD].each do |request_method|
-        endpoint = router.fetch_endpoint(request_method, endpoint_path)
-        next if endpoint == Rack::App::Endpoint::NOT_FOUND
-        router.register_endpoint!(request_method, '/', 'Root endpoint', endpoint)
-      end
-    end
-
-    def add_route(request_method, request_path, &block)
-
-      request_path = ::Rack::App::Utils.join(@namespaces, request_path)
-
-      builder = Rack::Builder.new
-      middlewares.each do |builder_block|
-        builder_block.call(builder)
-      end
-
-      properties = {
-          :user_defined_logic => block,
-          :request_method => request_method,
-          :request_path => request_path,
-
-          :default_headers => headers,
-          :error_handler => error,
-          :description => @last_description,
-          :serializer => serializer,
-          :middleware => builder,
-          :app_class => self
-      }
-
-
-      endpoint = Rack::App::Endpoint.new(properties)
-      router.register_endpoint!(request_method, request_path, @last_description, endpoint)
-
-      @last_description = nil
-      return endpoint
-
-    end
-
-    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
-
-    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
-
-      api_class.on_mounted.each do |on_mount|
-        on_mount.call(self, mount_prop)
-      end
-
-      merge_prop = {:namespaces => [@namespaces, mount_prop[:to]].flatten}
-      router.merge_router!(api_class.router, merge_prop)
-
-      return nil
-    end
-
-  end
-
-  attr_writer :request, :response
-
-  def params
-    @__params__ ||= Rack::App::Params.new(request.env).to_hash
-  end
-
-  def request
-    @request || raise("request object is not set for #{self.class}")
-  end
-
-  def response
-    @response || raise("response object is not set for #{self.class}")
-  end
-
-  def payload
-    @__payload__ ||= lambda {
-      return nil unless @request.body.respond_to?(:gets)
-
-      payload = ''
-      while chunk = @request.body.gets
-        payload << chunk
-      end
-      @request.body.rewind
-
-      return payload
-    }.call
-  end
+  require 'rack/app/singleton_methods'
+  extend Rack::App::SingletonMethods
 
-  def redirect_to(url)
-    url = "#{url}?#{request.env['QUERY_STRING']}" unless request.env['QUERY_STRING'].empty?
-    response.status = 301
-    response.headers.merge!({'Location' => url})
-    'See Ya!'
-  end
+  require 'rack/app/instance_methods'
+  include Rack::App::InstanceMethods
 
 end

data/lib/rack/app/constants.rb

@@ -1,4 +1,3 @@
 module Rack::App::Constants
   NORMALIZED_REQUEST_PATH = 'NORMALIZED_REQUEST_PATH'
-
 end

data/lib/rack/app/endpoint.rb

@@ -54,16 +54,9 @@ class Rack::App::Endpoint
   protected
 
   def set_response_body(response, result)
-    if result.is_a?(::Rack::App::File::Streamer)
-      response.length += result.length
-      response.headers[LAST_MODIFIED_HEADER]= result.mtime
-      response.body = result
+    return nil unless response.body.is_a?(Array)
 
-    else
-      response.write(String(@serializer.serialize(result)))
-
-    end
-    nil
+    response.write(String(@serializer.serialize(result)))
   end
 
   def set_default_headers(response)

data/lib/rack/app/{file/server.rb → file_server.rb}

@@ -1,9 +1,9 @@
-class Rack::App::File::Server
+class Rack::App::FileServer
 
   def initialize(root_folder)
     require 'rack/file'
     @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
+    @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
 
@@ -13,13 +13,19 @@ class Rack::App::File::Server
     @relative_file_paths.each do |relative_file_path|
       if path_info =~ /#{Regexp.escape(relative_file_path)}$/
         env[::Rack::PATH_INFO]= relative_file_path
+        break
       end
     end
 
     @rack_file_server.call(env)
   end
 
-  def register_path_params_matcher(*args)
+  def self.serve_file(env, file_path)
+    file_server = self.new(File.dirname(file_path))
+    env = env.dup
+    env[::Rack::REQUEST_METHOD]= 'GET'
+    env[::Rack::PATH_INFO]= file_path
+    file_server.call(env)
   end
 
   protected

data/lib/rack/app/instance_methods.rb

@@ -0,0 +1,45 @@
+module Rack::App::InstanceMethods
+
+  attr_writer :request, :response
+
+  def params
+    @__params__ ||= Rack::App::Params.new(request.env).to_hash
+  end
+
+  def request
+    @request || raise("request object is not set for #{self.class}")
+  end
+
+  def response
+    @response || raise("response object is not set for #{self.class}")
+  end
+
+  def payload
+    @__payload__ ||= lambda {
+      return nil unless @request.body.respond_to?(:gets)
+
+      payload = ''
+      while chunk = @request.body.gets
+        payload << chunk
+      end
+      @request.body.rewind
+
+      return payload
+    }.call
+  end
+
+  def redirect_to(url)
+    url = "#{url}?#{request.env['QUERY_STRING']}" unless request.env['QUERY_STRING'].empty?
+    response.status = 301
+    response.headers.merge!({'Location' => url})
+    'See Ya!'
+  end
+
+  def serve_file(file_path)
+    raw_rack_resp = Rack::App::FileServer.serve_file(request.env, file_path)
+    response.headers.merge!(raw_rack_resp[1])
+    response.body = raw_rack_resp.last
+    return nil
+  end
+
+end

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

@@ -89,7 +89,9 @@ class Rack::App::Router::Dynamic < Rack::App::Router::Base
     end
 
     current_cluster[:endpoint]= endpoint
-    current_cluster[:endpoint].register_path_params_matcher(path_params)
+    if current_cluster[:endpoint].respond_to?(:register_path_params_matcher)
+      current_cluster[:endpoint].register_path_params_matcher(path_params)
+    end
 
     endpoint
   end

data/lib/rack/app/singleton_methods.rb

@@ -0,0 +1,17 @@
+module Rack::App::SingletonMethods
+
+  require 'rack/app/singleton_methods/http_methods'
+  require 'rack/app/singleton_methods/inheritance'
+  require 'rack/app/singleton_methods/mounting'
+  require 'rack/app/singleton_methods/rack_interface'
+  require 'rack/app/singleton_methods/route_handling'
+  require 'rack/app/singleton_methods/utility'
+
+  include Rack::App::SingletonMethods::HttpMethods
+  include Rack::App::SingletonMethods::Inheritance
+  include Rack::App::SingletonMethods::Mounting
+  include Rack::App::SingletonMethods::RackInterface
+  include Rack::App::SingletonMethods::RouteHandling
+  include Rack::App::SingletonMethods::Utility
+
+end

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

@@ -0,0 +1,44 @@
+module Rack::App::SingletonMethods::HttpMethods
+
+  def get(path = '/', &block)
+    add_route('GET', path, &block)
+  end
+
+  def post(path = '/', &block)
+    add_route('POST', path, &block)
+  end
+
+  def put(path = '/', &block)
+    add_route('PUT', path, &block)
+  end
+
+  def head(path = '/', &block)
+    add_route('HEAD', path, &block)
+  end
+
+  def delete(path = '/', &block)
+    add_route('DELETE', path, &block)
+  end
+
+  def options(path = '/', &block)
+    add_route('OPTIONS', path, &block)
+  end
+
+  def patch(path = '/', &block)
+    add_route('PATCH', path, &block)
+  end
+
+  def alias_endpoint(new_request_path, original_request_path)
+    router.endpoints.select { |ep| ep[:request_path] == original_request_path }.each do |endpoint|
+      router.register_endpoint!(endpoint[:request_method], new_request_path, endpoint[:description], endpoint[:endpoint])
+    end
+  end
+
+  def serve_files_from(file_path, options={})
+    file_server = Rack::App::FileServer.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
+
+end

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

@@ -0,0 +1,26 @@
+module Rack::App::SingletonMethods::Inheritance
+
+  def inherited(klass)
+
+    klass.serializer(&serializer.logic)
+    klass.headers.merge!(headers)
+    klass.middlewares.push(*middlewares)
+
+    on_inheritance.each do |block|
+      block.call(self, klass)
+      klass.on_inheritance(&block)
+    end
+
+    error.handlers.each do |ex_class, block|
+      klass.error(ex_class, &block)
+    end
+
+  end
+
+  def on_inheritance(&block)
+    @on_inheritance ||= []
+    @on_inheritance << block unless block.nil?
+    @on_inheritance
+  end
+
+end

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

@@ -0,0 +1,27 @@
+module Rack::App::SingletonMethods::Mounting
+
+  def on_mounted(&block)
+    @on_mounted ||= []
+    @on_mounted << block unless block.nil?
+    @on_mounted
+  end
+
+  alias while_being_mounted on_mounted
+
+  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
+
+    api_class.on_mounted.each do |on_mount|
+      on_mount.call(self, mount_prop)
+    end
+
+    merge_prop = {:namespaces => [@namespaces, mount_prop[:to]].flatten}
+    router.merge_router!(api_class.router, merge_prop)
+
+    return nil
+  end
+
+end

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

@@ -0,0 +1,11 @@
+module Rack::App::SingletonMethods::RackInterface
+
+  def call(request_env)
+    Rack::App::RequestConfigurator.configure(request_env)
+    endpoint = router.fetch_endpoint(
+        request_env['REQUEST_METHOD'],
+        request_env[Rack::App::Constants::NORMALIZED_REQUEST_PATH])
+    endpoint.call(request_env)
+  end
+
+end

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

@@ -0,0 +1,61 @@
+module Rack::App::SingletonMethods::RouteHandling
+
+  def root(endpoint_path)
+    %W[GET POST PUT DELETE OPTIONS PATCH HEAD].each do |request_method|
+      endpoint = router.fetch_endpoint(request_method, endpoint_path)
+      next if endpoint == Rack::App::Endpoint::NOT_FOUND
+      router.register_endpoint!(request_method, '/', 'Root endpoint', endpoint)
+    end
+  end
+
+  def description(*description_texts)
+    @last_description = description_texts.join("\n")
+  end
+
+  alias desc description
+
+  def add_route(request_method, request_path, &block)
+
+    request_path = ::Rack::App::Utils.join(@namespaces, request_path)
+
+    builder = Rack::Builder.new
+    middlewares.each do |builder_block|
+      builder_block.call(builder)
+    end
+
+    properties = {
+        :user_defined_logic => block,
+        :request_method => request_method,
+        :request_path => request_path,
+
+        :default_headers => headers,
+        :error_handler => error,
+        :description => @last_description,
+        :serializer => serializer,
+        :middleware => builder,
+        :app_class => self
+    }
+
+
+    endpoint = Rack::App::Endpoint.new(properties)
+    router.register_endpoint!(request_method, request_path, @last_description, endpoint)
+
+    @last_description = nil
+    return endpoint
+
+  end
+
+  def namespace(request_path_namespace)
+    return unless block_given?
+    @namespaces ||= []
+    @namespaces.push(request_path_namespace)
+    yield
+    @namespaces.pop
+    nil
+  end
+
+  def router
+    @router ||= Rack::App::Router.new
+  end
+
+end

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

@@ -0,0 +1,36 @@
+module Rack::App::SingletonMethods::Utility
+
+  def serializer(&definition_how_to_serialize)
+    @serializer ||= Rack::App::Serializer.new
+
+    unless definition_how_to_serialize.nil?
+      @serializer.set_serialization_logic(definition_how_to_serialize)
+    end
+
+    return @serializer
+  end
+
+  def headers(new_headers=nil)
+    @headers ||= {}
+    @headers.merge!(new_headers) if new_headers.is_a?(Hash)
+    @headers
+  end
+
+  def middlewares(&block)
+    @middlewares ||= []
+    @middlewares << block unless block.nil?
+    @middlewares
+  end
+
+  alias middleware middlewares
+
+  def error(*exception_classes, &block)
+    @error_handler ||= Rack::App::ErrorHandler.new
+    unless block.nil?
+      @error_handler.register_handler(exception_classes, block)
+    end
+
+    return @error_handler
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,10 +93,8 @@ files:
 - lib/rack/app/endpoint.rb
 - lib/rack/app/endpoint/not_found.rb
 - lib/rack/app/error_handler.rb
-- lib/rack/app/file.rb
-- lib/rack/app/file/server.rb
-- lib/rack/app/file/streamer.rb
-- lib/rack/app/file/version.rb
+- lib/rack/app/file_server.rb
+- lib/rack/app/instance_methods.rb
 - lib/rack/app/params.rb
 - lib/rack/app/request_configurator.rb
 - lib/rack/app/router.rb
@@ -104,6 +102,13 @@ files:
 - lib/rack/app/router/dynamic.rb
 - lib/rack/app/router/static.rb
 - lib/rack/app/serializer.rb
+- lib/rack/app/singleton_methods.rb
+- lib/rack/app/singleton_methods/http_methods.rb
+- lib/rack/app/singleton_methods/inheritance.rb
+- lib/rack/app/singleton_methods/mounting.rb
+- lib/rack/app/singleton_methods/rack_interface.rb
+- lib/rack/app/singleton_methods/route_handling.rb
+- lib/rack/app/singleton_methods/utility.rb
 - lib/rack/app/test.rb
 - lib/rack/app/utils.rb
 - lib/rack/app/version.rb

data/lib/rack/app/file.rb

@@ -1,5 +0,0 @@
-require 'rack/app'
-module Rack::App::File
-  require 'rack/app/file/streamer'
-  require 'rack/app/file/server'
-end

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

@@ -1,35 +0,0 @@
-class Rack::App::File::Streamer
-
-  include Enumerable
-
-  def each(&block)
-    file { |f| f.each(&block) }
-  end
-
-  def render(object=nil)
-    file { |f| f.read }
-  end
-
-  def mtime(object=nil)
-    ::File.mtime(@file_path).httpdate
-  end
-
-  def length(object=nil)
-    ::Rack::Utils.bytesize(render())
-  end
-
-  protected
-
-  def initialize(file_path)
-    @file_path = file_path
-    @file = File.open(file_path)
-  end
-
-  def file(&block)
-    @file.reopen(@file_path) if @file.closed?
-    return block.call(@file)
-  ensure
-    @file.close
-  end
-
-end

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

@@ -1,7 +0,0 @@
-module Rack
-end unless defined?(Rack)
-class Rack::App
-end unless defined?(Rack::App)
-module Rack::App::File
-  VERSION = File.read(File.join(File.dirname(__FILE__),'..','..', '..', '..', 'VERSION')).strip
-end