rails-canhaz 2.0.0.pre1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb6d2afdb656ffd883ae8b70ca29bb86b589fabd
-  data.tar.gz: 4b3fb58b229967e0a8da3669caf424a03e6d4b08
+  metadata.gz: cba07dfae0b516985fc7cf3ece68027c4572b9f0
+  data.tar.gz: a30e785af6b55507a8496b75d1ce107715a7d2a4
 SHA512:
-  metadata.gz: 059680e3b378d9e2aecda25b4a22e2677d5b11b61c0a5563375196c38f8ed581dc51cccbcfbd336afdf12b941a736b2a9c984b70e72ddedf2bdeaeef1a65c285
-  data.tar.gz: 01bbe686a014bb82b22f312ae1a750fd60f4353dc824f933ba820e6506dd125ce8576100ee95c1328d15cb14ea0e8f4f3d557987b07482ed71d5c14af434a810
+  metadata.gz: 6ffb8e98b2af37e18cc2e9a8587b322e6a9fea5a64d1f70bdd7f294a6bd80adf4056e77d9168b6ace8abe6af9b487343573cfb92a69c5be689613987eb6e6852
+  data.tar.gz: 96ec2e1f01ed6cb2e042e141b05769b722edc00f8380c7e6a7aea74d42a5bbf1243bbaea3b46c458718f6d4a7d41fad5d03fe194ae8809824071ba6348f6146f

data/.travis.yml

@@ -2,3 +2,12 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1
+gemfile:
+  - gemfiles/Gemfile.ar-3.2.x
+  - gemfiles/Gemfile.ar-4.0.x
+  - gemfiles/Gemfile.ar-4.1.x
+  - gemfiles/Gemfile.ar-edge
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/Gemfile.ar-edge

data/README.md

