.rbenv-version

@@ -1 +0,0 @@
-1.8.7-p357

CHANGELOG.rdoc

@@ -1,50 +1,3 @@
-1.6.10 (May 7, 2013)
-
-* fix matches_conditons_hash for string values on 1.8 (thanks rrosen)
-
-* work around SQL injection vulnerability in older Rails versions (thanks steerio) - issue #800
-
-* add support for nested join conditions (thanks yuszuv) - issue #806
-
-* fix load_resource "find_by" in mongoid resources (thanks albertobajo) - issue #705
-
-* fix namespace split behavior (thanks xinuc) - issue #668
-
-1.6.9 (February 4, 2013)
-
-* fix inserting AND (NULL) to end of SQL queries (thanks jonsgreen) - issue #687
-
-* fix merge_joins for nested association hashes (thanks DavidMikeSimon) - issues #655, #560
-
-* raise error on recursive alias_action (thanks fl00r) - issue #660
-
-* fix namespace controllers not loading params (thanks andhapp) - issues #670, #664
-
-
-1.6.8 (June 25, 2012)
-
-* improved support for namespaced controllers and models
-
-* pass :if and :unless options for load and authorize resource (thanks mauriciozaffari)
-
-* Travis CI badge (thanks plentz)
-
-* adding Ability#merge for combining multiple abilities (thanks rogercampos)
-
-* support for multiple MetaWhere rules (thanks andhapp)
-
-* various fixes for DataMapper, Mongoid, and Inherited Resource integration
-
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.6.7...1.6.8]
-
-
-1.6.7 (October 4, 2011)
-
-* fixing nested resource problem caused by namespace addition - issue #482
-
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.6.6...1.6.7]
-
-
 1.6.6 (September 28, 2011)
 
 * correct "return cant jump across threads" error when using check_authorization (thanks codeprimate) - issues #463, #469
@@ -63,8 +16,6 @@
 
 * allow :find_by option to be full find method name - issue #335
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.6.5...1.6.6]
-
 
 1.6.5 (May 18, 2011)
 
@@ -82,15 +33,11 @@
 
 * improve scope merging - issue #328
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.6.4...1.6.5]
-
 
 1.6.4 (March 29, 2011)
 
 * Fixed mongoid 'or' error - see issue #322
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.6.3...1.6.4]
-
 
 1.6.3 (March 25, 2011)
 
@@ -98,15 +45,11 @@
 
 * Return subject passed to authorize! - see issue #314
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.6.2...1.6.3]
-
 
 1.6.2 (March 18, 2011)
 
 * Fixed instance loading when :singleton option is used - see issue #310
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.6.1...1.6.2]
-
 
 1.6.1 (March 15, 2011)
 
@@ -116,8 +59,6 @@
 
 * Reverted Inherited Resources "collection" override since it doesn't seem to be working - see issue #305
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.6.0...1.6.1]
-
 
 1.6.0 (March 11, 2011)
 
@@ -139,8 +80,6 @@
 
 * Raise an exception when trying to make a Ability condition with both a hash of conditions and a block - see issue #269
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.5.1...1.6.0]
-
 
 1.5.1 (January 20, 2011)
 
@@ -148,8 +87,6 @@
 
 * Improving Mongoid support for multiple can and cannot definitions (thanks stellard) - see issue #239
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.5.0...1.5.1]
-
 
 1.5.0 (January 11, 2011)
 
@@ -171,8 +108,6 @@
 
 * Internal: added .rvmrc to auto-switch to 1.8.7 with gemset - see issue #231
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.4.1...1.5.0]
-
 
 1.4.1 (November 12, 2010)
 
@@ -186,8 +121,6 @@
 
 * Fix odd behavior when "cache_classes = false" (thanks mphalliday) - see issue #174
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.4.0...1.4.1]
-
 
 1.4.0 (October 5, 2010)
 
@@ -227,15 +160,11 @@
 
 * No longer calling block in +can+ definition when checking on class - see issue #116
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.3.4...1.4.0]
-
 
 1.3.4 (August 31, 2010)
 
 * Don't stop at +cannot+ with hash conditions when checking class (thanks tamoya) - see issue #131
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.3.3...1.3.4]
-
 
 1.3.3 (August 20, 2010)
 
@@ -243,22 +172,16 @@
 
 * Pluralize nested associations for conditions in accessible_by (thanks mlooney) - see issue #123
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.3.2...1.3.3]
-
 
 1.3.2 (August 7, 2010)
 
 * Fixing slice error when passing in custom resource name - see issue #112
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.3.1...1.3.2]
-
 
 1.3.1 (August 6, 2010)
 
 * Fixing protected sanitize_sql error - see issue #111
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.3.0...1.3.1]
-
 
 1.3.0 (August 6, 2010)
 
@@ -286,8 +209,6 @@
 
 * Supporting deeply nested aliases - see issue #98
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.2.0...1.3.0]
-
 
 1.2.0 (July 16, 2010)
 
@@ -303,15 +224,11 @@
 
 * Adding joins clause to accessible_by when conditions are across associations
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.1.1...1.2.0]
-
 
 1.1.1 (April 17, 2010)
 
 * Fixing behavior in Rails 3 by properly initializing ResourceAuthorization
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.1...1.1.1]
-
 
 1.1.0 (April 17, 2010)
 
@@ -335,8 +252,6 @@
 
 * Support additional arguments to can? which get passed to the block - see issue #48
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.0.2...1.1]
-
 
 1.0.2 (Dec 30, 2009)
 
