rails_current 1.6.2 → 1.7.0

data/lib/rails_current.rb

@@ -2,7 +2,7 @@
 
 module Current
   def Current.version
-    '1.6.2'
+    '1.7.0'
   end
 
   def Current.dependencies
@@ -22,7 +22,6 @@ module Current
     require(lib)
   end
 
-
   def Current.data
     Thread.current[:current] ||= Map.new
   end
@@ -188,7 +187,7 @@ module Current
       #controller.send(:initialize_template_class, response) 
       #controller.send(:assign_shortcuts, request, response) 
       controller.send(:default_url_options).merge!(default_url_options)
-      controller
+      Current.proxy_for(controller)
     end
   end 
 
@@ -206,6 +205,24 @@ module Current
       block.call()
     end
   end
+
+  class BlankSlate
+    instance_methods.each{|m| undef_method(m) unless m.to_s =~ /^__|object_id/}
+  end
+
+  class Proxy < BlankSlate
+    def initialize(object)
+      @object = object
+    end
+
+    def method_missing(method, *args, &block)
+      @object.__send__(method, *args, &block)
+    end
+  end
+
+  def Current.proxy_for(object)
+    Proxy.new(object)
+  end
 end
 
 def Current(*args, &block)
@@ -230,8 +247,8 @@ if defined?(Rails)
         ::ActionController::Base.module_eval do
           prepend_before_filter do |controller|
             Current.clear
-            Current.controller = controller
-            Current.action = controller.send(:action_name)
+            Current.controller = Current.proxy_for(controller)
+            Current.action = controller ? controller.send(:action_name) : nil
           end
 
           extend Current

data/rails_current.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "rails_current"
-  spec.version = "1.6.2"
+  spec.version = "1.7.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "rails_current"
   spec.description = "description: rails_current kicks the ass"

data/test/rails_current_test.rb

@@ -147,9 +147,9 @@ Testing Current do
 
 ##
 #
-  test 'that loading Current into an old skool rails app creates Current.user and Current.controller' do
+  test 'that loading Current into an old skool rails app creates Current.user and Current.controller and Current.action' do
     mock_rails! do
-      assert{ Current.attributes =~ {:user => nil, :controller => nil} }
+      assert{ Current.attributes =~ {:user => nil, :controller => nil, :action => nil} }
 
       assert do
         Current.user = :user
@@ -168,7 +168,7 @@ Testing Current do
 #
   test 'that loading Current into a new skool rails app creates Current.user and Current.controller' do
     mock_rails_engine! do
-      assert{ Current.attributes =~ {:user => nil, :controller => nil} }
+      assert{ Current.attributes =~ {:user => nil, :controller => nil, :action => nil} }
 
       assert{ $before_initialize_called }
       assert{ $prepend_before_filter_called }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_current
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-09 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: codeforpeople
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: rails_current