pakyow-core 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a272d5c2f6d429275df4e3eac0561c8df6c285e3
-  data.tar.gz: 8b21f4193337cd9c7298ccbe0e004bd9c814beb0
+  metadata.gz: 8c95a638e0b963832783f28d930b2d3643d22d9a
+  data.tar.gz: 13933ac6f3e609509cbdd2114820a9dfbd9daf23
 SHA512:
-  metadata.gz: dbb4242d0cbbb4dcce94608b6773026e68c4168c450dd4e7587def70a3db921d5e6d53a7b9cd45b3f718451ec70c8b7cf7878ea998eacf95aed655dc084cea56
-  data.tar.gz: b965ed0dd836899da344beb011cd777eb09080fa3013c381d7a4e1194108147f90c58f9be3dfcb0dedce8d6c06519a66d78ea85188a10c992280cb1506173f07
+  metadata.gz: e9de80789a1192803b8643ed2a66523d675a4bd5482f0baca76b4680334f322b7ee612752809383f272a325c6aba9dc378d410ea3ba836c71dfd5f64bcfe4b45
+  data.tar.gz: 9399398fa726206307b9de398575289d7c1e470ef21cbd6b05c30cdc714a70e67372158ce5ded1f32ca6ddf3bcb84b65631b501fc118aa9094980fd1775bbdd5

data/pakyow-core/CHANGES

@@ -1,3 +1,11 @@
+= 0.9.0
+
+  * Renames restful "remove" action to "delete"
+  * Improves app generator bundle install by showing progress
+  * Complete refactor of config handling with a shiny DSL
+  * 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
 
   * Major rewrite, including changes to app definition and routing
@@ -48,4 +56,4 @@
 
 = 0.6.0 / 2011-08-20
 
- * Initial gem release of 0.6.0 codebase
+ * Initial gem release of 0.6.0 codebase

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

@@ -1,30 +1,61 @@
 module Pakyow
   class App
     class << self
-      def reset
-        @@routes = {}
-        @@config = {}
-        @@middleware = []
+      attr_reader :path
 
-        @@stacks = {:before => {}, :after => {}}
-        %w(init load process route match error).each {|name|
-          @@stacks[:before][name.to_sym] = []
-          @@stacks[:after][name.to_sym] = []
-        }
+      # Prepares the app for being staged in one or more environments by
+      # loading config(s), middleware, and setting the load path.
+      #
+      def prepare(*env_or_envs)
+        return if prepared?
+
+        # load config for one or more environments
+        load_config(*env_or_envs)
+
+        # load each block from middleware stack
+        load_middleware
+
+        # include pwd in load path
+        $:.unshift(Dir.pwd) unless $:.include? Dir.pwd
+
+        @prepared = true
+      end
+
+      # Stages the app by preparing and returning an instance. This is
+      # essentially everything short of running it.
+      #
+      def stage(*env_or_envs)
+        unless staged?
+          prepare(*env_or_envs)
+          @staged = true
+        end
+
+        self.new
+      end
+
+      # Runs the staged app.
+      #
+      def run(*env_or_envs)
+        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) }
+          trap(:TERM) { stop(server) }
+        end
       end
 
       # Defines an app
       #
       def define(&block)
         # sets the path to the app file so it can be reloaded later
-        config.app.path = Utils::String.parse_path_from_caller(caller[0])
-
+        @path = String.parse_path_from_caller(caller[0])
         self.instance_eval(&block)
       end
 
       # Defines a route set.
       #
-      #TODO default route set should be config option (also for bindings)
       def routes(set_name = :main, &block)
         if set_name && block
           @@routes[set_name] = block
@@ -63,30 +94,6 @@ module Pakyow
         @@stacks[:after][stack_name.to_sym] << block
       end
 
