wd_sinatra 0.3.1 → 0.3.2

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Weasel Diesel Sinatra Changelog
 
+## 0.3.2
+* Removed `post_dispatch_hook` since it doesn't work well with `halt`
+  and file responses. Use Sinatra's `after` filter instead.
+* Fixed a bug with `params_postprocessor_hook`.
+* Added a 'wd.service' entry to `env` that points to the dispatched
+  service.
+
 ## 0.3.1
 
 * Added `post_dispatch_hook`.

data/README.md

@@ -174,7 +174,6 @@ The request dispatcher offers a fews hooks which you can see demonstrated in
 * `params_postprocessor_hook(params)`
 * `params_exception_handler(exception)`
 * `pre_dispatch_hook`
-* `post_dispatch_hook(response)`
 
 The two first hooks are used to process the params and when implemented
 are expected to return the params that will be used in the request.

data/lib/wd_sinatra/sinatra_ext.rb

@@ -67,7 +67,7 @@ class WeaselDiesel
         @params = (processed_params || app.params)
         @params = params_preprocessor_hook(@params) if self.respond_to?(:params_preprocessor_hook)
         @params = ParamsVerification.validate!(@params, service.defined_params)
-        @params = params_postrocessor_hook(@params) if self.respond_to?(:params_postprocessor_hook)
+        @params = params_postprocessor_hook(@params) if self.respond_to?(:params_postprocessor_hook)
       rescue Exception => e
         LOGGER.error e.message
         LOGGER.error "passed params: #{app.params.inspect}"
@@ -79,13 +79,7 @@ class WeaselDiesel
       end
 
       pre_dispatch_hook if self.respond_to?(:pre_dispatch_hook)
-      if self.respond_to?(:post_dispatch_hook)
-        body = service_dispatch
-        post_dispatch_hook
-        body
-      else
-        service_dispatch
-      end
+      service_dispatch
     end
 
     # Forwarding some methods to the underlying app object
@@ -117,6 +111,7 @@ class WeaselDiesel
     # Note that we are using a private API to define the route and that unlike sinatra usual DSL
     # we do NOT define a HEAD route for every GET route.
     Sinatra::Base.send(:route, upcase_verb, "/#{self.url}") do
+      env['wd.service'] = service
       service.handler.dispatch(self)
     end
     

data/lib/wd_sinatra/version.rb

@@ -1,5 +1,5 @@
 module WD
   module Sinatra
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/templates/lib/hooks.rb

@@ -66,7 +66,7 @@ module WDSinatraHooks
       halt 403 # protect by default
     end
   end
-  #
+
   #########################################
 
   # AUTHENTICATION

metadata

@@ -1,61 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wd_sinatra
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Matt Aimonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-28 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: weasel_diesel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70164648069100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70164648069100
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70164648068640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps using the Weasel Diesel DSL
-email: 
+  prerelease: false
+  version_requirements: *70164648068640
+description: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra
+  apps using the Weasel Diesel DSL
+email:
 - mattaimonetti@gmail.com
-executables: 
+executables:
 - wd_sinatra
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
@@ -146,39 +132,29 @@ files:
 - templates/test/integration/hello_world_test.rb
 - templates/test/test_helpers.rb
 - wd-sinatra.gemspec
-has_rdoc: true
 homepage: https://github.com/mattetti/wd-sinatra
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
-summary: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps using the Weasel Diesel DSL
+summary: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps
+  using the Weasel Diesel DSL
 test_files: []
-