typus 3.0.1 → 3.0.2

data/lib/typus/authentication/session.rb

@@ -23,20 +23,20 @@ module Typus
       #++
       def current_user
 
-        user = Typus.user_class.find(session[:typus_user_id])
+        @current_user ||= Typus.user_class.find(session[:typus_user_id])
 
-        unless Typus::Configuration.roles.has_key?(user.role)
+        unless Typus::Configuration.roles.has_key?(@current_user.role)
           raise _t("Role does no longer exists.")
         end
 
-        unless user.status
+        unless @current_user.status
           back_to = (request.env['REQUEST_URI'] == admin_dashboard_path) ? nil : request.env['REQUEST_URI']
           raise _t("Typus user has been disabled.")
         end
 
-        I18n.locale = user.preferences[:locale]
+        I18n.locale = @current_user.preferences[:locale]
 
-        return user
+        return @current_user
 
       rescue Exception => error
         session[:typus_user_id] = nil

data/lib/typus/format.rb

@@ -64,11 +64,9 @@ module Typus
       render format => data.send("to_#{format}", :methods => methods, :except => except)
     end
 
-    def data(*args)
+    def data
       eager_loading = @resource.reflect_on_all_associations(:belongs_to).map { |i| i.name }
-      options = { :joins => @joins, :conditions => @conditions, :order => @order, :include => eager_loading }
-      options.merge!(args.extract_options!)
-      @resource.all(options)
+      @resource.joins(@joins).where(@conditions).order(@order).includes(eager_loading)
     end
 
   end

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-10-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency