cancancan 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55bf93046d99f249ab63118d79f1188ef2383278
-  data.tar.gz: 052a7a962e2585ca122723f23a733d882872a660
+  metadata.gz: 60da1f3c13774c65e5c622667c2a1472fffa0dbf
+  data.tar.gz: 1e3f6fd8446e2560579d313980a7633efe8e8af1
 SHA512:
-  metadata.gz: 7b4259d5de95a69c48301338605341a0f86d200ec01e56981a50d08e5367b7513042620fbeaae77d6790299dcae616feb606fa3c1718b20250bf29cd35356519
-  data.tar.gz: 1c58fbfde297986492dda47b7f1c03f86da96fb412fe2917bb75bbe8ea5e4e49607189d71c8f19336392d8dd7a7cc30a6b19e8c6e475cc69e38e9ecd533ac135
+  metadata.gz: f717a5d3e6c98cb11aad2e1fd38ccfa4d7848d1181f031d0c2e988200f77bda96df6997b9d5c18b8b62d50c0b0ebf0d0c8177b8b6b596443875b52c895820e65
+  data.tar.gz: 504adef485e28df04ba9decd2902f38963886e9fe7e047125c15d8505b02fc0bb3f978d99f2306e154be3b8cb64dd1ad4ffdd7e8f0172950817841a67160f31b

data/.travis.yml

@@ -1,55 +1,28 @@
+language: ruby
+cache: bundler
+sudo: false
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.2.0
-  - ree
   - jruby
   - rbx
 gemfile:
-  - gemfiles/activerecord_3.0.gemfile
-  - gemfiles/activerecord_3.1.gemfile
   - gemfiles/activerecord_3.2.gemfile
   - gemfiles/activerecord_4.0.gemfile
   - gemfiles/activerecord_4.1.gemfile
   - gemfiles/activerecord_4.2.gemfile
-  - gemfiles/datamapper_1.x.gemfile
   - gemfiles/mongoid_2.x.gemfile
   - gemfiles/sequel_3.x.gemfile
 services:
   - mongodb
 matrix:
+  fast_finish: true
   allow_failures:
     - rvm: rbx
-    - rvm: jruby
-      gemfile: gemfiles/datamapper_1.x.gemfile
   exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/activerecord_4.0.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/activerecord_4.1.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/activerecord_4.2.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/activerecord_4.0.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/activerecord_4.1.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/activerecord_4.2.gemfile
-    - rvm: 2.2.0
-      gemfile: gemfiles/activerecord_3.0.gemfile
-    - rvm: 2.2.0
-      gemfile: gemfiles/activerecord_3.1.gemfile
     - rvm: 2.2.0
       gemfile: gemfiles/activerecord_3.2.gemfile
-    - rvm: ree
-      gemfile: gemfiles/activerecord_4.0.gemfile
-    - rvm: ree
-      gemfile: gemfiles/activerecord_4.1.gemfile
-    - rvm: ree
-      gemfile: gemfiles/activerecord_4.2.gemfile
 notifications:
   recipients:
     - bryan@bryanrite.com

data/Appraisals

@@ -1,42 +1,6 @@
-appraise "activerecord_3.0" do
-  gem "activerecord", "~> 3.0.20", :require => "active_record"
-  gem "activesupport", "~> 3.0.20", :require => "active_support/all"
-  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 "activerecord_3.1" do
-  gem "activerecord", "~> 3.1.0", :require => "active_record"
-
-  gemfile.platforms :ruby_18, :ruby_19 do
-    gem "i18n", "< 0.7"
-  end
-
-  gemfile.platforms :jruby do
-    gem "activerecord-jdbcsqlite3-adapter"
-    gem "jdbc-sqlite3"
-  end
-
-  gemfile.platforms :ruby, :mswin, :mingw do
-    gem "sqlite3"
-  end
-end
-
 appraise "activerecord_3.2" do
   gem "activerecord", "~> 3.2.0", :require => "active_record"
 
