rails_current 1.4.1 → 1.5.0

data/lib/rails_current.rb

@@ -4,7 +4,7 @@ require 'map'
 
 module Current
   def Current.version
-    '1.4.1'
+    '1.5.0'
   end
 
   def Current.data
@@ -59,17 +59,16 @@ module Current
   end
 
   def Current.define_attribute_method(name)
+    name = name.to_s
     unless respond_to?(name)
       singleton_class.module_eval do
         define_method(name) do
-          if data.has_key?(name) and !data[name].nil?
-            data[name]
-          else
-            if generator = generators[name]
-              value = generator.call
-              data[name] = value
-            end
+          value = data[name]
+          if value.nil? and generator = generators[name]
+            value = generator.call
+            data[name] = value
           end
+          value
         end
 
         define_method(name + '=') do |value|
@@ -135,7 +134,8 @@ module Current
     case method.to_s
       when /^current_(.*)$/
         msg = $1
-        Current.send(msg, *args, &block)
+        value = Current.send(msg, *args, &block)
+
       else
         super
     end
@@ -146,7 +146,6 @@ def Current(*args, &block)
   Current.attribute(*args, &block)
 end
 
-
 if defined?(Rails)
 
 ##
@@ -167,6 +166,7 @@ if defined?(Rails)
             Current.controller = controller
           end
 
+          extend Current
           include Current
           helper{ include Current }
         end

data/rails_current.gemspec

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

metadata

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