trust 0.7.0 → 0.8.0

data/test/unit/trust/controller/resource_test.rb

@@ -70,6 +70,21 @@ class Trust::Controller::ResourceTest < ActiveSupport::TestCase
       should 'resolve parameter' do
         assert_equal 'cool', @res.params
       end
+      context 'collection' do
+        should 'return array where parent represented' do
+          parent = stub('parent', :object => 12)
+          @res.expects(:association_name).with(parent).returns(15)
+          assert_equal [12, 15], @res.collection(parent)
+        end
+        should 'return class where no parent' do
+          assert_equal NameSpacedResource::MyEntity, @res.collection(nil)
+        end
+        should 'return with instance if present' do
+          parent = stub('parent', :object => 12)
+          @res.expects(:association_name).never
+          assert_equal [12, 15], @res.collection(parent, 15)
+        end
+      end
     end
 
     context 'Irregular Instance' do
@@ -216,34 +231,34 @@ class Trust::Controller::ResourceTest < ActiveSupport::TestCase
       setup do
         Trust::Controller::Resource.any_instance.expects(:extract_resource_info).with('child', {}).returns(@resource_info)
         Trust::Controller::Resource.any_instance.expects(:extract_parent_info).with({:parent => nil}, {}, @request).returns(@parent_info)
-      end
-      should 'instantiate properly' do      
         @resource = Trust::Controller::Resource.new(@controller, @properties, 'new',{}, @request)      
       end
       should 'discover variable names' do
-        @resource = Trust::Controller::Resource.new(@controller, @properties, 'new',{}, @request)
         @resource_info.expects(:plural_name).returns(:children)
         assert_equal :child, @resource.send(:instance_name)
         assert_equal :parent, @resource.send(:parent_name)
         assert_equal :children, @resource.send(:plural_instance_name)
       end
       should 'have access to instances' do
-        @resource = Trust::Controller::Resource.new(@controller, @properties, 'new',{}, @request)
         @resource.expects(:plural_instance_name).twice.returns(:children)
         @resource.instances = [1]
         assert_equal [1], @resource.instances
         assert_equal [1], @controller.instance_variable_get(:@children)
       end
       should 'have access to instantiated' do
-        @resource = Trust::Controller::Resource.new(@controller, @properties, 'new',{}, @request)
         @resource.expects(:instances).returns(1)
         assert_equal 1, @resource.instantiated
         @resource.expects(:instances).returns(nil)
         @resource.expects(:instance).returns(2)
         assert_equal 2, @resource.instantiated
       end
+      should 'provide collection' do
+        @resource_info.expects(:collection).with(@parent_info, nil).returns(1)
+        assert_equal 1, @resource.collection
+        @resource_info.expects(:collection).with(@parent_info, 2).returns(3)
+        assert_equal 3, @resource.collection(2)
+      end
       should 'load as expected' do
-        @resource = Trust::Controller::Resource.new(@controller, @properties, 'new',{}, @request)      
         @resource_info.stubs(:params).returns({})
         @controller.expects(:respond_to?).with(:build).returns(false)
         @resource.load

data/test/unit/trust/permissions_test.rb

@@ -254,5 +254,56 @@ class Trust::PermissionsTest < ActiveSupport::TestCase
       expect = {:tester => [[:hi, {:if=>:ho}], [:wink, {}], [:hi, {:if=>:ha}]]}
       assert_equal expect, TestOverride.permissions
     end
+    
+    context 'with cannot' do
+      should  'not accept options' do
+        class TestCannnotArgumentError < Trust::Permissions
+        end
+        assert_raises ArgumentError do
+          TestCannnotArgumentError.cannot :do, :options => true
+        end
+      end
+      should 'revoke permissions' do
+        class TestBaseAuth3 < Trust::Permissions
+          role :tester, :friend do
+            can :hi, :if => :ho
+            can :wink
+          end
+        end
+        expect = {:tester => [[:hi, {:if => :ho}],[:wink, {}]], :friend => [[:hi, {:if => :ho}],[:wink, {}]]}
+        assert_equal expect, TestBaseAuth3.permissions
+        class TestCannot < TestBaseAuth3
+          role :tester, cannot(:wink)
+          role :friend do
+            cannot :hi
+          end
+        end
+        expect = {:tester => [[:hi, {:if => :ho}]], :friend => [[:wink, {}]]}
+        assert_equal expect, TestCannot.permissions
+      end
+    end
+    context 'with enforce' do
+      should 'override previous cans' do
+        class TestBaseAuth4 < Trust::Permissions
+          role :tester, :friend do
+            can :hi, :if => :ho
+            can :wink
+          end
+        end
+        expect = {:tester => [[:hi, {:if => :ho}],[:wink, {}]], :friend => [[:hi, {:if => :ho}],[:wink, {}]]}
+        assert_equal expect, TestBaseAuth4.permissions
+        class TestEnforce < TestBaseAuth4
+          role :tester, can(:wink, :enforce => true, :if => :yo)
+          role :friend do
+            can :hi, :enforce => true, :if => :sure
+          end
+        end
+        expect = {:tester => [[:hi, {:if => :ho}],[:wink, {:if => :yo}]], :friend => [[:wink, {}],[:hi, {:if => :sure}]]}
+        assert_equal expect, TestEnforce.permissions
+        # Parent permissions should not be affected
+        expect = {:tester => [[:hi, {:if => :ho}],[:wink, {}]], :friend => [[:hi, {:if => :ho}],[:wink, {}]]}
+        assert_equal expect, TestBaseAuth4.permissions
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trust
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3498159881798664050
+      hash: 608733387918017970
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3498159881798664050
+      hash: 608733387918017970
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24