mass_assignment 1.0.1 → 1.1.0

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/lib/mass_assignment.rb

@@ -1,6 +1,11 @@
 module MassAssignment
   def self.included(base)
-    base.class_eval do extend ClassMethods end
+    base.class_eval do
+      class_attribute :assignment_policy, :instance_reader => false, :instance_writer => false
+      def self.mass_assignment_policy(val)
+        self.assignment_policy = val
+      end
+    end
   end
 
   # Basic Example:
@@ -24,27 +29,35 @@ module MassAssignment
   #   @user.save!
   def assign(attributes, allowed_attributes = nil, &block)
     return unless attributes and attributes.is_a? Hash
-  
+
     if allowed_attributes
       safe_attributes = filter_attributes(attributes, :only => allowed_attributes)
       yield attributes if block_given?
-      self.send("attributes=", safe_attributes, false)
+      mass_assign_safe_attributes(safe_attributes)
     else
-      if policy = self.class.get_mass_assignment_policy
+      if policy = self.class.assignment_policy
         safe_attributes = filter_attributes(attributes, policy)
-        self.send("attributes=", safe_attributes, false)
+        mass_assign_safe_attributes(safe_attributes)
       else
-        # backwards compatibility. use attr_protected and attr_accessible.
+        # fall back on Rails' system
         self.attributes = attributes
       end
     end
   end
-  
+
   private
 
+  def mass_assign_safe_attributes(safe_attributes)
+    if respond_to?(:assign_attributes)
+      assign_attributes(safe_attributes, :without_protection => true)
+    else
+      self.send("attributes=", safe_attributes, false)
+    end
+  end
+
   def filter_attributes(attributes, options = {}) # could surely be refactored.
     attributes = attributes.stringify_keys
