pakyow-core 0.7.1 → 0.7.2

data/pakyow-core/CHANGES

@@ -1,3 +1,9 @@
+= 0.7.2 / 2012-02-29
+
+  * Application server shuts down gracefully
+  * Fix issue requesting route with format
+  * Fix issue surrounding ignore_routes -- now matches request path in all cases
+
 = 0.7.1 / 2012-01-08
 
   * Changed loader to only load ruby files

data/pakyow-core/lib/core/application.rb

@@ -21,7 +21,10 @@ module Pakyow
         return if running?
         @running = true
         self.builder.run(self.prepare(args))
-        detect_handler.run(builder, :Host => Pakyow::Configuration::Base.server.host, :Port => Pakyow::Configuration::Base.server.port)
+        detect_handler.run(builder, :Host => Pakyow::Configuration::Base.server.host, :Port => Pakyow::Configuration::Base.server.port) do |server|
+          trap(:INT) { stop(server) }
+          trap(:TERM) { stop(server) }
+        end
       end
 
       # Stages the application. Everything is loaded but the application is
@@ -133,6 +136,17 @@ module Pakyow
           end
         end
       end
+
+      def stop(server)
+        if server.respond_to?('stop!')
+          server.stop!
+        elsif server.respond_to?('stop')
+          server.stop
+        else
+          # exit ungracefully if necessary...
+          Process.exit!
+        end
+      end
     end
 
     include Helpers
@@ -161,7 +175,8 @@ module Pakyow
     end
 
     def invoke_route!(route, method=nil)
-      self.request.working_path = route
+      base_route, ignore_format = StringUtils.split_at_last_dot(route)
+      self.request.working_path = base_route
       self.request.working_method = method if method
       block = prepare_route_block(route, self.request.working_method)
       throw :new_block, block
@@ -192,7 +207,8 @@ module Pakyow
     def call(env)
       self.request = Request.new(env)
       self.response = Rack::Response.new
-      self.request.working_path = self.request.path
+      base_route, ignore_format = StringUtils.split_at_last_dot(self.request.path)
+      self.request.working_path = base_route
       self.request.working_method = self.request.method
 
       has_route = false
@@ -204,7 +220,7 @@ module Pakyow
           self.presenter.prepare_for_request(self.request)
         end
 
-        has_route = trampoline(route_block) if !Pakyow::Configuration::App.ignore_routes
+        has_route = trampoline(route_block)
 
         if self.presenter
           self.response.body = [self.presenter.content]
@@ -408,11 +424,16 @@ module Pakyow
 
     def prepare_route_block(route, method)
       set_request_format_from_route(route)
-
-      controller_block, packet = @route_store.get_block(route, method)
+      base_route, ignore_format = StringUtils.split_at_last_dot(route)
+      
+      if Pakyow::Configuration::App.ignore_routes
+        controller_block, packet = nil, {:vars=>{}, :data=>nil}
+      else
+        controller_block, packet = @route_store.get_block(base_route, method)
+      end
 
       self.request.params.merge!(HashUtils.strhash(packet[:vars]))
-      self.request.route_spec = packet[:data][:route_spec] if packet[:data] unless Pakyow::Configuration::App.ignore_routes
+      self.request.route_spec = packet[:data][:route_spec] if packet[:data]
       self.request.restful = packet[:data][:restful] if packet[:data]
 
       controller_block

metadata

@@ -1,46 +1,62 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pakyow-core
-version: !ruby/object:Gem::Version
-  version: 0.7.1
+version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 2
+  version: 0.7.2
 platform: ruby
-authors:
+authors: 
 - Bryan Powell
 - Bret Young
 autorequire: 
 bindir: pakyow-core/bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-29 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &70284532262360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :runtime
-  prerelease: false
-  version_requirements: *70284532262360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &70284532261660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 2
+        - 11
+        version: "2.11"
   type: :development
-  prerelease: false
-  version_requirements: *70284532261660
+  version_requirements: *id002
 description: pakyow-core
 email: bryan@metabahn.com
-executables:
+executables: 
 - pakyow
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - pakyow-core/CHANGES
 - pakyow-core/README
 - pakyow-core/MIT-LICENSE
@@ -82,27 +98,38 @@ files:
 - pakyow-core/bin/pakyow
 homepage: http://pakyow.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - pakyow-core/lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: pakyow-core
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: pakyow-core
 test_files: []
-has_rdoc: 
+