acts_as_authoritah 2.0.2 → 2.0.3

data/.rvmrc

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+environment_id="ruby-1.9.3-p125"
+

data/lib/acts_as_authoritah/access_control_list.rb

@@ -6,7 +6,7 @@ require "acts_as_authoritah/matchers/scope_matcher.rb"
 class ActsAsAuthoritah::AccessControlList
   include ActsAsAuthoritah::Matchers
   
-  attr_reader :store
+  attr_accessor :store
   
   def initialize(access_rules)
     @store = {}
@@ -29,4 +29,9 @@ class ActsAsAuthoritah::AccessControlList
     match(identifier) || {}
   end
   
+  def merge!(other_access_control_list)
+    store.merge!(other_access_control_list.store)
+    self
+  end
+  
 end

data/lib/acts_as_authoritah/acl_loader.rb

@@ -0,0 +1,23 @@
+class ActsAsAuthoritah::AclLoader 
+  attr_reader :contexts, :acls
+  
+  def initialize(path)
+    @path = path
+    @files = []
+    @contexts = []
+    Dir.glob(File.join(@path,"*.xls")).each{ |x|
+      @files    << x
+      @contexts << File.split(x).last.split('.').first
+    }
+    @acls = {}
+  end
+  
+  def load
+    @files.each_with_index do |file, i|
+      context = @contexts[i]
+      rules   = ActsAsAuthoritah::SpreadsheetWrapper.new(file).to_access_rules
+      @acls[context.to_sym] = ActsAsAuthoritah::AccessControlList.new(rules)
+    end
+    @acls
+  end
+end

data/lib/acts_as_authoritah/core.rb

@@ -13,20 +13,29 @@ module ActsAsAuthoritah
      module InstanceMethods
        def can?(identifier, options={})
          klass = self.class
-         h = klass.send(:default_acl).match_identifier(identifier)
+         context = (options[:context] && options[:context] != '') ? options[:context] : 'default'
+         raise ActsAsAuthoritah::InvalidContextError, "'#{context}' is not a valid context" unless klass.valid_contexts.include?(context)
+         h = klass.send(:get_acl, context.to_sym).match_identifier(identifier)
          h.empty? ? !klass.send(:whitelist) : h[self.usertype(options)]
        end
      end
      
      module ClassMethods
        def acts_as_authoritah(path, options={})
-         rules = ActsAsAuthoritah::SpreadsheetWrapper.new(path).to_access_rules
          @@whitelist = options[:whitelist] ||= false
-         @@default_acl = ActsAsAuthoritah::AccessControlList.new(rules)
+         loader = ActsAsAuthoritah::AclLoader.new(path)
+         @@contexts = loader.contexts
+         @@acls = loader.load  
        end
        
-       def default_acl
-         @@default_acl ||= ActsAsAuthoritah::AccessControlList.new(rules)
+       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
        end
        
        def whitelist

data/lib/acts_as_authoritah/errors.rb

@@ -0,0 +1,3 @@
+module ActsAsAuthoritah
+  class InvalidContextError < RuntimeError; end
+end

data/lib/acts_as_authoritah/version.rb

@@ -1,3 +1,3 @@
 module ActsAsAuthoritah
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/lib/acts_as_authoritah.rb

@@ -9,7 +9,9 @@ require "acts_as_authoritah/core"
 
 require "acts_as_authoritah/access_rule"
 require "acts_as_authoritah/access_control_list"
+require "acts_as_authoritah/acl_loader"
 require "acts_as_authoritah/identifier_parser"
+require "acts_as_authoritah/errors.rb"
 
 require 'spreadsheet'
 Spreadsheet.client_encoding = 'UTF-8'

data/spec/acts_as_authoritah/access_control_list_spec.rb

@@ -75,4 +75,27 @@ describe ActsAsAuthoritah::AccessControlList do
       @acl.match_identifier("Admin::ProjectsController#create").should eq "c"
     end
   end
