lib/declarative_authorization.rb lib/declarative_authorization/authorization.rb lib/declarative_authorization/helper.rb lib/declarative_authorization/in_controller.rb lib/declarative_authorization/in_model.rb lib/declarative_authorization/maintenance.rb lib/declarative_authorization/obligation_scope.rb lib/declarative_authorization/rails_legacy.rb lib/declarative_authorization/reader.rb @@ -2,13 +2,13 @@ Gem::Specification.new do |s| s.name = "declarative_authorization" - s.version = "0.2.3" + s.version = "0.2.4" s.required_ruby_version = ">= 1.8.6" s.authors = ["Steffen Bartsch"] s.summary = "declarative_authorization is a Rails plugin for authorization based on readable authorization rules." s.email = "sbartsch@tzi.org" - s.files = ["CHANGELOG", "MIT-LICENSE", "README.rdoc", "Rakefile", "authorization_rules.dist.rb", "garlic_example.rb", "init.rb", "app/controllers/authorization_rules_controller.rb", "app/controllers/authorization_usages_controller.rb", "app/helpers/authorization_rules_helper.rb", "app/views/authorization_usages/index.html.erb", "app/views/authorization_rules/index.html.erb", "app/views/authorization_rules/graph.dot.erb", "app/views/authorization_rules/graph.html.erb", "config/routes.rb", "lib/in_controller.rb", "lib/reader.rb", "lib/rails_legacy.rb", "lib/obligation_scope.rb", "lib/in_model.rb", "lib/helper.rb", "lib/authorization.rb", "lib/maintenance.rb", "test/authorization_test.rb", "test/schema.sql", "test/maintenance_test.rb", "test/model_test.rb", "test/controller_test.rb", "test/helper_test.rb", "test/dsl_reader_test.rb", "test/test_helper.rb"] + s.files = ["CHANGELOG", "MIT-LICENSE", "README.rdoc", "Rakefile", "authorization_rules.dist.rb", "garlic_example.rb", "init.rb", "app/controllers/authorization_rules_controller.rb", "app/controllers/authorization_usages_controller.rb", "app/helpers/authorization_rules_helper.rb", "app/views/authorization_usages/index.html.erb", "app/views/authorization_rules/index.html.erb", "app/views/authorization_rules/graph.dot.erb", "app/views/authorization_rules/graph.html.erb", "config/routes.rb", "lib/declarative_authorization.rb", "lib/declarative_authorization/in_controller.rb", "lib/declarative_authorization/reader.rb", "lib/declarative_authorization/rails_legacy.rb", "lib/declarative_authorization/obligation_scope.rb", "lib/declarative_authorization/in_model.rb", "lib/declarative_authorization/helper.rb", "lib/declarative_authorization/authorization.rb", "lib/declarative_authorization/maintenance.rb", "lib/declarative_authorization.rb", "test/authorization_test.rb", "test/schema.sql", "test/maintenance_test.rb", "test/model_test.rb", "test/controller_test.rb", "test/helper_test.rb", "test/dsl_reader_test.rb", "test/test_helper.rb"] s.has_rdoc = true s.homepage = %q{http://github.com/stffn/declarative_authorization} declarative_authorization.gemspec @@ -2,13 +2,13 @@ Gem::Specification.new do |s| s.name = "declarative_authorization" - s.version = "0.2.3" + s.version = "0.2.4" s.required_ruby_version = ">= 1.8.6" s.authors = ["Steffen Bartsch"] s.summary = "declarative_authorization is a Rails plugin for authorization based on readable authorization rules." s.email = "sbartsch@tzi.org" - s.files = %w{CHANGELOG MIT-LICENSE README.rdoc Rakefile authorization_rules.dist.rb garlic_example.rb init.rb} + Dir["app/**/*.rb"] + Dir["app/**/*.erb"] + Dir["config/*"] + Dir["lib/*"] + Dir["test/*"] + s.files = %w{CHANGELOG MIT-LICENSE README.rdoc Rakefile authorization_rules.dist.rb garlic_example.rb init.rb} + Dir["app/**/*.rb"] + Dir["app/**/*.erb"] + Dir["config/*"] + Dir["lib/*.rb"] + Dir["lib/**/*.rb"] + Dir["test/*"] s.has_rdoc = true s.homepage = %q{http://github.com/stffn/declarative_authorization} declarative_authorization.gemspec.src @@ -1,15 +1,5 @@ -require File.dirname(__FILE__) + "/lib/rails_legacy.rb" -require File.dirname(__FILE__) + "/lib/helper.rb" -require File.dirname(__FILE__) + "/lib/in_controller.rb" -require File.dirname(__FILE__) + "/lib/in_model.rb" -require File.dirname(__FILE__) + "/lib/obligation_scope.rb" - -min_rails_version = "2.1.0" -if Rails::VERSION::STRING < min_rails_version - raise "declarative_authorization requires Rails #{min_rails_version}. You are using #{Rails::VERSION::STRING}." +begin + require File.join(File.dirname(__FILE__), 'lib', 'declarative_authorization') # From here +rescue LoadError + require 'declarative_authorization' # From gem end - -ActionController::Base.send :include, Authorization::AuthorizationInController -ActionController::Base.helper Authorization::AuthorizationHelper - -ActiveRecord::Base.send :include, Authorization::AuthorizationInModel \ No newline at end of file init.rb @@ -1,6 +1,5 @@ require File.join(File.dirname(__FILE__), 'test_helper.rb') -require File.dirname(__FILE__) + '/../lib/in_controller.rb' -require File.dirname(__FILE__) + '/../lib/helper.rb' +require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization helper}) class HelperMocksController < MocksController test/helper_test.rb @@ -1,5 +1,5 @@ require File.join(File.dirname(__FILE__), 'test_helper.rb') -require File.join(File.dirname(__FILE__), %w{.. lib maintenance}) +require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization maintenance}) class MaintenanceTest < Test::Unit::TestCase test/maintenance_test.rb @@ -1,5 +1,5 @@ require File.join(File.dirname(__FILE__), 'test_helper.rb') -require File.join(File.dirname(__FILE__), '..', 'lib', 'in_model.rb') +require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization in_model}) ActiveRecord::Base.send :include, Authorization::AuthorizationInModel #ActiveRecord::Base.logger = Logger.new(STDOUT) test/model_test.rb @@ -1,8 +1,8 @@ require 'test/unit' -RAILS_ROOT = File.dirname(__FILE__) + '/../../../../' -require File.dirname(__FILE__) + '/../lib/rails_legacy.rb' -require File.dirname(__FILE__) + '/../lib/authorization.rb' -require File.dirname(__FILE__) + '/../lib/in_controller.rb' +RAILS_ROOT = File.join(File.dirname(__FILE__), %w{.. .. .. ..}) +require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization rails_legacy}) +require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization authorization}) +require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization in_controller}) unless defined?(ActiveRecord) if File.directory? RAILS_ROOT + 'config' test/test_helper.rb lib/authorization.rb lib/helper.rb lib/in_controller.rb lib/in_model.rb lib/maintenance.rb lib/obligation_scope.rb lib/rails_legacy.rb lib/reader.rb 2a1ebde4b4670afd5e8e5622deb6fc48f8aabf4e Steffen Bartsch sbartsch@tzi.org http://github.com/stffn/declarative_authorization/commit/fd1276c0408fc44818ada0c45529bad313845470 fd1276c0408fc44818ada0c45529bad313845470 2009-03-05T12:16:34-08:00 2009-03-04T08:41:07-08:00 Restructured directories to better serve as gem plugin 701bc24053b3885dcd102d76c931aa9f56a8f439 Steffen Bartsch sbartsch@tzi.org