cancan_strong_parameters 0.3 → 0.4

data/README.md

@@ -1,6 +1,8 @@
 # CancanStrongParameters
 
-[CanCan](ryanb/cancan) and [strong_parameters](rails/strong_parameters) are friends now!
+[strong_parameters](rails/strong_parameters) and [CanCan](ryanb/cancan) (and others, like ActiveAdmin) are friends now!
+
+This gem makes it easy to control the authorization of params used by CanCan.
 
 [![Build Status](https://secure.travis-ci.org/colinyoung/cancan_strong_parameters.png)](http://travis-ci.org/colinyoung/cancan_strong_parameters)
 
@@ -22,6 +24,14 @@ Or install it yourself as:
 
     $ gem install cancan_strong_parameters
 
+## Rails 3
+
+Rails 3 users must require `strong_parameters` in their Gemfiles manually.
+
+    gem 'strong_parameters', '>= 0.1.6'
+
+Alternatively, you can use versions of this gem below 0.3.
+
 ## Usage
 
 1. Add `gem "cancan_strong_parameters"` to your Gemfile
@@ -72,6 +82,20 @@ class BlogPost < ActiveModel::Base
   permit_params :title, :content, tag_ids: Array
 end
 ```
+
+## Usage with other gems
+
+It's possible to use `cancan_strong_parameters` with other gems, like Active Admin:
+
+```ruby
+ActiveAdmin.register Member do
+  controller do
+    permit_params :project_id, :name, :email
+  end
+end
+```
+
+(Thanks to @joshhepworth!)
         
 ## Testing
 
@@ -79,6 +103,10 @@ Run with `bundle exec rake test`.
 
 ## Contributing
 
+First, thank you to @joshhepworth, @sespindola, and @seifsallam for their code and issue contributions.
+
+To become a contributor:
+
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
@@ -93,4 +121,4 @@ Run with `bundle exec rake test`.
 * Added default allows for _destroy.
 * Tests pass in Travis.
 * Fixes for irregular parameters posted like {"child_attributes" => {"0" => {}}}.
-* Fixed a major security problem where I was manually inserting IDs - should be allowed by default, but not manually added
+* Fixed a major security problem where I was manually inserting IDs - should be allowed by default, but not manually added

data/Rakefile

@@ -1,6 +1,10 @@
 #!/usr/bin/env rake
 $: << File.dirname(__FILE__)
 
+require 'rubygems'
+
+gem 'activesupport', '~> 3.0'
+
 require "bundler/gem_tasks"
 require 'rake/testtask'
 require 'test/rails_helper'

data/cancan_strong_parameters.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/colinyoung/cancan_strong_parameters"
   
   gem.add_dependency "cancan"
-  gem.add_dependency "strong_parameters", ">= 0.1.6"
   gem.add_dependency "activesupport"
   
   gem.add_development_dependency "require_all"
@@ -17,6 +16,13 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "minitest_tu_shim"
   gem.add_development_dependency "rails"
 
+  # For testing
+  gem.add_development_dependency "strong_parameters", "0.1.6"
+  gem.add_development_dependency 'actionpack', '~> 3.0'
+  gem.add_development_dependency 'activesupport', '~> 3.0'
+  gem.add_development_dependency 'activemodel', '~> 3.0'
+  gem.add_development_dependency 'railties', '~> 3.0'
+
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

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

@@ -1,5 +1,3 @@
-require 'strong_parameters'
-
 class ActionController::Base
   include CancanStrongParameters::Controller
 end

data/lib/cancan_strong_parameters/version.rb

@@ -1,3 +1,3 @@
 module CancanStrongParameters
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/test/app/controllers/posts_controller.rb

@@ -1,12 +1,11 @@
 class PostsController < ActionController::Base
   include CancanStrongParameters::Controller
   
-  permit_params :title, :content,
+  permit_params :title, :content, :label_ids,
     :comments => [
       :body, 
       { :tags => [ :name ] } # This is fugly, use 1.9!
-    ],
-    :label_ids => Array
+    ]
     
   def create
     @post = Post.new(params[:post])

data/test/rails_helper.rb

@@ -5,10 +5,10 @@ ENV["RAILS_ENV"] ||= 'test'
 
 require 'rubygems'
 
-gem 'actionpack', '>= 3.0.0'
-gem 'activesupport', '>= 3.0.0'
-gem 'activemodel', '>= 3.0.0'
-gem 'railties', '>= 3.0.0'
+gem 'actionpack',         '~> 3.0'
+gem 'activemodel',        '~> 3.0'
+gem 'railties',           '~> 3.0'
+gem 'strong_parameters',  '0.1.6'
 
 # Only the parts of rails we want to use
 # if you want everything, use "rails/all"
@@ -17,6 +17,8 @@ require "active_model/railtie"
 require "rails/test_unit/railtie"
 require "rack/test"
 
+require 'strong_parameters' # when using an ordinary bundle, this wouldn't be required
+
 root = File.expand_path(File.dirname(__FILE__))
 
 # Define the application and configuration

data/test/test_helper.rb

@@ -2,7 +2,6 @@ require 'require_all'
 
 require 'minitest/autorun'
 
-require 'strong_parameters'
 require 'cancan_strong_parameters'
 
 ## Boot up an instance of rails
@@ -15,4 +14,4 @@ require 'assertions/assert_same_content'
 module MiniTest::Expectations
   infect_an_assertion :assert_same_content, :must_have_same_content_as
   infect_an_assertion :refute_same_content, :wont_have_same_content_as
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancan_strong_parameters
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancan
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: strong_parameters
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +107,86 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: strong_parameters
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: make CanCan work with strong_parameters
 email:
 - me@colinyoung.com