platanus 0.0.30 → 0.0.31

data/lib/platanus/canned2.rb

@@ -94,19 +94,78 @@ module Platanus
     # TODO: example
     class Profile
 
-      attr_reader :rules
-      attr_reader :def_matcher
-      attr_reader :def_resource
+      def is_avaliable()
+        return @shared.all? do |rule|
+          rule_ctx = RuleContext.new _ctx, _tests, @def_matcher, @def_resource
+          rule_ctx.instance_eval(&rule)
+          rule_ctx.passed?
+        end
+      end
+
+      def is_forbidden()
+        # TODO: local forbids
+      end
+
+      def is_allowed()
+      end
+
+      def
+
+      def allowance_for(_ctx, _action, _tests)
+
+        # all shared rules must pass
+        return :not_applicable unless @shared.all? do |rule|
+          rule_ctx = RuleContext.new _ctx, _tests, @def_matcher, @def_resource
+          rule_ctx.instance_eval(&rule)
+          rule_ctx.passed?
+        end
+
+        # TODO: local forbids
+
+        # process base profile
+        unless @base.nil?
+          result = @base.process _ctx, _action, _tests
+          return result if result == :not_applicable or result == :forbidden
+          matches << resu
+        end
+
+        # process subprofiles
+        if @isolated.each do |profile|
+          result = profile.process _ctx, _action, _tests
+          return :forbidden if result == :forbidden
+          result = :allowed if result == :allowed
+        end
+
+        # see if any of the registered rules pass
+        return :allowed if @rules[_action].any? do |rule|
+          rule_ctx = RuleContext.new _ctx, _tests, @def_matcher, @def_resource
+          rule_ctx.instance_eval(&rule)
+          rule_ctx.passed?
+        end
+
+        return :not_allowed
+      end
 
       # The initializer takes another profile as rules base.
-      def initialize(_base, _def_matcher, _def_resource)
+      def initialize(_def_matcher, _def_resource, _base=nil)
+        @base = _base
         @rules = Hash.new { |h, k| h[k] = [] }
-        _base.rules.each { |k, tests| @rules[k] = tests.clone } unless _base.nil?
+        @isolated = []
+        @shared = []
+
         raise Error.new 'Must provide a default test' if _def_matcher.nil?
         @def_matcher = _def_matcher
         @def_resource = _def_resource
       end
 
+      def always(_upon=nil, &_block)
+        @shared << (_upon || _block)
+      end
+
+      def isolate(_options={}, &_block)
+        @isolated << Profile.new _options.fetch(, @def_matcher), _options.fetch(, @def_resource)
+      end
+
       ## Adds an "allowance" rule
       def allow(_action, _upon=nil, &_block)
         @rules[_action] << (_upon || _block)
@@ -117,11 +176,6 @@ module Platanus
         # TODO
       end
 
-      ## Clear all rules related to an action
-      def clear(_action)
-        @rules[_action] = []
-      end
-
       ## SHORT HAND METHODS
 
       def upon(_expr=nil, &_block)
@@ -195,6 +249,16 @@ module Platanus
         @def_matcher = _def_matcher
       end
 
+      ## Test whether the current action matches a list of actions
+      def action_is(*_actions)
+        _actions.any? { |a| a.to_s == @ctx.action_name }
+      end
+
+      ## Test whether the current action is no in list of actions
+      def action_is_not(*_actions)
+        !_actions.any? { |a| a.to_s == @ctx.action_name }
+      end
+
       ## Tests for a match between one of the request's parameters and a resource expression.
       #
       # **IMPORTANT** if no resource is provided the current controller instance is used instead.

data/lib/platanus/serializers/json_sym.rb

@@ -5,7 +5,7 @@
 class JSONSym
 
   def self.load(_str)
-    return nil if _str.nil?
+    return nil if _str.nil? or str == "null"
     MultiJson.load(_str, symbolize_keys: true)
   end
 

data/lib/platanus/version.rb

@@ -1,3 +1,3 @@
 module Platanus
-  VERSION = "0.0.30" # 0.1 will come with tests!
+  VERSION = "0.0.31" # 0.1 will come with tests!
 end

data/spec/canned2_spec.rb

@@ -17,10 +17,12 @@ describe Platanus::Canned2 do
   class DummyCtx
 
     attr_reader :params
+    attr_reader :action_name
     attr_reader :current_user
 
-    def initialize(_user, _params={})
+    def initialize(_user, _action_name=nil, _params={})
       @current_user = _user
+      @action_name = _action_name
       @params = _params
     end
   end
@@ -40,6 +42,7 @@ describe Platanus::Canned2 do
       allow 'rute1#action3', upon { same(:char1, key: "current_user.char1") }
       allow 'rute1#action4', upon(:current_user) { same(:param2, key: "char2") and checks(:test1) }
       allow 'rute1#action5', upon(:current_user) { passes { current_user.char2 == params[:param2] } }
+      allow 'rute2', upon(:current_user) { same(:char1) and action_is_not(:create) }
 
       # Complex routes
       allow 'rute1#action5' do
@@ -49,8 +52,8 @@ describe Platanus::Canned2 do
     end
   end
 
-  let(:good_ctx) { DummyCtx.new(DummyUsr.new(10, "200"), char1: '10', param2: '200') }
-  let(:bad_ctx) { DummyCtx.new(DummyUsr.new(10, 30), char1: '10', param2: '200') }
+  let(:good_ctx) { DummyCtx.new(DummyUsr.new(10, "200"), 'create', char1: '10', param2: '200') }
+  let(:bad_ctx) { DummyCtx.new(DummyUsr.new(10, 30), 'create', char1: '10', param2: '200') }
 
   describe "._run" do
     context 'when using single context rules' do
@@ -73,6 +76,9 @@ describe Platanus::Canned2 do
       it "does authorize on rute with context and inline test" do
         Roles.can?(good_ctx, :user, 'rute1#action5').should be_true
       end
+      it "does not authorize on rute with context, match and action_is_not" do
+        Roles.can?(good_ctx, :user, 'rute2').should be_false
+      end
     end
 
     context 'when using multiple context rules' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: platanus
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json