activemodel 3.0.7 → 3.0.8.rc1

data/lib/active_model/attribute_methods.rb

@@ -56,6 +56,8 @@ module ActiveModel
   module AttributeMethods
     extend ActiveSupport::Concern
 
+    COMPILABLE_REGEXP = /^[a-zA-Z_]\w*[!?=]?$/
+
     module ClassMethods
       # Defines an "attribute" method (like +inheritance_column+ or +table_name+).
       # A new (class) method will be created with the given name. If a value is
@@ -101,10 +103,13 @@ module ActiveModel
         if block_given?
           sing.send :define_method, name, &block
         else
-          if name =~ /^[a-zA-Z_]\w*[!?=]?$/
-            sing.class_eval <<-eorb, __FILE__, __LINE__ + 1
-                def #{name}; #{value.nil? ? 'nil' : value.to_s.inspect}; end
-            eorb
+          # If we can compile the method name, do it. Otherwise use define_method.
+          # This is an important *optimization*, please don't change it. define_method
+          # has slower dispatch and consumes more memory.
+          if name =~ COMPILABLE_REGEXP
+            sing.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def #{name}; #{value.nil? ? 'nil' : value.to_s.inspect}; end
+            RUBY
           else
             value = value.to_s if value
             sing.send(:define_method, name) { value }
@@ -227,11 +232,20 @@ module ActiveModel
 
       def alias_attribute(new_name, old_name)
         attribute_method_matchers.each do |matcher|
-          module_eval <<-STR, __FILE__, __LINE__ + 1
-            def #{matcher.method_name(new_name)}(*args)
-              send(:'#{matcher.method_name(old_name)}', *args)
+          matcher_new = matcher.method_name(new_name).to_s
+          matcher_old = matcher.method_name(old_name).to_s
+
+          if matcher_new =~ COMPILABLE_REGEXP && matcher_old =~ COMPILABLE_REGEXP
+            module_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def #{matcher_new}(*args)
+                send(:#{matcher_old}, *args)
+              end
+            RUBY
+          else
+            define_method(matcher_new) do |*args|
+              send(matcher_old, *args)
             end
-          STR
+          end
         end
       end
 
@@ -271,14 +285,25 @@ module ActiveModel
               else
                 method_name = matcher.method_name(attr_name)
 
-                generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
-                  if method_defined?(:'#{method_name}')
+                generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+                  if method_defined?('#{method_name}')
                     undef :'#{method_name}'
                   end
-                  define_method('#{method_name}') do |*args|
-                    send(:'#{matcher.method_missing_target}', '#{attr_name}', *args)
-                  end
-                STR
+                RUBY
+
+                if method_name.to_s =~ COMPILABLE_REGEXP
+                  generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+                    def #{method_name}(*args)
+                      send(:#{matcher.method_missing_target}, '#{attr_name}', *args)
+                    end
+                  RUBY
+                else
+                  generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+                    define_method('#{method_name}') do |*args|
+                      send('#{matcher.method_missing_target}', '#{attr_name}', *args)
+                    end
+                  RUBY
+                end
               end
             end
           end

data/lib/active_model/version.rb

@@ -2,8 +2,8 @@ module ActiveModel
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 7
-    PRE   = nil
+    TINY  = 8
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activemodel
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
+  hash: 15424055
+  prerelease: 6
   segments: 
   - 3
   - 0
-  - 7
-  version: 3.0.7
+  - 8
+  - rc
+  - 1
+  version: 3.0.8.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 Z
+date: 2011-05-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -25,12 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15424055
         segments: 
         - 3
         - 0
-        - 7
-        version: 3.0.7
+        - 8
+        - rc
+        - 1
+        version: 3.0.8.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -133,16 +137,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: activemodel
-rubygems_version: 1.7.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: A toolkit for building modeling frameworks (part of Rails).