-  
+
     if options[:only]
       if options[:only].is_a? Regexp
         attributes.reject { |k, v| !k.gsub(/\(.+/, "").match(options[:only]) }
@@ -73,19 +86,6 @@ module MassAssignment
       attributes
     end
   end
-  
-  module ClassMethods
-    # sets a default mass assignment policy for your model's attributes. you may choose to start from a
-    # closed state that allows no mass assignment, an open state that allows any mass assignment (this is
-    # activerecord's default), or somewhere inbetween.
-    def mass_assignment_policy(val)
-      write_inheritable_attribute :mass_assignment_policy, val
-    end
-    
-    def get_mass_assignment_policy
-      read_inheritable_attribute :mass_assignment_policy
-    end
-  end
 end
 
 ActiveRecord::Base.class_eval do include MassAssignment end

data/test/mass_assignment_test.rb

@@ -1,55 +1,19 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class User < ActiveRecord::Base
-  class << self
-    def columns
-      @columns ||= [
-        ActiveRecord::ConnectionAdapters::Column.new("name", nil, "varchar(100)", true),
-        ActiveRecord::ConnectionAdapters::Column.new("email", nil, "varchar(100)", true),
-        ActiveRecord::ConnectionAdapters::Column.new("role_id", nil, "integer(11)", false)
-      ]
-    end
-  end
-  
-  def friend
-    @friend ||= User.new
-  end
-  
-  def friend_attributes=(attributes)
-    friend.attributes = attributes
-  end
-end
-
-class ProtectedUser < User
-  attr_protected :role_id
-end
-
-class ClosedUser < User
-  mass_assignment_policy :except => :all
-end
-
-class SemiClosedUser < User
-  mass_assignment_policy :except => /_id$/
-end
-
-class OpenUser < User
-  mass_assignment_policy :only => :all
-end
-
 class MassAssignmentTest < ActiveSupport::TestCase
   def setup
     @user = ProtectedUser.new
     @attributes = {"name" => "Bob", "email" => "bob@example.com"}
     ActiveRecord::Base.logger = stub('debug' => true)
   end
-  
+
   test "assigning nothing" do
     params = {}
     assert_nothing_raised do
       @user.assign(params[:user])
     end
   end
-  
+
   test "assigning a string" do
     params = {:user => "well this is embarrassing"}
     assert_nothing_raised do
@@ -62,31 +26,31 @@ class MassAssignmentTest < ActiveSupport::TestCase
     assert_equal "Bob", @user.name
     assert_equal "bob@example.com", @user.email
   end
-  
+
   test "assigning protected attributes" do
     @user.assign(@attributes.merge(:role_id => 1))
     assert_equal "Bob", @user.name
     assert_nil @user.role_id
   end
-  
+
   test "overriding protected attributes" do
     @user.assign(@attributes.merge(:role_id => 1), [:name, :email, :role_id])
     assert_equal "Bob", @user.name
     assert_equal 1, @user.role_id
   end
-  
+
   test "assigning unallowed attributes" do
     @user.assign(@attributes.merge(:role_id => 1), [:name, :email])
     assert_equal "Bob", @user.name
     assert_nil @user.role_id
   end
-  
+
   test "nested assignment" do
     @user.assign(@attributes.merge(:friend_attributes => {:name => 'Joe', :role_id => 1}), [:name, :role_id, {:friend_attributes => [:name]}])
     assert_equal "Joe", @user.friend.name
     assert_nil @user.friend.role_id
   end
-  
+
   test "deep assignment" do
     @user.assign(@attributes.merge(:friend => {:name => 'Joe', :role_id => 1}), [:name, :role_id]) do |params|
       @user.friend.assign(params[:friend], [:name])
@@ -101,42 +65,42 @@ class MassAssignmentPolicyTest < ActiveSupport::TestCase
     @attributes = {"name" => "Bob", "role_id" => 1}
     ActiveRecord::Base.logger = stub('debug' => true)
   end
-  
+
   test "an open policy" do
     @user = OpenUser.new
     @user.assign(@attributes)
     assert_equal "Bob", @user.name
     assert_equal 1, @user.role_id
   end
-  
+
   test "an overridden open policy" do
     @user = OpenUser.new
     @user.assign(@attributes, [:name])
     assert_equal "Bob", @user.name
     assert_nil @user.role_id
   end
-  
+
   test "a closed policy" do
     @user = ClosedUser.new
     @user.assign(@attributes)
     assert_nil @user.name
     assert_nil @user.role_id
   end
-  
+
   test "an overridden closed policy" do
     @user = ClosedUser.new
     @user.assign(@attributes, [:name, :role_id])
     assert_equal "Bob", @user.name
     assert_equal 1, @user.role_id
   end
-  
+
   test "a semi-closed policy" do
     @user = SemiClosedUser.new
     @user.assign(@attributes)
     assert_equal "Bob", @user.name
     assert_nil @user.role_id
   end
-  
+
   test "an overridden semi-closed policy" do
     @user = SemiClosedUser.new
     @user.assign(@attributes, [:name, :role_id])

data/test/models.rb

@@ -0,0 +1,51 @@
+class User < ActiveRecord::Base
+  class << self
+    def columns
+      @columns ||= [
+        ActiveRecord::ConnectionAdapters::Column.new("name", nil, "varchar(100)", true),
+        ActiveRecord::ConnectionAdapters::Column.new("email", nil, "varchar(100)", true),
+        ActiveRecord::ConnectionAdapters::Column.new("role_id", nil, "integer(11)", false)
+      ]
+    end
+
+    def column_defaults
+      columns.inject({}) { |h, col| h.merge(col.name => col.default) }
+    end
+
+    def columns_hash
+      columns.inject({}) { |h, col| h.merge(col.name => col) }
+    end
+
+    def primary_key
+      'id'
+    end
+
+    def attributes_protected_by_default
+      [ primary_key ]
+    end
+  end
+
+  def friend
+    @friend ||= User.new
+  end
+
+  def friend_attributes=(attributes)
+    friend.attributes = attributes
+  end
+end
+
+class ProtectedUser < User
+  attr_protected :role_id
+end
+
+class ClosedUser < User
+  mass_assignment_policy :except => :all
+end
+
+class SemiClosedUser < User
+  mass_assignment_policy :except => /_id$/
+end
+
+class OpenUser < User
+  mass_assignment_policy :only => :all
+end

data/test/test_helper.rb

@@ -1,8 +1,9 @@
 require 'rubygems'
 require 'test/unit'
-gem 'rails', '3.0.7'
+gem 'rails', '3.1.1'
 require 'active_support'
 require 'active_support/test_case'
 require 'active_record'
 require 'mass_assignment'
+require 'models'
 require 'mocha'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mass_assignment
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Lance Ivy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 -04:00
+date: 2011-11-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,8 +45,9 @@ files:
 - LICENSE
 - README.textile
 - Rakefile
-- test/test_helper.rb
 - test/mass_assignment_test.rb
+- test/models.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/cainlevy/mass_assignment
 licenses: []
@@ -77,10 +78,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple and secure params assignment for ActiveRecord
 test_files: 
-- test/test_helper.rb
 - test/mass_assignment_test.rb
+- test/models.rb
+- test/test_helper.rb