sinatra-reloader 0.4.1 → 0.5.0

data/LICENSE

@@ -0,0 +1,27 @@
+copyright (c) 2010 Konstantin Haase.  All rights reserved.
+
+Developed by: Konstantin Haase
+              http://github.com/rkh/big_band
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal with the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimers.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimers in the
+     documentation and/or other materials provided with the distribution.
+  3. Neither the name of Konstantin Haase, nor the names of other contributors
+     may be used to endorse or promote products derived from this Software without
+     specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS 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
+WITH THE SOFTWARE.

data/lib/sinatra/reloader.rb

@@ -1,4 +1,4 @@
-require "monkey"
+require "monkey-lib"
 require "sinatra/base"
 require "sinatra/sugar"
 require "sinatra/advanced_routes"
@@ -7,19 +7,16 @@ module Sinatra
   Base.ignore_caller
 
   module Reloader
-
     class FileWatcher < Array
-
-      attr_reader :file, :mtime
-
+      attr_reader :file, :mtime, :inline_templates, :app
       extend Enumerable
       @map ||= {}
 
       def self.register(route)
-        new(route.file) << route if route.file?
+        new(route.file, route.app) << route if route.file?
       end
 
-      def self.new(file)
+      def self.new(file, app)
         file = file.expand_path
         begin
           file = file.realpath
@@ -36,8 +33,8 @@ module Sinatra
         @map.values.each(&block) 
       end
 
-      def initialize(file)
-        @reload, @file = true, file
+      def initialize(file, app)
+        @reload, @file, @app = true, file, app
         @mtime = File.exist?(file) ? File.mtime(file) : Time.at(0)
         super()
       end
@@ -58,16 +55,24 @@ module Sinatra
         reload! if reload?
       end
 
+      def inline_templates?
+        !!inline_templates
+      end
+
+      def inline_templates!
+        @inline_templates = true
+      end
+
       def reload!
         each { |route| route.deactivate }
         $LOADED_FEATURES.delete file
         clear
         if File.exist? file
+          app.set :inline_templates, file if inline_templates?
           @mtime = File.mtime(file)
           require file
         end
       end
-
     end
 
     module ClassMethods
@@ -77,20 +82,27 @@ module Sinatra
         end
         files.flatten.each do |file|
           # Rubinius and JRuby ignore block passed to glob.
-          Dir.glob(file).each { |f| FileWatcher[f].dont_reload! dont }
-          FileWatcher[file].dont_reload! dont
+          Dir.glob(file).each { |f| FileWatcher[f, self].dont_reload! dont }
+          FileWatcher[file, self].dont_reload! dont
         end
       end
 
       def also_reload(*files)
         dont_reload(files, false)
       end
+
+      def inline_templates=(file = nil)
+        file = (file.nil? || file == true) ? caller_files.first : (file || $0)
+        FileWatcher[file, self].inline_templates!
+        super
+      end
     end
 
     def self.registered(klass)
       klass.register AdvancedRoutes
       klass.extend ClassMethods
       klass.each_route { |route| advanced_route_added(route) }
+      klass.enable :reload_templates
       klass.before { Reloader.reload_routes }
     end
 
@@ -106,9 +118,7 @@ module Sinatra
       return Thread.exclusive { reload_routes(false) } if thread_safe and thread_safe?
       FileWatcher.each { |file| file.reload }
     end
-
   end
 
   register Reloader
-
 end

data/spec/sinatra/reloader_spec.rb

@@ -1,15 +1,20 @@
 require File.expand_path("../../spec_helper", __FILE__)
 
 describe Sinatra::Reloader do
+  it_should_behave_like 'sinatra'
 
-  def app_file(file, content, go_sleeping = true)
+  def app_file(file, content)
     file = File.expand_path(file, @temp_dir)
     old_mtime = File.exist?(file) ? File.mtime(file) : Time.at(0)
     new_mtime = old_mtime
     # this is eventually faster than a hard coded sleep 1, also it adjusts to the systems
     # mtime granularity
     until new_mtime > old_mtime
-      File.open(file, "w") { |f| f << "class ::ExampleApp < Sinatra::Base; #{content}; end" }
+      File.open(file, "w") do |f|
+        f << "class ::ExampleApp < Sinatra::Base; #{content}; end\n"
+        yield f if block_given?
+      end
+      File.utime File.atime(file), old_mtime + 10, file unless ENV['MTIME']
       new_mtime = File.mtime file
       # ok, let's not generate too much io
       sleep 0.1 if new_mtime == old_mtime
@@ -59,4 +64,26 @@ describe Sinatra::Reloader do
     browse_route(:get, '/baz').body.should == 'foo'
   end
 
-end
+  it "reloads inline templates" do
+    file = app_file("example_app4.rb", "get('/foo') { haml :foo }") { |f| f.puts "__END__", "@@foo", "foo" }
+    app.set :inline_templates, file
+    browse_route(:get, '/foo').body.strip.should == "foo"
+    app_file("example_app4.rb", "get('/foo') { haml :foo }") { |f| f.puts "__END__", "@@foo", "bar" }
+    browse_route(:get, '/foo').body.strip.should == "bar"
+  end
+
+  it "should not readd middleware" do
+    3.times do
+      app_file "example_app5.rb", <<-RUBY
+        use Rack::Config do |env|
+          env['some.counter'] ||= 0
+          env['some.counter'] += 1
+          $counter = env['some.counter']
+        end
+      RUBY
+      browse_route :get, '/foo'
+    end
+    $counter.should == 1
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require "sinatra/rspec"
+require "sinatra/rspec/shared"
 require "sinatra/reloader"
 require "fileutils"
 include FileUtils

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-reloader
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -14,58 +15,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +02:00
+date: 2010-07-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra-advanced-routes
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra-test-helper
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        version: "1.0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -86,6 +94,7 @@ files:
 - spec/sinatra/reloader_spec.rb
 - spec/spec_helper.rb
 - README.md
+- LICENSE
 has_rdoc: yard
 homepage: http://github.com/rkh/sinatra-reloader
 licenses: []
@@ -96,23 +105,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Smart and fast code reloader for Sinatra (part of BigBand).