reuser 0.2.2 → 1.0.0

data/Rakefile

@@ -16,9 +16,9 @@ end
 desc 'make (build and install the gem from gemspec)'
 task :make => [:build, :install]
 
-desc 'run all the specs in the `spec/` directory.'
-task :spec do
-  Dir.glob('./spec/reuser/**/*.rb').each do |file|
-    sh "rspec #{file}"
-  end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--color'
 end
+
+task :default => :spec

data/lib/reuser/reuser.rb

@@ -6,7 +6,6 @@ module ReUser
   instance_eval do
     def included(subclass)
       subclass.instance_eval do
-        @@roles = {}
         def roles(&block)
           @@roles ||= {}
           yield if block
@@ -23,35 +22,23 @@ module ReUser
           end
           role_name
         end
-
-        def default(name = nil)
-          if name
-            @@roles[:default] = @@roles[name]
-          else
-            @@roles[:default]
-          end
-        end
       end
       subclass.class_eval do
 
-        def role?(name)
-          @role == self.class.role(name)
-        end
-
-        def can?(name)
-          !!@role.can?(name)
+        def can?(action)
+          !!@role.can?(action)
         end
 
-        def cant?(name)
-          !@role.can?(name)
+        def cant?(action)
+          !@role.can?(action)
         end
 
-        def could?(name, obj)
-          @role.could?(name, obj)
+        def could?(action, obj)
+          !!@role.could?(action, obj)
         end
 
-        def couldnt?(name, obj)
-          !@role.could?(name, obj)
+        def couldnt?(action, obj)
+          !@role.could?(action, obj)
         end
       end
     end

data/lib/reuser/role.rb

@@ -2,16 +2,13 @@ require_relative('../reuser')
 
 module ReUser
   class Role
-    attr_reader :actions
-
     def initialize(name)
+      @name = name
       @actions = {}
     end
 
     def can(*names)
-      names.each do |name|
-        action(name)
-      end
+      actions(*names)
     end
 
     def can?(name)
@@ -25,7 +22,13 @@ module ReUser
     end
 
     def could?(name, data)
-      @actions[name] == Proc ? @actions[name].call(data) : true
+      if actions[name]
+        if actions[name].is_a?(Proc)
+          actions[name].call(data)
+        else
+          true
+        end
+      end
     end
 
     private

data/spec/reuser/{reuser.rb → reuser_spec.rb}

@@ -1,36 +1,4 @@
-require 'rspec'
-require 'pry'
-require_relative '../reuser'
-
-class TestReUser
-  include ReUser
-
-  roles do
-    role(:admin).can(:read, :write, :execute)
-    role(:user) do |usr|
-      usr.can :read
-
-      usr.could :execute, :read do |obj|
-        obj == 1
-      end
-    end
-    role :writer, :write
-    role :sysadmin, [:write, :execute]
-    default(:user)
-  end
-
-  def initialize(name = :default)
-    @role = TestReUser.role(name)
-  end
-end
-REUSER_METHODS = [:roles,
-                  :role,
-                  :role?,
-                  :default,
-                  :can?,
-                  :cant?,
-                  :could?,
-                  :couldnt?].sort
+require_relative 'test_reuser'
 
 describe TestReUser do
   context "has included the ReUser module" do
@@ -46,9 +14,9 @@ describe TestReUser do
 
     context "has defined the :admin and :user roles," do
       context "is instantiated as test_ru" do
-        context "set :user to the default" do
+        context "with role :user" do
           before do
-            @test_ru = TestReUser.new
+            @test_ru = TestReUser.new(:user)
           end
           context " using the default role" do
             it "should not be able to write" do

data/spec/reuser/test_reuser.rb

@@ -0,0 +1,22 @@
+require_relative '../reuser'
+
+class TestReUser
+  include ReUser
+
+  roles do
+    role(:admin).can(:read, :write, :execute)
+    role(:user) do |usr|
+      usr.can :read
+
+      usr.could :execute do |obj|
+        obj == 1
+      end
+    end
+    role :writer, :write
+    role :sysadmin, [:write, :execute]
+  end
+
+  def initialize(name)
+    @role = TestReUser.role(name)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reuser
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-17 00:00:00.000000000Z
+date: 2011-12-25 00:00:00.000000000 Z
 dependencies: []
 description: ReUse is an Internal DSL for Ruby to create roles and manage actions.
 email: isaacsanders@gmail.com
@@ -23,7 +23,8 @@ files:
 - Rakefile
 - README.md
 - spec/reuser.rb
-- spec/reuser/reuser.rb
+- spec/reuser/test_reuser.rb
+- spec/reuser/reuser_spec.rb
 homepage: http://isaacsanders.github.com/reuser
 licenses: []
 post_install_message: 
@@ -44,10 +45,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: An internal DSL for Ruby to make user role management simple.
 test_files:
 - spec/reuser.rb
-- spec/reuser/reuser.rb
+- spec/reuser/test_reuser.rb
+- spec/reuser/reuser_spec.rb