deas 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: cc1b0541f8352e417fcaea600dfc199984f4ee5f
-  data.tar.gz: 55e89c13f41a75441fb281025d62deb3fa114080
+  metadata.gz: 5e46a609344a9bab5fd5dd0aa922a7109258c2fb
+  data.tar.gz: 6b809e7cc1cc9c9fbfdf17115f88f00e06adbe0a
 SHA512: 
-  metadata.gz: 066f4eac74ffd2e34af998f5622291a9d3db400381e3e3b1bbb68fd819ca00880d208460462f2b340980659b1518da9a575d4b58d67a8750b099688c6b5d7187
-  data.tar.gz: c4bf700bfe1196493333e38cf2bf437841d4f86258bd6e713159c5c9838db19c5d3526ab04f18619d5fd30c6e513b8369589c91e0a368ca081ba747c41d1de57
+  metadata.gz: 6a4dd5daee23f0ebd8ae06588a15330ffa0fb57ca59fcf8027c7db0b3c3d7f0aba97251ceb6b098c954cb47a56c8c0aaa72b19f612c4ebb6108dac31b4dc6585
+  data.tar.gz: 53ab6f0f9d22a00248a4c3e195d3e553856d3e4cdd3e44f47d04c8d4c3343b3732761640b7e870f1d9d2d01004b61631e0999d3df02defbdbcf3908ef17e24ec

data/README.md

@@ -9,10 +9,12 @@ Handler-based web framework powered by Sinatra.
 
 require 'deas'
 
-class MyApp
+class MyServer
   include Deas::Server
 
-  get '/', 'HelloWorldHandler'
+  router do
+    get '/', 'HelloWorldHandler'
+  end
 
 end
 
@@ -25,8 +27,8 @@ class HellowWorldHandler
 
 end
 
-app = MyApp.new
-run app
+server = MyServer.new
+run server
 ```
 
 ## Installation

data/deas.gemspec

@@ -18,11 +18,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert",           ["~> 2.15.1"])
-  gem.add_development_dependency("assert-rack-test", ["~> 1.0.3"])
+  gem.add_development_dependency("assert",           ["~> 2.16.1"])
+  gem.add_development_dependency("assert-rack-test", ["~> 1.0.4"])
 
-  gem.add_dependency("much-plugin", ["~> 0.1.0"])
-  gem.add_dependency("ns-options",  ["~> 1.1.6"])
+  gem.add_dependency("much-plugin", ["~> 0.2.0"])
   gem.add_dependency("rack",        ["~> 1.1"])
   gem.add_dependency("sinatra",     ["~> 1.2"])
 

data/lib/deas.rb

@@ -1,6 +1,4 @@
-require 'ns-options'
 require 'pathname'
-
 require 'deas/version'
 require 'deas/exceptions'
 require 'deas/server'
@@ -9,4 +7,5 @@ require 'deas/view_handler'
 # TODO - remove with future version of Rack (> v1.5.2)
 require 'deas/rack_request_fix'
 
-module Deas; end
+module Deas
+end

data/lib/deas/router.rb

@@ -6,7 +6,7 @@ module Deas
 
   class Router
 
-    DEFAULT_REQUEST_TYPE_NAME = 'default'
+    DEFAULT_REQUEST_TYPE_NAME = 'default'.freeze
 
     attr_reader :request_types, :urls, :routes, :definitions
     attr_reader :escape_query_value_proc
@@ -53,7 +53,13 @@ module Deas
     def url_for(name, *args)
       url = self.urls[name.to_sym]
       raise ArgumentError, "no route named `#{name.to_sym.inspect}`" unless url
-      prepend_base_url(url.path_for(*args))
+      begin
+        prepend_base_url(url.path_for(*args))
+      rescue Deas::Url::NonHashParamsError => err
+        raise ArgumentError, "url param values must be passed as a Hash"
+      rescue Deas::Url::EmptyNamedValueError => err
+        raise ArgumentError, err.message
+      end
     end
 
     def default_request_type_name(value = nil)

data/lib/deas/runner.rb

@@ -52,11 +52,8 @@ module Deas
 
     def body(value = nil)
       if !value.nil?
-        unless value.respond_to?(:each)
-          raise ArgumentError, "this body value (class `#{value.class}`), does not "\
-                               "respond to `each`."
-        end
-        @body = value
+        # String#each is a thing in 1.8.7, so account for it here
+        @body = !value.respond_to?(:each) || value.kind_of?(String) ? [*value] : value
       end
       @body
     end
@@ -68,7 +65,7 @@ module Deas
     def halt(*args)
       self.status(args.shift)  if args.first.instance_of?(::Fixnum)
       self.headers(args.shift) if args.first.kind_of?(::Hash)
-      self.body(args.shift)    if args.first.respond_to?(:each)
+      self.body(args.shift)
       throw :halt
     end
 

data/lib/deas/server.rb

@@ -1,7 +1,4 @@
 require 'much-plugin'
-require 'ns-options'
-require 'ns-options/boolean'
-require 'pathname'
 require 'deas/exceptions'
 require 'deas/logger'
 require 'deas/logging'
@@ -34,169 +31,197 @@ module Deas
       # TODO: needed while Deas is powered by Sinatra
       # eventually do an initialize method more like Sanford does
       def new
-        Deas::SinatraApp.new(self.configuration)
+        Deas::SinatraApp.new(self.config)
       end
 
-      def configuration
-        @configuration ||= Configuration.new
+      def config
+        @config ||= Config.new
       end
 
-      # sinatra settings DSL
-
-      def env(*args)
-        self.configuration.env *args
-      end
-
-      def root(*args)
-        self.configuration.root *args
+      def env(value = nil)
+        self.config.env = value if !value.nil?
+        self.config.env
       end
 
-      def public_root(*args)
-        self.configuration.public_root *args
+      def root(value = nil)
+        self.config.root = value if !value.nil?
+        self.config.root
       end
 
-      def views_root(*args)
-        self.configuration.views_root *args
+      def views_path(value = nil)
+        self.config.views_path = value if !value.nil?
+        self.config.views_path
       end
 
-      def dump_errors(*args)
-        self.configuration.dump_errors *args
+      def views_root
+        self.config.views_root
       end
 
-      def method_override(*args)
-        self.configuration.method_override *args
+      def public_path(value = nil)
+        self.config.public_path = value if !value.nil?
+        self.config.public_path
       end
 
-      def sessions(*args)
-        self.configuration.sessions *args
+      def public_root
+        self.config.public_root
       end
 
-      def show_exceptions(*args)
-        self.configuration.show_exceptions *args
+      def default_encoding(value = nil)
+        self.config.default_encoding = value if !value.nil?
+        self.config.default_encoding
       end
 
-      def static_files(*args)
-        self.configuration.static_files *args
+      def set(name, value)
+        self.config.settings[name.to_sym] = value
       end
 
-      def reload_templates(*args)
-        self.configuration.reload_templates *args
+      def settings
+        self.config.settings
       end
 
-      # Server handling DSL
-
-      def init(&block)
-        self.configuration.init_procs << block
+      def template_helpers(*helper_modules)
+        helper_modules.each{ |m| self.config.template_helpers << m }
+        self.config.template_helpers
       end
 
-      def error(&block)
-        self.configuration.error_procs << block
+      def template_helper?(helper_module)
+        self.config.template_helpers.include?(helper_module)
       end
 
-      def template_helpers(*helper_modules)
-        helper_modules.each{ |m| self.configuration.template_helpers << m }
-        self.configuration.template_helpers
+      def use(*args)
+        self.config.middlewares << args
       end
 
-      def template_helper?(helper_module)
-        self.configuration.template_helpers.include?(helper_module)
+      def middlewares
+        self.config.middlewares
       end
 
-      def use(*args)
-        self.configuration.middlewares << args
+      def init(&block)
+        self.config.init_procs << block
       end
 