-      # Runs the application. Accepts the environment(s) to run, for example:
-      # run(:development)
-      # run([:development, :staging])
-      #
-      def run(*args)
-        return if running?
-
-        @running = true
-        builder.run(prepare(args))
-        detect_handler.run(builder, :Host => config.server.host, :Port => config.server.port) do |server|
-          trap(:INT)  { stop(server) }
-          trap(:TERM) { stop(server) }
-        end
-      end
-
-      # Stages the application. Everything is loaded but the application is
-      # not started. Accepts the same arguments as #run.
-      #
-      def stage(*args)
-        return if staged?
-        @staged = true
-        prepare(args)
-      end
-
       def builder
         @builder ||= Rack::Builder.new
       end
@@ -110,51 +117,55 @@ module Pakyow
       # Convenience method for base configuration class.
       #
       def config
-        Pakyow::Config::Base
+        Pakyow::Config
+      end
+
+      def reset
+        @prepared = false
+        @staged = false
+        @running = false
+
+        @@routes = {}
+        @@config = {}
+        @@middleware = []
+
+        @@stacks = {:before => {}, :after => {}}
+        %w(init load process route match error).each {|name|
+          @@stacks[:before][name.to_sym] = []
+          @@stacks[:after][name.to_sym] = []
+        }
       end
 
-      def load_config(envs)
+      def load_config(*env_or_envs)
+        envs = Array.ensure(env_or_envs)
+        envs = envs.empty? || envs.first.nil? ? [config.app.default_environment] : envs
+
+        config.app.loaded_envs = envs
+        config.env = envs.first.to_sym
+
         # run global config first
         if global_proc = @@config[:global]
-          config.instance_eval(&global_proc)
+          config.app_config(&global_proc)
         end
 
         # then run other envs
-
         envs.each do |env|
           next unless config_proc = @@config[env.to_sym]
-          config.instance_eval(&config_proc)
+          config.app_config(&config_proc)
         end
-
-        config.app.loaded_envs = envs
       end
 
       protected
 
-      # Prepares the application for running or staging and returns an instance
-      # of the application.
-      def prepare(envs)
-        return if prepared?
-
-        # configure
-        envs = envs.empty? || envs.first.nil? ? [config.app.default_environment] : envs
-        load_config(envs)
-
-        # load each block from middleware stack
-        @@middleware.each {|mw|
+      def load_middleware
+        @@middleware.each do |mw|
           self.instance_exec(builder, &mw)
-        }
+        end
 
         builder.use(Rack::MethodOverride)
         builder.use(Middleware::Static)   if config.app.static
         builder.use(Middleware::Logger)   if config.app.log
         builder.use(Middleware::Reloader) if config.app.auto_reload
-
-        @prepared = true
-
-        $:.unshift(Dir.pwd) unless $:.include? Dir.pwd
-
-        return self.new
       end
 
       def detect_handler
@@ -201,7 +212,7 @@ module Pakyow
     # Returns the primary (first) loaded env.
     #
     def env
-      config.app.loaded_envs[0]
+      config.env
     end
 
     def app
@@ -246,7 +257,7 @@ module Pakyow
             view_file = File.join(File.expand_path('../../', __FILE__), 'views', 'errors', '404.html')
             content = File.open(view_file).read
 
-            path = Utils::String.normalize_path(request.path)
+            path = String.normalize_path(request.path)
             path = '/' if path.empty?
 
             content.gsub!('{view_path}', path == '/' ? 'index.html' : "#{path}.html")
@@ -276,12 +287,12 @@ module Pakyow
         view_file = File.join(File.expand_path('../../', __FILE__), 'views', 'errors', '500.html')
         content = File.open(view_file).read
 
-        path = Utils::String.normalize_path(request.path)
+        path = String.normalize_path(request.path)
         path = '/' if path.empty?
 
         nice_source = error.backtrace[0].match(/^(.+?):(\d+)(|:in `(.+)')$/)
 
-        content.gsub!('{file}', nice_source[1].gsub(File.expand_path(Config::App.root) + '/', ''))
+        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))
@@ -307,10 +318,10 @@ module Pakyow
 
       # reset config
       envs = config.app.loaded_envs
-      config.reset!
+      config.reset
 
       # reload config
-      self.class.load_config(envs)
+      self.class.load_config(*envs)
 
       load_app
     end
@@ -345,7 +356,7 @@ module Pakyow
         data = file_or_data.read
 
         # auto set type based on file type
-        type = Rack::Mime.mime_type("." + Utils::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

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

@@ -1,8 +1,3 @@
-require 'core/config/base'
-require 'core/config/app'
-require 'core/config/server'
-require 'core/config/cookies'
-require 'core/config/logger'
 require 'core/helpers'
 require 'core/multilog'
 require 'core/app_context'
@@ -18,31 +13,29 @@ require 'core/route_template_defaults'
 require 'core/route_lookup'
 require 'core/app'
 require 'core/errors'
+require 'core/config'
+require 'core/config/app'
+require 'core/config/server'
+require 'core/config/cookies'
+require 'core/config/logger'
 
 # middlewares
 require 'core/middleware/logger'
 require 'core/middleware/static'
 require 'core/middleware/reloader'
 
-# utils
-require 'utils/string'
-require 'utils/hash'
-require 'utils/dir'
-
 module Pakyow
   attr_accessor :app, :logger
 
   def configure_logger
-    conf = Config::Base
-
     logs = []
 
-    if File.directory?(conf.logger.path)
-      log_path = File.join(conf.logger.path, conf.logger.name)
+    if File.directory?(Config.logger.path)
+      log_path = File.join(Config.logger.path, Config.logger.filename)
 
       begin
         log = File.open(log_path, 'a')
-        log.sync if conf.logger.sync
+        log.sync if Config.logger.sync
 
         logs << log
       rescue StandardError => e
@@ -50,10 +43,10 @@ module Pakyow
       end
     end
 
-    logs << $stdout if conf.app.log_output
+    logs << $stdout if Config.app.log_output
 
     io = logs.count > 1 ? MultiLog.new(*logs) : logs[0]
 
-    Pakyow.logger = Logger.new(io, conf.logger.level, conf.logger.colorize, conf.logger.auto_flush)
+    Pakyow.logger = Logger.new(io, Config.logger.level, Config.logger.colorize, Config.logger.auto_flush)
   end
 end

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

@@ -1,89 +1,65 @@
-module Pakyow
-  module Config
-    class App
-      Config::Base.register_config(:app, self)
-
-      class << self
-        attr_accessor :log, :resources, :root, :default_action, :ignore_routes,
-        :default_environment, :path, :src_dir, :auto_reload, :errors_in_browser,
-        :static, :all_views_visible, :loaded_envs, :log_output
-
-        def method_missing(name, *args)
-          if name[-1,1] == '='
-            name = name[0..-2]
-            instance_variable_set("@#{name}", *args)
-          else
-            instance_variable_get("@#{name}")
-          end
-        end
-
-        def auto_reload
-          @auto_reload.nil? ? true : @auto_reload
-        end
-
-        def errors_in_browser
-          @errors_in_browser.nil? ? true : @errors_in_browser
-        end
-
-        # Log requests?
-        def log
-          @log.nil? ? true : @log
-        end
-
-        def log_output
-          @log_output || true
-        end
-
-        # Root directory
-        def root
-          @root || File.dirname('')
-        end
-
-        # Resources directory
-        def resources
-          @resources ||= { :default => "#{root}/public" }
-        end
-
-        def src_dir
-          @src_dir || "#{root}/app/lib"
-        end
-
-        # Default action
-        def default_action
-          @default_action || :index
-        end
-
-        # Mockup mode
-        def ignore_routes
-          @ignore_routes.nil? ? false : @ignore_routes
-        end
-
-        def all_views_visible
-          @all_views_visible.nil? ? true : @all_views_visible
-        end
-
-        def default_environment
-          @default_environment || :development
-        end
-
-        # The path to the application class
-        def path
-          @path
-        end
-
-        # Handle static files?
-        #
-        # For best performance, should be set to false if static files are
-        # handled by a web server (e.g. Nginx)
-        #
-        def static
-          @static || true
-        end
-
-        def loaded_envs
-          @loaded_envs
-        end
-      end
-    end
-  end
-end
+Pakyow::Config.register(:app) { |config|
+
+  # if true, the app will be reloaded on every request
+  config.opt :auto_reload
+
+  # if true, errors are displayed in the browser
+  config.opt :errors_in_browser
+
+  # the location of the app's root directory
+  config.opt :root, File.dirname('')
+
+  # the location of the app's resources
+  config.opt :resources, lambda { { default: File.join(root, 'public') } }
+
+  # the location of the app's source code
+  config.opt :src_dir, lambda { File.join(root, 'app', 'lib') }
+
+  # the environment to run in, if one isn't provided
+  config.opt :default_environment, :development
+
+  # the default action to use for routing
+  config.opt :default_action, :index
+
+  # if true, all routes are ignored
+  config.opt :ignore_routes, false
+
+  # if true, views are visible without a route defined
+  config.opt :all_views_visible, true
+
+  # whether or not pakyow should log to stdout
+  config.opt :log_output, true
+
+  # whether or not pakyow should write to a log
+  config.opt :log, true
+
+  # whether or not pakyow should serve static files
+  config.opt :static
+
+  # stores the path to the app definition
+  config.opt :path, lambda { Pakyow::App.path }
+
+  # stores the envs an app is run in
+  config.opt :loaded_envs
+
+}.env(:development) { |opts|
+
+  opts.auto_reload = true
+  opts.errors_in_browser = true
+  opts.static = true
+
+}.env(:staging) { |opts|
+
+  opts.auto_reload = false
+  opts.errors_in_browser = true
+  opts.log_output = false
+  opts.static = false
+
+}.env(:production) { |opts|
+
+  opts.auto_reload = false
+  opts.errors_in_browser = false
+  opts.log_output = false
+  opts.static = false
+
+}

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

@@ -1,21 +1,4 @@
-module Pakyow
-  module Config
-    class Cookies
-      Config::Base.register_config(:cookies, self)
-
-      class << self
-        attr_accessor :path, :expiration
-        
-        # What path should the cookie be created for?
-        def path
-          @path || '/'
-        end
-        
-        # When does the cookie expire?
-        def expiration
-          @expiration || Time.now + 60 * 60 * 24 * 7 # one week
-        end
-      end
-    end
-  end
-end
+Pakyow::Config.register(:cookies) { |config|
+  config.opt :path, '/'
+  config.opt :expiration, lambda { Time.now + 60 * 60 * 24 * 7 }
+}

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

@@ -1,37 +1,39 @@
-module Pakyow
-  module Config
-    class Logger
-      Config::Base.register_config(:logger, self)
-
-      class << self
-        attr_accessor :path, :name, :sync, :colorize, :auto_flush, :level
-
-        # Path to logs
-        def path
-          @path || "#{Config::Base.app.root}/logs"
-        end
-
-        def name
-          @name || "requests.log"
-        end
-
-        def sync
-          instance_variable_defined?(:@sync) ? @sync : true
-        end
-
-        def auto_flush
-          instance_variable_defined?(:@auto_flush) ? @auto_flush : true
-        end
-
-        def colorize
-          instance_variable_defined?(:@colorize) ? @colorize : true
-        end
-
-        def level
-          @level || Pakyow::Logger::LEVELS[:debug]
-        end
-
-      end
-    end
-  end
-end
+Pakyow::Config.register(:logger) { |config|
+
+  # the default level to log at
+  config.opt :level, :debug
+
+  # where the log file should be placed
+  config.opt :path, lambda { File.join(Pakyow::Config.app.root, 'log') }
+
+  # the name of the log file
+  config.opt :filename, 'pakyow.log'
+
+  # whether or not the log file should be synced
+  config.opt :sync
+
+  # whether or not the log file should be flushed automatically
+  config.opt :auto_flush
+
+  # whether or not the log file should be colorized
+  config.opt :colorize
+
+}.env(:development) { |opts|
+
+  opts.sync = true
+  opts.auto_flush = true
+  opts.colorize = true
+
+}.env(:staging) { |opts|
+
+  opts.sync = false
+  opts.auto_flush = false
+  opts.colorize = false
+
+}.env(:production) { |opts|
+
+  opts.sync = false
+  opts.auto_flush = false
+  opts.colorize = false
+
+}

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

@@ -1,26 +1,12 @@
-module Pakyow
-  module Config
-    class Server
-      Config::Base.register_config(:server, self)
+Pakyow::Config.register(:server) { |config|
 
-      class << self
-        attr_accessor :port, :host, :handler
-        
-        # On what port does the application run?
-        def port
-          @port || 3000
-        end
-        
-        # On what host does the application run?
-        def host
-          @host || '0.0.0.0'
-        end
-        
-        # If set, adds a handler to try (e.g. puma)
-        def handler
-          @handler || nil
-        end
-      end
-    end
-  end
-end
+  # the port to start `pakyow server`
+  config.opt :port, 3000
+
+  # the host to start `pakyow server`
+  config.opt :host, '0.0.0.0'
+
+  # explicitly set a handler to try (e.g. puma)
+  config.opt :handler
+
+}

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

@@ -0,0 +1,90 @@
+module Pakyow
+  class Config
+    class << self
+      attr_accessor :env
+    end
+
+    def self.register(name)
+      config = Pakyow::Config.new(name)
+      yield(config.defaults)
+
+      @config ||= {}
+      @config[name] = config
+
+      self.class.instance_eval do
+        define_method(name) { @config[name] }
+      end
+
+      config
+    end
+
+    def self.deregister(name)
+      @config.delete(name)
+    end
+
+    def self.reset
+      @config.values.each(&:reset)
+    end
+
+    def self.app_config(&block)
+      instance_eval(&block)
+    end
+
+    attr_reader :config_name
+
+    def initialize(name)
+      @config_name = name
+      @opts = {}
+      @envs = {}
+    end
+
+    def defaults
+      @defaults ||= Pakyow::Config.new("#{@config_name}.defaults")
+    end
+
+    def env(name)
+      config = Pakyow::Config.new("#{@config_name}.#{name}")
+      yield(config)
+
+      @envs[name] = config
+      self
+    end
+
+    def clear_env(name)
+      @envs.delete(name)
+    end
+
+    def value(name, *args)
+      value = @opts.fetch(name) { raise(ConfigError.new("No config option 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
+    end
+
+    def reset
+      @opts = {}
+    end
+
+    def method_missing(method, *args)
+      if /^(\w+)=$/ =~ method
+        @opts[$1.to_sym] = args[0]
+      else
+        configs = [self]
+        configs << @envs[Config.env] if @envs.key?(Config.env)
+        configs << @defaults unless @defaults.nil?
+
+        configs.each do |config|
+          begin
+            return config.value(method, *args)
+          rescue ConfigError
+          end
+        end
+
+        raise(ConfigError.new("No config option available for `#{@config_name}.#{method}`"))
+      end
+    end
+  end
+end

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

@@ -2,6 +2,9 @@ module Pakyow
   # Raised when no app context is available
   class NoContextError < StandardError; end
 
+  # Raised when no config object is available
+  class ConfigError < StandardError; end
+
   # Raised when route is looked up that doesn't exist
   class MissingRoute < StandardError; end
 

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

@@ -36,7 +36,7 @@ module Pakyow
     end
 
     def config
-      Pakyow::Config::Base
+      Pakyow::Config
     end
   end
 

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

@@ -13,11 +13,11 @@ module Pakyow
     def require_recursively(dir)
       @times ||= {}
       if File.exists?(dir)
-        Utils::Dir.walk_dir(dir) do |path|
+        Dir.walk(dir) do |path|
           next if FileTest.directory?(path)
           next if path.split('.')[-1] != 'rb'
 
-          if Config::Base.app.auto_reload
+          if Config.app.auto_reload
             if !@times[path] || (@times[path] && File.mtime(path) - @times[path] > 0)
               load(path)
               @times[path] = File.mtime(path)

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

@@ -34,6 +34,7 @@ module Pakyow
     BOLD_SEQ  = "\033[1m"
 
     def initialize(log = $stdout, level = 0, format = false, auto_flush = false)
+      level = LEVELS[level] if level.is_a?(Symbol)
       @log, @level, @format, @auto_flush = log, level, format, auto_flush
       @mutex = Mutex.new
     end

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

@@ -26,7 +26,7 @@ module Pakyow
       def is_static?(env)
         return false unless env['PATH_INFO'] =~ /\.(.*)$/
 
-        Config::App.resources.each_pair do |name, path|
+        Config.app.resources.each_pair do |name, path|
           resource_path = File.join(path, env['PATH_INFO'])
           next unless File.exists?(resource_path)
           return true, resource_path

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

@@ -51,12 +51,12 @@ module Pakyow
     end
 
     def cookies
-      @cookies ||= Utils::Hash.strhash(super)
+      @cookies ||= Hash.strhash(super)
     end
 
     # Returns indifferent params (see {HashUtils.strhash} for more info on indifferent hashes).
     def params
-      @params ||= Utils::Hash.strhash(super)
+      @params ||= Hash.strhash(super)
     end
 
     # Returns array of url components.
@@ -97,14 +97,14 @@ module Pakyow
     protected
 
     def set_working_path_from_path(path, method)
-      base_route, ignore_format = Utils::String.split_at_last_dot(path)
+      base_route, ignore_format = String.split_at_last_dot(path)
 
       self.path = base_route
       self.method = method || self.method
     end
 
     def set_request_format_from_path(path)
-      path, format = Utils::String.split_at_last_dot(path)
+      path, format = String.split_at_last_dot(path)
       self.format = ((format && (format[format.length - 1, 1] == '/')) ? format[0, format.length - 1] : format)
     end
   end

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

@@ -73,7 +73,7 @@ module Pakyow
       # build the final list of fns
       fns = build_fns(fns, hooks)
 
-      @handlers << [name, code, fns]
+      @handlers.unshift([name, code, fns])
     end
 
     def group(*args, &block)
@@ -108,7 +108,7 @@ module Pakyow
 
       evaluator = RouteExpansionEval.from_scope(self, path: File.join(descendent_path, path), group: g_name, hooks: hooks)
 			evaluator.direct_path = path
-      evaluator.template = template
+      evaluator.set_template(g_name, template)
       evaluator.eval(&block)
 
       merge(evaluator)
@@ -159,7 +159,7 @@ module Pakyow
       else
         # prepend scope path if we're in a scope
         path = File.join(@path, path)
-        path = Utils::String.normalize_path(path)
+        path = String.normalize_path(path)
 
         # get regex and vars for path
         regex, vars = build_route_matcher(path)
@@ -316,7 +316,8 @@ module Pakyow
       super
     end
 
-    def template=(template)
+    def set_template(expansion_name, template)
+      @expansion_name = expansion_name
       @template_block = template[1]
 
       @hooks = merge_hooks(@hooks, template[0])
@@ -343,7 +344,7 @@ module Pakyow
 			group = @template_eval.group_named(name)
 
 			hooks = merge_hooks(hooks, group[0])
-			group(name, hooks, &block)
+			group(@expansion_name, hooks, &block)
 		end
 
 		def action_namespace(*args, &block)
@@ -351,7 +352,7 @@ module Pakyow
 			namespace = @template_eval.namespace_named(name)
 
 			hooks = merge_hooks(hooks, namespace[1])
-			namespace(name, namespace[0], hooks, &block)
+			namespace(@expansion_name, namespace[0], hooks, &block)
 		end
 
     def method_missing(method, *args, &block)

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

@@ -1,6 +1,6 @@
 module Pakyow
   module RouteMerger
-    private 
+    private
 
     def merge(route_eval)
       merge_fns(route_eval.fns)
@@ -28,7 +28,7 @@ module Pakyow
 
     def merge_lookup(lookup)
       @lookup[:routes].merge!(lookup[:routes])
-      @lookup[:grouped].merge!(lookup[:grouped])
+      @lookup[:grouped].deep_merge!(lookup[:grouped])
     end
 
     def merge_templates(templates)

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

@@ -22,7 +22,7 @@ module Pakyow
     # [regex, vars, name, fns, path]
     #
     def match(path, method)
-      path = Utils::String.normalize_path(path)
+      path = String.normalize_path(path)
 
       # want the request to still knows it's a head, but match as get
       method = method.to_sym

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

@@ -22,7 +22,7 @@ module Pakyow
         get :edit, "/#{resource_id}/edit"
         patch :update, "/#{resource_id}"
         put :replace, "/#{resource_id}"
-        delete :delete, "/#{resource_id}"
+        delete :remove, "/#{resource_id}"
 
         group :collection
         namespace :member, resource_id

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

@@ -88,7 +88,7 @@ module Pakyow
           else
             app.instance_exec(&fn)
           end
-          
+
           break
         end
       }
@@ -106,7 +106,7 @@ module Pakyow
     # returns the list of route functions for that route.
     #
     def match(request)
-      path   = Utils::String.normalize_path(request.path)
+      path   = String.normalize_path(request.path)
       method = request.method
 
       match, data = nil
@@ -121,7 +121,7 @@ module Pakyow
 
         # handle route params
         #TODO where to do this?
-        request.params.merge!(Utils::Hash.strhash(self.data_from_path(path, data, match[1])))
+        request.params.merge!(Hash.strhash(self.data_from_path(path, data, match[1])))
 
         #TODO where to do this?
         request.route_path = match[4]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-core
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Bryan Powell
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pakyow-support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: Core functionality for Pakyow applications, including routing and middleware.
+description: Core functionality for Pakyow apps, including routing and middleware.
 email: bryan@metabahn.com
 executables: []
 extensions: []
@@ -51,8 +65,8 @@ files:
 - pakyow-core/lib/core/app.rb
 - pakyow-core/lib/core/app_context.rb
 - pakyow-core/lib/core/base.rb
+- pakyow-core/lib/core/config.rb
 - pakyow-core/lib/core/config/app.rb
-- pakyow-core/lib/core/config/base.rb
 - pakyow-core/lib/core/config/cookies.rb
 - pakyow-core/lib/core/config/logger.rb
 - pakyow-core/lib/core/config/server.rb
@@ -73,9 +87,6 @@ files:
 - pakyow-core/lib/core/route_template_defaults.rb
 - pakyow-core/lib/core/router.rb
 - pakyow-core/lib/pakyow-core.rb
-- pakyow-core/lib/utils/dir.rb
-- pakyow-core/lib/utils/hash.rb
-- pakyow-core/lib/utils/string.rb
 - pakyow-core/lib/views/errors/404.html
 - pakyow-core/lib/views/errors/500.html
 homepage: http://pakyow.com
@@ -90,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -98,8 +109,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pakyow-core
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Core functionality for Pakyow applications.
+summary: Core functionality for Pakyow apps.
 test_files: []
+has_rdoc: 

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

@@ -1,30 +0,0 @@
-module Pakyow
-  module Config
-    class Base
-      @@configs = {}
-      def self.register_config(name, klass)
-        @@configs[name] = klass
-
-        define_singleton_method name do
-          @@configs[name]
-        end
-      end
-
-      # Resets all config
-      def self.reset!
-        @@configs.keys.each do |type|
-          klass = self.send(type.to_sym)
-          klass.instance_variables.each do |var|
-            # Assumes path shouldn't be reset, since it's only set
-            # once when Pakyow::Application is inherited.
-            next if var.to_sym == :'@path'
-            begin
-              klass.send("#{var.to_s.gsub('@', '')}=", nil)
-            rescue
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/pakyow-core/lib/utils/dir.rb

@@ -1,40 +0,0 @@
-module Pakyow
-  module Utils
-
-  # Utility methods for directories and files.
-    class Dir
-
-      # visit dir, then all files in dir, then walk_dir each directory in dir
-      def self.walk_dir(dir, &block)
-        yield dir
-        all = ::Dir.entries(dir)
-        partition = all.partition{|e| File.file?("#{dir}/#{e}")}
-        files = partition[0]
-        dirs = partition[1]
-        files.each{|f| yield "#{dir}/#{f}" unless f.start_with?(".")}
-        dirs.each{|d| walk_dir("#{dir}/#{d}", &block) unless d.start_with?(".")}
-      end
-
-      def self.print_dir(dir)
-        puts "/#{dir}"
-        Utils::Dir.walk_dir(dir) {|full_path|
-          path = full_path.gsub(Regexp.new("#{dir}\/?"), '')
-          next if path.empty?
-
-          prefix = "|"
-          path.scan(/\//).size.times do
-            prefix += "  |"
-          end
-
-          path.gsub!(/^.*\//, '')
-          puts "#{prefix}-- #{path}"
-        }
-      end
-
-      def self.dir_within_dir?(dir1, dir2)
-        (dir1.split('/') - dir2.split('/')).empty?
-      end
-    end
-
-  end
-end

data/pakyow-core/lib/utils/hash.rb

@@ -1,44 +0,0 @@
-module Pakyow
-  module Utils
-
-    # Utility methods for hashes.
-    class Hash
-      # Creates an indifferent hash. This means that when indifferentized, this hash:
-      #   { 'foo' => 'bar' }
-      #
-      # Can be accessed like this:
-      #   { :foo => 'bar' }
-      #
-      def self.strhash(hash)
-        indifferentize(hash)
-      end
-
-      # Converts keys to symbols.
-      def self.symbolize_keys(hash)
-        ::Hash[hash.map{|(k,v)| [k.to_sym,v]}]
-      end
-
-      # Converts keys/values to symbols.
-      def self.symbolize(hash)
-        ::Hash[hash.map{|(k,v)| [k.to_sym,v.to_sym]}]
-      end
-
-      protected
-
-      # (see {strhash})
-      def self.indifferentize(hash)
-        hash.each_pair do |key, value|
-          hash[key] = indifferentize(value) if value.is_a? ::Hash
-        end
-
-        indifferent_hash.merge(hash)
-      end
-
-      # (see {strhash})
-      def self.indifferent_hash
-        ::Hash.new { |hash,key| hash[key.to_s] if Symbol === key }
-      end
-    end
-
-  end
-end

data/pakyow-core/lib/utils/string.rb

@@ -1,41 +0,0 @@
-module Pakyow
-  module Utils
-
-    # Utility methods for strings.
-    class String
-
-      # split . seperated string at the last .
-      def self.split_at_last_dot(s)
-        split_index = s.rindex('.')
-        return s,nil unless split_index
-        left = s[0,split_index]
-        right = s[split_index+1,s.length-(split_index+1)]
-        return left,right
-      end
-
-      def self.remove_route_vars(route_spec)
-        return unless route_spec
-        arr = route_spec.split('/')
-        new_arr = []
-        arr.each {|e| new_arr << e unless e[0,1] == ':'}
-        ret = new_arr.join('/')
-        return '/' if ret == ''
-        return ret
-      end
-
-      def self.parse_path_from_caller(caller)
-        caller.match(/^(.+)(:?:\d+(:?:in `.+')?$)/)[1]
-      end
-
-      def self.normalize_path(path)
-        return path if path.is_a?(Regexp)
-
-        path = path[1, path.length - 1] if path[0, 1] == '/'
-        path = path[0, path.length - 1] if path[path.length - 1, 1] == '/'
-        path
-      end
-
-    end
-
-  end
-end