consul 0.6.0 → 0.6.1

data/lib/consul/power.rb

@@ -35,19 +35,44 @@ module Consul
       include?(*args) or raise Consul::Powerless.new("No power to #{args.inspect}")
     end
 
+    def name_for_record(*args)
+      adjective, record = Util.adjective_and_argument(*args)
+      name_for_model(adjective, record.class)
+    end
+
     def for_record(*args)
+      send(name_for_record(*args))
+    end
+
+    def include_record?(*args)
       adjective, record = Util.adjective_and_argument(*args)
-      for_model(adjective, record.class)
+      include?(name_for_record(*args), record)
     end
 
-    def for_model(*args)
+    def include_record!(*args)
+      adjective, record = Util.adjective_and_argument(*args)
+      include!(name_for_record(*args), record)
+    end
+
+    def name_for_model(*args)
       adjective, model_class = Util.adjective_and_argument(*args)
       collection_name = model_class.name.underscore.gsub('/', '_').pluralize
       [adjective, collection_name].select(&:present?).join('_')
     end
 
-    private
+    def for_model(*args)
+      send(name_for_model(*args))
+    end
 
+    def include_model?(*args)
+      include?(name_for_model(*args))
+    end
+
+    def include_model!(*args)
+      include!(name_for_model(*args))
+    end
+
+    private
 
     def boolean_or_nil?(value)
       [TrueClass, FalseClass, NilClass].include?(value.class)
@@ -87,6 +112,22 @@ module Consul
         end
       end
 
+      def include_model?(*args)
+        if current
+          current.include_model?(*args)
+        else
+          true
+        end
+      end
+
+      def include_model!(*args)
+        if current
+          current.include_model!(*args)
+        else
+          true
+        end
+      end
+
       def for_record(*args)
         if current
           current.for_record(*args)
@@ -96,6 +137,22 @@ module Consul
         end
       end
 
+      def include_record?(*args)
+        if current
+          current.include_record?(*args)
+        else
+          true
+        end
+      end
+
+      def include_record!(*args)
+        if current
+          current.include_record!(*args)
+        else
+          true
+        end
+      end
+
       private
 
       def define_power(name, &block)

data/lib/consul/version.rb

@@ -1,3 +1,3 @@
 module Consul
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/spec/shared/app_root/app/models/power.rb

@@ -74,13 +74,16 @@ class Power
   end
 
   power :deals do
-    'deals'
+    'deals power' unless guest?
   end
 
   power :updatable_deals do
-    'updatable_deals'
+    'updatable_deals power' unless guest?
   end
 
+  power :deal_items do
+    'deal_items power'
+  end
 
   private
 

data/spec/shared/consul/power_spec.rb

@@ -434,15 +434,15 @@ describe Consul::Power do
   describe '#for_model' do
 
     it 'should return the power corresponding to the given model' do
-      @user.power.for_model(Deal).should == 'deals'
+      @user.power.for_model(Deal).should == 'deals power'
     end
 
     it 'should return the correct power for a namespaced model' do
-      @user.power.for_model(Deal::Item).should == 'deal_items'
+      @user.power.for_model(Deal::Item).should == 'deal_items power'
     end
 
     it 'should allow to prefix the power with an adjective' do
-      @user.power.for_model(:updatable, Deal).should == 'updatable_deals'
+      @user.power.for_model(:updatable, Deal).should == 'updatable_deals power'
     end
 
   end
@@ -452,14 +452,14 @@ describe Consul::Power do
     context 'when Power.current is present' do
 
       it 'should return the power corresponding to the given model' do
-        Power.with_power(Power.new) do
-          Power.for_model(Deal).should == 'deals'
+        Power.with_power(@user.power) do
+          Power.for_model(Deal).should == 'deals power'
         end
       end
 
       it 'should allow to prefix the power with an adjective' do
-        Power.with_power(Power.new) do
-          Power.for_model(:updatable, Deal).should == 'updatable_deals'
+        Power.with_power(@user.power) do
+          Power.for_model(:updatable, Deal).should == 'updatable_deals power'
         end
       end
 
@@ -479,10 +479,45 @@ describe Consul::Power do
 
   end
 
+  describe '#include_model?' do
+
+    it 'should return if the given model corresponds to a non-nil power' do
+      @user.role = 'guest'
+      @user.power.include_model?(Client).should be_false
+      @user.role = 'admin'
+      @user.power.include_model?(Client).should be_true
+    end
+
+  end
+
+  describe '.include_model?' do
+
+    context 'when Power.current is present' do
+
+      it 'should return whether the given model corresponds to a non-nil power' do
+        Power.with_power(@user.power) do
+          @user.role = 'guest'
+          Power.include_model?(Deal).should be_false
+          @user.role = 'admin'
+          Power.include_model?(Deal).should be_true
+        end
+      end
+    end
+
+    context 'when Power.current is nil' do
+
+      it 'should return true' do
+        Power.include_model?(Deal).should be_true
+      end
+
+    end
+
+  end
+
   describe '#for_record' do
 
     it 'should return the power corresponding to the class of the given record' do
-      @user.power.for_record(Deal.new).should == 'deals'
+      @user.power.for_record(Deal.new).should == 'deals power'
     end
 
   end
@@ -492,14 +527,14 @@ describe Consul::Power do
     context 'when Power.current is present' do
 
       it 'should return the power corresponding to the class of the given record' do
-        Power.with_power(Power.new) do
-          Power.for_record(Deal.new).should == 'deals'
+        Power.with_power(@user.power) do
+          Power.for_record(Deal.new).should == 'deals power'
         end
       end
 
       it 'should allow to prefix the power with an adjective' do
-        Power.with_power(Power.new) do
-          Power.for_record(:updatable, Deal.new).should == 'updatable_deals'
+        Power.with_power(@user.power) do
+          Power.for_record(:updatable, Deal.new).should == 'updatable_deals power'
         end
       end
 
@@ -507,11 +542,11 @@ describe Consul::Power do
 
     context 'when Power.current is nil' do
 
-      it 'should return the given model' do
+      it 'should return true' do
         Power.for_record(Deal.new).should == Deal
       end
 
-      it 'should return the given model even if the model was prefixed with an adjective' do
+      it 'should return true even if the model was prefixed with an adjective' do
         Power.for_record(:updatable, Deal.new).should == Deal
       end
 
@@ -519,4 +554,36 @@ describe Consul::Power do
 
   end
 
+  describe '#include_record?' do
+
+    it 'should return if the given record is included in the power corresponding to the class of the given record' do
+      @user.power.include_record?(@deleted_client).should be_false
+      @user.power.include_record?(@client1).should be_true
+    end
+
+  end
+
+  describe '.include_record?' do
+
+    context 'when Power.current is present' do
+
+      it 'should return whether the given record is included in the the power corresponding to the class of the given record' do
+        Power.with_power(@user.power) do
+          Power.include_record?(@deleted_client).should be_false
+          Power.include_record?(@client1).should be_true
+        end
+      end
+    end
+
+    context 'when Power.current is nil' do
+
+      it 'should return true' do
+        Power.include_record?(Deal.new).should be_true
+      end
+
+    end
+
+  end
+
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: consul
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-15 00:00:00 +01:00
+date: 2013-01-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency