cancan 1.3.4 → 1.4.1

data/spec/cancan/query_spec.rb

@@ -7,101 +7,101 @@ describe CanCan::Query do
   end
 
   it "should have false conditions if no abilities match" do
-    @ability.query(:destroy, Person).conditions.should == "true=false"
+    @ability.query(:destroy, Project).conditions.should == "true=false"
   end
 
   it "should return hash for single `can` definition" do
-    @ability.can :read, Person, :blocked => false, :user_id => 1
-    @ability.query(:read, Person).conditions.should == { :blocked => false, :user_id => 1 }
+    @ability.can :read, Project, :blocked => false, :user_id => 1
+    @ability.query(:read, Project).conditions.should == { :blocked => false, :user_id => 1 }
   end
 
   it "should merge multiple can definitions into single SQL string joining with OR" do
-    @ability.can :read, Person, :blocked => false
-    @ability.can :read, Person, :admin => true
-    @ability.query(:read, Person).conditions.should == "(admin=true) OR (blocked=false)"
+    @ability.can :read, Project, :blocked => false
+    @ability.can :read, Project, :admin => true
+    @ability.query(:read, Project).conditions.should == "(admin=true) OR (blocked=false)"
   end
 
   it "should merge multiple can definitions into single SQL string joining with OR and AND" do
-    @ability.can :read, Person, :blocked => false, :active => true
-    @ability.can :read, Person, :admin => true
-    @ability.query(:read, Person).conditions.should orderlessly_match("(blocked=false AND active=true) OR (admin=true)")
+    @ability.can :read, Project, :blocked => false, :active => true
+    @ability.can :read, Project, :admin => true
+    @ability.query(:read, Project).conditions.should orderlessly_match("(blocked=false AND active=true) OR (admin=true)")
   end
 
   it "should merge multiple can definitions into single SQL string joining with OR and AND" do
-    @ability.can :read, Person, :blocked => false, :active => true
-    @ability.can :read, Person, :admin => true
-    @ability.query(:read, Person).conditions.should orderlessly_match("(blocked=false AND active=true) OR (admin=true)")
+    @ability.can :read, Project, :blocked => false, :active => true
+    @ability.can :read, Project, :admin => true
+    @ability.query(:read, Project).conditions.should orderlessly_match("(blocked=false AND active=true) OR (admin=true)")
   end
 
   it "should return false conditions for cannot clause" do
-    @ability.cannot :read, Person
-    @ability.query(:read, Person).conditions.should == "true=false"
+    @ability.cannot :read, Project
+    @ability.query(:read, Project).conditions.should == "true=false"
   end
 
   it "should return SQL for single `can` definition in front of default `cannot` condition" do
-    @ability.cannot :read, Person
-    @ability.can :read, Person, :blocked => false, :user_id => 1
-    @ability.query(:read, Person).conditions.should orderlessly_match("blocked=false AND user_id=1")
+    @ability.cannot :read, Project
+    @ability.can :read, Project, :blocked => false, :user_id => 1
+    @ability.query(:read, Project).conditions.should orderlessly_match("blocked=false AND user_id=1")
   end
 
   it "should return true condition for single `can` definition in front of default `can` condition" do
-    @ability.can :read, Person
-    @ability.can :read, Person, :blocked => false, :user_id => 1
-    @ability.query(:read, Person).conditions.should == 'true=true'
+    @ability.can :read, Project
+    @ability.can :read, Project, :blocked => false, :user_id => 1
+    @ability.query(:read, Project).conditions.should == 'true=true'
   end
 
   it "should return false condition for single `cannot` definition" do
-    @ability.cannot :read, Person, :blocked => true, :user_id => 1
-    @ability.query(:read, Person).conditions.should == 'true=false'
+    @ability.cannot :read, Project, :blocked => true, :user_id => 1
+    @ability.query(:read, Project).conditions.should == 'true=false'
   end
 
   it "should return `false condition` for single `cannot` definition in front of default `cannot` condition" do
-    @ability.cannot :read, Person
-    @ability.cannot :read, Person, :blocked => true, :user_id => 1
-    @ability.query(:read, Person).conditions.should == 'true=false'
+    @ability.cannot :read, Project
+    @ability.cannot :read, Project, :blocked => true, :user_id => 1
+    @ability.query(:read, Project).conditions.should == 'true=false'
   end
 
   it "should return `not (sql)` for single `cannot` definition in front of default `can` condition" do
-    @ability.can :read, Person
-    @ability.cannot :read, Person, :blocked => true, :user_id => 1
-    @ability.query(:read, Person).conditions.should orderlessly_match("not (blocked=true AND user_id=1)")
+    @ability.can :read, Project
+    @ability.cannot :read, Project, :blocked => true, :user_id => 1
+    @ability.query(:read, Project).conditions.should orderlessly_match("not (blocked=true AND user_id=1)")
   end
 
   it "should return appropriate sql conditions in complex case" do
-    @ability.can :read, Person
-    @ability.can :manage, Person, :id => 1
-    @ability.can :update, Person, :manager_id => 1
-    @ability.cannot :update, Person, :self_managed => true
-    @ability.query(:update, Person).conditions.should == 'not (self_managed=true) AND ((manager_id=1) OR (id=1))'
-    @ability.query(:manage, Person).conditions.should == {:id=>1}
-    @ability.query(:read, Person).conditions.should == 'true=true'
+    @ability.can :read, Project
+    @ability.can :manage, Project, :id => 1
+    @ability.can :update, Project, :manager_id => 1
+    @ability.cannot :update, Project, :self_managed => true
+    @ability.query(:update, Project).conditions.should == 'not (self_managed=true) AND ((manager_id=1) OR (id=1))'
+    @ability.query(:manage, Project).conditions.should == {:id=>1}
+    @ability.query(:read, Project).conditions.should == 'true=true'
   end
 
   it "should have nil joins if no can definitions" do
-    @ability.query(:read, Person).joins.should be_nil
+    @ability.query(:read, Project).joins.should be_nil
   end
 
   it "should have nil joins if no nested hashes specified in conditions" do
-    @ability.can :read, Person, :blocked => false
-    @ability.can :read, Person, :admin => true
-    @ability.query(:read, Person).joins.should be_nil
+    @ability.can :read, Project, :blocked => false
+    @ability.can :read, Project, :admin => true
+    @ability.query(:read, Project).joins.should be_nil
   end
 
   it "should merge separate joins into a single array" do
-    @ability.can :read, Person, :project => { :blocked => false }
-    @ability.can :read, Person, :company => { :admin => true }
-    @ability.query(:read, Person).joins.inspect.should orderlessly_match([:company, :project].inspect)
+    @ability.can :read, Project, :project => { :blocked => false }
+    @ability.can :read, Project, :company => { :admin => true }
+    @ability.query(:read, Project).joins.inspect.should orderlessly_match([:company, :project].inspect)
   end
 
   it "should merge same joins into a single array" do
-    @ability.can :read, Person, :project => { :blocked => false }
-    @ability.can :read, Person, :project => { :admin => true }
-    @ability.query(:read, Person).joins.should == [:project]
+    @ability.can :read, Project, :project => { :blocked => false }
+    @ability.can :read, Project, :project => { :admin => true }
+    @ability.query(:read, Project).joins.should == [:project]
   end
 
   it "should merge complex, nested joins" do
-    @ability.can :read, Person, :project => { :bar => {:test => true} }, :company => { :bar => {:test => true} }
-    @ability.can :read, Person, :project => { :foo => {:bar => true}, :bar => {:zip => :zap} }
-    @ability.query(:read, Person).joins.inspect.should orderlessly_match([{:project => [:bar, :foo]}, {:company => [:bar]}].inspect)
+    @ability.can :read, Project, :project => { :bar => {:test => true} }, :company => { :bar => {:test => true} }
+    @ability.can :read, Project, :project => { :foo => {:bar => true}, :bar => {:zip => :zap} }
+    @ability.query(:read, Project).joins.inspect.should orderlessly_match([{:project => [:bar, :foo]}, {:company => [:bar]}].inspect)
   end
 end

data/spec/matchers.rb

@@ -1,4 +1,4 @@
-Spec::Matchers.define :orderlessly_match do |original_string|
+RSpec::Matchers.define :orderlessly_match do |original_string|
   match do |given_string|
     original_string.split('').sort == given_string.split('').sort
   end

data/spec/spec.opts

@@ -1 +1,2 @@
 --color
+--backtrace

data/spec/spec_helper.rb

@@ -1,15 +1,17 @@
 require 'rubygems'
-require 'spec'
-require 'active_support'
-require 'active_record'
-require 'action_controller'
-require 'action_view'
+require 'bundler/setup'
+Bundler.require(:default)
+require 'supermodel' # shouldn't Bundler do this already?
+require 'active_support/all'
 require 'matchers'
-require 'cancan'
 require 'cancan/matchers'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :rr
+  config.before(:each) do
+    Project.delete_all
+    Category.delete_all
+  end
 end
 
 class Ability
@@ -19,8 +21,13 @@ class Ability
   end
 end
 
-# this class helps out in testing SQL conditions
-class Person
+class Category < SuperModel::Base
+  has_many :projects
+end
+
+class Project < SuperModel::Base
+  belongs_to :category
+
   class << self
     protected
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cancan
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: false
   segments: 
   - 1
-  - 3
   - 4
-  version: 1.3.4
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Ryan Bates
@@ -14,10 +15,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -07:00
+date: 2010-11-12 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 62196431
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 22
+        version: 2.0.0.beta.22
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 33
+        segments: 
+        - 0
+        - 10
+        - 11
+        version: 0.10.11
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: supermodel
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
+        version: 0.1.4
+  type: :development
+  version_requirements: *id004
 description: Simple authorization solution for Rails which is decoupled from user roles. All permissions are stored in a single location.
 email: ryan@railscasts.com
 executables: []
@@ -33,6 +99,7 @@ files:
 - lib/cancan/controller_additions.rb
 - lib/cancan/controller_resource.rb
 - lib/cancan/exceptions.rb
+- lib/cancan/inherited_resource.rb
 - lib/cancan/matchers.rb
 - lib/cancan/query.rb
 - lib/cancan.rb
@@ -42,12 +109,14 @@ files:
 - spec/cancan/controller_additions_spec.rb
 - spec/cancan/controller_resource_spec.rb
 - spec/cancan/exceptions_spec.rb
+- spec/cancan/inherited_resource_spec.rb
 - spec/cancan/matchers_spec.rb
 - spec/cancan/query_spec.rb
 - spec/matchers.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - CHANGELOG.rdoc
+- Gemfile
 - LICENSE
 - Rakefile
 - README.rdoc
@@ -62,16 +131,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 19
       segments: 
       - 1
       - 3
@@ -80,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cancan
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple authorization solution for Rails.