scoped_rolify 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deaaabae41d436b0c393ceb4ecb219d420163d97
-  data.tar.gz: 6b8e3f4dfadf46dbd23bc12bcc7548845a62390d
+  metadata.gz: c3e13a8a7e65850a3b96cda280e51f1b418c4d5b
+  data.tar.gz: 9d8c277b01b4dbffbcc7b17236034b218b405c89
 SHA512:
-  metadata.gz: e6e5906f5c4bd2c4d87f4543f18a227d3ffb5d7cee36c91dad8e71a4f1457263026fb531d720a4b099aa0689577cf56615b7f1e86d417c2adabae981c2aa1d4d
-  data.tar.gz: 566ae4ca33bd94717c6df4082803ee1f256b7228002d1e54d12aa6339ddcc82d2b853935029ed368fc287de4cafb4b3ada9b5d8c23f614be66c768554b681916
+  metadata.gz: 7e34de7d161615d1289a0e8605581745d5ba347de05f79a012eb62a6edb7d547c639e39bf853112fbc9cb8dea8d3f38a38cb6c6af4ec0ced36bd727d5e0130d0
+  data.tar.gz: a6887d2590d790aa7399adac031bc9f7895e023762b94deeb9d5cb3cb69982d8fd41b8660b19747fabe9122f4e8555194e07f8b04bb5b3ff0553e26b33f77415

data/.coveralls.yml

@@ -1 +1 @@
-repo_token: GErR5C0zFnYNumgFd8UUE5LTq8w0ggvr4
+repo_token: SDzsRXsu69Pye4AaTsoAP94UsBRverfMU

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### VERSION 0.0.3
+
+* little changes
+
+### VERSION 0.0.2
+
+* Rename gem from scopable to scoped_rolify
+* Rename method from scope_role to add_scope_role
+
 ### VERSION 0.0.1
 
 * Resctricted add_role method

data/README.md

@@ -9,7 +9,7 @@
 [![Build Status](https://travis-ci.org/joel/scoped_rolify.png?branch=master)](https://travis-ci.org/joel/scoped_rolify) (Travis CI)
 
 [![Coverage Status](https://coveralls.io/repos/joel/scoped_rolify/badge.png)](https://coveralls.io/r/joel/scoped_rolify)
-
+                                                                              https://coveralls.io/r/joel/scoped_rolify#
 This is a monkey patch of rolify for specifics purposes. We want only have users scoped on specific instance of resource. We are no really interesting by hierarchy.
 
 ## Installation
@@ -40,7 +40,9 @@ Only this case it's possible
 
     user.add_scope_role :moderator, Forum.first #
 
-Method with_scoped_role map #with_role
+Method with_scoped_role and method #with_any_scoped_role
+
+Theu methods return users for asked roles
 
 You can not call method without instance of resource
 
@@ -51,6 +53,8 @@ Only this case it's possible
 
     User.with_scoped_role :moderator, Forum.first #
 
+Method ```with_any_scoped_role``` return an ```ActiveRecord::Relation``` of all users with all roles asked for one resource
+
 ## Contributing
 
 1. Fork it ( http://github.com/<my-github-username>/scoped_rolify/fork )

data/lib/scoped_rolify/finders.rb

@@ -1,11 +1,30 @@
 module Rolify
   module Finders
-    
-    def with_scoped_role(role_name, resource)
+
+    def with_scoped_role role_name, resource
       raise MissingResourceError, "You should provide resource" unless resource
       raise InstanceResourceError, "You should provide INSTANCE resource" unless resource.respond_to?(:id)
-      
-      with_role(role_name, resource)
+
+      self.joins(:roles).where(rolify_constraints(role_name, resource))
     end
+
+    def with_any_scoped_role role_names, resource
+      self.joins(:roles).where(rolify_constraints(role_names, resource))
+    end
+
+    def rolify_constraints role_names, resource
+      raise 'You should give somes role' if role_names.nil? or (role_names||[]).empty?
+      table = Arel::Table.new(:roles)
+      [].tap do |_constraints|
+        Array.wrap(role_names).each do |name|
+          _constraints << [].tap do |_constraint|
+            _constraint << table[:name].eq(name)
+            _constraint << table[:resource_type].eq(resource.class.name)
+            _constraint << table[:resource_id].eq(resource.id)
+          end.reduce(:and)
+        end
+      end.reduce(:or)
+    end
+
   end
 end

data/lib/scoped_rolify/version.rb

@@ -1,3 +1,3 @@
 module ScopedRolify
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/scoped_rolify/finders_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe Rolify::Finders do
   let(:resource) { Forum.first }
-  let(:user) { User.first }
+  let(:admin)     { User.where(login: 'admin').first }
 
-  before { user.add_role(:admin, resource) }
+  before { admin.add_role(:admin, resource) }
 
   subject { User }
 
@@ -12,8 +12,18 @@ describe Rolify::Finders do
   it { expect { subject.with_scoped_role(:admin, resource) }.to_not raise_error }
 
   context 'regular way' do
-    it { User.with_scoped_role(:admin, resource).should eq([user]) }
+    it { subject.with_scoped_role(:admin, resource).should eq([admin]) }
   end
 
+  context '#with_any_scoped_role' do
+    let(:moderator) { subject.where(login: 'moderator').first }
+    before { moderator.add_role(:moderator, resource) }
+    it do
+      expect(subject.with_any_scoped_role([:admin, :moderator], resource)).to be_a(ActiveRecord::Relation)
+    end
+    it do
+      expect(subject.with_any_scoped_role([:admin, :moderator], resource).to_a).to eq([admin, moderator])
+    end
+  end
 end
 

data/spec/support/data.rb

@@ -1,6 +1,7 @@
 # Users
 User.destroy_all
 User.create login: 'admin'
+User.create login: 'moderator'
 
 # Roles
 Role.destroy_all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoped_rolify
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Joel AZEMAR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rolify