dzl 1.0.0.beta1 → 1.0.0.beta2

data/dzl.gemspec

@@ -8,14 +8,14 @@ Gem::Specification.new do |s|
   s.authors     = ["Kyle Brett", "Paul Bergeron"]
   s.email       = ["kyle@vitrue.com", "pbergeron@vitrue.com"]
   s.homepage    = "http://github.com/vitrue/dzl"
-  s.summary     = %q{Parameter validation and request routing DSL & framework}
-  s.description = %q{Dzl zones live!}
+  s.summary     = %q{Parameter validation and request routing DSL & web framework}
+  s.description = %q{Small, fast racktivesupport web framework with handy DSL and explicit parameter validation.}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'rack'
-  s.add_runtime_dependency 'activesupport'
+  s.add_runtime_dependency 'rack', '~> 1.4.1'
+  s.add_runtime_dependency 'activesupport', '~> 3.2.2'
 end

data/lib/dzl/rack_interface.rb

@@ -5,6 +5,7 @@ module Dzl::RackInterface
   PROFILE_REQUESTS = false
 
   def call(env)
+    __reloader.reload_if_updated if respond_to?(:__reloader)
     response = nil
     request = nil
     start_time = Time.now

data/lib/dzl/reloader.rb

@@ -0,0 +1,44 @@
+class Dzl::Reloader
+  def initialize(app)
+    @app = app
+    @files = Dir["#{app.root}/lib/**/*.rb"]
+    @last_reload = Time.now
+  end
+
+  def reload_if_updated
+    reload! if updated?
+  end
+
+  def reload!
+    @app.__wipe
+
+    @files.each do |file|
+      begin
+        load(file) if $LOADED_FEATURES.include?(file)
+      rescue LoadError, SyntaxError, SystemStackError => e
+        @app.logger.error(e)
+        @app.logger.error(e.backtrace)
+        @app.logger.error "While loading file #{file}"
+      end
+    end
+
+    @last_reload = Time.now
+  end
+
+  private
+  def updated?
+    # If it hasn't been two seconds, don't reload.
+    updated_at > (@last_reload + 2.seconds)
+  end
+
+  def files_and_mtimes(rb_files)
+    rb_files.each_with_object({}) do |file, out|
+      out[file] = File.mtime(file)
+    end
+  end
+
+  def updated_at
+    @files.collect {|f| File.mtime(f)}.max
+  end
+end
+

data/lib/dzl/version.rb

@@ -1,3 +1,3 @@
 module Dzl
-  VERSION = "1.0.0.beta1"
+  VERSION = "1.0.0.beta2"
 end

data/lib/dzl.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/core_ext'
 require 'dzl/version'
 require 'dzl/logger'
@@ -30,6 +31,12 @@ module Dzl
       )
     end
 
+    [:development?, :production?, :staging?, :test?].each do |m|
+      define_singleton_method(m) do
+        env == m.to_s[0..-2]
+      end
+    end
+
     base.extend(RackInterface)
 
     class << base
@@ -40,6 +47,10 @@ module Dzl
         @__router ||= Dzl::DSLSubjects::Router.new(self)
       end
 
+      def __wipe
+        @__router = nil
+      end
+
       def __logger
         @__logger ||= begin
           if self.orig_respond_to?(:logger) && self.logger.is_a?(ActiveSupport::BufferedLogger)
@@ -79,18 +90,15 @@ module Dzl
           endpoint_page.close
         end
       end
-    end
-  end
 
-  [:development?, :production?, :staging?, :test?].each do |m|
-    define_singleton_method(m) do
-      env == m.to_s[0..-2]
+      if Dzl.development?
+        require 'dzl/reloader'
+        def __reloader
+          @__reloader ||= Dzl::Reloader.new(self)
+        end
+      end
     end
   end
-
-  def self.development?
-    true
-  end
 end
 
 Diesel = Dzl

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dzl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,31 +10,32 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70345596630620 !ruby/object:Gem::Requirement
+  requirement: &70297835742860 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70345596630620
+  version_requirements: *70297835742860
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70345596630120 !ruby/object:Gem::Requirement
+  requirement: &70297835740780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70345596630120
-description: Dzl zones live!
+  version_requirements: *70297835740780
+description: Small, fast racktivesupport web framework with handy DSL and explicit
+  parameter validation.
 email:
 - kyle@vitrue.com
 - pbergeron@vitrue.com
@@ -83,6 +84,7 @@ files:
 - lib/dzl/examples/trey.rb
 - lib/dzl/logger.rb
 - lib/dzl/rack_interface.rb
+- lib/dzl/reloader.rb
 - lib/dzl/request.rb
 - lib/dzl/response_context.rb
 - lib/dzl/response_context/request_helpers.rb
@@ -126,7 +128,7 @@ rubyforge_project:
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Parameter validation and request routing DSL & framework
+summary: Parameter validation and request routing DSL & web framework
 test_files:
 - spec/dsl_subject_spec.rb
 - spec/endpoint_doc_spec.rb