scoped_rolify 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3e13a8a7e65850a3b96cda280e51f1b418c4d5b
-  data.tar.gz: 9d8c277b01b4dbffbcc7b17236034b218b405c89
+  metadata.gz: 02c456aa8ca494528222680ebc0024fc8069a91b
+  data.tar.gz: afe192eba189a99fec5f5eed531bb46e137e8c21
 SHA512:
-  metadata.gz: 7e34de7d161615d1289a0e8605581745d5ba347de05f79a012eb62a6edb7d547c639e39bf853112fbc9cb8dea8d3f38a38cb6c6af4ec0ced36bd727d5e0130d0
-  data.tar.gz: a6887d2590d790aa7399adac031bc9f7895e023762b94deeb9d5cb3cb69982d8fd41b8660b19747fabe9122f4e8555194e07f8b04bb5b3ff0553e26b33f77415
+  metadata.gz: cfb764ac9b475af72a8361aebcf9cb1b2ea416187dc70eceec89e691763ac9324a3b5d13c398ee9b233e4569cf732327d9cbb5c97e013486931d27559fa818d5
+  data.tar.gz: ad768d2fc9a2f853be116476ec50381225fcef6834789f0962cd8196d1a797ffb60b2d5451af7a3dbbd732fc1dc8642e03edd41f34f7c5ffa8611819a7d0bf7a

data/.ruby-gemset

@@ -1 +1 @@
-scopable
+scoped_rolify

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### VERSION 0.0.4
+
+* bug fix
+  * monkey patch has_role? of Rolify for fixing behavior with heterogeneous role through in sym or string
+
+* enhancements
+  * add_scope_role can be add role on none persisted object
+  * add method remove_scope_role for manage none persisted object
+  * move check into ScopedRolify::Policy
+
+* backwards incompatible changes
+
+* deprecations
+
 ### VERSION 0.0.3
 
 * little changes

data/README.md

@@ -38,7 +38,10 @@ You can not add right without instance of resource
 
 Only this case it's possible
 
-    user.add_scope_role :moderator, Forum.first #
+    user.add_scope_role :moderator, Forum.first
+    user.add_scope_role :moderator, Forum.new
+
+You can play also with remove_scope_role
 
 Method with_scoped_role and method #with_any_scoped_role
 
@@ -53,6 +56,9 @@ Only this case it's possible
 
     User.with_scoped_role :moderator, Forum.first #
 
+You can't play with none persisted object
+
+
 Method ```with_any_scoped_role``` return an ```ActiveRecord::Relation``` of all users with all roles asked for one resource
 
 ## Contributing

data/bin/publish

@@ -5,6 +5,7 @@
 class Publish
 
   def start version
+    system "rvm use `cat .ruby-version`@`cat .ruby-gemset`"
     system "bundle && bundle exec rspec"
     system "gem build scoped_rolify.gemspec"
     system "git tag -a v#{version} -m 'version #{version}'"

data/lib/scoped_rolify.rb

@@ -1,11 +1,13 @@
 require 'rolify'
 
 require 'scoped_rolify/version'
+require 'scoped_rolify/policy'
 require 'scoped_rolify/role'
 require 'scoped_rolify/finders'
 
 class MissingResourceError  < StandardError; end
 class InstanceResourceError < StandardError; end
+class PersistenceError < StandardError; end
 
 module ScopedRolify
   # Your code goes here...

data/lib/scoped_rolify/finders.rb

@@ -2,18 +2,18 @@ module Rolify
   module Finders
 
     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)
-
+      ScopedRolify::Policy.new(self, resource).check_persisted!
       self.joins(:roles).where(rolify_constraints(role_name, resource))
     end
 
     def with_any_scoped_role role_names, resource
+      ScopedRolify::Policy.new(self, resource).check_persisted!
       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?
+      ScopedRolify::Policy.new(self, resource).check_persisted!
       table = Arel::Table.new(:roles)
       [].tap do |_constraints|
         Array.wrap(role_names).each do |name|

data/lib/scoped_rolify/policy.rb

@@ -0,0 +1,15 @@
+module ScopedRolify
+  class Policy < Struct.new(:model, :resource)
+
+    def check!
+      raise MissingResourceError, "You should provide resource" unless self.resource
+      raise InstanceResourceError, "You should provide INSTANCE resource" unless self.resource.respond_to?(:id)
+    end
+
+    def check_persisted!
+      check!
+      raise PersitenceError, "You should ask on persisted resource" unless self.resource.persisted?
+    end
+
+  end
+end