@@ -1,21 +1,20 @@
 [A port of this gem working on mongoid](https://github.com/intrepidd/mongoid-canhaz) is now avaible.
-
-# Rails-Canhaz for Rails 4.0.0.beta1 !
+# Rails-Canhaz [![Build Status](https://travis-ci.org/Intrepidd/rails-canhaz.png)](https://travis-ci.org/Intrepidd/rails-canhaz)
 
 This gem is a simple activerecord extention that allows any application using activerecord to manage permissions based roles.
 
-## Installation (Prerelease gem !)
+## Installation
 
 Standard gem installation :
 
 ```
-gem install rails-canhaz -v 2.0.0.pre
+gem install rails-canhaz
 ```
 
 Or in your Gemfile if you use bundler
 
 ```ruby
-gem 'rails-canhaz', '2.0.0.pre'
+gem 'rails-canhaz'
 ```
 
 You then need to create a single table in order to make this gem to work
@@ -66,7 +65,10 @@ Now our models are marked as canhaz subjects and objects, we have access to some
 
 ```ruby
 user = User.find(42)
+user2 = User.find(21)
+
 article = Article.find(1337)
+article2 = Article.find(784)
 
 user.can?(:read, article) # Can the user read this article? false for now
 
@@ -77,8 +79,12 @@ user.can?(:read, article) # Will be true
 
 user.objects_with_permission(Article, :read) # Will return all the articles w/ read permissions for this user
 
+User.objects_with_permission([user, user2], :read) # Will return all the articles w/ read permissions for these users
+
 article.subjects_with_permission(User, :read) # Will return all the users hat are able to read this article
 
+Article.subjects_with_permission([article, article2], User, :read) # Will return all the users that are able to read theses articles
+
 #You can also remove permissions
 
 user.cannot!(:read, article)

data/gemfiles/Gemfile.ar-3.2.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => '..'
+
+gem 'activerecord', '~> 3.2'

data/gemfiles/Gemfile.ar-4.0.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => '..'
+
+gem 'activerecord', '~> 4.0'

data/gemfiles/Gemfile.ar-4.1.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => '..'
+
+gem 'activerecord', '~> 4.1.0'

data/gemfiles/Gemfile.ar-edge

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec :path => '..'
+
+git 'git://github.com/rails/rails.git' do
+  gem 'activerecord'
+end

data/lib/rails-canhaz/canhaz_permission.rb

@@ -2,6 +2,11 @@ require 'active_record'
 
 class CanHazPermission < ActiveRecord::Base
 
+  # Only call attr_accessible for Rails 3.x
+  if ActiveRecord::VERSION::MAJOR == '3'
+    attr_accessible :csubject_id, :csubject_type, :cobject_type, :cobject_id, :permission_name
+  end
+
   validates :cobject_id, :uniqueness => {:scope => [:permission_name, :csubject_id, :csubject_type, :cobject_type]}
 
   # Gets the permission row between two objects

data/lib/rails-canhaz/extensions_object.rb

@@ -20,6 +20,7 @@ module CanHaz
         type.joins("INNER JOIN can_haz_permissions ON can_haz_permissions.csubject_id = #{type.table_name}.id").where('cobject_id = ? AND cobject_type = ?', self.id, self.class.to_s).where('csubject_type = ?', type.to_s).where('permission_name = ?', permission)
       end
 
+
       # Removes all rights on this object
       #
       def not_accessible
@@ -30,6 +31,23 @@ module CanHaz
         true
       end
 
+      module ClassMethods
+        # Gets the subjects that have the corresponding permission and type on this model
+        #
+        # params objects [Array or Object] The object(s) that you want subjects with permission
+        # @param type [Class] The type of the subjects we're looking for
+        # @param permission [String, Symbol] The permission
+        def subjects_with_permission(objects, type, permission)
+          class_name = (objects.is_a?(Array) ? objects.first.try(:class).try(:name) : objects.class.name)
+
+          type.joins("INNER JOIN can_haz_permissions ON can_haz_permissions.csubject_id = #{type.table_name}.id")
+          .where(:'can_haz_permissions.cobject_type' => class_name)
+          .where(:'can_haz_permissions.cobject_id' => objects)
+          .where('csubject_type = ?', type.to_s)
+          .where('permission_name = ?', permission)
+          .uniq
+        end
+      end
     end
   end
 end

data/lib/rails-canhaz/extensions_subject.rb

@@ -73,6 +73,21 @@ module CanHaz
         true
       end
 
+      module ClassMethods
+        # Gets All objects that match a given type and permission
+        #
+        # params subjects [Array or Object] The subject(s) that you want objects with permission
+        # @param type [Class] The type of the objects
+        # @param permission [ String, Symbol] The name of the permission
+        # @return The macthing objects in an array
+        def objects_with_permission(subjects, type, permission)
+          type.joins("INNER JOIN can_haz_permissions ON can_haz_permissions.cobject_id = #{type.table_name}.id")
+          .where('cobject_type = ?', type.to_s)
+          .where(:'can_haz_permissions.csubject_id' => subjects)
+          .where('permission_name = ?', permission)
+          .uniq
+        end
+      end
     end
   end
 end

data/lib/rails-canhaz/model_extensions.rb

@@ -17,6 +17,7 @@ module CanHaz
     #
     def acts_as_canhaz_object
       include CanHaz::ModelExtensions::Object
+      extend CanHaz::ModelExtensions::Object::ClassMethods
       before_destroy :not_accessible # Removes permission before deleting the object
     end
 
@@ -25,6 +26,7 @@ module CanHaz
     #
     def acts_as_canhaz_subject
       include CanHaz::ModelExtensions::Subject
+      extend CanHaz::ModelExtensions::Subject::ClassMethods
       before_destroy :can_do_nothing # Removes permission before deleting the subject
     end
 

data/lib/rails-canhaz/version.rb

@@ -1,3 +1,3 @@
 module CanHaz
-  VERSION = '2.0.0.pre1'
+  VERSION = '2.0.1'
 end

data/rails-canhaz.gemspec

@@ -17,9 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activerecord', '4.0.0.beta1'
-  gem.add_dependency 'rake'
-
+  gem.add_dependency 'activerecord', '>= 3.1.0', '<5'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'minitest'
 end

data/test/init_tests.rb

@@ -3,4 +3,3 @@ require 'active_record'
 require 'active_support'
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => 'test.sqlite3')
-

data/test/test_canhaz.rb

@@ -1,13 +1,13 @@
 require 'init_tests'
 require 'rails-canhaz'
-require 'test/unit'
+require 'minitest/autorun'
 require 'models/object_model'
 require 'models/subject_model'
 require 'models/foo_model'
 
 load 'schema.rb'
 
-class CanHazTest < Test::Unit::TestCase
+class CanHazTest < Minitest::Unit::TestCase
 
   def test_methods
     assert ActiveRecord::Base.respond_to? :acts_as_canhaz_object
@@ -38,21 +38,19 @@ class CanHazTest < Test::Unit::TestCase
 
     object = ObjectModel.new
 
-    assert_raise CanHaz::Exceptions::NotACanHazObject do
+    assert_raises CanHaz::Exceptions::NotACanHazObject do
         subject.can!(:whatever, foo)
     end
 
-    assert_nothing_raised RuntimeError do
-        subject.can!(:whatever, object)
-    end
 
-    assert_raise CanHaz::Exceptions::NotACanHazObject do
+    subject.can!(:whatever, object)
+
+
+    assert_raises CanHaz::Exceptions::NotACanHazObject do
         subject.can?(:whatever, foo)
     end
 
-    assert_nothing_raised RuntimeError do
-        subject.can?(:whatever, object)
-    end
+    subject.can?(:whatever, object)
 
   end
 
@@ -63,12 +61,27 @@ class CanHazTest < Test::Unit::TestCase
     subject2 = SubjectModel.new
     subject2.save
 
+    subject3 = SubjectModel.new
+    subject3.save
+
     object = ObjectModel.new
     object.save
 
+    object2 = ObjectModel.new
+    object2.save
+
+    object3 = ObjectModel.new
+    object3.save
+
     subject2.can!(:foo, object)
     subject2.can!(:bar, object)
 
+    subject2.can!(:foo, object2)
+    subject2.can!(:bar, object2)
+
+    subject3.can!(:foo, object)
+    subject3.cannot!(:bar, object)
+
     assert subject.can?(:foo, object) == false
     assert subject.can?(:bar, object) == false
 
@@ -92,9 +105,21 @@ class CanHazTest < Test::Unit::TestCase
 
     assert subject.objects_with_permission(ObjectModel, :bar).count == 1
     assert subject.objects_with_permission(ObjectModel, :bar).first == object
-
     assert subject.objects_with_permission(ObjectModel, :foobar).count == 0
 
+    assert SubjectModel.objects_with_permission(subject, ObjectModel, :bar).count == 1
+    assert SubjectModel.objects_with_permission([subject, subject2], ObjectModel, :bar).count == 2
+    assert SubjectModel.objects_with_permission([subject, subject2, subject3], ObjectModel, :bar).count == 2
+    assert SubjectModel.objects_with_permission([subject, subject2, subject3], ObjectModel, :foo).count == 2
+    assert SubjectModel.objects_with_permission([subject, subject3], ObjectModel, :foo).count == 1
+
+    assert object.subjects_with_permission(SubjectModel, :bar).count == 2
+    assert object.subjects_with_permission(SubjectModel, :foo).count == 3
+    assert object.subjects_with_permission(SubjectModel, :foo).count == 3
+
+    assert ObjectModel.subjects_with_permission([object, object2, object3], SubjectModel, :foo).count == 3
+    assert ObjectModel.subjects_with_permission(object2, SubjectModel, :foo).count == 1
+    assert ObjectModel.subjects_with_permission([object], SubjectModel, :bar).count == 2
   end
 
   def test_can_cannot
@@ -271,4 +296,3 @@ class CanHazTest < Test::Unit::TestCase
   end
 
 end
-

metadata

@@ -1,69 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: rails-canhaz
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.1
 platform: ruby
 authors:
 - Intrepidd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple gem for managing permissions between rails models
@@ -73,11 +79,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
+- gemfiles/Gemfile.ar-3.2.x
+- gemfiles/Gemfile.ar-4.0.x
+- gemfiles/Gemfile.ar-4.1.x
+- gemfiles/Gemfile.ar-edge
 - lib/generators/can_haz/install/install_generator.rb
 - lib/generators/can_haz/install/templates/migrations/1_default_can_haz.rb
 - lib/rails-canhaz.rb
@@ -105,17 +115,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple gem for managing permissions between rails models