cefigueiredo · cefigueiredo · Apr 13, 2014 · Feb 23, 2014 · Feb 24, 2014 · Feb 25, 2014
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,15 @@
+.DS_Store
+.idea/*
 *.swp
 **/*.swp
 *.gem
-Gemfile.lock
 .bundle
+
+gemfiles/*.lock
+Gemfile.lock
+
+.rvmrc
+.rbenv-version
+.ruby-version
+.ruby-gemset
+/tmp
diff --git a/.ruby-version b/.ruby-version
diff --git a/.travis.yml b/.travis.yml
@@ -7,10 +7,15 @@ rvm:
   - ree
   - jruby
   - rbx
+gemfile:
+  - gemfiles/rails_3.0.gemfile
+  - gemfiles/rails_3.0_datamapper.gemfile
+  - gemfiles/rails_3.0_mongoid.gemfile
+services:
+  - mongodb
 matrix:
   allow_failures:
     - rvm: rbx
 notifications:
   recipients:
     - bryan@bryanrite.com
-    - ryan@railscasts.com
diff --git a/Appraisals b/Appraisals
@@ -0,0 +1,28 @@
+appraise "rails_3.0" do
+  gem "activerecord", "~> 3.0.20", :require => "active_record"
+  gem "with_model", "~> 0.2.5"
+  gem "meta_where"
+
+  gemfile.platforms :jruby do
+    gem "activerecord-jdbcsqlite3-adapter"
+    gem "jdbc-sqlite3"
+  end
+
+  gemfile.platforms :ruby, :mswin, :mingw do
+    gem "sqlite3"
+  end
+end
+
+appraise "rails_3.0_datamapper" do
+  gem "dm-core", "~> 1.0.2"
+  gem "dm-sqlite-adapter", "~> 1.0.2"
+  gem "dm-migrations", "~> 1.0.2"
+end
+
+appraise "rails_3.0_mongoid" do
+  gem "mongoid", "~> 2.0.0"
+
+  gemfile.platforms :ruby, :mswin, :mingw do
+    gem "bson_ext", "~> 1.1"
+  end
+end
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,6 +1,13 @@
 Master
 
 
+1.7.1 (March 19th, 2014)
+
+* Fix ryanb/cancan#992 - Remove Rails 4 deprecations for scoped (thejchap & hitendrasingh)
+
+* Fix cancancan#16 - RSpec expectations are not explicitly required in RSpec > 2.13 (justinaiken & bryanrite)
+
+
 1.7.0 (February 19th, 2014)
 
 * Feature #988 Adds support for strong_parameters (bryanrite)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,11 +1,23 @@
-### Please read before contributing
+## Contributing to CanCanCan
 
-1) If you have any questions about CanCan, search the [Wiki](https://github.com/bryanrite/cancancan/wiki) or use [Stack Overflow](http://stackoverflow.com/questions/tagged/cancancan). Do not post questions here.
+### Reporting an Issue
 
-2) If you find a security bug, **DO NOT** submit an issue here. Please send an e-mail to [bryan@bryanrite.com](mailto:bryan@bryanrite.com) instead.
+1. If you have any questions about CanCanCan, search the [Wiki](https://github.com/bryanrite/cancancan/wiki), use [Stack Overflow](http://stackoverflow.com/questions/tagged/cancancan), or [our mailing list](https://groups.google.com/forum/#!forum/cancancan). Do not post questions here.
 
-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.
+1. If you find a security bug, **DO NOT** submit an issue here. Please send an e-mail to [bryan@bryanrite.com](mailto:bryan@bryanrite.com) instead.
 
-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.
+1. Do a small search on the issues tracker before submitting your issue to see if it was already reported / fixed.
+
+1. Create your report including Rails and CanCanCan 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 CanCanCan test suite or to a sample application.
+
+### Adding new Features or Bugfixes
+
+CanCanCan uses a [git-flow](http://nvie.com/posts/a-successful-git-branching-model/) development model.  The latest "released" version of CanCanCan, the latest gem version, can always be found on `master`, while the next version or nightly is on `develop`.
+
+Please make sure you have test coverage for anything you add or fix!
+
+Please add a CHANGELOG entry with any relevant tags for issues, pull-requests, and authors.
 
 Thanks!
diff --git a/Gemfile b/Gemfile
@@ -1,23 +1,3 @@
 source "https://rubygems.org"
 
-case ENV["MODEL_ADAPTER"]
-when nil, "active_record"
-  # Sqlite for CRuby, Rubinius, including Windows and RubyInstaller
-  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-  # Sqlite for JRuby
-  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-  gem "activerecord", '~> 3.0.9', :require => "active_record"
-  gem "with_model", "~> 0.2.5"
-  gem "meta_where"
-when "data_mapper"
-  gem "dm-core", "~> 1.0.2"
-  gem "dm-sqlite-adapter", "~> 1.0.2"
-  gem "dm-migrations", "~> 1.0.2"
-when "mongoid"
-  gem "bson_ext", "~> 1.1"
-  gem "mongoid", "~> 2.0.0.beta.20"
-else
-  raise "Unknown model adapter: #{ENV["MODEL_ADAPTER"]}"
-end
-
 gemspec
diff --git a/README.rdoc b/README.rdoc
@@ -1,7 +1,8 @@
 = CanCanCan
 {<img src="https://badge.fury.io/rb/cancancan.png" alt="Gem Version" />}[http://badge.fury.io/rb/cancancan]
-{<img src="https://travis-ci.org/bryanrite/cancancan.png" alt="Build Status" />}[https://travis-ci.org/bryanrite/cancancan]
+{<img src="https://travis-ci.org/CanCanCommunity/cancancan.png?branch=master" alt="Build Status" />}[https://travis-ci.org/CanCanCommunity/cancancan]
 {<img src="https://codeclimate.com/github/bryanrite/cancancan.png?" alt="Code Climate" />}[https://codeclimate.com/github/bryanrite/cancancan]
+{<img src="http://inch-pages.github.io/github/CanCanCommunity/cancancan.png" alt="Inline docs" />}[http://inch-pages.github.io/github/CanCanCommunity/cancancan]
 
 Wiki[https://github.com/bryanrite/cancancan/wiki] | RDocs[http://rdoc.info/projects/ryanb/cancan] | Screencast[http://railscasts.com/episodes/192-authorization-with-cancan]
 
@@ -34,7 +35,7 @@ Alternatively, you can install it as a plugin.
 
 == Getting Started
 
-CanCan expects a +current_user+ method to exist in the controller. First, set up some authentication (such as Authlogic[https://github.com/binarylogic/authlogic] or Devise[https://github.com/plataformatec/devise]). See {Changing Defaults}[https://github.com/bryanrite/cancan/wiki/changing-defaults] if you need different behavior.
+CanCanCan expects a +current_user+ method to exist in the controller. First, set up some authentication (such as Authlogic[https://github.com/binarylogic/authlogic] or Devise[https://github.com/plataformatec/devise]). See {Changing Defaults}[https://github.com/bryanrite/cancancan/wiki/changing-defaults] if you need different behavior.
 
 
 === 1. Define Abilities
@@ -52,7 +53,7 @@ In Rails 2.3, just add a new class in <tt>app/models/ability.rb</tt> with the fo
     end
   end
 
-See {Defining Abilities}[https://github.com/bryanrite/cancan/wiki/defining-abilities] for details.
+See {Defining Abilities}[https://github.com/bryanrite/cancancan/wiki/defining-abilities] for details.
 
 
 === 2. Check Abilities & Authorization
@@ -114,7 +115,7 @@ Additionally, <tt>load_and_authorize_resource</tt> can now take a <tt>param_meth
       params.require(:article).permit(:name)
     end
   end
-  
+
 See {Strong Parameters}[https://github.com/bryanrite/cancancan/wiki/Strong-Parameters] for more information.
 
 === 3. Handle Unauthorized Access
@@ -153,9 +154,18 @@ This will raise an exception if authorization is not performed in an action. If
 
 == Questions or Problems?
 
-If you have any issues with CanCan which you cannot find the solution to in the documentation[https://github.com/bryanrite/cancancan/wiki], please add an {issue on GitHub}[https://github.com/bryanrite/cancancan/issues] or fork the project and send a pull request.
+If you have any issues with CanCan which you cannot find the solution to in the documentation[https://github.com/bryanrite/cancancan/wiki] or our mailing list: http://groups.google.com/group/cancancan, please add an {issue on GitHub}[https://github.com/bryanrite/cancancan/issues] or fork the project and send a pull request.
+
+
+== Development
+
+Cancancan uses {appraisals}[https://github.com/thoughtbot/appraisal] to test the code base against multiple versions of rails, as well as the different model adapters.
+
+When first developing, you may need to run <tt>bundle install</tt> and then <tt>appraisal install</tt>, to install the different sets.
+
+You can then run all appraisal files (like CI does), with <tt>appraisal rake</tt> or just run a specific set <tt>appraisal rails_3.0 rake</tt>.
 
-To get the specs running you should call +bundle+ and then +rake+. See the {spec/README}[https://github.com/bryanrite/cancancan/blob/master/spec/README.rdoc] for more information.
+See the {CONTRIBUTING}[https://github.com/CanCanCommunity/cancancan/blob/develop/CONTRIBUTING.md] and {spec/README}[https://github.com/bryanrite/cancancan/blob/master/spec/README.rdoc] for more information.
 
 
 == Special Thanks

diff --git a/Rakefile b/Rakefile
@@ -8,12 +8,4 @@ RSpec::Core::RakeTask.new do |t|
   t.verbose = false
 end
 
-desc "Run specs for all adapters"
-task :spec_all do
-  %w[active_record data_mapper mongoid].each do |model_adapter|
-    puts "MODEL_ADAPTER = #{model_adapter}"
-    system "rake spec MODEL_ADAPTER=#{model_adapter}"
-  end
-end
-
 task :default => :spec
diff --git a/cancancan.gemspec b/cancancan.gemspec
@@ -8,19 +8,23 @@ Gem::Specification.new do |s|
   s.version     = CanCan::VERSION
   s.authors     = ["Bryan Rite", "Ryan Bates"]
   s.email       = "bryan@bryanrite.com"
-  s.homepage    = "http://github.com/bryanrite/cancancan"
+  s.homepage    = "https://github.com/CanCanCommunity/cancancan"
   s.summary     = "Simple authorization solution for Rails."
   s.description = "Continuation of the simple authorization solution for Rails which is decoupled from user roles. All permissions are stored in a single location."
   s.platform    = Gem::Platform::RUBY
   s.license     = "MIT"
 
-  s.files        = Dir["{lib,spec}/**/*", "[A-Z]*", "init.rb"] - ["Gemfile.lock"]
-  s.require_path = "lib"
+  s.files       = `git ls-files`.split($/)
+  s.test_files  = `git ls-files -- Appraisals {spec,features,gemfiles}/*`.split($/)
+  s.executables = `git ls-files -- bin/*`.split($/).map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
+  s.required_rubygems_version = ">= 1.3.4"
 
   s.add_development_dependency 'rspec', '~> 2.14'
