deas 0.6.0 → 0.7.0

data/README.md

@@ -4,7 +4,30 @@ Handler-based web framework powered by Sinatra.
 
 ## Usage
 
-TODO: Write code samples and usage instructions here
+```ruby
+# in your rackup file (or whatever)
+
+require 'deas'
+
+class MyApp
+  include Deas::Server
+
+  get '/', 'HelloWorldHandler'
+
+end
+
+class HellowWorldHandler
+  include Deas::ViewHandler
+
+  def run!
+    "<h1>Hello World</h1>"
+  end
+
+end
+
+app = MyApp.new
+run app
+```
 
 ## Installation
 

data/deas.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency("rack",       ["~> 1.5"])
   gem.add_dependency("sinatra",    ["~> 1.4"])
 
-  gem.add_development_dependency("assert",       ["~> 2.0"])
-  gem.add_development_dependency("assert-mocha", ["~> 1.0"])
-  gem.add_development_dependency("rack-test",    ["~> 0.6"])
+  gem.add_development_dependency("assert")
+  gem.add_development_dependency("assert-mocha")
+  gem.add_development_dependency("assert-rack-test")
 
 end

data/lib/deas.rb

@@ -3,39 +3,13 @@ require 'pathname'
 
 require 'deas/version'
 require 'deas/server'
-require 'deas/sinatra_app'
 require 'deas/view_handler'
 
 # TODO - remove with future version of Rack (> v1.5.2)
 require 'deas/rack_request_fix'
 
-ENV['DEAS_ROUTES_FILE'] ||= 'config/routes'
-
 module Deas
 
-  def self.app
-    @app
-  end
-
-  def self.config
-    Deas::Config
-  end
-
-  def self.configure(&block)
-    self.config.define(&block)
-    self.config
-  end
-
-  def self.init
-    require self.config.routes_file
-    @app = Deas::SinatraApp.new(Deas::Server.configuration)
-  end
-
-  module Config
-    include NsOptions::Proxy
-    option :routes_file,  Pathname, :default => ENV['DEAS_ROUTES_FILE']
-  end
-
   class NullLogger
     require 'logger'
 

data/lib/deas/logging.rb

@@ -13,7 +13,7 @@ module Deas
 
     def initialize(app)
       @app    = app
-      @logger = Deas.app.settings.logger
+      @logger = @app.settings.logger
     end
 
     # The Rack call interface. The receiver acts as a prototype and runs

data/lib/deas/server.rb

@@ -1,59 +1,74 @@
 require 'ns-options'
 require 'ns-options/boolean'
 require 'pathname'
-require 'singleton'
+require 'deas/template'
 require 'deas/route'
+require 'deas/sinatra_app'
 
-module Deas
-
-  class Server
-    include Singleton
-
-    class Configuration
-      include NsOptions::Proxy
-
-      # Sinatra based options
-      option :env,  String,   :default => 'development'
-      option :root, Pathname, :default => proc{ File.dirname(Deas.config.routes_file) }
-
-      option :app_file,      Pathname, :default => proc{ Deas.config.routes_file }
-      option :public_folder, Pathname
-      option :views_folder,  Pathname
-
-      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
-
-      # server handling options
-      option :error_procs,     Array, :default => []
-      option :init_procs,      Array, :default => []
-      option :logger,                 :default => proc{ Deas::NullLogger.new }
-      option :middlewares,     Array, :default => []
-      option :verbose_logging,        :default => true
-
-      option :routes,          Array, :default => []
-      option :view_handler_ns, String
-
-      def initialize
-        # 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({
-          :public_folder => proc{ self.root.join('public') },
-          :views_folder  => proc{ self.root.join('views') }
-        })
-      end
+module Deas; end
+module Deas::Server
 
