junior 0.1.0 → 0.1.1

data/HISTORY

@@ -0,0 +1,3 @@
+0.1.1 - 2010-01-09 - Send file helper, content type bug fix.
+0.1.0 - 2010-01-05 - Added Usher router and restful resources
+0.0.0 - 2009-12-31 - Initial Release

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Michael Wood"]
 
     gem.add_dependency 'rack',       "~> 1.1.0"
-    gem.add_dependency 'usher',      "~> 0.6.2"
+    gem.add_dependency 'usher',      "~> 0.6.3"
     gem.add_dependency 'tilt',       "~> 0.4.0"
 
     gem.add_development_dependency 'rspec', '~> 1.2.9'

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/junior.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{junior}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Wood"]
-  s.date = %q{2010-01-05}
+  s.date = %q{2010-01-09}
   s.description = %q{A Mini MVC Web Framework for Ruby built on Rack and a lot of inspiration from Sinatra}
   s.email = %q{mike@michaelwood.com}
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "HISTORY",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -52,20 +53,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["~> 1.1.0"])
-      s.add_runtime_dependency(%q<usher>, ["~> 0.6.2"])
+      s.add_runtime_dependency(%q<usher>, ["~> 0.6.3"])
       s.add_runtime_dependency(%q<tilt>, ["~> 0.4.0"])
       s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
       s.add_development_dependency(%q<yard>, ["~> 0.5.2"])
     else
       s.add_dependency(%q<rack>, ["~> 1.1.0"])
-      s.add_dependency(%q<usher>, ["~> 0.6.2"])
+      s.add_dependency(%q<usher>, ["~> 0.6.3"])
       s.add_dependency(%q<tilt>, ["~> 0.4.0"])
       s.add_dependency(%q<rspec>, ["~> 1.2.9"])
       s.add_dependency(%q<yard>, ["~> 0.5.2"])
     end
   else
     s.add_dependency(%q<rack>, ["~> 1.1.0"])
-    s.add_dependency(%q<usher>, ["~> 0.6.2"])
+    s.add_dependency(%q<usher>, ["~> 0.6.3"])
     s.add_dependency(%q<tilt>, ["~> 0.4.0"])
     s.add_dependency(%q<rspec>, ["~> 1.2.9"])
     s.add_dependency(%q<yard>, ["~> 0.5.2"])

data/lib/junior/dispatcher.rb

@@ -14,22 +14,26 @@ module Junior
         
           #puts app.env['rack.input'].read
           
-          controller = app.env[ 'usher.response' ].last.destination[ :controller ].to_s
-          
-          if controller[ '/' ] # a nested route
-            controller = controller[(controller.rindex( '/' ) + 1)..controller.length]
-            puts controller
-          end
+          controller = app.env[ 'usher.response' ] ? app.env[ 'usher.response' ].last.destination[ :controller ].to_s : nil
+          if controller
+            
+            if controller[ '/' ] # a nested route
+              controller = controller[(controller.rindex( '/' ) + 1)..controller.length]
+              puts controller
+            end
           
-          action     = app.env[ 'usher.response' ].last.destination[ :action ].to_s
-          id         = app.env[ 'usher.params' ][ :id ].to_s
+            action     = app.env[ 'usher.response' ].last.destination[ :action ].to_s
+            id         = app.env[ 'usher.params' ][ :id ].to_s
         
-          controller_instance = controller.camelize.to_class.new(app, id)
+            controller_instance = controller.camelize.to_class.new(app, id)
 
-          if controller_instance.respond_to?(action)
-            controller_instance.send(action)
+            if controller_instance.respond_to?(action)
+              controller_instance.send(action)
+            else
+              controller_instance.not_found('Not found')
+            end
           else
-            controller_instance.not_found('Not found')
+            Junior::Controller.new(app).not_found('Not found')
           end
         end
       end

data/lib/junior/helpers.rb

@@ -65,7 +65,7 @@ module Junior
     # Set the Content-Type of the response body given a media type or file
     # extension.
     def content_type(type, params={})
-      mime_type = self.mime_type(type)
+      mime_type = self.mime_type( ".#{type}" )
       fail "Unknown media type: %p" % type if mime_type.nil?
       if params.any?
         params = params.collect { |kv| "%s=%s" % kv }.join(', ')
@@ -84,6 +84,21 @@ module Junior
         response['Content-Disposition'] << params
       end
     end
+    
+    # Set the last modified time of the resource (HTTP 'Last-Modified' header)
+    # and halt if conditional GET matches. The +time+ argument is a Time,
+    # DateTime, or other object that responds to +to_time+.
+    #
+    # When the current request includes an 'If-Modified-Since' header that
+    # matches the time specified, execution is immediately halted with a
+    # '304 Not Modified' response.
+    def last_modified(time)
+      time = time.to_time if time.respond_to?(:to_time)
+      time = time.httpdate if time.respond_to?(:httpdate)
+      response['Last-Modified'] = time
+      halt 304 if time == request.env['HTTP_IF_MODIFIED_SINCE']
+      time
+    end
 
     # Use the contents of the file at +path+ as the response body.
     def send_file(path, opts={})
@@ -108,4 +123,16 @@ module Junior
       not_found
     end
   end
+end
+
+# Rack response body used to deliver static files. The file contents are
+# generated iteratively in 8K chunks.
+class StaticFile < ::File #:nodoc:
+  alias_method :to_path, :path
+  def each
+    rewind
+    while buf = read(8192)
+      yield buf
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: junior
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Michael Wood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 -08:00
+date: 2010-01-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.2
+        version: 0.6.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -73,6 +73,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- HISTORY
 - LICENSE
 - README.md
 - Rakefile