pakyow-core 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 062ec93abfc6a96dd0b24672d552144f1fe524e8
-  data.tar.gz: bea34efd0af7831aa5ed5e28a525f37d162760c6
+  metadata.gz: 0eaf60c5af9154f9df19ab14a96308f39edafd34
+  data.tar.gz: 5a05552bab16a0579908bf7184aff752a6cf11d7
 SHA512:
-  metadata.gz: 6867a6cee9e72ddd59d7d0a72cd2cc83ea4ba55e39c268ac34b48a666e3d5af8b02e0390e9bb9eb8356f47fd337316b13a9e81f3e1e3fffa623ff64ce0a5b096
-  data.tar.gz: bf82dce8e66153023bb34d8bc89a78d4ed992d69631b6f58ca5e7d334b40ef1cdf2ccba4a3e013e07cc2f9d6daeda2e5a2f8780e30f845e55a98eec5e4871cdd
+  metadata.gz: b021ba547095c48b6b82c7d31300f25ca3b93a14e602725987fc6e4c20c0031a14cd4da1b48bd3669911eccfc6138448a5118d28265681946783786351745c32
+  data.tar.gz: f918b4f215fb736be9cab8ea44df1901599ca0227f923ef2c2366595a462703906e2f03ccf2c522d8859334703f662c90ea858d74f44c5b660e9ee5eb7a521c5

data/pakyow-core/{CHANGES → CHANGELOG.md}

@@ -1,8 +1,35 @@
-= 0.9.1 / 2014-12-06
+# 0.10.0 (to be released)
+
+  * Adds nested route groups / namespaces inherit hooks
+  * Static files are now served by default
+  * Consistently handles externally defined config options
+  * Adds post-processing step to route template expansions
+  * Prevents the logger from breaking when no log to write to
+  * Prevents resouces config from being reset on access
+  * Don't add query params when route building
+  * Fixes bug when defining nested restful routes
+  * Support passing group + route name to `redir` and `reroute`
+  * Updated status code names
+  * Sets mime type of response when setting type
+  * Exposes content type on response object
+  * Adds support for `pakyow.data` in Rack env
+  * Runs global config *after* local config
+  * Makes JSON body available in request params
+  * Fixes a bug in app reloading
+  * Ported all tests to rspec
+  * Adds the ability to halt execution in a 500 handler
+  * Fixes namespace collisions
+  * Use app's template for displaying Pakyow error views
+  * Provides default values for helpers when no context available
+  * Use `Bundler.require` to load dependencies in global config block
+  * Respects before hook order
+  * No longer overrides user-provided type when sending data/files
+
+# 0.9.1 / 2014-12-06
 
   * No changes -- bumped version to be consistent
 
-= 0.9.0 / 2014-11-09
+# 0.9.0 / 2014-11-09
 
   * Renames restful "remove" action to "delete"
   * Improves app generator bundle install by showing progress
@@ -10,17 +37,17 @@
   * Includes pakyow-rake as a dependency, and updates the generated Rakefile
   * Removes support for Ruby versions < 2.0.0
 
-= 0.8.0 / 2014-03-02
+# 0.8.0 / 2014-03-02
 
   * Major rewrite, including changes to app definition and routing
 
-= 0.7.2 / 2012-02-29
+# 0.7.2 / 2012-02-29
 
   * Application server shuts down gracefully
   * Fix issue requesting route with format
   * Fix issue surrounding ignore_routes -- now matches request path in all cases
 
-= 0.7.1 / 2012-01-08
+# 0.7.1 / 2012-01-08
 
   * Changed loader to only load ruby files
   * Moved session from app to request
@@ -29,7 +56,7 @@
   * Fixed generated rakefile so it runs in a specific environment
   * Fixed issue running with ignore_routes turned on
 
-= 0.7.0 / 2011-11-19
+# 0.7.0 / 2011-11-19
 
   * Added middleware for logging, static, and reloading
   * Added invoke_route! and invoke_handler! methods
@@ -40,24 +67,24 @@
   * App file is no longer loaded twice upon initialization
   * Fix cookie creation when cookie is a non-nil value but not a String
 
-= 0.6.3 / 2011-09-13
+# 0.6.3 / 2011-09-13
 
   * Fixes several load path issues
   * Fixes gemspecs so gem can be built/used from anywhere
   * Fixes inconsistency with with request.params having string and symbol keys
   * Fixes loading of middleware when staging application (simplifies rackup)
 
-= 0.6.2 / 2011-08-20
+# 0.6.2 / 2011-08-20
 
   * Fixes issue running pakyow server on Windows
   * Fixes several issues related to error handlers
   * Fixes an issue when using alphanumeric ids in restful routes
   * JRuby Support
 
-= 0.6.1 / 2011-08-20
+# 0.6.1 / 2011-08-20
 
   * Fixes gemspec problem
 
-= 0.6.0 / 2011-08-20
+# 0.6.0 / 2011-08-20
 
  * Initial gem release of 0.6.0 codebase

data/pakyow-core/{MIT-LICENSE → LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Bryan Powell
+Copyright (c) 2011-2015 Bryan Powell
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/pakyow-core/README.md

@@ -0,0 +1,34 @@
+# pakyow-core
+
+Core routing for Pakyow.
+
+# Download
+
+The latest version of Pakyow Core can be installed with RubyGems:
+
+```
+gem install pakyow-core
+```
+
+Source code can be downloaded as part of the Pakyow project on Github:
+
+- https://github.com/pakyow/pakyow/tree/master/pakyow-core
+
+# License
+
+Pakyow Core is released free and open-source under the [MIT
+License](http://opensource.org/licenses/MIT).
+
+# Support
+
+Documentation is available here:
+
+- http://pakyow.org/docs/routing
+
+Found a bug? Tell us about it here:
+
+- https://github.com/pakyow/pakyow/issues
+
+We'd love to have you in the community:
+
+- http://pakyow.org/get-involved

data/pakyow-core/lib/core/app.rb

@@ -39,6 +39,7 @@ module Pakyow
         return if running?
 
         @running = true
+
         builder.run(stage(*env_or_envs))
         detect_handler.run(builder, Host: config.server.host, Port: config.server.port) do |server|
           trap(:INT)  { stop(server) }
@@ -143,16 +144,16 @@ module Pakyow
         config.app.loaded_envs = envs
         config.env = envs.first.to_sym
 
-        # run global config first
-        if global_proc = @@config[:global]
-          config.app_config(&global_proc)
-        end
-
-        # then run other envs
+        # run specific config first
         envs.each do |env|
           next unless config_proc = @@config[env.to_sym]
           config.app_config(&config_proc)
         end
+
+        # then run global config
+        if global_proc = @@config[:global]
+          config.app_config(&global_proc)
+        end
       end
 
       protected
@@ -251,20 +252,12 @@ module Pakyow
         unless found?
           handle(404, false)
 
-          if config.app.errors_in_browser
-            response["Content-Type"] = 'text/html'
-
-            view_file = File.join(File.expand_path('../../', __FILE__), 'views', 'errors', '404.html')
-            content = File.open(view_file).read
-
+          present_error 404 do |content|
             path = String.normalize_path(request.path)
             path = '/' if path.empty?
 
-            content.gsub!('{view_path}', path == '/' ? 'index.html' : "#{path}.html")
             content.gsub!('{route_path}', path)
-
-            response.body = []
-            response.body << content
+            content
           end
         end
       }
@@ -275,31 +268,24 @@ module Pakyow
 
       response.finish
     rescue StandardError => error
-      call_stack(:before, :error)
-
       request.error = error
 
-      handle(500, false) unless found?
-
-      if config.app.errors_in_browser
-        response["Content-Type"] = 'text/html'
-
-        view_file = File.join(File.expand_path('../../', __FILE__), 'views', 'errors', '500.html')
-        content = File.open(view_file).read
+      catch :halt do
+        call_stack(:before, :error)
 
-        path = String.normalize_path(request.path)
-        path = '/' if path.empty?
+        handle(500, false) unless found?
 
-        nice_source = error.backtrace[0].match(/^(.+?):(\d+)(|:in `(.+)')$/)
+        present_error 500 do |content|
+          nice_source = error.backtrace[0].match(/^(.+?):(\d+)(|:in `(.+)')$/)
 
-        content.gsub!('{file}', nice_source[1].gsub(File.expand_path(Config.app.root) + '/', ''))
-        content.gsub!('{line}', nice_source[2])
+          content.gsub!('{file}', nice_source[1].gsub(File.expand_path(Config.app.root) + '/', ''))
+          content.gsub!('{line}', nice_source[2])
 
-        content.gsub!('{msg}', CGI.escapeHTML(error.to_s))
-        content.gsub!('{trace}', error.backtrace.map { |bt| CGI.escapeHTML(bt) }.join('<br>'))
+          content.gsub!('{msg}', CGI.escapeHTML("#{error.class}: #{error}"))
+          content.gsub!('{trace}', error.backtrace.map { |bt| CGI.escapeHTML(bt) }.join('<br>'))
 
-        response.body = []
-        response.body << content
+          content
+        end
       end
 
       call_stack(:after, :error)
@@ -336,8 +322,9 @@ module Pakyow
 
     # Routes the request to different logic.
     #
-    def reroute(path, method = nil)
-      request.setup(path, method)
+    def reroute(location, method = nil)
+      location = Router.instance.path(location)
+      request.setup(location, method)
 
       call_stack(:before, :route)
       call_stack(:after, :match)
@@ -356,7 +343,7 @@ module Pakyow
         data = file_or_data.read
 
         # auto set type based on file type
-        type = Rack::Mime.mime_type("." + String.split_at_last_dot(file_or_data.path)[1])
+        type ||= Rack::Mime.mime_type("." + String.split_at_last_dot(file_or_data.path)[1])
       else
         data = file_or_data
       end
@@ -372,7 +359,7 @@ module Pakyow
     # Redirects to location (immediately).
     #
     def redirect(location, status_code = 302)
-      location = router.path(location) if location.is_a?(Symbol)
+      location = Router.instance.path(location)
 
       headers = response ? response.header : {}
       headers = headers.merge({'Location' => location})
@@ -408,7 +395,7 @@ module Pakyow
       call_stack(:before, :load)
 
       # load src files
-      @loader = Loader.new
+      @loader ||= Loader.new
       @loader.load_from_path(config.app.src_dir)
 
       # load the routes
@@ -454,6 +441,30 @@ module Pakyow
       }
     end
 
+    def present_error(code)
+      return unless config.app.errors_in_browser
+
+      response["Content-Type"] = 'text/html'
+
+      if block_given?
+        content = yield(content_for_code(code))
+      end
+
+      response.body = [content]
+    end
+
+    def content_for_code(code)
+      File.open(
+        File.join(
+          File.expand_path(
+            '../../', __FILE__),
+            'views',
+            'errors',
+            code.to_s + '.html'
+          )
+      ).read
+    end
+
   end
 
   App.reset

data/pakyow-core/lib/core/base.rb

@@ -9,6 +9,8 @@ require 'core/route_merger'
 require 'core/route_module'
 require 'core/route_set'
 require 'core/route_eval'
+require 'core/route_expansion_eval'
+require 'core/route_template_eval'
 require 'core/route_template_defaults'
 require 'core/route_lookup'
 require 'core/app'
@@ -25,9 +27,11 @@ require 'core/middleware/static'
 require 'core/middleware/reloader'
 
 module Pakyow
-  attr_accessor :app, :logger
+  class << self
+    attr_accessor :app, :logger
+  end
 
-  def configure_logger
+  def self.configure_logger
     logs = []
 
     if File.directory?(Config.logger.path)

data/pakyow-core/lib/core/config/app.rb

@@ -10,7 +10,11 @@ Pakyow::Config.register(:app) { |config|
   config.opt :root, File.dirname('')
 
   # the location of the app's resources
-  config.opt :resources, lambda { { default: File.join(root, 'public') } }
+  config.opt :resources, lambda {
+    @resources ||= {
+      default: File.join(root, 'public')
+    }
+  }
 
   # the location of the app's source code
   config.opt :src_dir, lambda { File.join(root, 'app', 'lib') }
@@ -34,7 +38,7 @@ Pakyow::Config.register(:app) { |config|
   config.opt :log, true
 
   # whether or not pakyow should serve static files
-  config.opt :static
+  config.opt :static, true
 
   # stores the path to the app definition
   config.opt :path, lambda { Pakyow::App.path }
@@ -53,13 +57,13 @@ Pakyow::Config.register(:app) { |config|
   opts.auto_reload = false
   opts.errors_in_browser = true
   opts.log_output = false
-  opts.static = false
+  opts.static = true
 
 }.env(:production) { |opts|
 
   opts.auto_reload = false
   opts.errors_in_browser = false
   opts.log_output = false
-  opts.static = false
+  opts.static = true
 
 }

data/pakyow-core/lib/core/config.rb

@@ -32,14 +32,16 @@ module Pakyow
 
     attr_reader :config_name
 
-    def initialize(name)
+    def initialize(name, default_config: false)
       @config_name = name
       @opts = {}
       @envs = {}
+      @default_config = default_config
     end
 
     def defaults
-      @defaults ||= Pakyow::Config.new("#{@config_name}.defaults")
+      return if @default_config # don't define defaults for defaults
+      @defaults ||= Pakyow::Config.new("#{@config_name}.defaults", default_config: true)
     end
 
     def env(name)
@@ -55,13 +57,14 @@ module Pakyow
     end
 
     def value(name, *args)
-      value = @opts.fetch(name) { raise(ConfigError.new("No config option available for `#{@config_name}.#{name}`")) }
+      value = @opts.fetch(name) { raise(ConfigError.new("No config value available for `#{@config_name}.#{name}`")) }
       value = instance_exec(*args, &value) if value.is_a?(Proc)
       value
     end
 
     def opt(name, default = nil)
-      @opts[name] = default
+      context = defaults ? defaults : self
+      context.instance_variable_get(:@opts)[name] = default
     end
 
     def reset
@@ -83,7 +86,7 @@ module Pakyow
           end
         end
 
-        raise(ConfigError.new("No config option available for `#{@config_name}.#{method}`"))
+        raise(ConfigError.new("No config value available for `#{@config_name}.#{method}`"))
       end
     end
   end

data/pakyow-core/lib/core/helpers.rb

@@ -14,25 +14,25 @@ module Pakyow
     end
 
     def request
-      context.request
+      context ? context.request : nil
     end
     alias_method :req, :request
 
     def response
-      context.response
+      context ? context.response : nil
     end
     alias_method :res, :response
 
     def params
-      request.params
+      request ? request.params : {}
     end
 
     def session
-      request.session
+      request ? request.session : {}
     end
 
     def cookies
-      request.cookies
+      request ? request.cookies : {}
     end
 
     def config

data/pakyow-core/lib/core/middleware/logger.rb

@@ -40,6 +40,7 @@ module Pakyow
     end
 
     def <<(msg = nil, severity = :unknown)
+      return if @log.nil?
       msg << "\n"
 
       msg = format(msg, severity) if @format
@@ -102,7 +103,7 @@ module Pakyow
       # handles logging after an error occurs
       Pakyow::App.after(:error) {
         error = request.error
-        Pakyow.logger.error "[500] #{error}\n" + error.backtrace.join("\n") + "\n\n"
+        Pakyow.logger.error "[500] #{error.class}: #{error}\n" + error.backtrace.join("\n") + "\n\n"
       }
 
       def initialize(app)
@@ -132,60 +133,7 @@ module Pakyow
       end
 
       def nice_status(status)
-        {
-          100 => 'Continue',
-          101 => 'Switching Protocols',
-
-          200 => 'OK',
-          201 => 'Created',
-          202 => 'Accepted',
-          203 => 'Non-Authoritative Information',
-          204 => 'No Content',
-          205 => 'Reset Content',
-          206 => 'Partial Content',
-
-          300 => 'Multiple Choices',
-          301 => 'Moved Permanently',
-          302 => 'Found',
-          303 => 'See Other',
-          304 => 'Not Modified',
-          305 => 'Use Proxy',
-          306 => 'Switch Proxy',
-          307 => 'Temporary Redirect',
-
-          400 => 'Bad Request',
-          401 => 'Unauthorized',
-          402 => 'Payment Required',
-          403 => 'Forbidden',
-          404 => 'Not Found',
-          405 => 'Method Not Allowed',
-          406 => 'Not Acceptable',
-          407 => 'Proxy Authentication Required',
-          408 => 'Request Timeout',
-          409 => 'Conflict',
-          410 => 'Gone',
-          411 => 'Length Required',
-          412 => 'Precondition Failed',
-          413 => 'Request Entity Too Large',
-          414 => 'Request-URI Too Long',
-          415 => 'Unsupported Media Type',
-          416 => 'Requested Range Not Satisfiable',
-          417 => 'Expectation Failed',
-          418 => 'I\'m a teapot',
-
-          500 => 'Internal Server Error',
-          501 => 'Not Implemented',
-          502 => 'Bad Gateway',
-          503 => 'Service Unavailable',
-          504 => 'Gateway Timeout',
-          505 => 'HTTP Version Not Supported',
-          506 => 'Variant Also Negotiates',
-          507 => 'Insufficient Storage',
-          508 => 'Loop Detected',
-          509 => 'Bandwidth Limit Exceeded',
-          510 => 'Not Extended',
-          511 => 'Network Authentication Required'
-        }[status] || '?'
+        Pakyow::Response::STATUS_CODE_NAMES[status] || '?'
       end
     end
   end

data/pakyow-core/lib/core/request.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Pakyow
 
   # The Request object.
@@ -56,7 +58,9 @@ module Pakyow
 
     # Returns indifferent params (see {HashUtils.strhash} for more info on indifferent hashes).
     def params
-      @params ||= Hash.strhash(super)
+      @params ||= Hash.strhash(super.merge!(env['pakyow.data'] || {}).merge!(JSON.parse(body.read.to_s)))
+    rescue JSON::JSONError
+      @params = Hash.strhash(super)
     end
 
     # Returns array of url components.

data/pakyow-core/lib/core/response.rb

@@ -4,15 +4,130 @@ module Pakyow
   class Response < Rack::Response
     attr_reader :format
 
+    STATUS_CODE_NAMES = {
+      100 => 'Continue',
+      101 => 'Switching Protocols',
+
+      200 => 'OK',
+      201 => 'Created',
+      202 => 'Accepted',
+      203 => 'Non-Authoritative Information',
+      204 => 'No Content',
+      205 => 'Reset Content',
+      206 => 'Partial Content',
+
+      300 => 'Multiple Choices',
+      301 => 'Moved Permanently',
+      302 => 'Found',
+      303 => 'See Other',
+      304 => 'Not Modified',
+      305 => 'Use Proxy',
+      306 => 'Switch Proxy',
+      307 => 'Temporary Redirect',
+
+      400 => 'Bad Request',
+      401 => 'Unauthorized',
+      402 => 'Payment Required',
+      403 => 'Forbidden',
+      404 => 'Not Found',
+      405 => 'Method Not Allowed',
+      406 => 'Not Acceptable',
+      407 => 'Proxy Authentication Required',
+      408 => 'Request Timeout',
+      409 => 'Conflict',
+      410 => 'Gone',
+      411 => 'Length Required',
+      412 => 'Precondition Failed',
+      413 => 'Request Entity Too Large',
+      414 => 'Request-URI Too Long',
+      415 => 'Unsupported Media Type',
+      416 => 'Requested Range Not Satisfiable',
+      417 => 'Expectation Failed',
+      418 => 'I\'m a teapot',
+
+      500 => 'Internal Server Error',
+      501 => 'Not Implemented',
+      502 => 'Bad Gateway',
+      503 => 'Service Unavailable',
+      504 => 'Gateway Timeout',
+      505 => 'HTTP Version Not Supported',
+      506 => 'Variant Also Negotiates',
+      507 => 'Insufficient Storage',
+      508 => 'Loop Detected',
+      509 => 'Bandwidth Limit Exceeded',
+      510 => 'Not Extended',
+      511 => 'Network Authentication Required'
+    }
+
+    STATUS_CODE_LOOKUP = {
+      continue: 100,
+      switching_protocols: 101,
+
+      ok: 200,
+      created: 201,
+      accepted: 202,
+      non_authoritative_information: 203,
+      no_content: 204,
+      reset_content: 205,
+      partial_content: 206,
+
+      multiple_choices: 300,
+      moved_permanently: 301,
+      found: 302,
+      see_other: 303,
+      not_modified: 304,
+      use_proxy: 305,
+      reserved: 306,
+      temporary_redirect: 307,
+
+      bad_request: 400,
+      unauthorized: 401,
+      payment_required: 402,
+      forbidden: 403,
+      not_found: 404,
+      method_not_allowed: 405,
+      not_acceptable: 406,
+      proxy_authentication_required: 407,
+      request_timeout: 408,
+      conflict: 409,
+      gone: 410,
+      length_required: 411,
+      precondition_failed: 412,
+      request_entity_too_large: 413,
+      request_uri_too_long: 414,
+      unsupported_media_type: 415,
+      requested_range_not_satisfiable: 416,
+      expectation_failed: 417,
+      teapot: 418,
+
+      internal_server_error: 500,
+      not_implemented: 501,
+      bad_gateway: 502,
+      service_unavailable: 503,
+      gateway_timeout: 504,
+      http_version_not_supported: 505,
+      variant_also_negotiates: 506,
+      insufficient_storage: 507,
+      loop_detected: 508,
+      bandwidth_exceeded: 509,
+      not_extended: 510,
+      network_authentication_required: 511
+    }
+
     def initialize(*args)
       super
 
       self["Content-Type"] ||= 'text/html'
+      @format = Rack::Mime::MIME_TYPES.key(type)
     end
 
     def format=(format)
       @format = format
       self["Content-Type"] = Rack::Mime.mime_type(".#{format}")
     end
+
+    def type
+      self["Content-Type"]
+    end
   end
 end