cancannible 0.0.2 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWE0OWZkMjhlMWQ3ODMzNTVmZWNiMTk2ZWM5YmU2YjMyY2I1NTAwMA==
+    ZjFkNmJkNGYzODQ2NDRkZDJlODM0M2UyYjY2OTNlODJjMWIzNjU1Yw==
   data.tar.gz: !binary |-
-    YjQ0NDZhNzQ5MzdhMDJiMDQ4NzRjMjI1MDE5ZGY1N2ViZjU2NThlMA==
+    YzhmMDIxNGY3Y2NkOThiMDEzYzI2ODU5NTA1ZDMyMDA3NWQ1YzdjYQ==
 SHA512:
   metadata.gz: !binary |-
-    Zjc2OGYzMGI1ODA5ZmY4ZmQ3ZGRhNTU5MDM2MmRiOWJmNDNmNzI4MzZjYTY0
-    ZDNiNDM3ODVmZTExYzM5NDQ1ZmQyNDZmZjc0NDFiYWIxZTM2YjcwMTdiMGU0
-    YTliZGI0YjFhNDdjY2RmZWNhZjNhY2YyNDU5YTQ3MDQ3NDRhNjY=
+    MTc3ZGNlOTU1NzliNGFlNjBjOTk0ZGVmZDMyNzg4ODBlYTkxNGM4Njg3Mjdi
+    NDlkYjc0ZDg3NDRkZDIzMjkzMjRhOGQxZTQ4N2JiZDI1MjAxMWE4NzQ3ZmY5
+    NGFjZTYxYWM4Yzg0NGNlMWM3NGMzZTgxNjIxZWE5OThjNTAyMGE=
   data.tar.gz: !binary |-
-    MjFhMzBmNzQ5YTcyMzBmOTViMTYwMjEwNDI2YjllNjUxZjEzYjkxNmZjOTVi
-    YmVkOWZjMWUyODBiMDQ3MmY4YWExMDJiNmUzZTkzZTBlY2MwZWFjMzFmOWM0
-    MjNiMTBmMGFjNGI3OTllNTkxMjM3NTBmZDViOWYwNmVlZGMwZWE=
+    YzQzYzU4ZDEzZmRjZWZmNTZkYmVkNzExNzQxN2UyODNmNjc4ZWUzNTE2ZTZm
+    MzhmNDE2NjQwN2YyMzcwMDg5OTg5MGY1OGNiZjQyNDRmM2EyNjJmOGYxZGUw
+    ZjY1MjI2NmNhNTBkM2UyNjg4MTA1MGI3ZWIwNWFmYWE5MTY2NGM=

data/.travis.yml

@@ -2,3 +2,13 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.1.5
+gemfile:
+  - gemfiles/rails_3.gemfile
+  - gemfiles/rails_4.gemfile
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_4.gemfile
+    - rvm: 2.1.5
+      gemfile: gemfiles/rails_3.gemfile

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails-3" do
+  gem "activesupport", '~> 3.2'
+  gem "activemodel", '~> 3.2'
+  gem "activerecord", '~> 3.2'
+end
+
+appraise "rails-4" do
+  gem "activesupport", '> 4'
+  gem "activemodel", '> 4'
+  gem "activerecord", '> 4'
+end

data/Gemfile

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 
-# currently testing on the 3.2 branch of rails
-# gem "activemodel", '~> 3.2'
-# gem "activerecord", '~> 3.2'
+gem "appraisal"
 
 # Specify your gem's dependencies in cancannible.gemspec
 gemspec

data/README.md

