rack-app 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2df00445bf28113e1aae2013345dad70f163dc27
-  data.tar.gz: 860463dbdc86d2c72fb41fad5745a9c58cd31371
+  metadata.gz: d90aa076001c7ddbd654f22791f34854fbcd1d80
+  data.tar.gz: df0aa5a38c939340419270aae93830def72f84f0
 SHA512:
-  metadata.gz: aa27e35b11ea46817f6b91d31e64fc7b1ddee0148d11c6dcac3e236e1afbb0dd35e00fdc212f33a75462535078d495d2f9691d099e41d3a4e60341860dca1708
-  data.tar.gz: 67fa1277b0fcedc5119ad9d9ba848274083f62ec3012461681f47c47baeb72eadd4491caf63aac16a1148ee637600ea4a3c2483063fdb4facf726cc343f6d4db
+  metadata.gz: de99d24d08255b30a9962f0307da406558ab7e3212a19116ef4fff00aadeede2b74b8fe008244dc19f11d7d8fa87bb201b22c0b620d90f61bb50bc53e25547b1
+  data.tar.gz: 6d2e15dd8548668f67786b7c96c89b9bdce77adce5dc006fcf250965fa958b1deaf8a14ed905e2a0dc9541f243492cb9e8e0be33879e8e4aa0a76027e4d48cdf

data/README.md

@@ -4,6 +4,8 @@
 [travis-link]: http://travis-ci.org/adamluzsi/rack-app.rb
 [travis-home]: http://travis-ci.org/
 
+![Rack::App](http://rack-app-website.herokuapp.com/image/msruby.png)
+
 Your next favourite rack based micro framework that is totally addition free! 
 Have a cup of awesomeness with  your performance designed framework!
 

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.11.0

data/lib/rack/app/file.rb

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

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

@@ -1,32 +1,36 @@
-module Rack::App::File::Server
+class Rack::App::File::Server
 
-  include Rack::App::File::Parser::Factory
+  def initialize(root_folder, options={})
+    require 'rack/file'
 
-  def source_folder(relative_folder_path)
+    namespace = formatted_namespace(options)
+    namespace.freeze
 
-    source_folder = Rack::App::Utils.pwd(relative_folder_path)
-    Dir.glob(File.join(source_folder, '**', '*')).each do |file_path|
+    @namespace_rgx = /#{Regexp.escape(namespace)}/.freeze
+    @rack_file_server = ::Rack::File.new(Rack::App::Utils.pwd(root_folder), {})
 
-      file_parser_class = find_file_parser_class_for(File.extname(file_path))
-
-      raw_endpoint_name = file_path.sub(source_folder, '').split(File::Separator).join('/')
-      request_path = file_parser_class.format_request_path(raw_endpoint_name)
-
-      options request_path do
-        response.finish
-      end
+  end
 
-      get request_path do
-        file_parser = file_parser_class.new(self)
+  def call(env)
+    env[::Rack::PATH_INFO]= clean_path_info(env).sub(@namespace_rgx, '')
+    @rack_file_server.call(env)
+  end
 
-        response.body = file_parser.parse(file_path)
-        response.headers[Rack::CONTENT_TYPE]= Rack::Mime.mime_type(file_parser.file_type(file_path)).to_s
+  protected
 
-        response.finish
-      end
+  def raw_namespace(options)
+    options[:to] || '/'
+  end
 
-    end
+  def formatted_namespace(options)
+    namespace = raw_namespace(options).to_s.sub(/^\//, '').sub(/\/$/, '')
+    namespace += '/' unless namespace.empty?
+    namespace
+  end
 
+  def clean_path_info(env)
+    path_info = ::Rack::Utils.unescape(env[::Rack::PATH_INFO])
+    return clean_path_info = ::Rack::Utils.clean_path_info(path_info)
   end
 
 end

data/lib/rack/app/router.rb

@@ -3,11 +3,21 @@ class Rack::App::Router
   require 'rack/app/router/static'
   require 'rack/app/router/dynamic'
 
-  #TD
-  def endpoint_paths
-    @static.endpoints.map do |indentifiers, endpoint|
-      [[*indentifiers].join("\t"),endpoint.properties[:description]].compact.join("\t\t\t")
+  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
+
+    return endpoints.map do |row|
+      [
+          row[0].to_s.ljust(wd0),
+          row[1].to_s.ljust(wd1),
+          row[2].to_s.ljust(wd2)
+      ].join('   ')
     end
+
   end
 
   def add_endpoint(request_method, request_path, endpoint)
@@ -39,7 +49,7 @@ class Rack::App::Router
   end
 
   def defined_path_is_dynamic?(path_str)
-    !!(path_str.to_s =~ /\/:\w+/i)
+    !!(path_str.to_s =~ /\/:\w+/i) or !!(path_str.to_s =~ /\/\*/i)
   end
 
 end

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

@@ -1,22 +1,35 @@
 class Rack::App::Router::Dynamic
 
-  ANY = 'Rack::App::Router::Dynamic::ANY'.freeze
+  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(/^:/,'')
-                           ANY
+                           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
 
@@ -31,38 +44,51 @@ class Rack::App::Router::Dynamic
 
     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?
+      previous_cluster = current_cluster
+      current_cluster = current_cluster[path_part] || current_cluster[PATH_PARAM]
+      if current_cluster.nil?
+        if previous_cluster[PARTIAL]
+          current_cluster = previous_cluster[PARTIAL]
+          break
+        else
+          return nil
+        end
+      end
     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))
+    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)
     !!(path_part_str.to_s =~ /^:\w+$/i)
   end
 
-  def deep_merge!(hash,other_hash)
+  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)
+                            deep_merge!(this_value, other_value)
                           else
-                              other_value
+                            other_value
                           end
     end
 
@@ -73,4 +99,8 @@ class Rack::App::Router::Dynamic
     (@http_method_cluster[request_method.to_s.upcase] ||= {})
   end
 
+  def path_part_is_a_partial?(path_part)
+    (path_part == '**' or path_part == '*')
+  end
+
 end

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

@@ -12,11 +12,16 @@ class Rack::App::Router::Static
   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)
+    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
 
+  def show_endpoints
+    @endpoints.map do |identifiers, endpoint|
+      [identifiers, endpoint.properties[:description]].flatten
+    end
+  end
 
   protected
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,9 +92,6 @@ files:
 - lib/rack/app/endpoint.rb
 - lib/rack/app/endpoint/not_found.rb
 - lib/rack/app/file.rb
-- lib/rack/app/file/parser.rb
-- lib/rack/app/file/parser/erb.rb
-- lib/rack/app/file/parser/factory.rb
 - lib/rack/app/file/server.rb
 - lib/rack/app/file/streamer.rb
 - lib/rack/app/file/version.rb

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

@@ -1,24 +0,0 @@
-class Rack::App::File::Parser
-
-  require 'rack/app/file/parser/factory'
-  require 'rack/app/file/parser/erb'
-
-  def self.format_request_path(request_path)
-    request_path
-  end
-
-  def parse(file_path)
-    Rack::App::File::Streamer.new(file_path)
-  end
-
-  def file_type(file_path)
-    File.extname(file_path)
-  end
-
-  protected
-
-  def initialize(app)
-    @app = app
-  end
-
-end

data/lib/rack/app/file/parser/erb.rb

@@ -1,18 +0,0 @@
-require 'erb'
-class Rack::App::File::Parser::ERB < Rack::App::File::Parser
-
-  require 'erb'
-
-  def parse(file_path)
-    [::ERB.new(File.read(file_path)).result(@app.instance_eval { binding })]
-  end
-
-  def file_type(file_path)
-    super(file_path.sub(/\.erb$/, ''))
-  end
-
-  def self.format_request_path(request_path)
-    request_path.sub(/\.erb$/, '')
-  end
-
-end

data/lib/rack/app/file/parser/factory.rb

@@ -1,22 +0,0 @@
-module Rack::App::File::Parser::Factory
-
-  def use_file_parser(parser_class, *extensions)
-    extensions.each do |extension|
-      file_parser_classes[extension.to_s]= parser_class
-    end
-    nil
-  end
-
-  def find_file_parser_class_for(extension)
-    file_parser_classes[extension.to_s] || Rack::App::File::Parser
-  end
-
-  protected
-
-  def file_parser_classes
-    @file_parser_classes ||= {
-        '.erb' => Rack::App::File::Parser::ERB
-    }
-  end
-
-end