+  
+  context "merge" do
+    before :each do
+      rules = [
+        ActsAsAuthoritah::AccessRule.new("Admin", nil, nil, "c"),
+        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"})
+      @acl2.store.should eq({"Admin"=>"C"})
+    end
+  end
 end

data/spec/acts_as_authoritah/acl_loader_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe ActsAsAuthoritah::AclLoader do
+  before :each do
+    @acl_loader = ActsAsAuthoritah::AclLoader.new("spec/data/")
+    @acl_loader.load
+  end
+  
+  it "should be able to get the list of contexts" do
+    @acl_loader.contexts.should eq ["archived", "default", "unpublished"]
+  end
+  
+  it "should load the rules of 'archived' context" do
+    archived_rules = {"scope1::scope2::DummyController#edit"=>{"admin"=>true, "anonymous"=>false, "super_admin"=>true}, "scope3::scope4::AnotherController#update"=>{"admin"=>true, "anonymous"=>true, "super_admin"=>true}}
+    @acl_loader.acls[:archived].store.should eq archived_rules
+  end
+  
+  it "should load all contexts" do
+    @acl_loader.acls.keys.size.should eq 3
+  end
+end

data/spec/acts_as_authoritah/core_spec.rb

@@ -4,7 +4,7 @@ describe ActsAsAuthoritah::Core do
   before :each do 
     class Foo
       include ActsAsAuthoritah::Core
-      acts_as_authoritah "spec/data/default.xls"
+      acts_as_authoritah "spec/data"
       
       def usertype(options)
         "admin"
@@ -12,26 +12,46 @@ describe ActsAsAuthoritah::Core do
     end
   end
   
-  it "should work" do
-  end
-  
   it "should be able to use 'can?' on instance of Foo class" do
     Foo.new.should respond_to('can?')
   end
   
-  it "should be able to add 'default_acl' method to Foo class" do
-    Foo.should respond_to('default_acl')
+  it "should be able to add 'get_acl' method to Foo class" do
+    Foo.should respond_to('get_acl')
+  end
+  
+  it "should be able to get the default acl" do
+    Foo.get_acl(:default).should_not be_nil
   end
   
   it "should be able to use 'can?' on Foo to check access rights - case1" do
     Foo.new.can?("scope1::scope2::DummyController#edit").should eq true
   end
   
+  it "should be able to use 'can?' on Foo to check access rights - case2" do
+    Foo.new.can?("scope3::scope4::AnotherController#update").should eq false
+  end
+  
+  it "should be able to use 'can?' with a context on Foo to check access rights - case3" do
+    Foo.new.can?("scope3::scope4::AnotherController#update", :context => 'archived').should eq true
+  end
+  
+  it "should know the valid contexts" do
+    Foo.should respond_to('valid_contexts')
+    Foo.valid_contexts.should eq ["archived", "default", "unpublished"]
+  end
+  
+  it "should raise 'InvalidContextError' if an invalid context is passed" do
+    lambda{
+      Foo.new.can?("scope3::scope4::AnotherController#update", :context => 'foobar')
+    }.should raise_error(ActsAsAuthoritah::InvalidContextError, "'foobar' is not a valid context")
+  end
+
   context "whitelist=false" do
     before :each do
       class Foo
         include ActsAsAuthoritah::Core
-        acts_as_authoritah "spec/data/default.xls", :whitelist => false
+        acts_as_authoritah "spec/data", :whitelist => false
       
         def usertype(options)
           "admin"
@@ -48,7 +68,7 @@ describe ActsAsAuthoritah::Core do
     before :each do
       class Foo
         include ActsAsAuthoritah::Core
-        acts_as_authoritah "spec/data/default.xls", :whitelist => true
+        acts_as_authoritah "spec/data", :whitelist => true
       
         def usertype(options)
           "admin"

data/spec/acts_as_authoritah/identifier_parser_spec.rb

@@ -44,68 +44,4 @@ describe ActsAsAuthoritah::IdentifierParser do
     end
   end
   
-  # context "controller" do
-  #     it "should return nil if identifier is empty" do
-  #       identifier_parser = ActsAsAuthoritah::IdentifierParser.new("", "edit a blog post",{:admin => true, :anonymous => false})
-  #       identifier_parser.controller.should be_nil
-  #     end
-  #     
-  #     it "should return nil if identifier is nil" do
-  #       identifier_parser = ActsAsAuthoritah::IdentifierParser.new(nil, "edit a blog post",{:admin => true, :anonymous => false})
-  #       identifier_parser.controller.should be_nil
-  #     end
-  #   
-  #     it "should return controller name if only controller is present" do
-  #       identifier_parser = ActsAsAuthoritah::IdentifierParser.new("BlogPosts", "edit a blog post",{:admin => true, :anonymous => false})
-  #       identifier_parser.controller.should eq "BlogPosts"
-  #     end
-  #     
-  #     it "should return controller name if controller and action are present" do
-  #       identifier_parser = ActsAsAuthoritah::IdentifierParser.new("BlogPosts#edit", "edit a blog post",{:admin => true, :anonymous => false})
-  #       identifier_parser.controller.should eq "BlogPosts"
-  #     end
-  #     
-  #     it "should return controller name if controller, one level scope and action are present" do
-  #       identifier_parser = ActsAsAuthoritah::IdentifierParser.new("Projects::BlogPosts#edit", "edit a blog post",{:admin => true, :anonymous => false})
-  #       identifier_parser.controller.should eq "Projects::BlogPosts"
-  #     end
-  #     
-  #     it "should return controller name if controller, two level scopes and action are present" do
-  #       identifier_parser = ActsAsAuthoritah::IdentifierParser.new("Admin::Projects::BlogPosts#edit", "edit a blog post",{:admin => true, :anonymous => false})
-  #       identifier_parser.controller.should eq "Admin::Projects::BlogPosts"
-  #     end
-  #   
-  #     it "should return controller name if controller and '#' are present" do
-  #       identifier_parser = ActsAsAuthoritah::IdentifierParser.new("BlogPosts#", "edit a blog post",{:admin => true, :anonymous => false})
-  #       identifier_parser.controller.should eq "BlogPosts"
-  #     end
-  #   end
-  #   
-  #   context "scopes" do
-  #     it "should return nil if identifier is empty" do
-  #       identifier_parser = ActsAsAuthoritah::IdentifierParser.new("", "edit a blog post",{:admin => true, :anonymous => false})
-  #       identifier_parser.scopes.should eq []
-  #     end
-  #     
-  #     it "should return nil if identifier is nil" do
-  #       identifier_parser = ActsAsAuthoritah::IdentifierParser.new(nil, "edit a blog post",{:admin => true, :anonymous => false})
-  #       identifier_parser.scopes.should eq []
-  #     end
-  #   
-  #     it "should return [] if only controller is present" do
-  #       identifier_parser = ActsAsAuthoritah::IdentifierParser.new("BlogPosts", "edit a blog post",{:admin => true, :anonymous => false})
-  #       identifier_parser.scopes.should eq []
-  #     end
-  #     
-  #     it "should return scope array if controller and level one scope is present" do
-  #       identifier_parser = ActsAsAuthoritah::IdentifierParser.new("Projects::BlogPosts", "edit a blog post",{:admin => true, :anonymous => false})
-  #       identifier_parser.scopes.should eq ["Projects"]
-  #     end
-  #     
-  #     it "should return scope array if controller and level two scope is present" do
-  #       identifier_parser = ActsAsAuthoritah::IdentifierParser.new("Admin::Projects::BlogPosts", "edit a blog post",{:admin => true, :anonymous => false})
-  #       identifier_parser.scopes.should eq ["Admin","Projects"]
-  #     end
-  #   end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_authoritah
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151759200 !ruby/object:Gem::Requirement
+  requirement: &2152579320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151759200
+  version_requirements: *2152579320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151758620 !ruby/object:Gem::Requirement
+  requirement: &2152578820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151758620
+  version_requirements: *2152578820
 description: Define user capabilities in your app
 email:
 - unni.tallman@gmail.com
@@ -42,6 +42,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .rvmrc
 - Gemfile
 - LICENSE
 - README.md
@@ -50,7 +51,9 @@ files:
 - lib/acts_as_authoritah.rb
 - lib/acts_as_authoritah/access_control_list.rb
 - lib/acts_as_authoritah/access_rule.rb
+- lib/acts_as_authoritah/acl_loader.rb
 - lib/acts_as_authoritah/core.rb
+- lib/acts_as_authoritah/errors.rb
 - lib/acts_as_authoritah/identifier_parser.rb
 - lib/acts_as_authoritah/matchers/controller_matcher.rb
 - lib/acts_as_authoritah/matchers/direct_matcher.rb
@@ -63,6 +66,7 @@ files:
 - lib/acts_as_authoritah/version.rb
 - spec/acts_as_authoritah/access_control_list_spec.rb
 - spec/acts_as_authoritah/access_rule_spec.rb
+- spec/acts_as_authoritah/acl_loader_spec.rb
 - spec/acts_as_authoritah/core_spec.rb
 - spec/acts_as_authoritah/identifier_parser_spec.rb
 - spec/acts_as_authoritah/matchers/controller_matcher_spec.rb
@@ -73,7 +77,9 @@ files:
 - spec/acts_as_authoritah/spreadsheets/spreadsheet_reader_spec.rb
 - spec/acts_as_authoritah/spreadsheets/spreadsheet_row_parser_spec.rb
 - spec/acts_as_authoritah/spreadsheets/spreadsheet_wrapper_spec.rb
+- spec/data/archived.xls
 - spec/data/default.xls
+- spec/data/unpublished.xls
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -102,6 +108,7 @@ summary: Define user capabilities in your app
 test_files:
 - spec/acts_as_authoritah/access_control_list_spec.rb
 - spec/acts_as_authoritah/access_rule_spec.rb
+- spec/acts_as_authoritah/acl_loader_spec.rb
 - spec/acts_as_authoritah/core_spec.rb
 - spec/acts_as_authoritah/identifier_parser_spec.rb
 - spec/acts_as_authoritah/matchers/controller_matcher_spec.rb
@@ -112,5 +119,7 @@ test_files:
 - spec/acts_as_authoritah/spreadsheets/spreadsheet_reader_spec.rb
 - spec/acts_as_authoritah/spreadsheets/spreadsheet_row_parser_spec.rb
 - spec/acts_as_authoritah/spreadsheets/spreadsheet_wrapper_spec.rb
+- spec/data/archived.xls
 - spec/data/default.xls
+- spec/data/unpublished.xls
 - spec/spec_helper.rb