cancan_strong_parameters 0.0.1 → 0.1.0

data/README.md

@@ -2,6 +2,12 @@
 
 CanCan and [strong_parameters](https://github.com/rails/strong_parameters) are friends now!
 
+## Authors
+
+The majority of this gem is credited to @mckeed, who posted this gist: https://gist.github.com/2878508
+I (@colinyoung) helped put some of it together.
+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -18,7 +24,14 @@ Or install it yourself as:
 
 ## Usage
 
-Just add it to your Gemfile! Use both CanCan and strong_parameters as normal.
+    1. Add it to your Gemfile
+    2. Wherever you use `load_and_authorize_resource`, also add:
+    
+        class PostsController < ApplicationController
+          ...
+          load_and_authorize_resource
+          permit_params post: [:name, :title, author: {:name}]
+        end
 
 ## Contributing
 

data/lib/cancan_strong_parameters.rb

@@ -1,5 +1,5 @@
 require "cancan_strong_parameters/version"
-require "cancan_strong_parameters/cancan/controller_resource"
+require "cancan_strong_parameters/rails/controller/base"
 
 module CancanStrongParameters
 end

data/lib/cancan_strong_parameters/rails/controller/base.rb

@@ -0,0 +1,99 @@
+class ActionController::Base
+  # Use this with CanCan's load_resource to permit a set of params before
+  # it tries to build or update a resource with them.
+  #
+  # Usage:
+  #   class BooksController < ApplicationController
+  #     load_resource :book
+  #     permit_params book: [:title, :isbn]
+  #   end
+  #
+  # Or:
+  #   class BooksController < ApplicationController
+  #     load_resource
+  #     permit_params :title, :isbn
+  #   end
+  #
+  # the second form should work in the simple case where you don't have to
+  # supply a resource name for #load_resource
+  #
+  def self.permit_params *keys
+    filter_strong_params :permit, [:create, :update], keys
+  end
+  
+  # Like permit_params, but only applies to create action
+  #
+  def self.permit_params_on_create *keys
+    filter_strong_params :permit, :create, keys
+  end
+  
+  # Like permit_params, but only applies to update action
+  #
+  def self.permit_params_on_update *keys
+    filter_strong_params :permit, :update, keys
+  end
+  
+  # Like permit_params, but marks the params required
+  #
+  def self.require_params *keys
+    filter_strong_params :require, [:create, :update], keys
+  end
+  
+  # Like require_params, but only applies to create action
+  #
+  def self.require_params *keys
+    filter_strong_params :require, :create, keys
+  end
+  
+  # Like require_params, but only applies to update action
+  #
+  def self.require_params *keys
+    filter_strong_params :require, :update, keys
+  end
+  
+  # Does a permit! at every level of the params to let everything through
+  #
+  def self.permit_all_params options = {}
+    prepend_before_filter options.reverse_merge(:only => [:create, :update]) do
+      self.params.deep_permit!
+    end
+  end
+  
+  def self.filter_strong_params method, actions, keys # :nodoc:
+    hash = keys.extract_options!
+    if hash.present? && keys.present?
+      prepend_before_filter :only => actions do
+        self.params = params.send method, *keys, hash
+      end
+    elsif hash.present?
+      prepend_before_filter :only => actions do
+        self.params.merge! params.send(method, hash)
+      end
+    else
+      resource_name = self.to_s.sub("Controller", "").underscore.split('/').last.singularize
+      prepend_before_filter :only => actions do
+        if params.has_key?(resource_name)
+          self.params[resource_name] = params[resource_name].send method, *keys
+        else
+          self.params = params.send method, *keys
+        end
+      end
+    end
+  end
+end
+
+module ActionController
+  class Parameters < ActiveSupport::HashWithIndifferentAccess
+    def deep_permit!
+      self.each do |key, value|
+        if value.is_a?(Hash)
+          if !value.respond_to?(:permit!)
+            self[key] = value = ActionController::Parameters.new(value)
+          end
+          value.deep_permit!
+        end
+      end
+      permit!
+    end
+  end
+end

data/lib/cancan_strong_parameters/version.rb

@@ -1,3 +1,3 @@
 module CancanStrongParameters
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancan_strong_parameters
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000Z
+date: 2012-08-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70144855890200 !ruby/object:Gem::Requirement
+  requirement: &70196034599640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144855890200
+  version_requirements: *70196034599640
 - !ruby/object:Gem::Dependency
   name: strong_parameters
-  requirement: &70144855889740 !ruby/object:Gem::Requirement
+  requirement: &70196034599200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144855889740
+  version_requirements: *70196034599200
 description: make CanCan work with strong_parameters
 email:
 - me@colinyoung.com
@@ -47,7 +47,7 @@ files:
 - Rakefile
 - cancan_strong_parameters.gemspec
 - lib/cancan_strong_parameters.rb
-- lib/cancan_strong_parameters/cancan/controller_resource.rb
+- lib/cancan_strong_parameters/rails/controller/base.rb
 - lib/cancan_strong_parameters/version.rb
 homepage: https://github.com/colinyoung/cancan_strong_parameters
 licenses: []

data/lib/cancan_strong_parameters/cancan/controller_resource.rb

@@ -1,23 +0,0 @@
-module CanCan
-  class ControllerResource
-    def load_resource_with_secure_params(*args)
-      secure_params!
-      load_resource_without_secure_params # This name comes from alias_method_chain. The params are already secured.
-    end
-    
-    def secure_params!
-      controller = @controller
-      if controller.params.respond_to?(:require)
-        protected_actions = controller.respond_to?(:protected_actions) ? controller.protected_actions : ['create', 'update']
-        if protected_actions.include?(controller.action_name)
-          internal_keys = ['controller', 'action', 'authenticity_token', 'commit', 'utf8']
-          internal_values = @params.select {|k,v| internal_keys.include?(k) }        
-          @params = ({resource_class.name.downcase => controller.secure_params}.merge(internal_values))
-          @params = ActiveSupport::HashWithIndifferentAccess.new(@params)
-        end
-      end
-    end
-    
-    alias_method_chain :load_resource, :secure_params
-  end
-end