reuser 3.0.0 → 3.1.0

data/lib/reuser/errors.rb

@@ -0,0 +1,12 @@
+module ReUser
+  class Error < StandardError; end
+  class RoleNotDefined < Error
+    def initialize(name)
+      @name = name
+    end
+
+    def message
+      "Role `#{@name}` is not defined"
+    end
+  end
+end

data/lib/reuser/role_definition.rb

@@ -0,0 +1,18 @@
+module ReUser
+  class RoleDefinition
+    def initialize(definition)
+      @roles = {}
+      instance_eval &definition
+    end
+
+    def roles
+      @roles
+    end
+
+    def role name, permissions=[], &block
+      role = ReUser::Role.new(name, permissions)
+      yield(role) if block_given?
+      @roles[name] = role
+    end
+  end
+end

data/lib/reuser/version.rb

@@ -1,6 +1,6 @@
 module ReUser
   MAJOR = 3
-  MINOR = 0
+  MINOR = 1
   PATCH = 0
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 end

data/lib/reuser.rb

@@ -1,41 +1,42 @@
-require "reuser/role"
+require 'reuser/role'
+require 'reuser/role_definition'
+require 'reuser/errors'
 
 module ReUser
-
-  def self.included klass
-
-    klass.instance_eval do
-      def roles &block
-        @@roles ||= {}
-        yield if block_given?
-        @@roles.freeze.keys
+  module ClassMethods
+    def roles &definition_block
+      if block_given?
+        definition = ReUser::RoleDefinition.new(definition_block)
+        @@roles = definition.roles
+      else
+        @@roles.keys
       end
+    end
 
-      def role name, permissions=[], &block
-        role = ( @@roles[name] ||= ReUser::Role.new(name, permissions) )
-        yield(role) if block_given?
-        role
-      end
+    def role(name)
+      @@roles.fetch(name.to_sym)
+    rescue ::IndexError
+      raise RoleNotDefined.new(name)
     end
   end
 
-  def permissions
-    self.class.role(self.role.to_sym).permissions
+  def self.included(base)
+    base.extend ReUser::ClassMethods
   end
 
   def can? permission
-    self.class.role(self.role.to_sym).can? permission
+    self.class.role(self.role).can? permission
   end
 
   def cant? permission
-    !(can? permission)
+    !can?(permission)
   end
 
   def could? permission, block_args
-    self.class.role(self.role.to_sym).could? permission, block_args
+    self.class.role(self.role).could? permission, block_args
   end
 
   def couldnt? permission, block_args
-    !(could? permission, block_args)
+    !could?(permission, block_args)
   end
 end

data/spec/reuser/class_spec.rb

@@ -32,10 +32,6 @@ describe "Classes including ReUser" do
       lambda { subject.role(:admin) }.should_not raise_error
     end
 
-    it "takes a symbol, and an optional array" do
-      lambda { subject.role(:admin, [:read, :write]) }.should_not raise_error
-    end
-
     it "returns a ReUser::Role instance" do
       subject.role(:admin).should be_instance_of ReUser::Role
     end
@@ -54,7 +50,7 @@ describe "Classes including ReUser" do
             role(:admin)
           end
         end
-        lambda { subject.role(:user) }.should raise_error
+        lambda { subject.role(:user) }.should raise_error(ReUser::RoleNotDefined)
       end
     end
   end

data/spec/reuser/instances_spec.rb

@@ -29,12 +29,6 @@ describe "Instances of a Class including ReUser" do
     klass.role(:admin)
   end
 
-  describe '#permissions' do
-    it 'returns the array of permissions on the subject\'s role' do
-      subject.permissions.should =~ [:read, :write]
-    end
-  end
-
   specify "#can? is delegated to the ReUser::Role" do
     admin_role.should_receive :can?
     subject.can? :read

data/spec/reuser/role_definition_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe ReUser::RoleDefinition do
+  subject do
+    definition = proc do
+      role :foo
+    end
+
+    described_class.new definition
+  end
+
+  describe '#role' do
+    it "takes a symbol, and an optional array" do
+      puts subject
+      lambda { subject.role(:admin, [:read, :write]) }.should_not raise_error
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reuser
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies: []
 description: ReUse is an Internal DSL for Ruby to create roles and manage actions.
 email: isaac@isaacsanders.com
@@ -17,11 +17,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/reuser/errors.rb
 - lib/reuser/role.rb
+- lib/reuser/role_definition.rb
 - lib/reuser/version.rb
 - lib/reuser.rb
 - spec/reuser/class_spec.rb
 - spec/reuser/instances_spec.rb
+- spec/reuser/role_definition_spec.rb
 - spec/reuser/role_spec.rb
 - spec/spec_helper.rb
 homepage: http://isaacbfsanders.com/reuser
@@ -38,7 +41,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2919554755411533887
+      hash: -285099739461963091
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -54,5 +57,6 @@ summary: An internal DSL for Ruby to make user role management simple.
 test_files:
 - spec/reuser/class_spec.rb
 - spec/reuser/instances_spec.rb
+- spec/reuser/role_definition_spec.rb
 - spec/reuser/role_spec.rb
 - spec/spec_helper.rb