-    end
+  class Configuration
+    include NsOptions::Proxy
+
+    # Sinatra based options
+    option :env,  String,   :default => 'development'
+
+    option :root,          Pathname
+    option :public_folder, Pathname
+    option :views_folder,  Pathname
+
+    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
+
+    # server handling options
+    option :error_procs,     Array, :default => []
+    option :init_procs,      Array, :default => []
+    option :logger,                 :default => proc{ Deas::NullLogger.new }
+    option :middlewares,     Array, :default => []
+    option :settings,        Array, :default => []
+    option :verbose_logging,        :default => true
+    option :routes,          Array, :default => []
+    option :view_handler_ns, String
 
-    attr_reader :configuration
+    attr_reader :template_helpers
 
     def initialize
-      @configuration = Configuration.new
+      # 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({
+        :public_folder => proc{ self.root.join('public') },
+        :views_folder  => proc{ self.root.join('views') }
+      })
+      @template_helpers = []
+    end
+
+    def template_scope
+      Class.new(Deas::Template::Scope).tap do |klass|
+        klass.send(:include, *self.template_helpers)
+      end
+    end
+
+  end
+
+  def self.included(receiver)
+    receiver.class_eval{ extend ClassMethods }
+  end
+
+  module ClassMethods
+
+    def new
+      Deas::SinatraApp.new(self.configuration)
+    end
+
+    def configuration
+      @configuration ||= Configuration.new
     end
 
     # sinatra settings DSL
@@ -100,28 +115,41 @@ module Deas
 
     # Server handling DSL
 
-    def error(&block)
-      self.configuration.error_procs << block
-    end
-
     def init(&block)
       self.configuration.init_procs << block
     end
 
+    def template_helpers(*helper_modules)
+      helper_modules.each{ |m| self.configuration.template_helpers << m }
+      self.configuration.template_helpers
+    end
+
+    def template_helper?(helper_module)
+      self.configuration.template_helpers.include?(helper_module)
+    end
+
+    def error(&block)
+      self.configuration.error_procs << block
+    end
+
     def logger(*args)
       self.configuration.logger *args
     end
 
-    def verbose_logging(*args)
-      self.configuration.verbose_logging *args
+    def use(*args)
+      self.configuration.middlewares << args
+    end
+
+    def set(*args)
+      self.configuration.settings << args
     end
 
     def view_handler_ns(*args)
       self.configuration.view_handler_ns *args
     end
 
-    def use(*args)
-      self.configuration.middlewares << args
+    def verbose_logging(*args)
+      self.configuration.verbose_logging *args
     end
 
     def get(path, handler_class_name)
@@ -153,14 +181,6 @@ module Deas
       end
     end
 
-    def self.method_missing(method, *args, &block)
-      self.instance.send(method, *args, &block)
-    end
-
-    def self.respond_to?(*args)
-      super || self.instance.respond_to?(*args)
-    end
-
   end
 
 end

data/lib/deas/sinatra_app.rb

@@ -19,7 +19,6 @@ module Deas
         set :environment, server_config.env
         set :root,        server_config.root
 
-        set :app_file,      server_config.app_file
         set :public_folder, server_config.public_folder
         set :views,         server_config.views_folder
 
@@ -29,21 +28,20 @@ module Deas
         set :show_exceptions,  server_config.show_exceptions
         set :static,           server_config.static_files
         set :reload_templates, server_config.reload_templates
-        set :logging,         false
+        set :logging,          false
 
         # custom settings
-        set :deas_error_procs, server_config.error_procs
-        set :logger,           server_config.logger
+        set :deas_template_scope, server_config.template_scope
+        set :deas_error_procs,    server_config.error_procs
+        set :logger,              server_config.logger
+
+        server_config.settings.each{ |set_args| set *set_args }
+        server_config.middlewares.each{ |use_args| use *use_args }
 
-        server_config.middlewares.each do |middleware_args|
-          use *middleware_args
-        end
         use Deas::Logging.middleware(server_config.verbose_logging)
 
         # routes
         server_config.routes.each do |route|
-          # defines Sinatra routes like:
-          #   get('/'){ ... }
           send(route.method, route.path){ route.run(self) }
         end
 

data/lib/deas/template.rb

