merb_datamapper 0.4.3 → 0.4.4

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb_datamapper"
 NAME = "merb_datamapper"
-VERSION = "0.4.3"
+VERSION = "0.4.4"
 AUTHOR = "Jason Toy"
 EMAIL = "jtoy@rubynow.com"
 HOMEPAGE = "http://merbivore.com"

data/datamapper_generators/resource_controller/templates/controller.rb

@@ -10,7 +10,7 @@ class <%= class_name %> < Application
   
   def show(id)
     @<%= ivar %> = <%= klass %>[id]
-    raise BadRequest unless @<%= ivar %>
+    raise NotFound unless @<%= ivar %>
     render @<%= ivar %>
   end
   
@@ -32,13 +32,13 @@ class <%= class_name %> < Application
   def edit(id)
     only_provides :html
     @<%= ivar %> = <%= klass %>[id]
-    raise BadRequest unless @<%= ivar %>
+    raise NotFound unless @<%= ivar %>
     render
   end
   
   def update(id, <%= ivar %>)
     @<%= ivar %> = <%= klass %>[id]
-    raise BadRequest unless @<%= ivar %>
+    raise NotFound unless @<%= ivar %>
     if @<%= ivar %>.update_attributes(<%= ivar %>)
       redirect url(:<%= ivar %>, @<%= ivar %>)
     else
@@ -48,7 +48,7 @@ class <%= class_name %> < Application
   
   def destroy(id)
     @<%= ivar %> = <%= klass %>[id]
-    raise BadRequest unless @<%= ivar %>
+    raise NotFound unless @<%= ivar %>
     if @<%= ivar %>.destroy!
       redirect url(:<%= ivar.pluralize %>)
     else

data/lib/merb/session/data_mapper_session.rb

@@ -5,15 +5,15 @@ module Merb
     def setup_session
       MERB_LOGGER.info("Setting up session")
       before = cookies[_session_id_key]
-      @_session, cookies[_session_id_key] = Merb::DataMapperSession.persist(cookies[_session_id_key])
-      @_fingerprint = Marshal.dump(@_session.data).hash
+      request.session, cookies[_session_id_key] = Merb::DataMapperSession.persist(cookies[_session_id_key])
+      @_fingerprint = Marshal.dump(request.session.data).hash
       @_new_cookie = cookies[_session_id_key] != before
     end
   
     def finalize_session
       MERB_LOGGER.info("Finalize session")
-      @_session.save if @_fingerprint != Marshal.dump(@_session.data).hash
-      set_cookie(_session_id_key, @_session.session_id, _session_expiry) if (@_new_cookie || @_session.needs_new_cookie)
+      request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash
+      set_cookie(_session_id_key, request.session.session_id, _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
     end
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
-date: 2007-11-08 00:00:00 -06:00
+  version: 0.4.4
+date: 2007-11-12 00:00:00 -06:00
 summary: Merb plugin that provides DataMapper support for Merb
 require_paths: 
 - lib