-  gemfile.platforms :ruby_18, :ruby_19 do
-    gem "i18n", "< 0.7"
-  end
-
   gemfile.platforms :jruby do
     gem "activerecord-jdbcsqlite3-adapter"
     gem "jdbc-sqlite3"
@@ -90,25 +54,10 @@ appraise "activerecord_4.2" do
   end
 end
 
-appraise "datamapper_1.x" do
-  gem "activesupport", "~> 3.0", :require => "active_support/all"
-  gem "dm-core", "~> 1.0"
-  gem "dm-sqlite-adapter", "~> 1.0"
-  gem "dm-migrations", "~> 1.0"
-
-  gemfile.platforms :ruby_18, :ruby_19 do
-    gem "i18n", "< 0.7"
-  end
-end
-
 appraise "mongoid_2.x" do
   gem "activesupport", "~> 3.0", :require => "active_support/all"
   gem "mongoid", "~> 2.0.0"
 
-  gemfile.platforms :ruby_18, :ruby_19 do
-    gem "i18n", "< 0.7"
-  end
-
   gemfile.platforms :ruby, :mswin, :mingw do
     gem "bson_ext", "~> 1.1"
   end
@@ -122,10 +71,6 @@ appraise "sequel_3.x" do
   gem "sequel", "~> 3.47.0"
   gem "activesupport", "~> 3.0", :require => "active_support/all"
 
-  gemfile.platforms :ruby_18, :ruby_19 do
-    gem "i18n", "< 0.7"
-  end
-
   gemfile.platforms :jruby do
     gem "jdbc-sqlite3"
   end

data/CHANGELOG.rdoc

@@ -1,5 +1,12 @@
 Develop
 
+Unreleased
+
+1.13.0 (Oct 7th, 2015)
+
+* Significantly improve rule lookup time (amarshall)
+* Removed deprecation warnings for RSpec 3.2 (NekoNova)
+
 1.12.0 (June 28th, 2015)
 
 * Add a permissions method to Ability (devaroop)

data/CONTRIBUTING.md

@@ -2,9 +2,9 @@
 
 ### Reporting an Issue
 
