rails_current 1.1.0 → 1.2.0

data/lib/rails_current.rb

@@ -1,7 +1,9 @@
 require 'map'
 
 module Current
-  def Current.version() '1.1.0' end
+  def Current.version
+    '1.2.0'
+  end
 
   def Current.data
     Thread.current[:current] ||= Map.new
@@ -51,8 +53,8 @@ module Current
           data[name] = value
         end
 
-        define_method(name + '?') do |value|
-          data[name]
+        define_method(name + '?') do |*args|
+          send(name)
         end
       end
     end
@@ -106,29 +108,15 @@ module Current
     end
   end
 
-  Code = proc do
-    def method_missing(method, *args, &block)
-      case method.to_s
-        when /^current_(.*)$/
-          msg = $1
-          Current.send(msg, *args, &block)
-        else
-          super
-      end
+  def method_missing(method, *args, &block)
+    case method.to_s
+      when /^current_(.*)$/
+        msg = $1
+        Current.send(msg, *args, &block)
+      else
+        super
     end
   end
-
-  def Current.included(other)
-    super
-  ensure
-    other.send(:module_eval, &Code)
-  end
-
-  def Current.extend_object(object)
-    super
-  ensure
-    object.send(:instance_eval, &Code)
-  end
 end
 
 def Current(*args, &block)
@@ -147,7 +135,7 @@ if defined?(Rails)
           Current.clear
           Current.controller = controller
         end
-      end
+      end if defined?(::ActionController::Base)
     end
   end
 
@@ -157,8 +145,16 @@ if defined?(Rails)
         Current.install_before_filter!
       end
     end
+  else
+    Current.install_before_filter!
   end
 
 end
 
-Rails_current = Current
+::Rails_current = ::Current
+
+BEGIN {
+  Object.send(:remove_const, :Current) if defined?(::Current)
+  Object.send(:remove_const, :Rails_current) if defined?(::Rails_current)
+}
+

data/rails_current.gemspec

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

data/test/rails_current_test.rb

@@ -112,19 +112,100 @@ Testing Current do
     assert{ Current.attributes =~ {:foo => :bar, :bar => :foo} }
   end
 
+##
+#
+  test 'that assigning to Current dynamically adds accessor methods' do
+    assert{ Current.foo = 42 }
+    assert{ Current.foo == 42 }
+
+    assert{ Current.bar = 'forty-two' }
+    assert{ Current.bar == 'forty-two' }
+  end
+
+##
+#
+  test 'that query methods on Current werky' do
+    assert{ Current.foo?.nil? }
+    assert{ Current.foo = 42 }
+    assert{ Current.foo? == 42 }
+  end
+
+##
+#
+  test 'that loading Current into a rails app creates Current.user and Current.controller' do
+    mock_rails! do
+      assert{ Current.attributes =~ {:user => nil, :controller => nil} }
+    end
+
+    mock_rails_engine! do
+      assert{ Current.attributes =~ {:user => nil, :controller => nil} }
+      assert{ $before_initialize_called }
+      assert{ $before_filter_called }
+    end
+  end
+
 ##
 #
   teardown do
     assert{ Current.reset }
   end
 
+
+private
+  def mock_rails!
+    Object.module_eval <<-__
+      module Rails
+      end
+    __
+    $load.call()
+    yield
+    Object.send(:remove_const, :Rails)
+  end
+
+  def mock_rails_engine!
+    Object.module_eval <<-__
+      module Rails
+        class Engine
+          def Engine.config
+            Config
+          end
+
+          class Config
+            def Config.before_initialize(*args, &block)
+              block.call
+            ensure
+              $before_initialize_called = true
+            end
+          end
+        end
+      end
+
+      module ActionController
+        class Base
+          def Base.before_filter(*args, &block)
+            block.call()
+          ensure
+            $before_filter_called = true
+          end
+        end
+      end
+    __
+    $load.call()
+    yield
+    Object.send(:remove_const, :Rails)
+  end
 end
 
 
 BEGIN {
-  this = File.expand_path(__FILE__)
-  root = File.dirname(File.dirname(this))
-
-  require(File.join(root, 'lib/rails_current.rb'))
-  require(File.join(root, 'test/testing.rb'))
+  $this = File.expand_path(__FILE__)
+  $root = File.dirname(File.dirname($this))
+
+  (
+    $load =
+      proc do
+        Kernel.load(File.join($root, 'lib/rails_current.rb'))
+        Kernel.load(File.join($root, 'test/testing.rb'))
+      end
+  ).call()
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_current
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000 Z
+date: 2012-01-06 00:00:00.000000000 Z
 dependencies: []
 description: ! 'description: rails_current kicks the ass'
 email: ara.t.howard@gmail.com