-      def set(name, value)
-        self.configuration.settings[name.to_sym] = value
+      def init_procs
+        self.config.init_procs
       end
 
-      def verbose_logging(*args)
-        self.configuration.verbose_logging *args
+      def error(&block)
+        self.config.error_procs << block
       end
 
-      def logger(*args)
-        self.configuration.logger *args
+      def error_procs
+        self.config.error_procs
       end
 
-      def default_encoding(*args)
-        self.configuration.default_encoding *args
+      def template_source(value = nil)
+        self.config.template_source = value if !value.nil?
+        self.config.template_source
       end
 
-      def template_source(*args)
-        self.configuration.template_source *args
+      def logger(value = nil)
+        self.config.logger = value if !value.nil?
+        self.config.logger
       end
 
       # router handling
 
-      def router(value = nil)
-        self.configuration.router = value if !value.nil?
-        self.configuration.router
+      def router(value = nil, &block)
+        self.config.router = value if !value.nil?
+        self.config.router.instance_eval(&block) if block
+        self.config.router
       end
 
-      def view_handler_ns(*args); self.router.view_handler_ns(*args); end
-      def base_url(*args);        self.router.base_url(*args);        end
-
-      def url(*args, &block);     self.router.url(*args, &block);     end
       def url_for(*args, &block); self.router.url_for(*args, &block); end
 
-      def default_request_type_name(*args); self.router.default_request_type_name(*args); end
-      def add_request_type(*args, &block);  self.router.add_request_type(*args, &block);  end
-      def request_type_name(*args);         self.router.request_type_name(*args);         end
+      # flags
 
-      def get(*args, &block);    self.router.get(*args, &block);    end
-      def post(*args, &block);   self.router.post(*args, &block);   end
-      def put(*args, &block);    self.router.put(*args, &block);    end
-      def patch(*args, &block);  self.router.patch(*args, &block);  end
-      def delete(*args, &block); self.router.delete(*args, &block); end
+      def dump_errors(value = nil)
+        self.config.dump_errors = value if !value.nil?
+        self.config.dump_errors
+      end
 
-      def route(*args, &block);    self.router.route(*args, &block);    end
-      def redirect(*args, &block); self.router.redirect(*args, &block); end
+      def method_override(value = nil)
+        self.config.method_override = value if !value.nil?
+        self.config.method_override
+      end
 
-    end
+      def reload_templates(value = nil)
+        self.config.reload_templates = value if !value.nil?
+        self.config.reload_templates
+      end
 
-    class Configuration
-      include NsOptions::Proxy
+      def sessions(value = nil)
+        self.config.sessions = value if !value.nil?
+        self.config.sessions
+      end
 
-      # Sinatra-based options
+      def show_exceptions(value = nil)
+        self.config.show_exceptions = value if !value.nil?
+        self.config.show_exceptions
+      end
 
-      option :env,  String,   :default => 'development'
+      def static_files(value = nil)
+        self.config.static_files = value if !value.nil?
+        self.config.static_files
+      end
 
-      option :root,        Pathname, :required => true
-      option :public_root, Pathname
-      option :views_root,  Pathname
+      def verbose_logging(value = nil)
+        self.config.verbose_logging = value if !value.nil?
+        self.config.verbose_logging
+      end
 
-      option :dump_errors,      NsOptions::Boolean, :default => false
-      option :method_override,  NsOptions::Boolean, :default => true
-      option :sessions,         NsOptions::Boolean, :default => false
-      option :show_exceptions,  NsOptions::Boolean, :default => false
-      option :static_files,     NsOptions::Boolean, :default => true
-      option :reload_templates, NsOptions::Boolean, :default => false
-      option :default_encoding, String,             :default => 'utf-8'
+    end
 