@@ -4,35 +4,25 @@ module Deas
 
   class Template
 
-    def self.helpers(*helper_modules)
-      Deas::Template::RenderScope.class_eval{ include *helper_modules }
-    end
-
-    def self.helper?(helper_module)
-      Deas::Template::RenderScope.included_modules.include?(helper_module)
-    end
-
     attr_reader :name, :options
 
     def initialize(sinatra_call, name, options = nil)
-      @options = options || {}
-      @options[:scope] = RenderScope.new(sinatra_call)
+      @sinatra_call, @name, @options = sinatra_call, name.to_sym, (options || {})
+      @options[:scope] = @sinatra_call.settings.deas_template_scope.new(@sinatra_call)
 
-      @sinatra_call = sinatra_call
-      @name         = name.to_sym
       (@options.delete(:layout) || @options.delete(:layouts) || []).tap do |l|
         @layouts = l.compact.map(&:to_sym)
       end
     end
 
-    # builds Sinatra render-blocks like:
+    # builds render-blocks like:
     #
     #   erb :main_layout do
     #     erb :second_layout do
     #       erb :user_index
     #     end
     #   end
-    #
+
     def render(&block)
       template_names = [ @layouts, @name ].flatten.reverse
       top_render_proc = template_names.inject(block) do |render_proc, name|
@@ -41,17 +31,18 @@ module Deas
       top_render_proc.call
     end
 
-    class RenderScope
+    class Scope
+      attr_reader :sinatra_call
       def initialize(sinatra_call)
         @sinatra_call = sinatra_call
       end
 
       def render(name, options = nil, &block)
-        Deas::Template.new(@sinatra_call, name, options || {}).render(&block)
+        Template.new(@sinatra_call, name, options || {}).render(&block)
       end
 
       def partial(name, locals = nil)
-        Deas::Partial.new(@sinatra_call, name, locals || {}).render
+        Partial.new(@sinatra_call, name, locals || {}).render
       end
 
       def escape_html(html)
@@ -64,19 +55,23 @@ module Deas
       end
       alias :u :escape_url
 
+      def ==(other_scope)
+        self.sinatra_call == other_scope.sinatra_call
+        self.class.included_modules == other_scope.class.included_modules
+      end
     end
 
-  end
+    class Partial < Template
 
