cbac 0.6.5 → 0.6.7

data/spec/cbac_pristine_role_spec.rb

@@ -1,11 +1,8 @@
-require 'spec'
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'cbac/cbac_pristine/pristine_role'
+require 'spec_helper'
 
 include Cbac::CbacPristine
 
 describe "CbacPristineRole" do
-
   describe "convert pristine role to a yml fixture" do
     it "should return an empty string if the pristine role is of type :context" do
       pristine_role = PristineRole.new(:role_id => 0, :role_type => PristineRole.ROLE_TYPES[:context], :name => "name is irrelevant")
@@ -21,7 +18,6 @@ describe "CbacPristineRole" do
       }.should raise_error(ArgumentError)
     end
 
-
     it "should return a yml string starting with cbac_generic_role_ " do
       pristine_role = PristineRole.new(:role_id => 0, :role_type => PristineRole.ROLE_TYPES[:generic], :name => "name is irrelevant")
 
@@ -78,8 +74,5 @@ describe "CbacPristineRole" do
       admin_role.id.should be_nil
     end
   end
-
-
-
 end
 

data/spec/fixtures/controllers/dating/daughter_controller.rb

@@ -0,0 +1,11 @@
+module Dating
+  class DaughterController < ActionController::Base
+    include Cbac
+
+    def take_to_dinner; end
+    def bring_home; end
+
+  private
+    attr_accessor :current_user
+  end
+end

data/spec/spec_helper.rb

@@ -1,12 +1,37 @@
 ENV["RAILS_ENV"] ||= 'test'
 
-require 'spec/autorun'
-require 'spec/rails'
-
-Spec::Runner.configure do |config|
-   # If you're not using ActiveRecord you should remove these
-  # lines, delete config/database.yml and disable :active_record
-  # in your config/boot.rb
-  config.use_transactional_fixtures = true
-  config.use_instantiated_fixtures  = false
-end
+require 'bundler'
+Bundler.require
+require 'rails/all'
+require 'rspec/rails'
+
+require 'cbac'
+
+require 'support/schema'
+require 'database_cleaner'
+
+DatabaseCleaner.strategy = :transaction
+
+RSpec.configure do |config|
+  config.before(:suite) do
+    Cbac::Schema.load
+
+    Cbac::Config.verbose = false
+
+    o = Object.new
+    o.send :extend, Cbac
+    o.cbac_boot!
+  end
+
+  config.after(:suite) do
+    Cbac::Schema.drop
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

data/spec/support/schema.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../../../lib/generators/cbac/copy_files/migrate/create_cbac_from_scratch.rb', __FILE__)
+
+class Cbac::Schema
+  DATABASE_FILE = File.expand_path('../test.sqlite3', __FILE__)
+
+  def self.load
+    print "Loading fresh database schema..."
+
+    connect!
+    CreateCbacFromScratch.suppress_messages do
+      CreateCbacFromScratch.up
+    end
+    connect!
+
+    puts "done"
+  end
+
+  def self.drop
+    FileUtils.rm_rf(DATABASE_FILE)
+  end
+
+private
+  def self.connect!
+    ActiveRecord::Base.establish_connection(
+      :adapter => 'sqlite3',
+      :database => Cbac::Schema::DATABASE_FILE
+    )
+  end
+
+end

data/test/test_cbac_privilege.rb

@@ -99,18 +99,22 @@ class CbacPrivilegeTest <  ActiveSupport::TestCase
 
   # Test the Privilege.select method. This method accepts a controller method
   # string and an action type It returns the privilegesets that comply with this
-  # combination The actions post, put and delete are identical. This test aims
+  # combination The actions post, put, patch and delete are identical. This test aims
   # at testing this assumption.
   def test_select_correct
     Privilege.resource :cbac_privilege, "select/correct/get", :get
-    Privilege.resource :cbac_privilege, "select/correct/post", :post
-    Privilege.resource :cbac_privilege, "select/correct/put", :post
-    Privilege.resource :cbac_privilege, "select/correct/delete", :post
+    post_action_types = [:post, :put, :patch, :delete]
+
+    post_action_types.each do |action|
+      Privilege.resource :cbac_privilege, "select/correct/#{action}", :post
+    end
+
     assert_equal 1, Privilege.select("select/correct/get", :get).length
-    [:post, :put, :delete].each do |action|
-      assert_equal 1, Privilege.select("select/correct/post", action).length
-      assert_equal 1, Privilege.select("select/correct/put", action).length
-      assert_equal 1, Privilege.select("select/correct/delete", action).length
+
+    post_action_types.each do |configured_action|
+      post_action_types.each do |actual_action|
+        assert_equal 1, Privilege.select("select/correct/#{configured_action}", actual_action).length
+      end
     end
   end
 
@@ -149,4 +153,4 @@ class CbacPrivilegeTest <  ActiveSupport::TestCase
       Privilege.select(controller_method, :post)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cbac
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
-dependencies: []
+date: 2013-01-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple authorization system for Rails applications. Allows you to develop
   applications with a mixed role based authorization and a context based authorization
   model. Does not supply authentication.
@@ -35,6 +99,7 @@ extra_rdoc_files:
 - lib/cbac/privilege_set.rb
 - lib/cbac/privilege_set_record.rb
 - lib/cbac/setup.rb
+- lib/cbac/version.rb
 - lib/generators/cbac/USAGE
 - lib/generators/cbac/cbac_generator.rb
 - lib/generators/cbac/copy_files/config/cbac.pristine
@@ -49,7 +114,6 @@ extra_rdoc_files:
 - lib/generators/cbac/copy_files/fixtures/cbac_permissions.yml
 - lib/generators/cbac/copy_files/initializers/cbac_config.rb
 - lib/generators/cbac/copy_files/migrate/create_cbac_from_scratch.rb