@@ -346,8 +261,6 @@
 
 * Adding custom message argument to unauthorized! method (thanks tjwallace) - see issue #18
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.0.1...1.0.2]
-
 
 1.0.1 (Dec 14, 2009)
 
@@ -355,8 +268,6 @@
 
 * Don't fetch parent of nested resource if *_id parameter is missing so it works with shallow nested routes - see issue #14
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/1.0.0...1.0.1]
-
 
 1.0.0 (Dec 13, 2009)
 
@@ -372,8 +283,6 @@
 
 * BACKWARDS INCOMPATIBLE: turning load and authorize resource methods into class methods which set up the before filter so they can accept additional arguments.
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/0.2.1...1.0.0]
-
 
 0.2.1 (Nov 26, 2009)
 
@@ -383,8 +292,6 @@
 
 * support custom objects (usually symbols) in can definition - see issue #8
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/0.2.0...0.2.1]
-
 
 0.2.0 (Nov 17, 2009)
 
@@ -396,8 +303,6 @@
 
 * BACKWARDS INCOMPATIBLE: use Ability#initialize instead of 'prepare' to set up abilities - see issue #4
 
-* {see the full list of changes}[https://github.com/ryanb/cancan/compare/0.1.0...0.2.0]
-
 
 0.1.0 (Nov 16, 2009)
 

CONTRIBUTING.md

@@ -1,11 +0,0 @@
-### Please read before contributing
-
-1) If you have any questions about CanCan, search the [Wiki](https://github.com/ryanb/cancan/wiki) or use [Stack Overflow](http://stackoverflow.com/questions/tagged/cancan). Do not post questions here.
-
-2) If you find a security bug, **DO NOT** submit an issue here. Please send an e-mail to [ryan@railscasts.com](mailto:ryan@railscasts.com) instead.
-
-3) Do a small search on the issues tracker before submitting your issue to see if it was already reported / fixed. In case it was not, create your report including Rails and CanCan versions. If you are getting exceptions, please include the full backtrace.
-
-That's it! The more information you give, the more easy it becomes for us to track it down and fix it. Ideal scenario would be adding the issue to CanCan test suite or to a sample application.
-
-Thanks!

Gemfile

@@ -4,7 +4,7 @@ case ENV["MODEL_ADAPTER"]
 when nil, "active_record"
   gem "sqlite3"
   gem "activerecord", '~> 3.0.9', :require => "active_record"
-  gem "with_model", "~> 0.2.5"
+  gem "with_model", '~> 0.1.5'
   gem "meta_where"
 when "data_mapper"
   gem "dm-core", "~> 1.0.2"

README.rdoc

@@ -1,4 +1,4 @@
-= CanCan {<img src="https://fury-badge.herokuapp.com/rb/cancan.png" alt="Gem Version" />}[http://badge.fury.io/rb/cancan] {<img src="https://secure.travis-ci.org/ryanb/cancan.png?branch=master" />}[http://travis-ci.org/ryanb/cancan] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/ryanb/cancan]
+= CanCan
 
 Wiki[https://github.com/ryanb/cancan/wiki] | RDocs[http://rdoc.info/projects/ryanb/cancan] | Screencast[http://railscasts.com/episodes/192-authorization-with-cancan]
 
@@ -31,15 +31,6 @@ User permissions are defined in an +Ability+ class. CanCan 1.5 includes a Rails
 
   rails g cancan:ability
 
-In Rails 2.3, just add a new class in `app/models/ability.rb` with the folowing contents:
-
-  class Ability
-    include CanCan::Ability
-
-    def initialize(user)
-    end
-  end
-
 See {Defining Abilities}[https://github.com/ryanb/cancan/wiki/defining-abilities] for details.
 
 

cancan.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "cancan"
-  s.version     = "1.6.10"
+  s.version     = "1.6.6"
   s.author      = "Ryan Bates"
   s.email       = "ryan@railscasts.com"
   s.homepage    = "http://github.com/ryanb/cancan"
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.files        = Dir["{lib,spec}/**/*", "[A-Z]*", "init.rb"] - ["Gemfile.lock"]
   s.require_path = "lib"
 
-  s.add_development_dependency 'rspec', '~> 2.6.0'
+  s.add_development_dependency 'rspec', '~> 2.1.0'
   s.add_development_dependency 'rails', '~> 3.0.9'
   s.add_development_dependency 'rr', '~> 0.10.11' # 1.0.0 has respond_to? issues: http://github.com/btakita/rr/issues/issue/43
   s.add_development_dependency 'supermodel', '~> 0.1.4'

lib/cancan/ability.rb

@@ -172,16 +172,10 @@ module CanCan
     # This way one can use params[:action] in the controller to determine the permission.
     def alias_action(*args)
       target = args.pop[:to]
-      validate_target(target)
       aliased_actions[target] ||= []
       aliased_actions[target] += args
     end
 
-    # User shouldn't specify targets with names of real actions or it will cause Seg fault
-    def validate_target(target)
-      raise Error, "You can't specify target (#{target}) as alias because it is real action name" if aliased_actions.values.flatten.include? target
-    end
-
     # Returns a hash of aliased actions. The key is the target and the value is an array of actions aliasing the key.
     def aliased_actions
       @aliased_actions ||= default_alias_actions
@@ -234,13 +228,6 @@ module CanCan
       relevant_rules(action, subject).any?(&:only_raw_sql?)
     end
 
-    def merge(ability)
-      ability.send(:rules).each do |rule|
-        rules << rule.dup
-      end
-      self
-    end
-
     private
 
     def unauthorized_message_keys(action, subject)

lib/cancan/controller_additions.rb

@@ -94,12 +94,7 @@ module CanCan
       # [:+find_by+]
       #   Find using a different attribute other than id. For example.
       #
-      #     load_resource :find_by => :permalink # will use find_by_permalink!(params[:id])
+      #     load_resource :find_by => :permalink # will use find_by_permlink!(params[:id])
-      #
-      # [:+id_param+]
-      #   Find using a param key other than :id. For example:
-      #
-      #     load_resource :id_key => :url # will use find(params[:url])
       #
       # [:+collection+]
       #   Specify which actions are resource collection actions in addition to :+index+. This
@@ -156,9 +151,6 @@ module CanCan
       # [:+except+]
       #   Does not apply before filter to given actions.
       #
-      # [:+singleton+]
-      #   Pass +true+ if this is a singleton resource through a +has_one+ association.
-      #
       # [:+parent+]
       #   True or false depending on if the resource is considered a parent resource. This defaults to +true+ if a resource
       #   name is given which does not match the controller.
@@ -390,7 +382,7 @@ module CanCan
   end
 end
 
-if defined? ActionController::Base
+if defined? ActionController
   ActionController::Base.class_eval do
     include CanCan::ControllerAdditions
   end

lib/cancan/controller_resource.rb

@@ -6,8 +6,8 @@ module CanCan
       options = args.extract_options!
       resource_name = args.first
       before_filter_method = options.delete(:prepend) ? :prepend_before_filter : :before_filter
-      controller_class.send(before_filter_method, options.slice(:only, :except, :if, :unless)) do |controller|
+      controller_class.send(before_filter_method, options.slice(:only, :except)) do |controller|
-        controller.class.cancan_resource_class.new(controller, resource_name, options.except(:only, :except, :if, :unless)).send(method)
+        controller.class.cancan_resource_class.new(controller, resource_name, options.except(:only, :except)).send(method)
       end
     end
 
@@ -24,10 +24,6 @@ module CanCan
     def load_and_authorize_resource
       load_resource
       authorize_resource
-      if update_actions.include?(@params[:action].to_sym)
-        update_resource
-        authorize_resource # Reauthorize the now-updated resource
-      end
     end
 
     def load_resource
@@ -86,15 +82,7 @@ module CanCan
     end
 
     def build_resource
-      resource = resource_base.new(resource_params || {})
+      resource = resource_base.new(@params[name] || {})
-      assign_attributes(resource)
-    end
-
-    def update_resource
-      resource.assign_attributes(resource_params || {})
-    end
-
-    def assign_attributes(resource)
       resource.send("#{parent_name}=", parent_resource) if @options[:singleton] && parent_resource
       initial_attributes.each do |attr_name, value|
         resource.send("#{attr_name}=", value)
@@ -104,7 +92,7 @@ module CanCan
 
     def initial_attributes
       current_ability.attributes_for(@params[:action].to_sym, resource_class).delete_if do |key, value|
-        resource_params && resource_params.include?(key)
+        @params[name] && @params[name].include?(key)
       end
     end
 
@@ -115,8 +103,6 @@ module CanCan
         if @options[:find_by]
           if resource_base.respond_to? "find_by_#{@options[:find_by]}!"
             resource_base.send("find_by_#{@options[:find_by]}!", id_param)
-          elsif resource_base.respond_to? "find_by"
-            resource_base.send("find_by", { @options[:find_by].to_sym => id_param })
           else
             resource_base.send(@options[:find_by], id_param)
           end
@@ -139,7 +125,7 @@ module CanCan
         @params[@options[:id_param]]
       else
         @params[parent? ? :"#{name}_id" : :id]
-      end.to_s
+      end
     end
 
     def member_action?
@@ -221,25 +207,8 @@ module CanCan
       @name || name_from_controller
     end
 
-    def resource_params
-      if @options[:class]
-        params_key = extract_key(@options[:class])
-        return @params[params_key] if @params[params_key]
-      end
-
-      resource_params_by_namespaced_name
-    end
-
-    def resource_params_by_namespaced_name
-      @params[extract_key(namespaced_name)]
-    end
-
-    def namespace
-      @params[:controller].split(/::|\//)[0..-2]
-    end
-
     def namespaced_name
-      [namespace, name.camelize].join('::').singularize.camelize.constantize
+      @params[:controller].sub("Controller", "").singularize.camelize.constantize
     rescue NameError
       name
     end
@@ -259,15 +228,5 @@ module CanCan
     def new_actions
       [:new, :create] + [@options[:new]].flatten
     end
-
-    def update_actions
-      [:update] #TODO: check what @options is for
-    end
-
-    private
-
-    def extract_key(value)
-       value.to_s.underscore.gsub('/', '_')
-    end
   end
 end

lib/cancan/inherited_resource.rb

@@ -6,8 +6,7 @@ module CanCan
         @controller.send :association_chain
         @controller.instance_variable_get("@#{instance_name}")
       elsif new_actions.include? @params[:action].to_sym
-        resource = @controller.send :build_resource
+        @controller.send :build_resource
-        assign_attributes(resource)
       else
         @controller.send :resource
       end

lib/cancan/model_adapters/active_record_adapter.rb

@@ -66,22 +66,11 @@ module CanCan
         return conditions unless conditions.kind_of? Hash
         conditions.inject({}) do |result_hash, (name, value)|
           if value.kind_of? Hash
-            value = value.dup
             association_class = model_class.reflect_on_association(name).class_name.constantize
-            nested = value.inject({}) do |nested,(k,v)|
+            name = model_class.reflect_on_association(name).table_name.to_sym
-              if v.kind_of? Hash
+            value = tableized_conditions(value, association_class)
-                value.delete(k)
-                nested[k] = v
-              else
-                name = model_class.reflect_on_association(name).table_name.to_sym
-                result_hash[name] = value
-              end
-              nested
-            end
-            result_hash.merge!(tableized_conditions(nested,association_class))
-          else
-            result_hash[name] = value
           end
+          result_hash[name] = value
           result_hash
         end
       end
@@ -100,12 +89,7 @@ module CanCan
         if override_scope
           @model_class.scoped.merge(override_scope)
         elsif @model_class.respond_to?(:where) && @model_class.respond_to?(:joins)
-          mergeable_conditions = @rules.select {|rule| rule.unmergeable? }.blank?
+          @model_class.where(conditions).joins(joins)
-          if mergeable_conditions
-            @model_class.where(conditions).joins(joins)
-          else
-            @model_class.where(*(@rules.map(&:conditions))).joins(joins)
-          end
         else
           @model_class.scoped(:conditions => conditions, :joins => joins)
         end
@@ -156,8 +140,8 @@ module CanCan
       # Takes two hashes and does a deep merge.
       def merge_joins(base, add)
         add.each do |name, nested|
-          if base[name].is_a?(Hash)
+          if base[name].is_a?(Hash) && !nested.empty?
-            merge_joins(base[name], nested) unless nested.empty?
+            merge_joins(base[name], nested)
           else
             base[name] = nested
           end

lib/cancan/model_adapters/mongoid_adapter.rb

@@ -30,9 +30,8 @@ module CanCan
         else
           # we only need to process can rules if
           # there are no rules with empty conditions
-          rules = @rules.reject { |rule| rule.conditions.empty? && rule.base_behavior }
+          rules = @rules.reject { |rule| rule.conditions.empty? }
           process_can_rules = @rules.count == rules.count
-
           rules.inject(@model_class.all) do |records, rule|
             if process_can_rules && rule.base_behavior
               records.or rule.conditions

lib/cancan/rule.rb

@@ -54,11 +54,6 @@ module CanCan
       @conditions == {} || @conditions.nil?
     end
 
-    def unmergeable?
-      @conditions.respond_to?(:keys) && @conditions.present? &&
-        (!@conditions.keys.first.kind_of? Symbol)
-    end
-
     def associations_hash(conditions = @conditions)
       hash = {}
       conditions.map do |name, value|
@@ -116,7 +111,7 @@ module CanCan
                 else
                   !attribute.nil? && matches_conditions_hash?(attribute, value)
                 end
-              elsif !value.is_a?(String) && value.kind_of?(Enumerable)
+              elsif value.kind_of?(Array) || value.kind_of?(Range)
                 value.include? attribute
               else
                 attribute == value
@@ -128,7 +123,7 @@ module CanCan
     end
 
     def nested_subject_matches_conditions?(subject_hash)
-      parent, child = subject_hash.first
+      parent, child = subject_hash.shift
       matches_conditions_hash?(parent, @conditions[parent.class.name.downcase.to_sym] || {})
     end
 
@@ -141,7 +136,7 @@ module CanCan
     end
 
     def model_adapter(subject)
-      CanCan::ModelAdapters::AbstractAdapter.adapter_class(subject_class?(subject) ? subject : subject.class)
+      ModelAdapters::AbstractAdapter.adapter_class(subject_class?(subject) ? subject : subject.class)
     end
   end
 end

lib/generators/cancan/ability/templates/ability.rb

@@ -11,22 +11,18 @@ class Ability
     #     can :read, :all
     #   end
     #
-    # The first argument to `can` is the action you are giving the user 
+    # The first argument to `can` is the action you are giving the user permission to do.
-    # permission to do.
+    # If you pass :manage it will apply to every action. Other common actions here are
-    # If you pass :manage it will apply to every action. Other common actions
+    # :read, :create, :update and :destroy.
-    # here are :read, :create, :update and :destroy.
     #
-    # The second argument is the resource the user can perform the action on. 
+    # The second argument is the resource the user can perform the action on. If you pass
-    # If you pass :all it will apply to every resource. Otherwise pass a Ruby
+    # :all it will apply to every resource. Otherwise pass a Ruby class of the resource.
-    # class of the resource.
     #
-    # The third argument is an optional hash of conditions to further filter the
+    # The third argument is an optional hash of conditions to further filter the objects.
-    # objects.
     # For example, here the user can only update published articles.
     #
     #   can :update, Article, :published => true
     #
-    # See the wiki for details:
+    # See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
-    # https://github.com/ryanb/cancan/wiki/Defining-Abilities
   end
 end

spec/cancan/ability_spec.rb

@@ -87,10 +87,6 @@ describe CanCan::Ability do
     @ability.can?(:increment, 123).should be_true
   end
 
-  it "should raise an Error if alias target is an exist action" do
-    lambda{ @ability.alias_action :show, :to => :show }.should raise_error(CanCan::Error, "You can't specify target (show) as alias because it is real action name")
-  end
-
   it "should always call block with arguments when passing no arguments to can" do
     @ability.can do |action, object_class, object|
       action.should == :foo
@@ -254,14 +250,6 @@ describe CanCan::Ability do
     @ability.can?(:read, 4..6).should be_false
   end
   
-  it "should accept a set as a condition value" do
-    mock(object_with_foo_2 = Object.new).foo { 2 }
-    mock(object_with_foo_3 = Object.new).foo { 3 }
-    @ability.can :read, Object, :foo => [1, 2, 5].to_set
-    @ability.can?(:read, object_with_foo_2).should be_true
-    @ability.can?(:read, object_with_foo_3).should be_false
-  end
-
   it "should not match subjects return nil for methods that must match nested a nested conditions hash" do
     mock(object_with_foo = Object.new).foo { :bar }
     @ability.can :read, Array, :first => { :foo => :bar }
@@ -269,12 +257,6 @@ describe CanCan::Ability do
     @ability.can?(:read, []).should be_false
   end
 
-  it "should match strings but not substrings specified in a conditions hash" do
-    @ability.can :read, String, :presence => "declassified"
-    @ability.can?(:read, "declassified").should be_true
-    @ability.can?(:read, "classified").should be_false
-  end
-
   it "should not stop at cannot definition when comparing class" do
     @ability.can :read, Range
     @ability.cannot :read, Range, :begin => 1
@@ -316,14 +298,6 @@ describe CanCan::Ability do
     @ability.can?(:read, 123 => Range).should be_true
   end
   
-  it "passing a hash of subjects with multiple definitions should check permissions correctly" do
-    @ability.can :read, Range, :string => {:length => 4}
-    @ability.can [:create, :read], Range, :string => {:upcase => 'FOO'}
-    @ability.can?(:read, "foo" => Range).should be_true
-    @ability.can?(:read, "foobar" => Range).should be_false
-    @ability.can?(:read, 1234 => Range).should be_true
-  end
-
   it "should allow to check ability on Hash-like object" do
     class Container < Hash; end
     @ability.can :read, Container
@@ -442,17 +416,4 @@ describe CanCan::Ability do
       @ability.unauthorized_message(:edit, 1..3).should == "edit range"
     end
   end
-
-  describe "#merge" do
-    it "should add the rules from the given ability" do
-      @ability.can :use, :tools
-      another_ability = Object.new
-      another_ability.extend(CanCan::Ability)
-      another_ability.can :use, :search
-
-      @ability.merge(another_ability)
-      @ability.can?(:use, :search).should be_true
-      @ability.send(:rules).size.should == 2
-    end
-  end
 end

spec/cancan/controller_additions_spec.rb

@@ -49,14 +49,14 @@ describe CanCan::ControllerAdditions do
 
   it "authorize_resource should setup a before filter which passes call to ControllerResource" do
     stub(CanCan::ControllerResource).new(@controller, nil, :foo => :bar).mock!.authorize_resource
-    mock(@controller_class).before_filter(:except => :show, :if => true) { |options, block| block.call(@controller) }
+    mock(@controller_class).before_filter(:except => :show) { |options, block| block.call(@controller) }
-    @controller_class.authorize_resource :foo => :bar, :except => :show, :if => true
+    @controller_class.authorize_resource :foo => :bar, :except => :show
   end
 
   it "load_resource should setup a before filter which passes call to ControllerResource" do
     stub(CanCan::ControllerResource).new(@controller, nil, :foo => :bar).mock!.load_resource
-    mock(@controller_class).before_filter(:only => [:show, :index], :unless => false) { |options, block| block.call(@controller) }
+    mock(@controller_class).before_filter(:only => [:show, :index]) { |options, block| block.call(@controller) }
-    @controller_class.load_resource :foo => :bar, :only => [:show, :index], :unless => false
+    @controller_class.load_resource :foo => :bar, :only => [:show, :index]
   end
 
   it "skip_authorization_check should set up a before filter which sets @_authorized to true" do

spec/cancan/controller_resource_spec.rb

@@ -20,7 +20,7 @@ describe CanCan::ControllerResource do
   end
 
   it "should not load resource into an instance variable if already set" do
-    @params.merge!(:action => "show", :id => "123")
+    @params.merge!(:action => "show", :id => 123)
     @controller.instance_variable_set(:@project, :some_project)
     resource = CanCan::ControllerResource.new(@controller)
     resource.load_resource
@@ -47,18 +47,6 @@ describe CanCan::ControllerResource do
     @controller.instance_variable_get(:@project).should == project
   end
 
-  # Rails includes namespace in params, see issue #349
-  it "should create through the namespaced params" do
-    module MyEngine
-      class Project < ::Project; end
-    end
-
-    @params.merge!(:controller => "MyEngine::ProjectsController", :action => "create", :my_engine_project => {:name => "foobar"})
-    resource = CanCan::ControllerResource.new(@controller)
-    resource.load_resource
-    @controller.instance_variable_get(:@project).name.should == "foobar"
-  end
-
   it "should properly load resource for namespaced controller when using '::' for namespace" do
     project = Project.create!
     @params.merge!(:controller => "Admin::ProjectsController", :action => "show", :id => project.id)
@@ -67,16 +55,6 @@ describe CanCan::ControllerResource do
     @controller.instance_variable_get(:@project).should == project
   end
 
-  it "has the specified nested resource_class when using / for namespace" do
-    module Admin
-      class Dashboard; end
-    end
-    @ability.can(:index, "admin/dashboard")
-    @params.merge!(:controller => "admin/dashboard", :action => "index")
-    resource = CanCan::ControllerResource.new(@controller, :authorize => true)
-    resource.send(:resource_class).should == Admin::Dashboard
-  end
-
   it "should build a new resource with hash if params[:id] is not specified" do
     @params.merge!(:action => "create", :project => {:name => "foobar"})
     resource = CanCan::ControllerResource.new(@controller)
@@ -84,20 +62,6 @@ describe CanCan::ControllerResource do
     @controller.instance_variable_get(:@project).name.should == "foobar"
   end
 
-  it "should build a new resource for namespaced model with hash if params[:id] is not specified" do
-    @params.merge!(:action => "create", 'sub_project' => {:name => "foobar"})
-    resource = CanCan::ControllerResource.new(@controller, :class => ::Sub::Project)
-    resource.load_resource
-    @controller.instance_variable_get(:@project).name.should == "foobar"
-  end
-
-  it "should build a new resource for namespaced controller and namespaced model with hash if params[:id] is not specified" do
-    @params.merge!(:controller => "Admin::SubProjectsController", :action => "create", 'sub_project' => {:name => "foobar"})
-    resource = CanCan::ControllerResource.new(@controller, :class => Project)
-    resource.load_resource
-    @controller.instance_variable_get(:@sub_project).name.should == "foobar"
-  end
-
   it "should build a new resource with attributes from current ability" do
     @params.merge!(:action => "new")
     @ability.can(:create, Project, :name => "from conditions")
@@ -158,7 +122,7 @@ describe CanCan::ControllerResource do
   end
 
   it "should perform authorization using controller action and loaded model" do
-    @params.merge!(:action => "show", :id => "123")
+    @params.merge!(:action => "show", :id => 123)
     @controller.instance_variable_set(:@project, :some_project)
     stub(@controller).authorize!(:show, :some_project) { raise CanCan::AccessDenied }
     resource = CanCan::ControllerResource.new(@controller)
@@ -166,14 +130,14 @@ describe CanCan::ControllerResource do
   end
 
   it "should perform authorization using controller action and non loaded model" do
-    @params.merge!(:action => "show", :id => "123")
+    @params.merge!(:action => "show", :id => 123)
     stub(@controller).authorize!(:show, Project) { raise CanCan::AccessDenied }
     resource = CanCan::ControllerResource.new(@controller)
     lambda { resource.authorize_resource }.should raise_error(CanCan::AccessDenied)
   end
 
   it "should call load_resource and authorize_resource for load_and_authorize_resource" do
-    @params.merge!(:action => "show", :id => "123")
+    @params.merge!(:action => "show", :id => 123)
     resource = CanCan::ControllerResource.new(@controller)
     mock(resource).load_resource
     mock(resource).authorize_resource
@@ -181,7 +145,7 @@ describe CanCan::ControllerResource do
   end
 
   it "should not build a single resource when on custom collection action even with id" do
-    @params.merge!(:action => "sort", :id => "123")
+    @params.merge!(:action => "sort", :id => 123)
     resource = CanCan::ControllerResource.new(@controller, :collection => [:sort, :list])
     resource.load_resource
     @controller.instance_variable_get(:@project).should be_nil
@@ -197,7 +161,7 @@ describe CanCan::ControllerResource do
   end
 
   it "should build a resource when on custom new action even when params[:id] exists" do
-    @params.merge!(:action => "build", :id => "123")
+    @params.merge!(:action => "build", :id => 123)
     stub(Project).new { :some_project }
     resource = CanCan::ControllerResource.new(@controller, :new => :build)
     resource.load_resource
@@ -231,47 +195,39 @@ describe CanCan::ControllerResource do
     resource.should_not be_parent
   end
 
-  it "should have the specified resource_class if 'name' is passed to load_resource" do
-    class Section
-    end
-
-    resource = CanCan::ControllerResource.new(@controller, :section)
-    resource.send(:resource_class).should == Section
-  end
-
   it "should load parent resource through proper id parameter" do
     project = Project.create!
-    @params.merge!(:controller => "categories", :action => "index", :project_id => project.id)
+    @params.merge!(:action => "index", :project_id => project.id)
-    resource = CanCan::ControllerResource.new(@controller, :project)
+    resource = CanCan::ControllerResource.new(@controller, :project, :parent => true)
     resource.load_resource
     @controller.instance_variable_get(:@project).should == project
   end
 
   it "should load resource through the association of another parent resource using instance variable" do
-    @params.merge!(:action => "show", :id => "123")
+    @params.merge!(:action => "show", :id => 123)
     category = Object.new
     @controller.instance_variable_set(:@category, category)
-    stub(category).projects.stub!.find("123") { :some_project }
+    stub(category).projects.stub!.find(123) { :some_project }
     resource = CanCan::ControllerResource.new(@controller, :through => :category)
     resource.load_resource
     @controller.instance_variable_get(:@project).should == :some_project
   end
 
   it "should load resource through the custom association name" do
-    @params.merge!(:action => "show", :id => "123")
+    @params.merge!(:action => "show", :id => 123)
     category = Object.new
     @controller.instance_variable_set(:@category, category)
-    stub(category).custom_projects.stub!.find("123") { :some_project }
+    stub(category).custom_projects.stub!.find(123) { :some_project }
     resource = CanCan::ControllerResource.new(@controller, :through => :category, :through_association => :custom_projects)
     resource.load_resource
     @controller.instance_variable_get(:@project).should == :some_project
   end
 
   it "should load resource through the association of another parent resource using method" do
-    @params.merge!(:action => "show", :id => "123")
+    @params.merge!(:action => "show", :id => 123)
     category = Object.new
     stub(@controller).category { category }
-    stub(category).projects.stub!.find("123") { :some_project }
+    stub(category).projects.stub!.find(123) { :some_project }
     resource = CanCan::ControllerResource.new(@controller, :through => :category)
     resource.load_resource
     @controller.instance_variable_get(:@project).should == :some_project
@@ -308,10 +264,10 @@ describe CanCan::ControllerResource do
   end
 
   it "should load through first matching if multiple are given" do
-    @params.merge!(:action => "show", :id => "123")
+    @params.merge!(:action => "show", :id => 123)
     category = Object.new
     @controller.instance_variable_set(:@category, category)
-    stub(category).projects.stub!.find("123") { :some_project }
+    stub(category).projects.stub!.find(123) { :some_project }
     resource = CanCan::ControllerResource.new(@controller, :through => [:category, :user])
     resource.load_resource
     @controller.instance_variable_get(:@project).should == :some_project
@@ -368,16 +324,8 @@ describe CanCan::ControllerResource do
     @controller.instance_variable_get(:@project).should == project
   end
 
-  it "should load the model using a custom namespaced class" do
-    project = Sub::Project.create!
-    @params.merge!(:action => "show", :id => project.id)
-    resource = CanCan::ControllerResource.new(@controller, :class => ::Sub::Project)
-    resource.load_resource
-    @controller.instance_variable_get(:@project).should == project
-  end
-
   it "should authorize based on resource name if class is false" do
-    @params.merge!(:action => "show", :id => "123")
+    @params.merge!(:action => "show", :id => 123)
     stub(@controller).authorize!(:show, :project) { raise CanCan::AccessDenied }
     resource = CanCan::ControllerResource.new(@controller, :class => false)
     lambda { resource.authorize_resource }.should raise_error(CanCan::AccessDenied)
@@ -400,13 +348,6 @@ describe CanCan::ControllerResource do
     @controller.instance_variable_get(:@project).should == project
   end
   
-  # CVE-2012-5664
-  it "should always convert id param to string" do
-    @params.merge!(:action => "show", :the_project => { :malicious => "I am" })
-    resource = CanCan::ControllerResource.new(@controller, :id_param => :the_project)
-    resource.send(:id_param).class.should == String
-  end
-
   it "should load resource using custom find_by attribute" do
     project = Project.create!(:name => "foo")
     @params.merge!(:action => "show", :id => "foo")

spec/cancan/inherited_resource_spec.rb

@@ -39,22 +39,4 @@ describe CanCan::InheritedResource do
     CanCan::InheritedResource.new(@controller).load_resource
     @controller.instance_variable_get(:@projects).should == :projects
   end
-
-  it "should build a new resource with attributes from current ability" do
-    @params[:action] = "new"
-    @ability.can(:create, Project, :name => "from conditions")
-    stub(@controller).build_resource { Struct.new(:name).new }
-    resource = CanCan::InheritedResource.new(@controller)
-    resource.load_resource
-    @controller.instance_variable_get(:@project).name.should == "from conditions"
-  end
-
-  it "should override initial attributes with params" do
-    @params.merge!(:action => "new", :project => {:name => "from params"})
-    @ability.can(:create, Project, :name => "from conditions")
-    stub(@controller).build_resource { Struct.new(:name).new }
-    resource = CanCan::ControllerResource.new(@controller)
-    resource.load_resource
-    @controller.instance_variable_get(:@project).name.should == "from params"
-  end
 end

spec/cancan/model_adapters/active_record_adapter_spec.rb

@@ -1,6 +1,10 @@
 if ENV["MODEL_ADAPTER"].nil? || ENV["MODEL_ADAPTER"] == "active_record"
   require "spec_helper"
 
+  RSpec.configure do |config|
+    config.extend WithModel
+  end
+
   ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
   describe CanCan::ModelAdapters::ActiveRecordAdapter do
@@ -20,12 +24,10 @@ if ENV["MODEL_ADAPTER"].nil? || ENV["MODEL_ADAPTER"] == "active_record"
         t.boolean "secret"
         t.integer "priority"
         t.integer "category_id"
-        t.integer "user_id"
       end
       model do
         belongs_to :category
         has_many :comments
-        belongs_to :user
       end
     end
 
@@ -39,15 +41,6 @@ if ENV["MODEL_ADAPTER"].nil? || ENV["MODEL_ADAPTER"] == "active_record"
       end
     end
 
-    with_model :user do
-      table do |t|
-
-      end
-      model do
-        has_many :articles
-      end
-    end
-
     before(:each) do
       Article.delete_all
       Comment.delete_all
@@ -207,16 +200,6 @@ if ENV["MODEL_ADAPTER"].nil? || ENV["MODEL_ADAPTER"] == "active_record"
       @ability.model_adapter(Article, :read).conditions.should == "'t'='t'"
     end
 
-    it "should return appropriate sql conditions in complex case with nested joins" do
-      @ability.can :read, Comment, :article => { :category => { :visible => true } }
-      @ability.model_adapter(Comment, :read).conditions.should == { Category.table_name.to_sym => { :visible => true } }
-    end
-
-    it "should return appropriate sql conditions in complex case with nested joins of different depth" do
-      @ability.can :read, Comment, :article => { :published => true, :category => { :visible => true } }
-      @ability.model_adapter(Comment, :read).conditions.should == { Article.table_name.to_sym => { :published => true }, Category.table_name.to_sym => { :visible => true } }
-    end
-
     it "should not forget conditions when calling with SQL string" do
       @ability.can :read, Article, :published => true
       @ability.can :read, Article, ['secret=?', false]
@@ -248,21 +231,6 @@ if ENV["MODEL_ADAPTER"].nil? || ENV["MODEL_ADAPTER"] == "active_record"
       @ability.model_adapter(Article, :read).joins.should == [:project]
     end
 
-    it "should merge nested and non-nested joins" do
-      @ability.can :read, Article, :project => { :blocked => false }
-      @ability.can :read, Article, :project => { :comments => { :spam => true } }
-      @ability.model_adapter(Article, :read).joins.should == [{:project=>[:comments]}]
-    end
-
-    it "should merge :all conditions with other conditions" do
-      user = User.create!
-      article = Article.create!(:user => user)
-      ability = Ability.new(user)
-      ability.can :manage, :all
-      ability.can :manage, Article, :user_id => user.id
-      Article.accessible_by(ability).should == [article]
-    end
-
     it "should restrict articles given a MetaWhere condition" do
       @ability.can :read, Article, :priority.lt => 2
       article1 = Article.create!(:priority => 1)
@@ -272,16 +240,6 @@ if ENV["MODEL_ADAPTER"].nil? || ENV["MODEL_ADAPTER"] == "active_record"
       @ability.should_not be_able_to(:read, article2)
     end
 
-    it "should merge MetaWhere and non-MetaWhere conditions" do
-      @ability.can :read, Article, :priority.lt => 2
-      @ability.can :read, Article, :priority => 1
-      article1 = Article.create!(:priority => 1)
-      article2 = Article.create!(:priority => 3)
-      Article.accessible_by(@ability).should == [article1]
-      @ability.should be_able_to(:read, article1)
-      @ability.should_not be_able_to(:read, article2)
-    end
-
     it "should match any MetaWhere condition" do
       adapter = CanCan::ModelAdapters::ActiveRecordAdapter
       article1 = Article.new(:priority => 1, :name => "Hello World")

spec/cancan/model_adapters/mongoid_adapter_spec.rb

@@ -73,17 +73,6 @@ if ENV["MODEL_ADAPTER"] == "mongoid"
         MongoidProject.accessible_by(@ability, :read).entries.should == [sir]
       end
 
-      it "should return the correct records when a mix of can and cannot rules in defined ability" do
-        @ability.can :manage, MongoidProject, :title => 'Sir'
-        @ability.cannot :destroy, MongoidProject
-
-        sir   = MongoidProject.create(:title => 'Sir')
-        lord  = MongoidProject.create(:title => 'Lord')
-        dude  = MongoidProject.create(:title => 'Dude')
-
-        MongoidProject.accessible_by(@ability, :destroy).entries.should == [sir]
-      end
-
       it "should be able to mix empty conditions and hashes" do
         @ability.can :read, MongoidProject
         @ability.can :read, MongoidProject, :title => 'Sir'

spec/cancan/rule_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "ostruct" # for OpenStruct below
 
 # Most of Rule functionality is tested in Ability specs
 describe CanCan::Rule do
@@ -37,16 +36,4 @@ describe CanCan::Rule do
     rule = CanCan::Rule.new(true, :read, Integer, nil, nil)
     rule.associations_hash.should == {}
   end
-
-  it "should not be mergeable if conditions are not simple hashes" do
-    meta_where = OpenStruct.new(:name => 'metawhere', :column => 'test')
-    @conditions[meta_where] = :bar
-
-    @rule.should be_unmergeable
-  end
-
-  it "should be mergeable if conditions is an empty hash" do
-    @conditions = {}
-    @rule.should_not be_unmergeable
-  end
 end

spec/spec_helper.rb

@@ -9,27 +9,11 @@ require 'matchers'
 require 'cancan/matchers'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.filter_run :focus => true
-  config.run_all_when_everything_filtered = true
   config.mock_with :rr
   config.before(:each) do
     Project.delete_all
     Category.delete_all
   end
-  config.extend WithModel if ENV["MODEL_ADAPTER"].nil? || ENV["MODEL_ADAPTER"] == "active_record"
-end
-
-# Working around CVE-2012-5664 requires us to convert all ID params
-# to strings. Let's switch to using string IDs in tests, otherwise
-# SuperModel and/or RR will fail (as strings are not fixnums).
-
-module SuperModel
-  class Base
-    def generate_id
-      object_id.to_s
-    end
-  end
 end
 
 class Ability
@@ -43,21 +27,6 @@ class Category < SuperModel::Base
   has_many :projects
 end
 
-module Sub
-  class Project < SuperModel::Base
-    belongs_to :category
-    attr_accessor :category # why doesn't SuperModel do this automatically?
-
-    def self.respond_to?(method, include_private = false)
-      if method.to_s == "find_by_name!" # hack to simulate ActiveRecord
-        true
-      else
-        super
-      end
-    end
-  end
-end
-
 class Project < SuperModel::Base
   belongs_to :category
   attr_accessor :category # why doesn't SuperModel do this automatically?