authorize 0.0.4 → 1.0.0

data/Gemfile

@@ -1,5 +1,3 @@
 source "http://rubygems.org"
 
-gemspec
-
-gem 'rake', '~> 0.8.7'
+gemspec

data/Rakefile

@@ -1,8 +1,11 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'bundler'
 
+# Silence warning from recent versions of bundler (1.0.12) for forward compatibility with rake > v0.9.0
+include Rake::DSL if defined? ::Rake::DSL
+
 Bundler::GemHelper.install_tasks
 
 desc 'Default: run unit tests.'

data/authorize.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency('mocha', '~>0.9')
   s.add_development_dependency('sqlite3', '~>1.3')
   s.add_development_dependency('rails', '~>2.3.5')
+  s.add_development_dependency('rake', '~>0.8.7')
+  s.add_development_dependency('rdoc')
   s.add_dependency('redis', '~>2.1')
   s.add_dependency('activerecord', '~>2.3.5')
   s.add_dependency('actionpack', '~>2.3.5')

data/lib/authorize/active_record.rb

@@ -5,12 +5,12 @@ module Authorize
     end
 
     module ClassMethods
-      def authorizable_trustee
+      def authorizable_trustee(options = {})
         include Authorize::Trustee
         # The "identity" role -the single role that represents this trustee.  It is also the root vertex for collecting
         # the set of roles belonging to the trustee.
         has_one :role, :class_name => "Authorize::Role", :as => :resource, :conditions => {:relation => nil}, :dependent => :destroy
-        after_create {|trustee| trustee.create_role(:name => to_s)}
+        after_create {|trustee| trustee.create_role(:name => options[:name] || trustee.to_s)}
       end
 
       def authorizable_resource
@@ -37,4 +37,4 @@ module Authorize
       end
     end
   end
-end
+end

data/lib/authorize/role.rb

@@ -81,7 +81,7 @@ class Authorize::Role < ActiveRecord::Base
   end
 
   def to_s
-    (name || "%s") % resource rescue "!! INVALID ROLE NAME !!"
+    (name || "%s") % [relation, resource].compact.join(":") rescue "!! INVALID ROLE NAME !!"
   end
 
   def vertex
@@ -112,4 +112,4 @@ class Authorize::Role < ActiveRecord::Base
   def reverse_traverser
     @reverse_traverser ||= Authorize::Graph::DirectedAcyclicGraphReverseTraverser.traverse(vertex)
   end
-end
+end

data/lib/authorize/version.rb

@@ -1,3 +1,3 @@
 module Authorize
-  VERSION = "0.0.4"
+  VERSION = "1.0.0"
 end

metadata

@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
   hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors: 
 - Chris Hapgood
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 Z
+date: 2012-06-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mocha
@@ -64,9 +64,39 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: redis
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,11 +107,11 @@ dependencies:
         - 1
         version: "2.1"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,11 +123,11 @@ dependencies:
         - 5
         version: 2.3.5
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,7 +139,7 @@ dependencies:
         - 5
         version: 2.3.5
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id008
 description: Authorize implements a full-blown Role-based Access Control (RBAC) system for Ruby on Rails
 email: 
 - cch1@hapgoods.com