merb_activerecord 0.4.2 → 0.4.3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb_activerecord"
 NAME = "merb_activerecord"
-VERSION = "0.4.2"
+VERSION = "0.4.3"
 AUTHOR = "Duane Johnson"
 EMAIL = "canadaduane@gmail.com"
 HOMEPAGE = "http://merbivore.com"

data/activerecord_generators/resource_controller/templates/controller.rb

@@ -4,8 +4,8 @@ class <%= class_name %> < Application
   provides :xml, :js, :yaml
   
   def index
-    @<%= ivar %>s = <%= klass %>.find(:all)
-    render @<%= ivar %>s
+    @<%= ivar.pluralize %> = <%= klass %>.find(:all)
+    render @<%= ivar.pluralize %>
   end
   
   def show

data/lib/merb/session/active_record_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::ActiveRecordSession.persist(cookies[_session_id_key])
-      @_fingerprint = Marshal.dump(@_session.data).hash
+      request.session, cookies[_session_id_key] = Merb::ActiveRecordSession.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 # ActiveRecordMixin
 

metadata

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