consul 0.5.0 → 0.6.0

data/lib/consul/power.rb

@@ -35,8 +35,20 @@ module Consul
       include?(*args) or raise Consul::Powerless.new("No power to #{args.inspect}")
     end
 
+    def for_record(*args)
+      adjective, record = Util.adjective_and_argument(*args)
+      for_model(adjective, record.class)
+    end
+
+    def 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 boolean_or_nil?(value)
       [TrueClass, FalseClass, NilClass].include?(value.class)
     end
@@ -66,6 +78,24 @@ module Consul
         self.current = old_power
       end
 
+      def for_model(*args)
+        if current
+          current.for_model(*args)
+        else
+          adjective, model = Util.adjective_and_argument(*args)
+          model
+        end
+      end
+
+      def for_record(*args)
+        if current
+          current.for_record(*args)
+        else
+          adjective, record = Util.adjective_and_argument(*args)
+          record.class
+        end
+      end
+
       private
 
       def define_power(name, &block)

data/lib/consul/util.rb

@@ -34,6 +34,17 @@ module Consul
       end
     end
 
+    def adjective_and_argument(*args)
+      if args.size > 1
+        adjective = args[0]
+        record = args[1]
+      else
+        adjective = nil
+        record = args[0]
+      end
+      [adjective, record]
+    end
+
   end
 end
 

data/lib/consul/version.rb

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

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

@@ -0,0 +1,3 @@
+class Deal
+
+end

data/spec/shared/app_root/app/models/deal/item.rb

@@ -0,0 +1,3 @@
+class Deal::Item
+
+end

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

@@ -73,6 +73,15 @@ class Power
     Song.recent
   end
 
+  power :deals do
+    'deals'
+  end
+
+  power :updatable_deals do
+    'updatable_deals'
+  end
+
+
   private
 
   attr_accessor :user

data/spec/shared/consul/controllers/util_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Consul::Util do
+
+  describe '.adjective_and_argument' do
+
+    it 'should return [nil, argument] if given a single argument' do
+      Consul::Util.adjective_and_argument(Deal).should == [nil, Deal]
+    end
+
+    it 'should return [adjective, argument] if given an adjective and an argument' do
+      Consul::Util.adjective_and_argument('updatable', Deal).should == ['updatable', Deal]
+    end
+
+  end
+
+end

data/spec/shared/consul/power_spec.rb

@@ -403,7 +403,7 @@ describe Consul::Power do
         spy.observe(Power.current)
       end
       Power.current.should == 'outer power'
-      Power.current = nil # clean up for subsequent specs -- to bad we can't use .with_power :)
+      Power.current = nil # clean up for subsequent specs -- too bad we can't use .with_power :)
     end
 
     it 'should restore an existing power even if the block raises an error' do
@@ -417,6 +417,7 @@ describe Consul::Power do
         # do nothing
       end
       Power.current.should == 'outer power'
+      Power.current = nil # clean up for subsequent specs -- too bad we can't use .with_power :)
     end
 
     it 'should call instantiate a new Power if the given argument is not already a power' do
@@ -430,4 +431,92 @@ describe Consul::Power do
 
   end
 
+  describe '#for_model' do
+
+    it 'should return the power corresponding to the given model' do
+      @user.power.for_model(Deal).should == 'deals'
+    end
+
+    it 'should return the correct power for a namespaced model' do
+      @user.power.for_model(Deal::Item).should == 'deal_items'
+    end
+
+    it 'should allow to prefix the power with an adjective' do
+      @user.power.for_model(:updatable, Deal).should == 'updatable_deals'
+    end
+
+  end
+
+  describe '.for_model' 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'
+        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'
+        end
+      end
+
+    end
+
+    context 'when Power.current is nil' do
+
+      it 'should return the given model' do
+        Power.for_model(Deal).should == Deal
+      end
+
+      it 'should return the given model even if the model was prefixed with an adjective' do
+        Power.for_model(:updatable, Deal).should == Deal
+      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'
+    end
+
+  end
+
+  describe '.for_record' 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'
+        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'
+        end
+      end
+
+    end
+
+    context 'when Power.current is nil' do
+
+      it 'should return the given model' 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
+        Power.for_record(:updatable, Deal.new).should == Deal
+      end
+
+    end
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: consul
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-14 00:00:00 +01:00
+date: 2013-01-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,6 +130,8 @@ files:
 - spec/shared/app_root/app/controllers/songs_controller.rb
 - spec/shared/app_root/app/controllers/users_controller.rb
 - spec/shared/app_root/app/models/client.rb
+- spec/shared/app_root/app/models/deal.rb
+- spec/shared/app_root/app/models/deal/item.rb
 - spec/shared/app_root/app/models/note.rb
 - spec/shared/app_root/app/models/power.rb
 - spec/shared/app_root/app/models/song.rb
@@ -144,6 +146,7 @@ files:
 - spec/shared/consul/controllers/risks_controller_spec.rb
 - spec/shared/consul/controllers/songs_controller_spec.rb
 - spec/shared/consul/controllers/users_controller_spec.rb
+- spec/shared/consul/controllers/util_spec.rb
 - spec/shared/consul/power_spec.rb
 has_rdoc: true
 homepage: https://github.com/makandra/consul