rolify 3.3.0.rc1 → 3.3.0.rc2

data/lib/generators/rolify/role/templates/initializer.rb

@@ -1,4 +1,4 @@
-Rolify.configure do |config|
+Rolify.configure<%= "(\"#{role_cname.camelize.to_s}\")" if role_cname != "Role" %> do |config|
   # By default ORM adapter is ActiveRecord. uncomment to use mongoid
   <%= "# " if orm_adapter == "active_record" %>config.use_mongoid
   

data/lib/rolify/configure.rb

@@ -3,7 +3,8 @@ module Rolify
     @@dynamic_shortcuts = false
     @@orm = "active_record"
      
-    def configure
+    def configure(*role_cnames)
+      return if !sanity_check(role_cnames)
       yield self if block_given?
     end
 
@@ -37,5 +38,19 @@ module Rolify
         config.orm = "active_record"
       end
     end
+    
+    private
+    
+    def sanity_check(role_cnames)
+      role_cnames = [ "Role" ] if role_cnames.empty?
+      role_cnames.each do |role_cname|
+        role_class = role_cname.constantize
+        if role_class.superclass == ActiveRecord && !role_class.table_exists?
+          warn "[WARN] table '#{role_cname}' doesn't exist. Did you run the migration ? Ignoring rolify config."
+          return false
+        end
+      end
+      true
+    end
   end
 end

data/lib/rolify/resource.rb

@@ -8,11 +8,16 @@ module Rolify
       def find_roles(role_name = nil, user = nil)
         roles = user && (user != :any) ? user.roles : self.role_class
         roles = roles.where(:resource_type => self.to_s)
-        roles = roles.where(:name => role_name) if role_name && (role_name != :any)
+        roles = roles.where(:name => role_name.to_s) if role_name && (role_name != :any)
         roles
       end
 
       def with_role(role_name, user = nil)
+        if role_name.is_a? Array
+          role_name.map!(&:to_s)
+        else
+          role_name = role_name.to_s
+        end
         resources = self.adapter.resources_find(self.role_table_name, self, role_name)
         user ? self.adapter.in(resources, user, role_name) : resources
       end

data/lib/rolify/role.rb

@@ -52,7 +52,7 @@ module Rolify
     end
 
     def remove_role(role_name, resource = nil)
-      self.class.adapter.remove(self, role_name, resource)
+      self.class.adapter.remove(self, role_name.to_s, resource)
     end
     
     alias_method :revoke, :remove_role
@@ -84,4 +84,4 @@ module Rolify
       end
     end
   end
-end
+end

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "3.3.0.rc1"
+  VERSION = "3.3.0.rc2"
 end

data/rolify.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails", ">= 2.0"
   s.add_development_dependency "mongoid-rspec", ">= 1.5"
   s.add_development_dependency "bundler" 
+  s.add_development_dependency "fuubar"
 end

data/spec/generators/rolify/role/role_generator_spec.rb

@@ -74,7 +74,7 @@ describe Rolify::Generators::RoleGenerator do
       subject { file('config/initializers/rolify.rb') }
       
       it { should exist }
-      it { should contain "Rolify.configure do |config|"}
+      it { should contain "Rolify.configure(\"AdminRole\") do |config|"}
       it { should contain "# config.use_dynamic_shortcuts" }
       it { should contain "# config.use_mongoid" }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc1
+  version: 3.3.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -171,6 +171,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Very simple Roles library without any authorization enforcement supporting
   scope on resource objects (instance or class). Supports ActiveRecord and Mongoid
   ORMs.