-  s.add_development_dependency 'rails', '~> 3.0.9'
-  s.add_development_dependency 'supermodel', '~> 0.1.4'
+  s.add_development_dependency 'supermodel', '~> 0.1.6'
+  s.add_development_dependency 'appraisal', '>= 1.0.0.beta3'
 
   s.rubyforge_project = s.name
-  s.required_rubygems_version = ">= 1.3.4"
 end
diff --git a/gemfiles/rails_3.0.gemfile b/gemfiles/rails_3.0.gemfile
@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.0.20", :require=>"active_record"
+gem "with_model", "~> 0.2.5"
+gem "meta_where"
+
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "jdbc-sqlite3"
+end
+
+platforms :ruby, :mswin, :mingw do
+  gem "sqlite3"
+end
+
+gemspec :path=>".././"
diff --git a/gemfiles/rails_3.0_datamapper.gemfile b/gemfiles/rails_3.0_datamapper.gemfile
@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "dm-core", "~> 1.0.2"
+gem "dm-sqlite-adapter", "~> 1.0.2"
+gem "dm-migrations", "~> 1.0.2"
+
+gemspec :path=>".././"
diff --git a/gemfiles/rails_3.0_mongoid.gemfile b/gemfiles/rails_3.0_mongoid.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "~> 2.0.0"
+
+platforms :ruby, :mswin, :mingw do
+  gem "bson_ext", "~> 1.1"
+end
+
+gemspec :path=>".././"
diff --git a/lib/cancan/matchers.rb b/lib/cancan/matchers.rb
@@ -1,4 +1,12 @@
 rspec_module = defined?(RSpec::Core) ? 'RSpec' : 'Spec'  # for RSpec 1 compatability
+
+if rspec_module == 'RSpec'
+  require 'rspec/core'
+  require 'rspec/expectations'
+else
+  ActiveSupport::Deprecation.warn("RSpec v1 will not be supported in the CanCanCan >= 2.0.0")
+end
+
 Kernel.const_get(rspec_module)::Matchers.define :be_able_to do |*args|
   match do |ability|
     ability.can?(*args)

diff --git a/lib/cancan/model_adapters/active_record_adapter.rb b/lib/cancan/model_adapters/active_record_adapter.rb
@@ -97,7 +97,7 @@ def joins
 
       def database_records
         if override_scope
-          @model_class.scoped.merge(override_scope)
+          @model_class.where(nil).merge(override_scope)
         elsif @model_class.respond_to?(:where) && @model_class.respond_to?(:joins)
           mergeable_conditions = @rules.select {|rule| rule.unmergeable? }.blank?
           if mergeable_conditions
@@ -106,7 +106,7 @@ def database_records
             @model_class.where(*(@rules.map(&:conditions))).includes(joins)
           end
         else
-          @model_class.scoped(:conditions => conditions, :joins => joins)
+          @model_class.all(:conditions => conditions, :joins => joins)
         end
       end
 

diff --git a/lib/cancan/rule.rb b/lib/cancan/rule.rb
@@ -111,7 +111,7 @@ def matches_conditions_hash?(subject, conditions = @conditions)
             else
               attribute = subject.send(name)
               if value.kind_of?(Hash)
-                if attribute.kind_of?(Array) || attribute.kind_of?(ActiveRecord::Relation)
+                if attribute.kind_of?(Array) || (defined?(ActiveRecord) && attribute.kind_of?(ActiveRecord::Relation))
                   attribute.any? { |element| matches_conditions_hash? element, value }
                 else
                   !attribute.nil? && matches_conditions_hash?(attribute, value)

diff --git a/lib/cancan/version.rb b/lib/cancan/version.rb
@@ -1,3 +1,3 @@
 module CanCan
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end
diff --git a/spec/README.rdoc b/spec/README.rdoc
@@ -5,24 +5,23 @@
 To run the specs first run the +bundle+ command to install the necessary gems and the +rake+ command to run the specs.
 
   bundle
-  rake
 
-The specs currently require Ruby 1.8.7. Ruby 1.9.2 support will be coming soon.
+Then run the appraisal command to install all the necssary test sets:
 
+  appraisal install
 
-== Model Adapters
+You can then run all test sets:
+
+  appraisal rake
 
-CanCan offers separate specs for different model adapters (such as Mongoid and Data Mapper). By default it will use Active Record but you can change this by setting the +MODEL_ADAPTER+ environment variable before running. You can run the +bundle+ command with this as well to ensure you have the installed gems.
+Or individual ones:
 
-  MODEL_ADAPTER=data_mapper bundle
-  MODEL_ADAPTER=data_mapper rake
+  appraisal rails_3.0 rake
 
-The different model adapters you can specify are:
+A list of the tests is in the +Appraisal+ file.
 
-* active_record (default)
-* data_mapper
-* mongoid
+The specs support Ruby 1.8.7+
 
-You can also run the +spec_all+ rake task to run specs for each adapter.
+== Model Adapters
 
-  rake spec_all
+The model adapter ENV setting has been removed and replaced with the +Appraisal+ file.
diff --git a/spec/cancan/model_adapters/active_record_adapter_spec.rb b/spec/cancan/model_adapters/active_record_adapter_spec.rb
@@ -1,5 +1,10 @@
-if ENV["MODEL_ADAPTER"].nil? || ENV["MODEL_ADAPTER"] == "active_record"
-  require "spec_helper"
+require "spec_helper"
+
+if defined? CanCan::ModelAdapters::ActiveRecordAdapter
+
+  RSpec.configure do |config|
+    config.extend WithModel
+  end
 
   ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 

diff --git a/spec/cancan/model_adapters/data_mapper_adapter_spec.rb b/spec/cancan/model_adapters/data_mapper_adapter_spec.rb
@@ -1,5 +1,6 @@
-if ENV["MODEL_ADAPTER"] == "data_mapper"
-  require "spec_helper"
+require "spec_helper"
+
+if defined? CanCan::ModelAdapters::DataMapperAdapter
 
   DataMapper.setup(:default, 'sqlite::memory:')
 

diff --git a/spec/cancan/model_adapters/mongoid_adapter_spec.rb b/spec/cancan/model_adapters/mongoid_adapter_spec.rb
@@ -1,5 +1,6 @@
-if ENV["MODEL_ADAPTER"] == "mongoid"
-  require "spec_helper"
+require "spec_helper"
+
+if defined? CanCan::ModelAdapters::MongoidAdapter
 
   class MongoidCategory
     include Mongoid::Document