acts_as_authoritah 2.0.4 → 2.0.5

data/.rvmrc

@@ -1,4 +1,48 @@
 #!/usr/bin/env bash
 
-environment_id="ruby-1.9.3-p125"
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
 
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 1.9.3" > .rvmrc
+environment_id="ruby-1.9.3-p125@authoritah"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.10.3" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | grep -vE '^Using|Your bundle is complete'
+# fi

data/lib/acts_as_authoritah/access_control_list.rb

@@ -5,18 +5,18 @@ require "acts_as_authoritah/matchers/scope_matcher.rb"
 
 class ActsAsAuthoritah::AccessControlList
   include ActsAsAuthoritah::Matchers
-  
+
   attr_accessor :store
-  
+
   def initialize(access_rules)
     @store = {}
     access_rules.each do |access_rule|
       @store.merge! access_rule.to_rule
     end
-    
+
     @matchers = [DirectMatcher, ControllerMatcher, ScopeMatcher]
   end
-  
+
   def match(identifier)
     @matchers.each do |matcher|
       access_rights = matcher.new(@store).match(identifier)
@@ -24,14 +24,19 @@ class ActsAsAuthoritah::AccessControlList
     end
     nil
   end
-  
+
   def match_identifier(identifier)
     match(identifier) || {}
   end
-  
-  def merge!(other_access_control_list)
-    store.merge!(other_access_control_list.store)
-    self
+
+  def merge(other_access_control_list)
+    a = self.deep_clone
+    a.store.merge!(other_access_control_list.store)
+    a
+  end
+
+  def deep_clone
+    Marshal::load(Marshal.dump(self))
   end
-  
-end
+
+end

data/lib/acts_as_authoritah/core.rb

@@ -19,25 +19,25 @@ module ActsAsAuthoritah
          h.empty? ? !klass.send(:whitelist) : h[self.usertype(options)]
        end
      end
-     
+
      module ClassMethods
        def acts_as_authoritah(path, options={})
          @@whitelist = options[:whitelist] ||= false
          loader = ActsAsAuthoritah::AclLoader.new(path)
          @@contexts = loader.contexts
-         @@acls = loader.load  
+         @@acls = loader.load
        end
-       
+
        def valid_contexts
          @@contexts
        end
-       
+
        def get_acl(key = :default)
          h = @@acls[key]
-         h = @@acls[:default].clone.merge!(@@acls[key]) unless key.eql?(:default)
+         h = @@acls[:default].clone.merge(@@acls[key]) unless key.eql?(:default)
          h
        end
-       
+
        def whitelist
          @@whitelist
        end

data/lib/acts_as_authoritah/version.rb

@@ -1,3 +1,3 @@
 module ActsAsAuthoritah
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/spec/acts_as_authoritah/access_control_list_spec.rb

@@ -5,11 +5,11 @@ describe ActsAsAuthoritah::AccessControlList do
     it "should build list" do
       rule1 = ActsAsAuthoritah::AccessRule.new("Admin::Projects", "Surveys","update",{:admin => true, :anonymous => false})
       rule2 = ActsAsAuthoritah::AccessRule.new("Admin::Users", "Configurations","edit",{:admin => true, :anonymous => false})
-      
+
       ActsAsAuthoritah::AccessControlList.new([rule1, rule2]).store.should eq rule1.to_rule.merge(rule2.to_rule)
     end
   end
-  
+
   context "match" do
     before :each do
       rules = [
@@ -20,22 +20,22 @@ describe ActsAsAuthoritah::AccessControlList do
         ActsAsAuthoritah::AccessRule.new("Projects", "Surveys", "update", "e"),
         ActsAsAuthoritah::AccessRule.new("", "Projects", nil, "f")
       ]
-      
+
       @acl = ActsAsAuthoritah::AccessControlList.new(rules)
     end
-    
+
     it "test1" do
       @acl.match("Admin::ForumsController#index").should eq "a"
     end
-    
+
     it "test2" do
       @acl.match("Admin::Projects::SurveysController#index").should eq "d"
     end
-    
+
     it "test3" do
       @acl.match("Projects::SurveysController#index").should eq nil
     end
-    
+
     it "test4" do
       @acl.match("Projects::SurveysController#update").should eq "e"
     end
@@ -43,39 +43,39 @@ describe ActsAsAuthoritah::AccessControlList do
     it "test5" do
       @acl.match("Projects::SurveysController#edit").should eq "b"
     end
-  
+
     it "test6" do
       @acl.match("Admin::Projects::HomeController#update").should eq "c"
     end
-    
+
     it "test7" do
       @acl.match("ProjectsController#create").should eq "f"
     end
-    
+
     it "test8" do
       @acl.match("Admin::ProjectsController#create").should eq "a"
     end
-    
+
   end
-  
+
   context "match_identifier" do
     before :each do
       rules = [
         ActsAsAuthoritah::AccessRule.new("Admin", nil, nil, "c"),
       ]
-      
+
       @acl = ActsAsAuthoritah::AccessControlList.new(rules)
     end
-    
+
     it "should return {} if there is no match" do
       @acl.match_identifier("LinksController#create").should eq({})
     end
-    
+
     it "should return the matched value if there is a match" do
       @acl.match_identifier("Admin::ProjectsController#create").should eq "c"
     end
   end
-  
+
   context "merge" do
     before :each do
       rules = [
@@ -83,19 +83,22 @@ describe ActsAsAuthoritah::AccessControlList do
         ActsAsAuthoritah::AccessRule.new("Admin", "Projects", nil, "d"),
       ]
       @acl1 = ActsAsAuthoritah::AccessControlList.new(rules)
-      
+
       rules = [
         ActsAsAuthoritah::AccessRule.new("Admin", nil, nil, "C")
       ]
       @acl2 = ActsAsAuthoritah::AccessControlList.new(rules)
     end
-    
+
     it "should merge two @acl2 into @acl1 overriding common rule using the one from @acl2" do
       @acl1.store.should eq({"Admin"=>"c", "Admin::ProjectsController"=>"d"})
       @acl2.store.should eq({"Admin"=>"C"})
-      @acl1.merge!(@acl2).store.should eq({"Admin"=>"C", "Admin::ProjectsController"=>"d"})
-      @acl1.store.should eq({"Admin"=>"C", "Admin::ProjectsController"=>"d"})
+
+      new_acl = @acl1.merge(@acl2)
+
+      new_acl.store.should eq({"Admin"=>"C", "Admin::ProjectsController"=>"d"})
+      @acl1.store.should eq({"Admin"=>"c", "Admin::ProjectsController"=>"d"})
       @acl2.store.should eq({"Admin"=>"C"})
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_authoritah
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156287840 !ruby/object:Gem::Requirement
+  requirement: &2168867500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156287840
+  version_requirements: *2168867500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156287200 !ruby/object:Gem::Requirement
+  requirement: &2168866300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156287200
+  version_requirements: *2168866300
 description: Define user capabilities in your app
 email:
 - unni.tallman@gmail.com
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Define user capabilities in your app