-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.
+1. If you have any questions about CanCanCan, search the [Wiki](https://github.com/cancancommunity/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.
 
-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.
+1. If you find a security bug, **DO NOT** submit an issue here. Please send an e-mail to the current maintainer instead.
 
 1. Do a small search on the issues tracker before submitting your issue to see if it was already reported / fixed.
 

data/README.md

@@ -9,6 +9,9 @@
 
 CanCan is an authorization library for Ruby on Rails which restricts what resources a given user is allowed to access. All permissions are defined in a single location (the `Ability` class) and not duplicated across controllers, views, and database queries.
 
+## This is the master branch!
+This branch represents work towards version 2.0. Please checkout the 1.x branch for the stable release. Use master at your own risk.
+
 ## Mission
 
 This repo is a continuation of the dead [CanCan](https://github.com/ryanb/cancan) project. Our mission is to keep CanCan alive and moving forward, with maintenance fixes and new features. Pull Requests are welcome!
@@ -28,6 +31,12 @@ In **Rails 3 and 4**, add this to your Gemfile and run the `bundle install` comm
 
 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/CanCanCommunity/cancancan/wiki/changing-defaults) if you need different behavior.
 
+When using [rails-api](https://github.com/rails-api/rails-api), you have to manually include the controller methods for CanCan:
+```ruby
+class ApplicationController < ActionController::API
+  include CanCan::ControllerAdditions
+end
+```
 
 ### 1. Define Abilities
 
@@ -89,9 +98,26 @@ See [Authorizing Controller Actions](https://github.com/CanCanCommunity/cancanca
 
 When using `strong_parameters` or Rails 4+, you have to sanitize inputs before saving the record, in actions such as `:create` and `:update`.
 
-By default, CanCan will try to sanitize the input on `:create` and `:update` routes by seeing if your controller will respond to the following methods (in order):
+For the `:update` action, CanCan will load and authorize the resource but *not* change it automatically, so the typical usage would be something like:
+
+```ruby
+def update
+  if @article.update_attributes(update_params)
+    # hurray
+  else
+    render :edit
+  end
+end
+...
+
+def update_params
+  params.require(:article).permit(:body)
+end
+```
+
+For the `:create` action, CanCan will try to initialize a new instance with sanitized input by seeing if your controller will respond to the following methods (in order):
 
-1. `create_params` or `update_params` (depending on the action you are performing)
+1. `create_params`
 2. `<model_name>_params` such as `article_params` (this is the default convention in rails for naming your param method)
 3. `resource_params` (a generically named method you could specify in each controller)
 

data/cancancan.gemspec

@@ -6,8 +6,8 @@ require 'cancan/version'
 Gem::Specification.new do |s|
   s.name        = "cancancan"
   s.version     = CanCan::VERSION
-  s.authors     = ["Bryan Rite", "Ryan Bates"]
-  s.email       = "bryan@bryanrite.com"
+  s.authors     = ["Bryan Rite", "Ryan Bates", "Richard Wilson"]
+  s.email       = "r.crawfordwilson@gmail.com"
   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."
@@ -19,13 +19,10 @@ Gem::Specification.new do |s|
   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.required_ruby_version = ">= 2.0.0"
 
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake', '~> 10.1.1'
-  s.add_development_dependency 'rspec', '~> 3.0.0'
-  s.add_development_dependency 'appraisal', '>= 1.0.0'
-
-  s.rubyforge_project = s.name
+  s.add_development_dependency 'rspec', '~> 3.2.0'
+  s.add_development_dependency 'appraisal', '>= 2.0.0'
 end

data/gemfiles/activerecord_3.2.gemfile

@@ -4,10 +4,6 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 3.2.0", :require => "active_record"
 
-platforms :ruby_18, :ruby_19 do
-  gem "i18n", "< 0.7"
-end
-
 platforms :jruby do
   gem "activerecord-jdbcsqlite3-adapter"
   gem "jdbc-sqlite3"

data/gemfiles/mongoid_2.x.gemfile

@@ -5,10 +5,6 @@ source "https://rubygems.org"
 gem "activesupport", "~> 3.0", :require => "active_support/all"
 gem "mongoid", "~> 2.0.0"
 
-platforms :ruby_18, :ruby_19 do
-  gem "i18n", "< 0.7"
-end
-
 platforms :ruby, :mswin, :mingw do
   gem "bson_ext", "~> 1.1"
 end

data/gemfiles/sequel_3.x.gemfile

@@ -5,10 +5,6 @@ source "https://rubygems.org"
 gem "sequel", "~> 3.47.0"
 gem "activesupport", "~> 3.0", :require => "active_support/all"
 
-platforms :ruby_18, :ruby_19 do
-  gem "i18n", "< 0.7"
-end
-
 platforms :jruby do
   gem "jdbc-sqlite3"
 end

data/lib/cancan/ability.rb

@@ -119,7 +119,7 @@ module CanCan
     #   can :read, :stats
     #   can? :read, :stats # => true
     #
-    # IMPORTANT: Neither a hash of conditions or a block will be used when checking permission on a class.
+    # IMPORTANT: Neither a hash of conditions nor a block will be used when checking permission on a class.
     #
     #   can :update, Project, :priority => 3
     #   can? :update, Project # => true
@@ -133,7 +133,7 @@ module CanCan
     #   end
     #
     def can(action = nil, subject = nil, conditions = nil, &block)
-      rules << Rule.new(true, action, subject, conditions, block)
+      add_rule(Rule.new(true, action, subject, conditions, block))
     end
 
     # Defines an ability which cannot be done. Accepts the same arguments as "can".
@@ -149,7 +149,7 @@ module CanCan
     #   end
     #
     def cannot(action = nil, subject = nil, conditions = nil, &block)
-      rules << Rule.new(false, action, subject, conditions, block)
+      add_rule(Rule.new(false, action, subject, conditions, block))
     end
 
     # Alias one or more actions into another one.
@@ -246,8 +246,8 @@ module CanCan
     end
 
     def merge(ability)
-      ability.send(:rules).each do |rule|
-        rules << rule.dup
+      ability.rules.each do |rule|
+        add_rule(rule.dup)
       end
       self
     end
@@ -281,6 +281,12 @@ module CanCan
       permissions_list
     end
 
+    protected
+
+    # Must be protected as an ability can merge with other abilities.
+    # This means that an ability must expose their rules with another ability.
+    attr_reader :rules
+
     private
 
     def unauthorized_message_keys(action, subject)
@@ -331,21 +337,50 @@ module CanCan
       results
     end
 
-    def rules
+    def add_rule(rule)
       @rules ||= []
+      @rules << rule
+      add_rule_to_index(rule, @rules.size - 1)
+    end
+
+    def add_rule_to_index(rule, position)
+      @rules_index ||= Hash.new { |h, k| h[k] = [] }
+
+      subjects = rule.subjects.compact
+      subjects << :all if subjects.empty?
+
+      subjects.each do |subject|
+        @rules_index[subject] << position
+      end
+    end
+
+    def alternative_subjects(subject)
+      subject = subject.class unless subject.is_a?(Module)
+      [:all, *subject.ancestors,  subject.class.to_s]
     end
 
     # Returns an array of Rule instances which match the action and subject
     # This does not take into consideration any hash conditions or block statements
     def relevant_rules(action, subject)
-      relevant = rules.select do |rule|
+      return [] unless @rules
+      relevant = possible_relevant_rules(subject).select do |rule|
         rule.expanded_actions = expand_actions(rule.actions)
         rule.relevant? action, subject
       end
-      relevant.reverse!
+      relevant.reverse!.uniq!
       relevant
     end
 
+    def possible_relevant_rules(subject)
+      if subject.is_a?(Hash)
+        rules
+      else
+        positions = @rules_index.values_at(subject, *alternative_subjects(subject))
+        positions.flatten!.sort!
+        positions.map { |i| @rules[i] }
+      end
+    end
+
     def relevant_rules_for_match(action, subject)
       relevant_rules(action, subject).each do |rule|
         if rule.only_raw_sql?

data/lib/cancan/matchers.rb

@@ -15,6 +15,9 @@ Kernel.const_get(rspec_module)::Matchers.define :be_able_to do |*args|
   # Check that RSpec is < 2.99
   if !respond_to?(:failure_message) && respond_to?(:failure_message_for_should)
     alias :failure_message :failure_message_for_should
+  end
+
+  if !respond_to?(:failure_message_when_negated) && respond_to?(:failure_message_for_should_not)
     alias :failure_message_when_negated :failure_message_for_should_not
   end
 

data/lib/cancan/model_adapters/active_record_3_adapter.rb

@@ -6,37 +6,6 @@ module CanCan
         model_class <= ActiveRecord::Base
       end
 
-      def self.override_condition_matching?(subject, name, value)
-        name.kind_of?(MetaWhere::Column) if defined? MetaWhere
-      end
-
-      def self.matches_condition?(subject, name, value)
-        subject_value = subject.send(name.column)
-        if name.method.to_s.ends_with? "_any"
-          value.any? { |v| meta_where_match? subject_value, name.method.to_s.sub("_any", ""), v }
-        elsif name.method.to_s.ends_with? "_all"
-          value.all? { |v| meta_where_match? subject_value, name.method.to_s.sub("_all", ""), v }
-        else
-          meta_where_match? subject_value, name.method, value
-        end
-      end
-
-      def self.meta_where_match?(subject_value, method, value)
-        case method.to_sym
-        when :eq      then subject_value == value
-        when :not_eq  then subject_value != value
-        when :in      then value.include?(subject_value)
-        when :not_in  then !value.include?(subject_value)
-        when :lt      then subject_value < value
-        when :lteq    then subject_value <= value
-        when :gt      then subject_value > value
-        when :gteq    then subject_value >= value
-        when :matches then subject_value =~ Regexp.new("^" + Regexp.escape(value).gsub("%", ".*") + "$", true)
-        when :does_not_match then !meta_where_match?(subject_value, :matches, value)
-        else raise NotImplemented, "The #{method} MetaWhere condition is not supported."
-        end
-      end
-
       private
 
       def build_relation(*where_conditions)

data/lib/cancan/rule.rb

@@ -91,7 +91,11 @@ module CanCan
     end
 
     def matches_subject_class?(subject)
-      @subjects.any? { |sub| sub.kind_of?(Module) && (subject.kind_of?(sub) || subject.class.to_s == sub.to_s || subject.kind_of?(Module) && subject.ancestors.include?(sub)) }
+      @subjects.any? do |sub|
+        sub.kind_of?(Module) && (subject.kind_of?(sub) ||
+                                 subject.class.to_s == sub.to_s ||
+                                 (subject.kind_of?(Module) && subject.ancestors.include?(sub)))
+      end
     end
 
     # Checks if the given subject matches the given conditions hash.

data/lib/cancan/version.rb

@@ -1,3 +1,3 @@
 module CanCan
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

data/lib/cancan.rb

@@ -20,6 +20,5 @@ if defined? ActiveRecord
   end
 end
 
-require 'cancan/model_adapters/data_mapper_adapter' if defined? DataMapper
 require 'cancan/model_adapters/mongoid_adapter' if defined?(Mongoid) && defined?(Mongoid::Document)
 require 'cancan/model_adapters/sequel_adapter' if defined? Sequel

data/spec/cancan/ability_spec.rb

@@ -45,6 +45,13 @@ describe CanCan::Ability do
     expect(@ability.can?(:read, 6)).to be(false)
   end
 
+  it "overrides earlier rules with later ones (even if a different exact subject)" do
+    @ability.cannot :read, Numeric
+    @ability.can :read, Integer
+
+    expect(@ability.can?(:read, 6)).to be(true)
+  end
+
   it "does not pass class with object if :all objects are accepted" do
     @ability.can :preview, :all do |object|
       expect(object).to eq(123)

data/spec/cancan/model_adapters/active_record_adapter_spec.rb

@@ -380,67 +380,5 @@ if defined? CanCan::ModelAdapters::ActiveRecordAdapter
         expect(Namespace::TableX.accessible_by(ability)).to eq([table_x])
       end
     end
-
-    context "when MetaWhere is defined" do
-      before :each do
-        pending "[Deprecated] MetaWhere support is being removed" unless defined? MetaWhere
-      end
-
-      it "restricts articles given a MetaWhere condition" do
-        # pending "[Deprecated] MetaWhere support is being removed" unless defined? MetaWhere
-        @ability.can :read, Article, :priority.lt => 2
-        article1 = Article.create!(:priority => 1)
-        article2 = Article.create!(:priority => 3)
-        expect(Article.accessible_by(@ability)).to eq([article1])
-        expect(@ability).to be_able_to(:read, article1)
-        expect(@ability).to_not be_able_to(:read, article2)
-      end
-
-      it "merges MetaWhere and non-MetaWhere conditions" do
-        # pending "[Deprecated] MetaWhere support is being removed" unless defined? MetaWhere
-        @ability.can :read, Article, :priority.lt => 2
-        @ability.can :read, Article, :priority => 1
-        article1 = Article.create!(:priority => 1)
-        article2 = Article.create!(:priority => 3)
-        expect(Article.accessible_by(@ability)).to eq([article1])
-        expect(@ability).to be_able_to(:read, article1)
-        expect(@ability).to_not be_able_to(:read, article2)
-      end
-
-      it "matches any MetaWhere condition" do
-        adapter = CanCan::ModelAdapters::AbstractAdapter.adapter_class(Article)
-        article1 = Article.new(:priority => 1, :name => "Hello World")
-        expect(adapter.matches_condition?(article1, :priority.eq, 1)).to be(true)
-        expect(adapter.matches_condition?(article1, :priority.eq, 2)).to be(false)
-        expect(adapter.matches_condition?(article1, :priority.eq_any, [1, 2])).to be(true)
-        expect(adapter.matches_condition?(article1, :priority.eq_any, [2, 3])).to be(false)
-        expect(adapter.matches_condition?(article1, :priority.eq_all, [1, 1])).to be(true)
-        expect(adapter.matches_condition?(article1, :priority.eq_all, [1, 2])).to be(false)
-        expect(adapter.matches_condition?(article1, :priority.ne, 2)).to be(true)
-        expect(adapter.matches_condition?(article1, :priority.ne, 1)).to be(false)
-        expect(adapter.matches_condition?(article1, :priority.in, [1, 2])).to be(true)
-        expect(adapter.matches_condition?(article1, :priority.in, [2, 3])).to be(false)
-        expect(adapter.matches_condition?(article1, :priority.nin, [2, 3])).to be(true)
-        expect(adapter.matches_condition?(article1, :priority.nin, [1, 2])).to be(false)
-        expect(adapter.matches_condition?(article1, :priority.lt, 2)).to be(true)
-        expect(adapter.matches_condition?(article1, :priority.lt, 1)).to be(false)
-        expect(adapter.matches_condition?(article1, :priority.lteq, 1)).to be(true)
-        expect(adapter.matches_condition?(article1, :priority.lteq, 0)).to be(false)
-        expect(adapter.matches_condition?(article1, :priority.gt, 0)).to be(true)
-        expect(adapter.matches_condition?(article1, :priority.gt, 1)).to be(false)
-        expect(adapter.matches_condition?(article1, :priority.gteq, 1)).to be(true)
-        expect(adapter.matches_condition?(article1, :priority.gteq, 2)).to be(false)
-        expect(adapter.matches_condition?(article1, :name.like, "%ello worl%")).to be_truthy
-        expect(adapter.matches_condition?(article1, :name.like, "hello world")).to be_truthy
-        expect(adapter.matches_condition?(article1, :name.like, "hello%")).to be_truthy
-        expect(adapter.matches_condition?(article1, :name.like, "h%d")).to be_truthy
-        expect(adapter.matches_condition?(article1, :name.like, "%helo%")).to be_falsey
-        expect(adapter.matches_condition?(article1, :name.like, "hello")).to be_falsey
-        expect(adapter.matches_condition?(article1, :name.like, "hello.world")).to be_falsey
-        # For some reason this is reporting "The not_matches MetaWhere condition is not supported."
-        # expect(adapter.matches_condition?(article1, :name.nlike, "%helo%")).to be(true)
-        # expect(adapter.matches_condition?(article1, :name.nlike, "%ello worl%")).to be(false)
-      end
-    end
   end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cancancan
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Bryan Rite
 - Ryan Bates
+- Richard Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,31 +46,31 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 description: Continuation of the simple authorization solution for Rails which is
   decoupled from user roles. All permissions are stored in a single location.
-email: bryan@bryanrite.com
+email: r.crawfordwilson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -85,13 +86,10 @@ files:
 - README.md
 - Rakefile
 - cancancan.gemspec
-- gemfiles/activerecord_3.0.gemfile
-- gemfiles/activerecord_3.1.gemfile
 - gemfiles/activerecord_3.2.gemfile
 - gemfiles/activerecord_4.0.gemfile
 - gemfiles/activerecord_4.1.gemfile
 - gemfiles/activerecord_4.2.gemfile
-- gemfiles/datamapper_1.x.gemfile
 - gemfiles/mongoid_2.x.gemfile
 - gemfiles/sequel_3.x.gemfile
 - init.rb
@@ -106,7 +104,6 @@ files:
 - lib/cancan/model_adapters/active_record_3_adapter.rb
 - lib/cancan/model_adapters/active_record_4_adapter.rb
 - lib/cancan/model_adapters/active_record_adapter.rb
-- lib/cancan/model_adapters/data_mapper_adapter.rb
 - lib/cancan/model_adapters/default_adapter.rb
 - lib/cancan/model_adapters/mongoid_adapter.rb
 - lib/cancan/model_adapters/sequel_adapter.rb
@@ -126,7 +123,6 @@ files:
 - spec/cancan/matchers_spec.rb
 - spec/cancan/model_adapters/active_record_4_adapter_spec.rb
 - spec/cancan/model_adapters/active_record_adapter_spec.rb
-- spec/cancan/model_adapters/data_mapper_adapter_spec.rb
 - spec/cancan/model_adapters/default_adapter_spec.rb
 - spec/cancan/model_adapters/mongoid_adapter_spec.rb
 - spec/cancan/model_adapters/sequel_adapter_spec.rb
@@ -147,14 +143,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.4
+      version: '0'
 requirements: []
-rubyforge_project: cancancan
+rubyforge_project: 
 rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4

data/gemfiles/activerecord_3.0.gemfile

@@ -1,18 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 3.0.20", :require => "active_record"
-gem "activesupport", "~> 3.0.20", :require => "active_support/all"
-gem "meta_where"
-
-platforms :jruby do
-  gem "activerecord-jdbcsqlite3-adapter"
-  gem "jdbc-sqlite3"
-end
-
-platforms :ruby, :mswin, :mingw do
-  gem "sqlite3"
-end
-
-gemspec :path => "../"

data/gemfiles/activerecord_3.1.gemfile

@@ -1,20 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 3.1.0", :require => "active_record"
-
-platforms :ruby_18, :ruby_19 do
-  gem "i18n", "< 0.7"
-end
-
-platforms :jruby do
-  gem "activerecord-jdbcsqlite3-adapter"
-  gem "jdbc-sqlite3"
-end
-
-platforms :ruby, :mswin, :mingw do
-  gem "sqlite3"
-end
-
-gemspec :path => "../"

data/gemfiles/datamapper_1.x.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 3.0", :require => "active_support/all"
-gem "dm-core", "~> 1.0"
-gem "dm-sqlite-adapter", "~> 1.0"
-gem "dm-migrations", "~> 1.0"
-
-platforms :ruby_18, :ruby_19 do
-  gem "i18n", "< 0.7"
-end
-
-gemspec :path => "../"

data/lib/cancan/model_adapters/data_mapper_adapter.rb

@@ -1,34 +0,0 @@
-module CanCan
-  module ModelAdapters
-    class DataMapperAdapter < AbstractAdapter
-      def self.for_class?(model_class)
-        model_class <= DataMapper::Resource
-      end
-
-      def self.find(model_class, id)
-        model_class.get(id)
-      end
-
-      def self.override_conditions_hash_matching?(subject, conditions)
-        conditions.any? { |k,v| !k.kind_of?(Symbol) }
-      end
-
-      def self.matches_conditions_hash?(subject, conditions)
-        collection = DataMapper::Collection.new(subject.query, [ subject ])
-        !!collection.first(conditions)
-      end
-
-      def database_records
-        scope = @model_class.all(:conditions => ["0 = 1"])
-        cans, cannots = @rules.partition { |r| r.base_behavior }
-        return scope if cans.empty?
-        # apply unions first, then differences. this mean cannot overrides can
-        cans.each    { |r| scope += @model_class.all(:conditions => r.conditions) }
-        cannots.each { |r| scope -= @model_class.all(:conditions => r.conditions) }
-        scope
-      end
-    end # class DataMapper
-  end # module ModelAdapters
-end # module CanCan
-
-DataMapper::Model.append_extensions(CanCan::ModelAdditions::ClassMethods)

data/spec/cancan/model_adapters/data_mapper_adapter_spec.rb

@@ -1,119 +0,0 @@
-require "spec_helper"
-
-if defined? CanCan::ModelAdapters::DataMapperAdapter
-
-  DataMapper.setup(:default, 'sqlite::memory:')
-
-  class Article
-    include DataMapper::Resource
-    property :id, Serial
-    property :published, Boolean, :default => false
-    property :secret, Boolean, :default => false
-    property :priority, Integer
-    has n, :comments
-  end
-
-  class Comment
-    include DataMapper::Resource
-    property :id, Serial
-    property :spam, Boolean, :default => false
-    belongs_to :article
-  end
-
-  DataMapper.finalize
-  DataMapper.auto_migrate!
-
-  describe CanCan::ModelAdapters::DataMapperAdapter do
-    before(:each) do
-      Article.destroy
-      Comment.destroy
-      (@ability = double).extend(CanCan::Ability)
-    end
-
-    it "is for only data mapper classes" do
-      expect(CanCan::ModelAdapters::DataMapperAdapter).not_to be_for_class(Object)
-      expect(CanCan::ModelAdapters::DataMapperAdapter).to be_for_class(Article)
-      expect(CanCan::ModelAdapters::AbstractAdapter.adapter_class(Article)).to eq(CanCan::ModelAdapters::DataMapperAdapter)
-    end
-
-    it "finds record" do
-      article = Article.create
-      expect(CanCan::ModelAdapters::DataMapperAdapter.find(Article, article.id)).to eq(article)
-    end
-
-    it "does not fetch any records when no abilities are defined" do
-      Article.create
-      expect(Article.accessible_by(@ability)).to be_empty
-    end
-
-    it "fetches all articles when one can read all" do
-      @ability.can :read, Article
-      article = Article.create
-      expect(Article.accessible_by(@ability)).to eq([article])
-    end
-
-    it "fetches only the articles that are published" do
-      @ability.can :read, Article, :published => true
-      article1 = Article.create(:published => true)
-      article2 = Article.create(:published => false)
-      expect(Article.accessible_by(@ability)).to eq([article1])
-    end
-
-    it "fetches any articles which are published or secret" do
-      @ability.can :read, Article, :published => true
-      @ability.can :read, Article, :secret => true
-      article1 = Article.create(:published => true, :secret => false)
-      article2 = Article.create(:published => true, :secret => true)
-      article3 = Article.create(:published => false, :secret => true)
-      article4 = Article.create(:published => false, :secret => false)
-      expect(Article.accessible_by(@ability)).to eq([article1, article2, article3])
-    end
-
-    it "fetches only the articles that are published and not secret" do
-      @ability.can :read, Article, :published => true
-      @ability.cannot :read, Article, :secret => true
-      article1 = Article.create(:published => true, :secret => false)
-      article2 = Article.create(:published => true, :secret => true)
-      article3 = Article.create(:published => false, :secret => true)
-      article4 = Article.create(:published => false, :secret => false)
-      expect(Article.accessible_by(@ability)).to eq([article1])
-    end
-
-    it "only reads comments for articles which are published" do
-      @ability.can :read, Comment, :article => { :published => true }
-      comment1 = Comment.create(:article => Article.create!(:published => true))
-      comment2 = Comment.create(:article => Article.create!(:published => false))
-      expect(Comment.accessible_by(@ability)).to eq([comment1])
-    end
-
-    it "allows conditions in SQL and merge with hash conditions" do
-      @ability.can :read, Article, :published => true
-      @ability.can :read, Article, ["secret=?", true]
-      article1 = Article.create(:published => true, :secret => false)
-      article4 = Article.create(:published => false, :secret => false)
-      expect(Article.accessible_by(@ability)).to eq([article1])
-    end
-
-    it "matches gt comparison" do
-      @ability.can :read, Article, :priority.gt => 3
-      article1 = Article.create(:priority => 4)
-      article2 = Article.create(:priority => 3)
-      expect(Article.accessible_by(@ability)).to eq([article1])
-      expect(@ability).to be_able_to(:read, article1)
-      expect(@ability).not_to be_able_to(:read, article2)
-    end
-
-    it "matches gte comparison" do
-      @ability.can :read, Article, :priority.gte => 3
-      article1 = Article.create(:priority => 4)
-      article2 = Article.create(:priority => 3)
-      article3 = Article.create(:priority => 2)
-      expect(Article.accessible_by(@ability)).to eq([article1, article2])
-      expect(@ability).to be_able_to(:read, article1)
-      expect(@ability).to be_able_to(:read, article2)
-      expect(@ability).not_to be_able_to(:read, article3)
-    end
-
-    # TODO: add more comparison specs
-  end
-end