pebblebed 0.0.48 → 0.0.49

data/lib/pebblebed/security/role_schema.rb

@@ -73,14 +73,23 @@ module Pebblebed
               collected_roles << role
             end
           end
-          the_role.merge(:upgrades => begin
-              result = {}
-              (self.class.roles - collected_roles).each{|r|
-                result[:"#{r[:name]}"] = r[:requirements]
-              }
-              result
+          owned_capabilities = collected_roles.map{|c| c[:capabilities]}.flatten.compact.uniq
+          all_capabilities = self.class.roles.map{|r| r[:capabilities]}.flatten.compact.uniq
+          the_role.merge!(:upgrades => begin
+              upgraders = {}
+              all_capabilities.each do |c|
+                next if owned_capabilities.include?(c)
+                self.class.roles.select{|r| r[:capabilities].include?(c)}.each do |r|
+                  upgraders[c] ||=  []
+                  upgraders[c] << r[:requirements]
+                  upgraders[c].flatten!.uniq!
+                end
+              end
+              upgraders
             end
           )
+          the_role[:capabilities] = owned_capabilities
+          the_role
         end
       end
 

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.0.48"
+  VERSION = "0.0.49"
 end

data/spec/security/role_shema_spec.rb

@@ -15,7 +15,7 @@ describe Pebblebed::Security::RoleSchema do
   class CustomRoleSchema < Pebblebed::Security::RoleSchema
     role :guest, :capabilities => [], :requirements => []
     role :identified, :capabilities => [:kudo], :requirements => [:logged_in]
-    role :contributor, :capabilities => [:comment, :kudo], :requirements => [:logged_in, :verified_mobile]
+    role :contributor, :capabilities => [:comment], :requirements => [:logged_in, :verified_mobile]
 
     def check_logged_in
       return true if identity and identity['identity']
@@ -69,7 +69,7 @@ describe Pebblebed::Security::RoleSchema do
     end
 
     it "has the correct roles defined" do
-      CustomRoleSchema.roles.should ==  [{:capabilities=>[], :requirements=>[], :name=>:guest, :role_rank=>0}, {:capabilities=>[:kudo], :requirements=>[:logged_in], :name=>:identified, :role_rank=>1}, {:capabilities=>[:comment, :kudo], :requirements=>[:logged_in, :verified_mobile], :name=>:contributor, :role_rank=>2}]
+      CustomRoleSchema.roles.should ==  [{:capabilities=>[], :requirements=>[], :name=>:guest, :role_rank=>0, :upgrades=>{:kudo=>[:logged_in], :comment=>[:logged_in, :verified_mobile]}}, {:capabilities=>[:kudo], :requirements=>[:logged_in], :name=>:identified, :role_rank=>1}, {:capabilities=>[:comment], :requirements=>[:logged_in, :verified_mobile], :name=>:contributor, :role_rank=>2}]
     end
 
     it "has an answer to requirements for a role" do
@@ -97,7 +97,7 @@ describe Pebblebed::Security::RoleSchema do
     }
 
     it "returns the guest role" do
-      schema.role.should == {:current=>:guest, :capabilities=>[], :upgrades=>{:identified=>[:logged_in], :contributor=>[:logged_in, :verified_mobile]}}
+      schema.role.should == {:current=>:guest, :capabilities=>[], :upgrades=>{:kudo=>[:logged_in], :comment=>[:logged_in, :verified_mobile]}}
     end
 
   end
@@ -111,7 +111,7 @@ describe Pebblebed::Security::RoleSchema do
         }
 
         it "returns the idenitified role" do
-          schema.role.should == {:current=>:identified, :capabilities=>[:kudo], :upgrades=>{:contributor=>[:logged_in, :verified_mobile]}}
+          schema.role.should == {:current=>:identified, :capabilities=>[:kudo], :upgrades=>{:comment=>[:logged_in, :verified_mobile]}}
         end
 
       end
@@ -123,7 +123,7 @@ describe Pebblebed::Security::RoleSchema do
         }
 
         it "returns the contributor role" do
-          schema.role.should == {:current=>:contributor, :capabilities=>[:comment, :kudo], :upgrades=>{}}
+          schema.role.should ==  {:current=>:contributor, :capabilities=>[:kudo, :comment], :upgrades=>{}}
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.48
+  version: 0.0.49
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec