pebblebed 0.0.49 → 0.0.50

data/lib/pebblebed/rspec_helper.rb

@@ -4,12 +4,12 @@ module Pebblebed
   module RSpecHelper
     def god!(options = {})
       options.delete(:god)
-      stub_current_identity(options.merge(:id => 1, :god => true))
+      stub_current_identity({:id => 1, :god => true}.merge(options))
     end
 
     def user!(options = {})
       options.delete(:god)
-      stub_current_identity(options.merge(:id => 1, :god => false))
+      stub_current_identity({:id => 1, :god => false}.merge(options))
     end
 
     def guest!
@@ -22,7 +22,7 @@ module Pebblebed
 
     def another_identity
       id = current_identity ? (current_identity.id + 1) : 1
-      DeepStruct.wrap(default_identity_options.merge(:id => id, :god => false))
+      DeepStruct.wrap({:id => id, :god => false}.merge(default_identity_options))
     end
 
     private

data/lib/pebblebed/security/role_schema.rb

@@ -74,6 +74,7 @@ module Pebblebed
             end
           end
           owned_capabilities = collected_roles.map{|c| c[:capabilities]}.flatten.compact.uniq
+          owned_requirements = collected_roles.map{|c| c[:requirements]}.flatten.compact.uniq
           all_capabilities = self.class.roles.map{|r| r[:capabilities]}.flatten.compact.uniq
           the_role.merge!(:upgrades => begin
               upgraders = {}
@@ -81,7 +82,7 @@ module Pebblebed
                 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] << r[:requirements] - owned_requirements
                   upgraders[c].flatten!.uniq!
                 end
               end

data/lib/pebblebed/version.rb

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

data/spec/security/role_shema_spec.rb

@@ -111,7 +111,7 @@ describe Pebblebed::Security::RoleSchema do
         }
 
         it "returns the idenitified role" do
-          schema.role.should == {:current=>:identified, :capabilities=>[:kudo], :upgrades=>{:comment=>[:logged_in, :verified_mobile]}}
+          schema.role.should == {:current=>:identified, :capabilities=>[:kudo], :upgrades=>{:comment=>[:verified_mobile]}}
         end
 
       end

metadata

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