-      # server handling options
+    class Config
+
+      DEFAULT_ENV         = 'development'.freeze
+      DEFAULT_VIEWS_PATH  = 'views'.freeze
+      DEFAULT_PUBLIC_PATH = 'public'.freeze
+      DEFAULT_ENCODING    = 'utf-8'.freeze
+
+      attr_accessor :env, :root, :views_path, :public_path, :default_encoding
+      attr_accessor :settings, :template_helpers, :middlewares
+      attr_accessor :init_procs, :error_procs, :template_source, :logger, :router
+
+      attr_accessor :dump_errors, :method_override, :reload_templates
+      attr_accessor :sessions, :show_exceptions, :static_files
+      attr_accessor :verbose_logging
+
+      def initialize
+        @env              = DEFAULT_ENV
+        @root             = ENV['PWD']
+        @views_path       = DEFAULT_VIEWS_PATH
+        @public_path      = DEFAULT_PUBLIC_PATH
+        @default_encoding = DEFAULT_ENCODING
+        @settings         = {}
+        @template_helpers = []
+        @middlewares      = []
+        @init_procs       = []
+        @error_procs      = []
+        @template_source  = nil
+        @logger           = Deas::NullLogger.new
+        @router           = Deas::Router.new
+
+        @dump_errors      = false
+        @method_override  = true
+        @reload_templates = false
+        @sessions         = false
+        @show_exceptions  = false
+        @static_files     = true
+        @verbose_logging  = true
+
+        @valid = nil
+      end
 
-      option :verbose_logging, NsOptions::Boolean, :default => true
-      option :logger
-      option :template_source
+      def views_root
+        File.expand_path(@views_path.to_s, @root.to_s)
+      end
 
-      attr_accessor :settings, :init_procs, :error_procs, :template_helpers
-      attr_accessor :middlewares, :router
+      def public_root
+        File.expand_path(@public_path.to_s, @root.to_s)
+      end
 
-      def initialize(values = nil)
-        # these are defaulted here because we want to use the Configuration
-        # instance `root`. If we define a proc above, we will be using the
-        # Configuration class `root`, which will not update these options as
-        # expected.
-        super((values || {}).merge({
-          :public_root     => proc{ self.root.join('public') },
-          :views_root      => proc{ self.root.join('views') },
-          :logger          => proc{ Deas::NullLogger.new },
-          :template_source => proc{ Deas::NullTemplateSource.new(self.root) }
-        }))
-        @settings = {}
-        @init_procs, @error_procs, @template_helpers, @middlewares = [], [], [], []
-        @router = Deas::Router.new
-        @valid  = nil
+      def template_source
+        @template_source ||= Deas::NullTemplateSource.new(self.root)
       end
 
       def urls
@@ -207,25 +232,18 @@ module Deas
         self.router.routes
       end
 
-      def to_hash
-        super.merge({
-          :error_procs => self.error_procs,
-          :router      => self.router
-        })
-      end
-
       def valid?
         !!@valid
       end
 
-      # for the config to be considered "valid", a few things need to happen.  The
-      # key here is that this only needs to be done _once_ for each config.
+      # for the config to be considered "valid", a few things need to happen.
+      # The key here is that this only needs to be done _once_ for each config.
 
       def validate!
         return @valid if !@valid.nil?  # only need to run this once per config
 
         # ensure all user and plugin configs/settings are applied
-        self.init_procs.each{ |p| p.call }
+        self.init_procs.each(&:call)
         raise Deas::ServerRootError if self.root.nil?
 
         # validate the router
@@ -235,11 +253,10 @@ module Deas
         # that the logging and exception showing happens just before the app gets
         # the request and just after the app sends a response.
         self.middlewares << [Deas::ShowExceptions] if self.show_exceptions
-        [*Deas::Logging.middleware(self.verbose_logging)].tap do |mw_args|
-          self.middlewares << mw_args
-        end
+        logging_mw_args = [*Deas::Logging.middleware(self.verbose_logging)]
+        self.middlewares << logging_mw_args
 
-        @valid = true  # if it made it this far, its valid!
+        @valid = true # if it made it this far, its valid!
       end
 
     end