data/lib/scoped_rolify/role.rb

@@ -1,11 +1,45 @@
 module Rolify
   module Role
-    
+
     def add_scope_role(role_name, resource)
-      raise MissingResourceError, 'You should provide resource' unless resource
-      raise InstanceResourceError, 'You should provide INSTANCE resource' unless resource.respond_to?(:id)
-      
-      add_role(role_name, resource)
+      ScopedRolify::Policy.new(self, resource).check!
+      add_resourced_role(role_name, resource)
+    end
+
+    def remove_scope_role(role_name, resource)
+      ScopedRolify::Policy.new(self, resource).check!
+      remove_resourced_role(role_name, resource)
+    end
+
+    def has_role?(role_name, resource = nil)
+      if self.new_record?
+        self.roles.detect { |r| r.name.to_s == role_name.to_s && (r.resource == resource || resource.nil?) }
+      else
+        self.class.adapter.where(self.roles, :name => role_name, :resource => resource)
+      end.present?
+    end
+
+    private
+
+    def add_resourced_role(role_name, resource)
+      if self.new_record?
+        self.class.adapter.role_class.new(name: role_name, resource: resource).tap do |role|
+          self.roles << role
+          if Rolify.dynamic_shortcuts and !self.respond_to?("is_#{role_name}?".to_sym)
+            self.class.define_dynamic_method(role_name, resource)
+          end
+        end
+      else
+        add_role(role_name, resource)
+      end
+    end
+
+    def remove_resourced_role(role_name, resource)
+      if self.new_record?
+        self.roles = self.roles - [self.roles.detect { |r| r.name.to_s == role_name.to_s && r.resource == resource }]
+      else
+        remove_role(role_name, resource)
+      end
     end
 
   end

data/lib/scoped_rolify/version.rb

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

data/spec/scoped_rolify/finders_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Rolify::Finders do
   let(:resource) { Forum.first }
-  let(:admin)     { User.where(login: 'admin').first }
+  let(:admin)    { User.where(login: 'admin').first }
 
   before { admin.add_role(:admin, resource) }
 

data/spec/scoped_rolify/role_spec.rb

@@ -1,16 +1,36 @@
 require 'spec_helper'
 
 describe Rolify::Role do
-  let(:instance) { Forum.first }
+  let(:resource) { Forum.first }
+  let(:user)     { User.first }
 
-  subject { User.first }
+  subject { user }
 
   it { expect { subject.add_scope_role(:admin, Forum) }.to raise_error InstanceResourceError }
-  it { expect { subject.add_scope_role(:admin, instance) }.to_not raise_error }
+  it { expect { subject.add_scope_role(:admin, resource) }.to_not raise_error }
 
-  context 'regular way' do
-    before { subject.add_scope_role(:admin, instance) }
-    it { should have_role :admin, instance }
+  context 'persisted way' do
+    let(:resource) { Forum.first }
+    let(:user)     { User.first }
+
+    before { subject.add_scope_role(:admin, resource) }
+
+    it { expect { subject.add_scope_role(:admin, resource) }.to_not raise_error }
+    it { should have_role :admin, resource }
+  end
+
+  context 'new record way' do
+    let(:resource) { Forum.new name: 'forum 2' }
+    let(:user)     { User.new login: 'john' }
+
+    before { subject.add_scope_role(:whatever, resource) }
+
+    it { should have_role :whatever, resource }
+
+    context 'remove' do
+      before { subject.remove_scope_role(:whatever, resource) }
+      it { should_not have_role :whatever, resource }
+    end
   end
 
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: scoped_rolify
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Joel AZEMAR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rolify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
 description: This is a monkey patch of rolify, and add new methods
@@ -88,11 +88,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- .coveralls.yml
+- .gitignore
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -102,6 +102,7 @@ files:
 - bin/publish
 - lib/scoped_rolify.rb
 - lib/scoped_rolify/finders.rb
+- lib/scoped_rolify/policy.rb
 - lib/scoped_rolify/role.rb
 - lib/scoped_rolify/version.rb
 - scoped_rolify.gemspec
@@ -122,17 +123,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ~>
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: This is a monkey patch of rolify