sudo_attributes 0.3.0 → 0.4.0

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+.bundle

data/Gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+
+group :test do
+  gem 'rake'
+  gem 'jeweler', '1.4.0'
+  gem 'rspec', '~> 1.3.1'
+  gem 'sqlite3-ruby', :require => 'sqlite3'
+end

data/Gemfile.lock

@@ -0,0 +1,24 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    gemcutter (0.6.1)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    rake (0.8.7)
+    rspec (1.3.1)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    sqlite3-ruby (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler (= 1.4.0)
+  rake
+  rspec (~> 1.3.1)
+  sqlite3-ruby

data/README.textile

@@ -22,28 +22,28 @@ It's as easy as adding one method call to your models like so:
 
 <pre>
 class User < ActiveRecord::Base
-  has_sudo_attributes :protected => :admin
+  sudo_attr_protected :admin
 end
 </pre>
 
 h2. Class Methods
 
-The class method *has_sudo_attributes* will be available to all rails models. When called with or without arguments, it adds numerous 'sudo' methods to the class. You may still use the default methods @attr_protected@ or @attr_accessible@ provided by rails, but you must still call @has_sudo_attributes@ in order to gain access to the sudo methods.
+The class methods *sudo_attr_protected* and *sudo_attr_accessible* will be available to all ActiveRecord models. When called, it adds numerous 'sudo' methods to the class. You may still use the default methods @attr_protected@ or @attr_accessible@ provided by rails, but you must still call @has_sudo_attributes@ in order to gain access to the sudo methods.
 
 Here are four different ways it can be used:
 
-@has_sudo_attributes :attribute1, :attribute2@ - Defines protected attributes
+@sudo_attr_protected :attribute1, :attribute2@ - Defines protected attributes
 
-@has_sudo_attributes :protected => :attribute1@ - Identical behavior to previous
+@sudo_attr_accessible :attribute1, :attribute2@ - Defines accessible attributes
 
-@has_sudo_attributes :accessible => [:attribute1, :attribute2]@ - Defines accessible attributes
+@sudo_attr_protected@ or @sudo_attr_accessible@ - With no arguments, it will rely on calls to @attr_protected@ or @attr_accessible@
 
-@has_sudo_attributes@ - With no arguments, it will rely on calls to @attr_protected@ or @attr_accessible@
-
-Any model that calls @has_sudo_attributes@ will also be able to create new instances that override protected attributes using the following methods:
+Any model that calls @sudo_attr_*@ will also be able to create new instances that override protected attributes using the following methods:
 
 @Model.sudo_create@ - Uses same syntax as @Model.create@ to instantiate and save an object with protected attributes
 
+@Model.sudo_create!@ - Similar to @Model.sudo_create@, but it raises an ActiveRecord::RecordInvalid exception if there are invalid attributes
+
 @Model.sudo_new@ - Uses same syntax as @Model.new@ to instantiate, but not save an object with protected attributes
 
 h2. Instance Methods
@@ -58,7 +58,7 @@ h2. Examples
 
 <pre>
 class User < ActiveRecord::Base
-  has_sudo_attributes :protected => :admin
+  sudo_attr_protected :admin
 end
 </pre>
 

data/Rakefile

@@ -38,8 +38,6 @@ rescue LoadError
   end
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/sudo_attributes.rb

@@ -1,48 +1,27 @@
 module SudoAttributes
-  
-  module Base
-    # This is the method that will be called from each model you want to enable SudoAttributes in
-    def has_sudo_attributes(*attrs)
-      raise "Invalid argument passed to has_sudo_attributes" unless valid_attributes? attrs
 
-      set_protected_attributes(attrs) unless attrs.empty?
-
-      self.send :extend, SudoAttributes::ClassMethods
-      self.send :include, SudoAttributes::InstanceMethods
-    end
-    
-    private
-    
-    def valid_attributes?(attrs)
-      attrs.empty? || hash_syntax?(attrs) || all_symbols?(attrs)
-    end
-    
-    # True if argument is in the form ":protected => :field1" or ":accessible => :field2"
-    def hash_syntax?(attrs)
-      return false unless attrs.size == 1
-  
-      hash = attrs.first
-      
-      hash.is_a?(Hash) && (hash.has_key?(:protected) || hash.has_key?(:accessible))
+  module Base
+    def sudo_attr_protected(*attrs)
+      Private::set_attributes(self, attrs, :protected)
     end
-    
-    # True if argument is in the form ":field1, :field2, :field3"
-    def all_symbols?(attrs)
-      attrs.all? {|e| e.class == Symbol}
+
+    def sudo_attr_accessible(*attrs)
+      Private::set_attributes(self, attrs, :accessible)
     end
+  end
+
+  module Private
 
-    # Set the protected attributes depending on the key
-    def set_protected_attributes(attrs)
-      if all_symbols? attrs
-        self.attr_protected *attrs
-      else
-        key = attrs[0].has_key?(:protected) ? :protected : :accessible
+    def self.set_attributes(klass, attrs, type)
+      unless attrs.empty?
+        raise "Invalid argument passed to has_sudo_attributes" unless attrs.all? {|a| a.is_a? Symbol }
 
-        # Call either attr_protected or attr_accessible
-        self.send("attr_#{key}", *attrs[0][key])
+        klass.send("attr_#{type}", *attrs)
       end
+
+      klass.extend SudoAttributes::ClassMethods
+      klass.send :include, SudoAttributes::InstanceMethods
     end
-    
   end
   
   # Added to ActiveRecord model only if has_sudo_attributes is called
@@ -60,16 +39,13 @@ module SudoAttributes
     end
 
     def sudo_new(attributes=nil)
-      new(attributes, false)
+      instance = new(nil)
+      instance.send(:attributes=, attributes, false)
+      instance
     end
   end
  
   module InstanceMethods
-    def initialize(attributes=nil, attributes_protected=true)
-      super(nil)
-      send(:attributes=, attributes, attributes_protected)
-    end
-    
     def sudo_update_attributes(new_attributes)
       self.send(:attributes=, new_attributes, false)
       save
@@ -77,4 +53,4 @@ module SudoAttributes
   end
 end
 
-ActiveRecord::Base.send :extend, SudoAttributes::Base
+ActiveRecord::Base.extend SudoAttributes::Base

data/spec/spec_helper.rb

@@ -18,13 +18,12 @@ end
 
 module SudoAttributesTest
   ARGUMENTS = [
-    { :protected => :name},
-    { :accessible => [:color, :age] },
-    :name,
-    nil # No arguments passed in
+    "sudo_attr_protected :name",
+    "sudo_attr_accessible :color, :age",
+    "attr_protected :name; sudo_attr_protected"
   ]
   
-  def self.build_cat_class(arguments)
+  def self.build_cat_class(argument)
 
     # Remove the Cat class if it's already been defined in previous run
     Object.class_eval { remove_const "Cat" if const_defined? "Cat" }
@@ -33,16 +32,9 @@ module SudoAttributesTest
     klass = Class.new(ActiveRecord::Base)
     Object.const_set("Cat", klass)
 
-    if arguments.nil? 
-      Cat.class_eval do
-        attr_protected :name
-        has_sudo_attributes
-      end
-    else
-      Cat.class_eval do
-        validates_presence_of :color
-        has_sudo_attributes arguments
-      end
-    end
+    Cat.class_eval %{
+      validates_presence_of :color
+      #{argument}
+    }
   end
 end

data/spec/sudo_attributes_spec.rb

@@ -99,7 +99,7 @@ end
 describe "A Cat" do
 
   before(:each) do
-    SudoAttributesTest::build_cat_class(:name)
+    SudoAttributesTest::build_cat_class("sudo_attr_protected :name")
   end
 
   context "when initialized with invalid params using sudo_create!" do

data/sudo_attributes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sudo_attributes}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Brown"]
-  s.date = %q{2010-10-07}
+  s.date = %q{2010-11-19}
   s.description = %q{Adds 'sudo' methods to update protected ActiveRecord attributes with mass assignment}
   s.email = %q{github@lette.us}
   s.extra_rdoc_files = [
@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.textile",
      "Rakefile",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sudo_attributes
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Peter Brown
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -04:00
+date: 2010-11-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,8 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.textile
 - Rakefile