-- lib/generators/cbac/copy_files/migrate/create_cbac_upgrade_path.rb
 - lib/generators/cbac/copy_files/stylesheets/cbac.css
 - lib/generators/cbac/copy_files/tasks/cbac.rake
 - lib/generators/cbac/copy_files/views/generic_roles/index.html.erb
@@ -64,9 +128,9 @@ extra_rdoc_files:
 files:
 - Gemfile
 - Gemfile.lock
-- Manifest
 - README.rdoc
 - Rakefile
+- cbac.gemspec
 - config/cbac/context_roles.rb
 - config/cbac/privileges.rb
 - context_roles.rb
@@ -87,6 +151,7 @@ files:
 - lib/cbac/privilege_set.rb
 - lib/cbac/privilege_set_record.rb
 - lib/cbac/setup.rb
+- lib/cbac/version.rb
 - lib/generators/cbac/USAGE
 - lib/generators/cbac/cbac_generator.rb
 - lib/generators/cbac/copy_files/config/cbac.pristine
@@ -101,7 +166,6 @@ files:
 - lib/generators/cbac/copy_files/fixtures/cbac_permissions.yml
 - lib/generators/cbac/copy_files/initializers/cbac_config.rb
 - lib/generators/cbac/copy_files/migrate/create_cbac_from_scratch.rb
-- lib/generators/cbac/copy_files/migrate/create_cbac_upgrade_path.rb
 - lib/generators/cbac/copy_files/stylesheets/cbac.css
 - lib/generators/cbac/copy_files/tasks/cbac.rake
 - lib/generators/cbac/copy_files/views/generic_roles/index.html.erb
@@ -115,25 +179,27 @@ files:
 - migrations/20110211105533_add_pristine_files_to_cbac_upgrade_path.rb
 - privileges.rb
 - rails/init.rb
+- spec/cbac_authorization_check_spec.rb
 - spec/cbac_pristine_file_spec.rb
 - spec/cbac_pristine_permission_spec.rb
 - spec/cbac_pristine_role_spec.rb
+- spec/fixtures/controllers/dating/daughter_controller.rb
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/schema.rb
 - tasks/cbac.rake
 - test/fixtures/cbac_generic_roles.yml
 - test/fixtures/cbac_memberships.yml
 - test/fixtures/cbac_permissions.yml
 - test/fixtures/cbac_privilege_set.yml
 - test/test_cbac_actions.rb
-- test/test_cbac_authorize_context_roles.rb
 - test/test_cbac_authorize_generic_roles.rb
 - test/test_cbac_context_role.rb
 - test/test_cbac_privilege.rb
 - test/test_cbac_privilege_set.rb
 - test/test_helper.rb
-- cbac.gemspec
+- Manifest
 homepage: http://cbac.rubyforge.org
 licenses: []
 post_install_message: 
@@ -170,5 +236,4 @@ test_files:
 - test/test_helper.rb
 - test/test_cbac_actions.rb
 - test/test_cbac_privilege_set.rb
-- test/test_cbac_authorize_context_roles.rb
 - test/test_cbac_authorize_generic_roles.rb

data/lib/generators/cbac/copy_files/migrate/create_cbac_upgrade_path.rb

@@ -1,40 +0,0 @@
-class CreateCbacUpgradePath < ActiveRecord::Migration
-  def self.up
-
-    create_table :cbac_pristine_files do |t|
-      t.string :type
-      t.string :file_name
-      t.timestamps
-    end
-
-    create_table :cbac_staged_permissions do |t|
-      t.integer :pristine_role_id
-      t.integer :pristine_file_id
-      t.string :privilege_set_name
-      t.integer :line_number
-      t.string :comment
-      t.text :operation, :limit => 2
-      t.timestamps
-    end
-
-    create_table :cbac_staged_roles do |t|
-      t.string :role_type
-      t.string :name
-      t.integer :role_id
-      t.timestamps
-    end
-    
-    create_table :cbac_known_permissions do |t|
-      t.integer :permission_number, :null => :no
-      t.integer :permission_type, :default => 0
-    end
-
-  end
-
-  def self.down
-    drop_table :cbac_pristine_files
-    drop_table :cbac_staged_permissions
-    drop_table :cbac_staged_roles
-    drop_table :cbac_known_permissions
-  end
-end

data/test/test_cbac_authorize_context_roles.rb

@@ -1,39 +0,0 @@
-# Copyright 2010 Bert Meerman
-require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
-
-# Dummy code for overriding the default current_user behavior
-module Cbac
-  def current_user
-    1
-  end
-end
-
-###
-# Tests the Cbac system for authorization with context roles
-#
-class CbacAuthorizeContextRolesTest <  ActiveSupport::TestCase
-  include Cbac
-  
-  #self.fixture_path = File.join(File.dirname(__FILE__), "fixtures")
-  #fixtures :all
-  attr_accessor :authorize_context_eval_string
-  attr_accessor :session
-
-  # Setup defines the PrivilegeSet that is being used by all PrivilegeTest methods
-  def setup
-    return if PrivilegeSet.sets.include?(:cbac_context_role)
-    PrivilegeSet.add :cbac_context_role, ""
-    Privilege.resource  :cbac_context_role, "authorize/context/roles", :get
-    ContextRole.add :authorize_context_role, "context[:authorize_context_eval_string]"
-  end
-
-  # Check to see if action is correctly authorized
-  def test_authorize_ok
-    assert_equal true, authorization_check("authorize/context", "roles", :get, {:authorize_context_eval_string => true})
-  end
-
-  # Run authorization with incorrect authorization
-  def test_authorize_incorrect_privilege
-    assert_equal false, authorization_check("authorize/context", "roles", :get, {:authorize_context_eval_string => false})
-  end
-end