Include allowed_writer_methods only when mass-assignment is turned on

solnic · Oct 3, 2013 · a385ca2 · a385ca2
1 parent 5bc6b09
commit a385ca2
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 14 deletions.
diff --git a/lib/virtus/builder.rb b/lib/virtus/builder.rb
@@ -120,7 +120,11 @@ class ValueObjectBuilder < Builder
 
     # @api private
     def extensions
-      super << ValueObject::AllowedWriterMethods << ValueObject::InstanceMethods
+      super + [
+        Extensions::AllowedWriterMethods,
+        ValueObject::AllowedWriterMethods,
+        ValueObject::InstanceMethods
+      ]
     end
 
     # @api private

diff --git a/lib/virtus/class_inclusions.rb b/lib/virtus/class_inclusions.rb
@@ -13,6 +13,7 @@ module ClassInclusions
     def self.included(descendant)
       super
       descendant.extend(ClassMethods)
+      descendant.extend(Extensions::AllowedWriterMethods)
       descendant.class_eval { include Methods }
       descendant.class_eval { include InstanceMethods }
       descendant.class_eval { include InstanceMethods::Constructor }

diff --git a/lib/virtus/extensions.rb b/lib/virtus/extensions.rb
@@ -18,6 +18,7 @@ def self.extended(object)
       object.instance_eval do
         extend Methods
         extend InstanceMethods
+        extend AllowedWriterMethods
         extend InstanceMethods::MassAssignment
       end
     end
@@ -74,6 +75,23 @@ def values(&block)
         include(::Equalizer.new(*attribute_set.map(&:name)))
       end
 
+      private
+
+      # Return an attribute set for that instance
+      #
+      # @return [AttributeSet]
+      #
+      # @api private
+      def attribute_set
+        @attribute_set
+      end
+
+    end # Methods
+
+    module AllowedWriterMethods
+      WRITER_METHOD_REGEXP   = /=\z/.freeze
+      INVALID_WRITER_METHODS = %w[ == != === []= attributes= ].to_set.freeze
+
       # The list of writer methods that can be mass-assigned to in #attributes=
       #
       # @return [Set]
@@ -88,18 +106,8 @@ def allowed_writer_methods
           end
       end
 
-      private
-
-      # Return an attribute set for that instance
-      #
-      # @return [AttributeSet]
-      #
-      # @api private
-      def attribute_set
-        @attribute_set
-      end
-
-    end # Methods
+    end # AllowedWriterMethods
 
   end # module Extensions
+
 end # module Virtus
diff --git a/lib/virtus/instance_methods.rb b/lib/virtus/instance_methods.rb
@@ -14,7 +14,7 @@ module Constructor
       #
       # @api private
       def initialize(attributes = nil)
-        attribute_set.set(self, attributes) if attributes
+        self.class.attribute_set.set(self, attributes) if attributes
         set_default_attributes
       end
 

diff --git a/lib/virtus/model.rb b/lib/virtus/model.rb
@@ -51,13 +51,15 @@ module MassAssignment
       # @api private
       def self.included(descendant)
         super
+        descendant.extend(Extensions::AllowedWriterMethods)
         descendant.send(:include, InstanceMethods::MassAssignment)
       end
       private_class_method :included
 
       # @api private
       def self.extended(descendant)
         super
+        descendant.extend(Extensions::AllowedWriterMethods)
         descendant.extend(InstanceMethods::MassAssignment)
       end
       private_class_method :included