@@ -7,16 +7,17 @@ Cancannible is a gem that extends CanCan with a range of capabilities:
 * permissions inheritance (so that, for example, a User can inherit permissions from Roles and/or Groups)
 * caching of abilities (so that they don't need to be recalculated on each web request)
 * general-purpose access refinements (so that, for example, CanCan will automatically enforce multi-tenant or other security restrictions)
+* battle-tested with Rails 3.2
+* tested with Rails 4 (but limited experience in the field?)
 
 ## Limitations
-Cancannible's origin was in a web application that's been in production for over 3 years.
+Cancannible's origin was in a web application that's been in production for over 4 years.
 This gem is an initial refactoring as a separate component. It continues to be used in production, but
 there are some limitations and constraints that will ideally be removed or changed over time:
 
 * It only supports ActiveRecord for permissions storage (specifically, it has been tested with PostgreSQL and SQLite)
 * It currently assumes permissions are stored in a Permission model with a specific structure
 * It works with the [CanCan](https://github.com/ryanb/cancan) gem. It has not yet been tested with the new [CanCanCan](https://github.com/CanCanCommunity/cancancan) gem.
-* It assumes and is only tested with Rails 3.2. Not yet with Rails 4.
 * It assumes your CanCan rules are setup with the default `Ability` class
 
 
@@ -120,6 +121,23 @@ For example, this is a simple scheme using Redis:
     end
 
 
+## Testing the gem
+
+The RSpec test suite runs as the default rake task:
+
+    rake
+    # same as:
+    rake spec
+
+For convenience, guard is included in the development gem environment, so you can start automatic testing-on-change:
+
+    bundle exec guard
+
+[Appraisal](https://github.com/thoughtbot/appraisal) is also included to run tests across Rails 3 and 4 environments:
+
+    appraisal rake spec
+
+
 ## Contributing
 
 1. Fork it ( https://github.com/evendis/cancannible/fork )

data/cancannible.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport", "~> 3.2"
-  spec.add_runtime_dependency "activemodel", "~> 3.2"
+  spec.add_runtime_dependency "activesupport", ">= 3.2.1"
+  spec.add_runtime_dependency "activemodel", ">= 3.2.1"
   spec.add_runtime_dependency "cancan", "~> 1.6"
 
-  spec.add_development_dependency "activerecord", "~> 3.2"
+  spec.add_development_dependency "activerecord", ">= 3.2.1"
   spec.add_development_dependency "sqlite3", "~> 1.3"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"

data/gemfiles/rails_3.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "activesupport", "~> 3.2"
+gem "activemodel", "~> 3.2"
+gem "activerecord", "~> 3.2"
+
+gemspec :path => "../"

data/gemfiles/rails_3.gemfile.lock

@@ -0,0 +1,98 @@
+PATH
+  remote: ../
+  specs:
+    cancannible (1.0.0)
+      activemodel (>= 3.2.1)
+      activesupport (>= 3.2.1)
+      cancan (~> 1.6)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
+      builder (~> 3.0.0)
+    activerecord (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.19)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    appraisal (1.0.2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (3.0.3)
+    builder (3.0.4)
+    cancan (1.6.10)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    ffi (1.9.6)
+    formatador (0.2.5)
+    guard (2.10.5)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-compat (1.2.0)
+    guard-rspec (4.5.0)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    hitimes (1.2.2)
+    i18n (0.7.0)
+    listen (2.8.4)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    method_source (0.8.2)
+    multi_json (1.10.1)
+    nenv (0.1.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.4.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    slop (3.6.0)
+    sqlite3 (1.3.10)
+    thor (0.19.1)
+    timers (4.0.1)
+      hitimes
+    tzinfo (0.3.40)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (~> 3.2)
+  activerecord (~> 3.2)
+  activesupport (~> 3.2)
+  appraisal
+  bundler (~> 1.6)
+  cancannible!
+  guard-rspec (~> 4.0)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  sqlite3 (~> 1.3)

data/gemfiles/rails_4.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "activesupport", "> 4"
+gem "activemodel", "> 4"
+gem "activerecord", "> 4"
+
+gemspec :path => "../"

data/gemfiles/rails_4.gemfile.lock

@@ -0,0 +1,103 @@
+PATH
+  remote: ../
+  specs:
+    cancannible (1.0.0)
+      activemodel (>= 3.2.1)
+      activesupport (>= 3.2.1)
+      cancan (~> 1.6)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
+      builder (~> 3.1)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (1.0.2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.0)
+    builder (3.2.2)
+    cancan (1.6.10)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    ffi (1.9.6)
+    formatador (0.2.5)
+    guard (2.10.5)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-compat (1.2.0)
+    guard-rspec (4.5.0)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    hitimes (1.2.2)
+    i18n (0.7.0)
+    json (1.8.1)
+    listen (2.8.4)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    method_source (0.8.2)
+    minitest (5.5.0)
+    nenv (0.1.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.4.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    slop (3.6.0)
+    sqlite3 (1.3.10)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    timers (4.0.1)
+      hitimes
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (> 4)
+  activerecord (> 4)
+  activesupport (> 4)
+  appraisal
+  bundler (~> 1.6)
+  cancannible!
+  guard-rspec (~> 4.0)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  sqlite3 (~> 1.3)

data/lib/cancannible/grantee.rb

@@ -23,21 +23,15 @@ module Cancannible::Grantee
           resource_id = resource.try(:id)
         end
 
-        permission = find_by_asserted_and_ability_and_resource_id_and_resource_type(
-          asserted, ability, resource_id, resource_type)
-        unless permission
-          permission = find_or_initialize_by_asserted_and_ability_and_resource_id_and_resource_type(
-            !asserted, ability, resource_id, resource_type)
-          permission.asserted = asserted
-          permission.save!
-        end
+        # This looks ugly, but it avoid version-specific issues with find_by*/find_or_initialize_by* methods
+        permission = where(asserted: asserted, ability: ability, resource_id: resource_id, resource_type: resource_type).first
+        permission ||= where(asserted: !asserted, ability: ability, resource_id: resource_id, resource_type: resource_type).first
+        permission ||= new(asserted: asserted, ability: ability, resource_id: resource_id, resource_type: resource_type)
+        permission.asserted = asserted
+        permission.save!
+
+        proxy_association.owner.instance_variable_set :@abilities, nil # invalidate the owner's ability collection
 
-        # if Rails.version =~ /3\.0/ # the rails 3.0 way
-        #   proxy_owner.instance_variable_set :@permissions, nil # invalidate the owner's permissions collection
-        #   proxy_owner.instance_variable_set :@abilities, nil # invalidate the owner's ability collection
-        # else
-          proxy_association.owner.instance_variable_set :@abilities, nil # invalidate the owner's ability collection
-        # end
         permission
       end
     end

data/lib/cancannible/version.rb

@@ -1,3 +1,3 @@
 module Cancannible
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

data/lib/generators/cancannible/templates/cancannible_initializer.rb

@@ -24,6 +24,7 @@ Cancannible.setup do |config|
 
 
   # ACCESS REFINMENTS
+  # =================
   # Cancannible allows general-purpose access refinements to be declared here. This will be enforced
   # in addition to any rules defined in you Ability.rb file.
 

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'sqlite3'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each {|f| require f}
 
 RSpec.configure do |config|
   config.before do

data/spec/support/models.rb

@@ -29,7 +29,7 @@ class RolesUsers < ActiveRecord::Base
 end
 
 class Role < ActiveRecord::Base
-  has_many :roles_users, :class_name => 'RolesUsers'
+  has_many :roles_users, class_name: 'RolesUsers'
   has_many :users, through: :roles_users
 
   include Cancannible::Grantee

data/spec/unit/grantee_spec.rb

@@ -43,9 +43,13 @@ describe Cancannible::Grantee do
         context "when permission is not asserted" do
           it { should be_truthy }
         end
-        context "when permission is not asserted but can is" do
+        context "when :can already asserted" do
           before { grantee.can(:read, resource) }
           it { should be_falsey }
+          context "and then reset as :cannot" do
+            before { grantee.cannot(:read, resource) }
+            it { should be_truthy }
+          end
         end
         context "when permission is asserted" do
           before { grantee.cannot(:read, resource) }

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cancannible
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Paul Gallagher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -147,12 +147,17 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- Appraisals
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - cancannible.gemspec
+- gemfiles/rails_3.gemfile
+- gemfiles/rails_3.gemfile.lock
+- gemfiles/rails_4.gemfile
+- gemfiles/rails_4.gemfile.lock
 - lib/cancannible.rb
 - lib/cancannible/config.rb
 - lib/cancannible/grantee.rb
@@ -192,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Dynamic, configurable permissions for CanCan