-  class Partial < Template
-
-    def initialize(sinatra_call, name, locals = nil)
-      options = { :locals => (locals || {}) }
-      name = begin
-        basename = File.basename(name.to_s)
-        name.to_s.sub(/#{basename}\Z/, "_#{basename}")
+      def initialize(sinatra_call, name, locals = nil)
+        options = { :locals => (locals || {}) }
+        name = begin
+          basename = File.basename(name.to_s)
+          name.to_s.sub(/#{basename}\Z/, "_#{basename}")
+        end
+        super sinatra_call, name, options
       end
-      super sinatra_call, name, options
+
     end
 
   end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/deas/view_handler.rb

@@ -39,6 +39,10 @@ module Deas
       "#<#{self.class}:#{reference} @request=#{self.request.inspect}>"
     end
 
+    def ==(other_handler)
+      self.class == other_handler.class
+    end
+
     protected
 
     # Helpers

data/test/helper.rb

@@ -2,15 +2,20 @@
 # put any test helpers here
 
 # add the root dir to the load path
-ROOT = File.expand_path('../..', __FILE__)
-$LOAD_PATH.unshift(ROOT)
+require 'pathname'
+ROOT = Pathname.new(File.expand_path('../..', __FILE__))
+$LOAD_PATH.unshift(ROOT.to_s)
+TEST_SUPPORT_ROOT = ROOT.join('test/support')
 
 # require pry for debugging (`binding.pry`)
 require 'pry'
 require 'assert-mocha' if defined?(Assert)
 
-require 'deas'
-Deas.configure do |config|
-  config.routes_file = File.join(ROOT, 'test/support/routes')
-end
-Deas.init
+require 'fileutils'
+require 'logger'
+log_file_path = ROOT.join("log/test.log")
+FileUtils.rm_f log_file_path
+TEST_LOGGER = Logger.new(File.open(log_file_path, 'w'))
+
+require TEST_SUPPORT_ROOT.join('routes')
+

data/test/support/fake_app.rb

@@ -13,18 +13,19 @@ class FakeApp
     @params   = @request.params
     @session  = @request.session
     @response = FakeResponse.new
-    @settings = OpenStruct.new({ })
+    @settings = OpenStruct.new(:deas_template_scope => Deas::Template::Scope)
   end
 
   def halt(*args)
     throw :halt, args
   end
 
-  def erb(*args, &block)
+  # return the template name for each nested calls
+  def erb(name, opts, &block)
     if block
-      [ args, block.call ].flatten
+      [ name, opts, block.call ].flatten
     else
-      args
+      [ name, opts ]
     end
   end
 

data/test/support/routes.rb

@@ -1,12 +1,11 @@
 require 'deas'
 
-class Deas::Server
+class DeasTestServer
+  include Deas::Server
 
-  root File.expand_path("..", __FILE__)
+  root TEST_SUPPORT_ROOT
 
-  log_file_path = File.expand_path("../../../log/test.log", __FILE__)
-
-  logger Logger.new(File.open(log_file_path, 'w'))
+  logger TEST_LOGGER
   verbose_logging true
 
   error do |exception|

data/test/system/{making_requests_tests.rb → rack_tests.rb}

@@ -1,14 +1,15 @@
 require 'assert'
-require 'rack/test'
+require 'assert-rack-test'
+require 'deas'
 
 module Deas
 
   class RackTests < Assert::Context
-    include Rack::Test::Methods
+    include Assert::Rack::Test
 
-    desc "Deas' the rack app"
+    desc "a Deas server rack app"
     setup do
-      @app = Deas.app.new
+      @app = DeasTestServer.new
     end
 
     def app; @app; end
@@ -76,10 +77,11 @@ module Deas
   class SessionTests < RackTests
     desc "with sessions enabled"
     setup do
-      orig_sessions = Deas.app.settings.sessions
-      Deas.app.set :sessions, true
-      @app = Deas.app.new
-      Deas.app.set :sessions, orig_sessions
+      @orig_sessions = @app.settings.sessions
+      @app.set :sessions, true
+    end
+    teardown do
+      @app.set :sessions, @orig_sessions
     end
 
     should "return a 200 response and the session value" do

data/test/unit/logging_tests.rb

@@ -1,20 +1,24 @@
 require 'assert'
+require 'test/support/fake_app'
 require 'deas/logging'
 
 module Deas::Logging
 
   class BaseTests < Assert::Context
     desc "Deas::Logging"
+    setup do
+      @app = FakeApp.new
+    end
     subject{ Deas::Logging }
 
     should have_imeths :middleware
 
   end
 
-  class VerboseLoggingTests < Assert::Context
+  class VerboseLoggingTests < BaseTests
     desc "Deas::VerboseLogging"
     setup do
-      @middleware = Deas::VerboseLogging.new('a rack app goes here')
+      @middleware = Deas::VerboseLogging.new(@app)
     end
     subject{ @middleware }
 
@@ -26,10 +30,10 @@ module Deas::Logging
 
   end
 
-  class SummaryLoggingTests < Assert::Context
+  class SummaryLoggingTests < BaseTests
     desc "Deas::SummaryLogging"
     setup do
-      @middleware = Deas::SummaryLogging.new('a rack app goes here')
+      @middleware = Deas::SummaryLogging.new(@app)
     end
     subject{ @middleware }
 
@@ -41,7 +45,7 @@ module Deas::Logging
 
   end
 
-  class SummaryLineTests < Assert::Context
+  class SummaryLineTests < BaseTests
     desc "Deas::SummaryLine"
     subject{ Deas::SummaryLine }
 

data/test/unit/server_tests.rb

@@ -1,27 +1,19 @@
 require 'assert'
+require 'deas/template'
 require 'deas/route'
 require 'deas/server'
 require 'logger'
 
-class Deas::Server
+module Deas::Server
 
   class BaseTests < Assert::Context
     desc "Deas::Server"
     setup do
-      @old_configuration = Deas::Server.configuration.dup
-      new_configuration = Deas::Server::Configuration.new
-      Deas::Server.instance.tap do |s|
-        s.instance_variable_set("@configuration", new_configuration)
-      end
+      @server_class = Class.new{ include Deas::Server }
     end
-    teardown do
-      Deas::Server.instance.tap do |s|
-        s.instance_variable_set("@configuration", @old_configuration)
-      end
-    end
-    subject{ Deas::Server }
+    subject{ @server_class }
 
-    should have_reader :configuration
+    should have_imeths :new, :configuration
 
     # DSL for sinatra settings
     should have_imeths :env, :root, :public_folder, :views_folder
@@ -29,13 +21,10 @@ class Deas::Server
     should have_imeths :static_files, :reload_templates
 
     # DSL for server handling
-    should have_imeths :init, :logger, :use, :view_handler_ns, :use
+    should have_imeths :init, :template_helpers, :template_helper?, :error
+    should have_imeths :logger, :use, :set, :view_handler_ns, :verbose_logging
     should have_imeths :get, :post, :put, :patch, :delete, :route
 
-    should "be a singleton" do
-      assert_includes Singleton, subject.included_modules
-    end
-
     should "allow setting it's configuration options" do
       config = subject.configuration
 
@@ -72,6 +61,9 @@ class Deas::Server
       subject.use 'MyMiddleware'
       assert_equal [ ['MyMiddleware'] ], config.middlewares
 
+      subject.set :testing_set_meth, 'it works!'
+      assert_equal [ [:testing_set_meth, 'it works!'] ], config.settings
+
       stdout_logger = Logger.new(STDOUT)
       subject.logger stdout_logger
       assert_equal stdout_logger, config.logger
@@ -159,6 +151,11 @@ class Deas::Server
       assert_equal '::NoNsTest', route.handler_class_name
     end
 
+    should "add and query helper modules using #template_helpers and #template_helper?" do
+      subject.template_helpers (helper_module = Module.new)
+      assert subject.template_helper?(helper_module)
+    end
+
   end
 
   class ConfigurationTests < BaseTests
@@ -169,37 +166,25 @@ class Deas::Server
     subject{ @configuration }
 
     # sinatra related options
-    should have_imeths :env, :root, :app_file, :public_folder, :views_folder
+    should have_imeths :env, :root, :public_folder, :views_folder
     should have_imeths :dump_errors, :method_override, :sessions, :show_exceptions
     should have_imeths :static_files, :reload_templates
 
     # server handling options
-    should have_imeths :init_procs, :logger, :verbose_logging, :middlewares
-    should have_imeths :routes, :view_handler_ns
+    should have_imeths :error_procs, :init_procs, :logger, :middlewares, :settings
+    should have_imeths :verbose_logging, :routes, :view_handler_ns
+
+    should have_reader :template_helpers
 
     should "default the env to 'development'" do
       assert_equal 'development', subject.env
     end
 
-    should "default the root to the routes file's folder" do
-      expected_root = File.expand_path('..', Deas.config.routes_file)
-      assert_equal expected_root, subject.root.to_s
-    end
-
-    should "default the app file to the routes file" do
-      assert_equal Deas.config.routes_file.to_s, subject.app_file.to_s
-    end
+    should "default the public and views folders based off the root" do
+      subject.root = TEST_SUPPORT_ROOT
 
-    should "default the public folder based on the root" do
-      expected_root = File.expand_path('..', Deas.config.routes_file)
-      expected_public_folder = File.join(expected_root, 'public')
-      assert_equal expected_public_folder, subject.public_folder.to_s
-    end
-
-    should "default the views folder based on the root" do
-      expected_root = File.expand_path('..', Deas.config.routes_file)
-      expected_views_folder = File.join(expected_root, 'views')
-      assert_equal expected_views_folder, subject.views_folder.to_s
+      assert_equal subject.root.join('public'), subject.public_folder
+      assert_equal subject.root.join('views'), subject.views_folder
     end
 
     should "default the Sinatra flags" do
@@ -211,16 +196,24 @@ class Deas::Server
       assert_equal false, subject.reload_templates
     end
 
-    should "default the logger to a NullLogger" do
+    should "default the handling options" do
+      assert_empty subject.error_procs
+      assert_empty subject.init_procs
       assert_instance_of Deas::NullLogger, subject.logger
+      assert_empty subject.middlewares
+      assert_empty subject.settings
+      assert_equal true, subject.verbose_logging
+      assert_empty subject.routes
+      assert_nil   subject.view_handler_ns
+      assert_empty subject.template_helpers
     end
 
-    should "default routes to an empty array" do
-      assert_equal [], subject.routes
-    end
+    should "build a template scope including its template helpers" do
+      config = Deas::Server::Configuration.new
+      config.template_helpers << (helper_module = Module.new)
 
-    should "default middlewares to an empty array" do
-      assert_equal [], subject.middlewares
+      assert_includes Deas::Template::Scope, config.template_scope.ancestors
+      assert_includes helper_module, config.template_scope.included_modules
     end
 
   end

data/test/unit/sinatra_app_tests.rb

@@ -49,7 +49,6 @@ module Deas::SinatraApp
       subject.settings.tap do |settings|
         assert_equal 'staging',                  settings.environment
         assert_equal 'path/to/somewhere',        settings.root.to_s
-        assert_equal @configuration.app_file,    settings.app_file
         assert_equal 'path/to/somewhere/public', settings.public_folder.to_s
         assert_equal 'path/to/somewhere/views',  settings.views.to_s
         assert_equal true,                       settings.dump_errors

data/test/unit/sinatra_runner_tests.rb

@@ -42,17 +42,15 @@ class Deas::SinatraRunner
       assert_equal [ 'test' ], return_value
     end
 
-    should "call the sinatra_call's erb method with #render" do
-      return_value = subject.render('index')
-
-      assert_equal :web,   return_value[0]
-      assert_equal :index, return_value[2]
-
-      options = return_value[3]
-      assert_instance_of Deas::Template::RenderScope, options[:scope]
-
-      expected_locals = { :view => subject.instance_variable_get("@handler") }
-      assert_equal(expected_locals, options[:locals])
+    should "render the template with a :view local and the handler layouts with #render" do
+      exp_handler = FlagViewHandler.new(subject)
+      exp_layouts = FlagViewHandler.layouts
+      exp_result = Deas::Template.new(@fake_sinatra_call, 'index', {
+        :locals => { :view => exp_handler },
+        :layout => exp_layouts
+      }).render
+
+      assert_equal exp_result, subject.render('index')
     end
 
     should "call the sinatra_call's redirect method with #redirect" do

data/test/unit/template_tests.rb

@@ -13,14 +13,13 @@ class Deas::Template
     subject{ @template }
 
     should have_instance_methods :name, :options, :render
-    should have_class_methods :helpers, :helper?
 
     should "symbolize it's name" do
       assert_equal :"users/index", subject.name
     end
 
-    should "set it's scope option to a empty Module" do
-      assert_instance_of Deas::Template::RenderScope, subject.options[:scope]
+    should "set it's scope option" do
+      assert_instance_of Deas::Template::Scope, subject.options[:scope]
     end
 
     should "call the sinatra_call's `erb` method with #render" do
@@ -30,17 +29,6 @@ class Deas::Template
       assert_equal subject.options, return_value[1]
     end
 
-    should "include modules on the RenderScope using `helpers` class method"\
-           " and know if a given modules has been included in the RenderScope" do
-      helper_module = Module.new
-      Deas::Template.helpers(helper_module)
-
-      included_modules = Deas::Template::RenderScope.included_modules
-      assert_includes helper_module, included_modules
-
-      assert Deas::Template.helper?(helper_module)
-    end
-
   end
 
   class WithLayoutsTests < BaseTests
@@ -64,13 +52,12 @@ class Deas::Template
 
   end
 
-  class RenderScopeTests < Assert::Context
+  class ScopeTests < BaseTests
     desc "Deas::Template::RenderScope"
     setup do
-      @fake_sinatra_call = FakeApp.new
-      @render_scope = Deas::Template::RenderScope.new(@fake_sinatra_call)
+      @scope = Deas::Template::Scope.new(@fake_sinatra_call)
     end
-    subject{ @render_scope }
+    subject{ @scope }
 
     should have_imeths :partial, :escape_html, :h, :escape_url, :u, :render
 
@@ -80,7 +67,7 @@ class Deas::Template
       assert_equal :_part, return_value[0]
 
       expected_options = return_value[1]
-      assert_instance_of Deas::Template::RenderScope, expected_options[:scope]
+      assert_instance_of Deas::Template::Scope, expected_options[:scope]
 
       expected_locals = { :something => true }
       assert_equal(expected_locals, expected_options[:locals])
@@ -89,15 +76,13 @@ class Deas::Template
     should "call the sinatra_call's erb method with #render" do
       return_value = subject.render('my_template', {
         :views  => '/path/to/templates',
-        :locals => {
-          :something => true
-        }
+        :locals => { :something => true }
       })
 
       assert_equal :my_template, return_value[0]
 
       expected_options = return_value[1]
-      assert_instance_of Deas::Template::RenderScope, expected_options[:scope]
+      assert_instance_of Deas::Template::Scope, expected_options[:scope]
 
       expected_locals = { :something => true }
       assert_equal(expected_locals, expected_options[:locals])
@@ -121,15 +106,10 @@ class Deas::Template
 
   end
 
-end
-
-class Deas::Partial
-
-  class BaseTests < Assert::Context
-    desc "Deas::Partial"
+  class PartialTests < BaseTests
+    desc "Partial"
     setup do
-      @fake_sinatra_call = FakeApp.new
-      @partial = Deas::Partial.new(@fake_sinatra_call, 'users/index/listing', {
+      @partial = Deas::Template::Partial.new(@fake_sinatra_call, 'users/index/listing', {
         :user => 'Joe Test'
       })
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-10 00:00:00 Z
+date: 2013-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ns-options
@@ -77,13 +77,12 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 2
         - 0
-        version: "2.0"
+        version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -92,28 +91,26 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: assert-rack-test
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 0
-        - 6
-        version: "0.6"
+        version: "0"
   type: :development
   version_requirements: *id006
 description: Handler-based web framework powered by Sinatra
@@ -158,8 +155,7 @@ files:
 - test/support/views/layout3.erb
 - test/support/views/show.erb
 - test/support/views/with_layout.erb
-- test/system/making_requests_tests.rb
-- test/unit/deas_tests.rb
+- test/system/rack_tests.rb
 - test/unit/error_handler_tests.rb
 - test/unit/logging_tests.rb
 - test/unit/route_tests.rb
@@ -214,8 +210,7 @@ test_files:
 - test/support/views/layout3.erb
 - test/support/views/show.erb
 - test/support/views/with_layout.erb
-- test/system/making_requests_tests.rb
-- test/unit/deas_tests.rb
+- test/system/rack_tests.rb
 - test/unit/error_handler_tests.rb
 - test/unit/logging_tests.rb
 - test/unit/route_tests.rb

data/test/unit/deas_tests.rb

@@ -1,21 +0,0 @@
-require 'assert'
-require 'deas'
-
-module Deas
-
-  class BaseTests < Assert::Context
-    desc "Deas"
-    subject{ Deas }
-
-    should have_instance_methods :config, :configure, :init, :app
-
-  end
-
-  class ConfigTests < BaseTests
-    desc "Deas::Config"
-    subject{ Deas::Config }
-
-    should have_instance_methods :routes_file
-  end
-
-end