cannie 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4ec59a6c5ecf6c0e7307ea41c381cdca880956
-  data.tar.gz: 666cb9f5b763b66abd5ba9e8e8c5404933e4a940
+  metadata.gz: 5c13f08328b1aaa79398982b6005e90cf997d4c0
+  data.tar.gz: 8f3faaa516d773988f4d7a4f381f418f903da6c3
 SHA512:
-  metadata.gz: bb8863ea60b52ac207da478b9f890001f3d3525620a0f46971f21135d66fbef5182a315b73ea5ec66554f06a6ebb1aac8aeeebf4c9878e806f62aa9f62533e3f
-  data.tar.gz: 4832f762eaa2a38592721dce60f27390464055ac5b5e8a5a8123fc4f9cd3407249aa526e90d03c6f9380aeeb2f521b4ba9aa0c72b21e0f2c5519242f7e1810b8
+  metadata.gz: 75f7491acb62968bdcd8bd82d1ab88d5a7a0a544376ab87b6d4d7875c86f944c3588cf04fcde21a7a2956a9a9dc4e6ec270fc3fb7ee5777f30076c2917db08db
+  data.tar.gz: fff01d347bc693e53c2b2ccba2df544f7b3257512cc8e64b67a6f5d0db7417ebf76ae8d3e925d17300d83b4bd842f3a29b4a2b46ade17eaf68b54d6c95be51e5

data/README.md

@@ -63,6 +63,14 @@ or
 
     allow :index, on: :posts, unless: ->{ user.guest? }
 
+or
+
+    allow :index, on: :posts, if: &:admin?
+
+or
+
+    allow :index, on: :posts, unless: &:admin?
+
 These conditions are executed in context of `Permissions` object and its possible to use `user` method to access user that was passed to `Permissions::initialize`.
 
 ### Checking permissions

data/lib/cannie/rule.rb

@@ -14,11 +14,19 @@ module Cannie
     attr_reader :_if, :_unless
 
     def if?(permissions)
-      _if ? permissions.instance_exec(&_if) : true
+      _if ? exec_condition(_if, permissions) : true
     end
 
     def unless?(permissions)
-      _unless ? !permissions.instance_exec(&_unless) : true
+      _unless ? !exec_condition(_unless, permissions) : true
+    end
+
+    def exec_condition(condition, context)
+      if condition.is_a?(Symbol)
+        context.instance_eval(&condition)
+      else
+        context.instance_exec(&condition)
+      end
     end
   end
-end
+end

data/lib/cannie/version.rb

@@ -1,3 +1,3 @@
 module Cannie
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/cannie/rule_spec.rb

@@ -42,7 +42,17 @@ describe Cannie::Rule do
 
     it 'returns false if passed if-condition evaluated in scope of passed argument return false' do
       rule = described_class.new(:index, 'entries', if: -> { admin? })
-      expect(rule.applies_to?(permissions.new())).to be_false
+      expect(rule.applies_to?(permissions.new)).to be_false
+    end
+
+    it 'evaluates if-condition specified as symbol' do
+      rule = described_class.new(:index, 'entries', if: :admin?)
+      expect(rule.applies_to?(permissions.new(true))).to be_true
+    end
+
+    it 'evaluates if-condition specified as proc' do
+      rule = described_class.new(:index, 'entries', if: proc { admin? })
+      expect(rule.applies_to?(permissions.new(true))).to be_true
     end
 
     it 'returns true if passed unless-condition evaluated in scope of passed argument return false' do
@@ -55,9 +65,19 @@ describe Cannie::Rule do
       expect(rule.applies_to?(permissions.new(true))).to be_false
     end
 
+    it 'evaluates unless-condition specified as symbol' do
+      rule = described_class.new(:index, 'entries', unless: :admin?)
+      expect(rule.applies_to?(permissions.new(false))).to be_true
+    end
+
+    it 'evaluates unless-condition specified as proc' do
+      rule = described_class.new(:index, 'entries', unless: proc { admin? })
+      expect(rule.applies_to?(permissions.new(false))).to be_true
+    end
+
     it 'returns true if all conditions returned true' do
       rule = described_class.new(:index, 'entries', if: -> { admin? }, unless: -> { guest? })
       expect(rule.applies_to?(permissions.new(true))).to be_true
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cannie
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - hck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler