cantango 0.8.0 → 0.8.5.1
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +32 -19
- data/README.textile +79 -131
- data/VERSION +1 -1
- data/cantango.gemspec +94 -61
- data/lib/cantango.rb +4 -6
- data/lib/cantango/ability.rb +28 -17
- data/lib/cantango/ability/cache.rb +30 -60
- data/lib/cantango/ability/cache/base_cache.rb +1 -1
- data/lib/cantango/ability/cache/key.rb +39 -0
- data/lib/cantango/ability/cache/kompiler.rb +22 -6
- data/lib/cantango/ability/cache/moneta_cache.rb +1 -1
- data/lib/cantango/ability/cache/reader.rb +32 -0
- data/lib/cantango/ability/cache/rules_cache.rb +31 -0
- data/lib/cantango/ability/cache/session_cache.rb +3 -2
- data/lib/cantango/ability/cache/writer.rb +42 -0
- data/lib/cantango/ability/cache_helpers.rb +28 -0
- data/lib/cantango/ability/masquerade_helpers.rb +7 -2
- data/lib/cantango/ability/permission_helpers.rb +0 -8
- data/lib/cantango/ability/permit_helpers.rb +0 -17
- data/lib/cantango/ability/role_helpers.rb +0 -2
- data/lib/cantango/ability/user_helpers.rb +1 -0
- data/lib/cantango/adapter/compiler.rb +9 -0
- data/lib/cantango/adapter/moneta.rb +23 -0
- data/lib/cantango/api.rb +1 -1
- data/lib/cantango/api/aliases.rb +4 -8
- data/lib/cantango/api/attributes.rb +17 -0
- data/lib/cantango/api/common.rb +6 -0
- data/lib/cantango/api/options.rb +9 -5
- data/lib/cantango/cache.rb +1 -1
- data/lib/cantango/cache/hash_cache.rb +34 -0
- data/lib/cantango/configuration.rb +13 -8
- data/lib/cantango/configuration/adapters.rb +25 -0
- data/lib/cantango/configuration/categories.rb +3 -1
- data/lib/cantango/configuration/engines.rb +83 -11
- data/lib/cantango/configuration/engines/cache.rb +12 -1
- data/lib/cantango/configuration/engines/engine.rb +5 -5
- data/lib/cantango/configuration/engines/permission.rb +1 -1
- data/lib/cantango/configuration/permit_registry.rb +17 -0
- data/lib/cantango/configuration/permits.rb +29 -0
- data/lib/cantango/configuration/registry.rb +5 -2
- data/lib/cantango/configuration/role_groups.rb +3 -0
- data/lib/cantango/configuration/role_registry.rb +4 -0
- data/lib/cantango/configuration/roles.rb +2 -0
- data/lib/cantango/configuration/user_accounts.rb +1 -0
- data/lib/cantango/configuration/users.rb +1 -0
- data/lib/cantango/engine.rb +13 -0
- data/lib/cantango/filters.rb +5 -0
- data/lib/cantango/filters/filter.rb +34 -0
- data/lib/cantango/filters/role_filter.rb +29 -0
- data/lib/cantango/filters/role_group_filter.rb +28 -0
- data/lib/cantango/permission_engine.rb +26 -1
- data/lib/cantango/permission_engine/collector.rb +7 -2
- data/lib/cantango/permission_engine/compiler.rb +8 -1
- data/lib/cantango/permission_engine/evaluator.rb +2 -2
- data/lib/cantango/permission_engine/factory.rb +8 -12
- data/lib/cantango/permission_engine/loader.rb +1 -1
- data/lib/cantango/permission_engine/loader/base.rb +1 -1
- data/lib/cantango/permission_engine/loader/categories.rb +3 -3
- data/lib/cantango/permission_engine/loader/permissions.rb +8 -5
- data/lib/cantango/permission_engine/moneta_store.rb +2 -2
- data/lib/cantango/permission_engine/parser.rb +1 -1
- data/lib/cantango/permission_engine/parser/categories.rb +1 -1
- data/lib/cantango/permission_engine/parser/category.rb +1 -1
- data/lib/cantango/permission_engine/parser/default.rb +1 -2
- data/lib/cantango/permission_engine/parser/ownership.rb +1 -1
- data/lib/cantango/permission_engine/parser/permissions.rb +1 -1
- data/lib/cantango/permission_engine/parser/regex.rb +2 -2
- data/lib/cantango/permission_engine/parser/relationship.rb +1 -1
- data/lib/cantango/permission_engine/parser/rule.rb +1 -1
- data/lib/cantango/permission_engine/permission.rb +2 -2
- data/lib/cantango/permission_engine/selector.rb +3 -3
- data/lib/cantango/permission_engine/selector/account_types.rb +24 -0
- data/lib/cantango/permission_engine/selector/base.rb +3 -3
- data/lib/cantango/permission_engine/selector/licenses.rb +2 -2
- data/lib/cantango/permission_engine/selector/role_groups.rb +7 -6
- data/lib/cantango/permission_engine/selector/roles.rb +10 -6
- data/lib/cantango/permission_engine/selector/user_types.rb +23 -0
- data/lib/cantango/permission_engine/selector/users.rb +2 -2
- data/lib/cantango/permission_engine/statement.rb +10 -9
- data/lib/cantango/permission_engine/statements.rb +27 -25
- data/lib/cantango/permission_engine/store.rb +1 -1
- data/lib/cantango/permission_engine/yaml_store.rb +2 -2
- data/lib/cantango/permit_engine.rb +29 -4
- data/lib/cantango/permit_engine/builder.rb +2 -3
- data/lib/cantango/permit_engine/builder/base.rb +9 -1
- data/lib/cantango/permit_engine/builder/special_permits.rb +7 -8
- data/lib/cantango/permit_engine/compatibility.rb +1 -1
- data/lib/cantango/permit_engine/executor.rb +1 -1
- data/lib/cantango/permit_engine/executor/abstract.rb +1 -1
- data/lib/cantango/permit_engine/executor/base.rb +1 -1
- data/lib/cantango/permit_engine/executor/system.rb +1 -1
- data/lib/cantango/permit_engine/factory.rb +2 -7
- data/lib/cantango/permit_engine/finder.rb +43 -9
- data/lib/cantango/permit_engine/role_matcher.rb +1 -1
- data/lib/cantango/permit_engine/util.rb +2 -1
- data/lib/cantango/permits.rb +9 -0
- data/lib/cantango/{permit_engine → permits}/account_permit.rb +15 -4
- data/lib/cantango/{permit_engine → permits}/account_permit/builder.rb +2 -6
- data/lib/cantango/{permit_engine → permits}/account_permit/finder.rb +2 -2
- data/lib/cantango/{permit_engine → permits}/license.rb +1 -1
- data/lib/cantango/{permit_engine → permits}/license/loader.rb +1 -1
- data/lib/cantango/{permit_engine → permits}/license/rules.rb +1 -1
- data/lib/cantango/permits/macros.rb +19 -0
- data/lib/cantango/{permit_engine → permits}/permit.rb +13 -1
- data/lib/cantango/{permit_engine → permits}/role_group_permit.rb +15 -3
- data/lib/cantango/{permit_engine → permits}/role_group_permit/builder.rb +10 -22
- data/lib/cantango/{permit_engine → permits}/role_group_permit/finder.rb +2 -2
- data/lib/cantango/{permit_engine → permits}/role_permit.rb +15 -3
- data/lib/cantango/permits/role_permit/builder.rb +27 -0
- data/lib/cantango/{permit_engine → permits}/role_permit/finder.rb +2 -2
- data/lib/cantango/{permit_engine → permits}/user_permit.rb +15 -3
- data/lib/cantango/{permit_engine → permits}/user_permit/builder.rb +2 -6
- data/lib/cantango/{permit_engine → permits}/user_permit/finder.rb +2 -2
- data/lib/cantango/rails.rb +3 -1
- data/lib/cantango/rails/engine.rb +11 -6
- data/lib/cantango/rails/helpers/base_helper.rb +28 -0
- data/lib/cantango/rails/helpers/controller_helper.rb +17 -0
- data/lib/cantango/rails/helpers/rest_helper.rb +44 -0
- data/lib/cantango/rails/helpers/view_helper.rb +17 -0
- data/lib/cantango/rails/railtie.rb +1 -1
- data/lib/cantango/rspec/config.rb +1 -1
- data/lib/cantango/rspec/matchers/be_allowed_to.rb +5 -3
- data/lib/cantango/rules/user_relation.rb +1 -1
- data/lib/cantango/users/macros.rb +8 -2
- data/lib/cantango/users/user.rb +1 -1
- data/lib/generators/cantango/account_permit/account_permit_generator.rb +37 -0
- data/lib/generators/cantango/account_permit/templates/account_permit.erb +13 -0
- data/lib/generators/cantango/base.rb +15 -18
- data/lib/generators/cantango/basic.rb +41 -0
- data/lib/generators/cantango/install/install_generator.rb +37 -0
- data/lib/generators/cantango/install/templates/cantango.rb +4 -0
- data/{spec/active_record/scenarios/user_accounts/config/account_permits.yml → lib/generators/cantango/install/templates/categories.yml} +0 -0
- data/lib/generators/cantango/install/templates/permissions.yml +4 -0
- data/lib/generators/cantango/license/license_generator.rb +6 -11
- data/lib/generators/cantango/license/templates/license.erb +1 -1
- data/lib/generators/cantango/license_base.rb +2 -2
- data/lib/generators/cantango/licenses/licenses_generator.rb +2 -7
- data/lib/generators/cantango/permit_generator.rb +31 -10
- data/lib/generators/cantango/role_permit/role_permit_generator.rb +11 -14
- data/lib/generators/cantango/role_permit/templates/account_permit.erb +2 -2
- data/lib/generators/cantango/role_permit/templates/role_group_permit.erb +2 -2
- data/lib/generators/cantango/role_permit/templates/role_permit.erb +2 -2
- data/lib/generators/cantango/role_permits/role_permits_generator.rb +16 -98
- data/lib/generators/cantango/user_permit/templates/account_permit.erb +5 -0
- data/lib/generators/cantango/user_permit/templates/user_permit.erb +13 -0
- data/lib/generators/cantango/user_permit/user_permit_generator.rb +36 -0
- data/spec/TODO +1 -6
- data/spec/active_record/helper/permits_config.rb +1 -1
- data/spec/active_record/scenarios/engines/permission_engine/{cantango_permissions.yml → permissions.yml} +2 -1
- data/spec/active_record/scenarios/engines/permission_engine/tango_permission_yml_spec.rb +8 -9
- data/spec/active_record/scenarios/engines/permit_engine/licenses_spec.rb +2 -2
- data/spec/active_record/scenarios/engines/permit_engine/role_groups_permits_spec.rb +2 -2
- data/spec/active_record/scenarios/shared/{can_tango.rb → cantango.rb} +1 -1
- data/spec/active_record/scenarios/shared/models/items.rb +0 -1
- data/spec/active_record/scenarios/shared/models/users.rb +6 -1
- data/spec/active_record/spec_helper.rb +6 -4
- data/spec/cantango/ability/cache/key_spec.rb +64 -0
- data/spec/cantango/ability/cache/{compiler_spec.rb → kompiler_spec.rb} +9 -21
- data/spec/cantango/ability/cache/reader_compile_spec.rb +42 -0
- data/spec/cantango/ability/cache/reader_spec.rb +33 -0
- data/spec/cantango/ability/cache/rules_cache_spec.rb +15 -0
- data/spec/cantango/ability/cache/session_cache_spec.rb +1 -1
- data/spec/cantango/ability/cache/writer_spec.rb +21 -0
- data/spec/cantango/ability/cache_spec.rb +6 -2
- data/spec/cantango/ability_filters_spec.rb +5 -10
- data/spec/cantango/ability_spec.rb +2 -3
- data/spec/cantango/api/attributes_spec.rb +27 -0
- data/spec/cantango/api/user/can_api_spec.rb +2 -2
- data/spec/cantango/api/user_account/can_api_spec.rb +2 -2
- data/spec/cantango/configuration/adapter_spec.rb +28 -0
- data/spec/cantango/configuration/engines/cache_spec.rb +2 -2
- data/spec/cantango/configuration/engines/permission_spec.rb +3 -3
- data/spec/cantango/configuration/engines/permit_spec.rb +1 -1
- data/spec/cantango/configuration/engines/store_shared.rb +3 -1
- data/spec/cantango/configuration/engines_spec.rb +106 -3
- data/spec/cantango/configuration/hash_registry_spec.rb +1 -1
- data/spec/cantango/configuration/permit_registry_spec.rb +14 -0
- data/spec/cantango/configuration/permits_spec.rb +25 -0
- data/spec/cantango/configuration/registry_spec.rb +1 -1
- data/spec/cantango/configuration/shared/registry_ex.rb +2 -1
- data/spec/cantango/configuration_spec.rb +5 -5
- data/spec/cantango/permission_engine/compiler_spec.rb +8 -0
- data/spec/cantango/permission_engine/permission_spec.rb +1 -1
- data/spec/cantango/permission_engine/yaml_store_spec.rb +14 -4
- data/spec/cantango/permission_engine_spec.rb +0 -0
- data/spec/cantango/permit_engine/account_permit_spec.rb +2 -4
- data/spec/cantango/permit_engine/builder/role_group_permits_spec.rb +4 -7
- data/spec/cantango/permit_engine/builder/role_permits_spec.rb +5 -6
- data/spec/cantango/permit_engine/builder/special_permits_spec.rb +3 -4
- data/spec/cantango/permit_engine/executor/system_spec.rb +2 -2
- data/spec/cantango/permit_engine/factory_spec.rb +2 -3
- data/spec/cantango/permit_engine/finder_spec.rb +144 -23
- data/spec/cantango/permit_engine/permit/permit_static_and_dynamic_rules_spec.rb +4 -5
- data/spec/cantango/permit_engine/role_group_permit_spec.rb +1 -1
- data/spec/cantango/permit_engine/role_permit_spec.rb +6 -7
- data/spec/cantango/permit_engine/user_permit_spec.rb +2 -3
- data/spec/cantango/permit_engine_spec.rb +2 -0
- data/spec/cantango/permits/macros_spec.rb +41 -0
- data/spec/cantango/permits/permit_spec.rb +46 -0
- data/spec/cantango_spec.rb +13 -0
- data/spec/devise-dummy/app/helpers/application_helper.rb +7 -0
- data/spec/devise-dummy/app/views/articles/admin.html.haml +1 -1
- data/spec/devise-dummy/app/views/articles/admin_account.html.haml +1 -1
- data/spec/devise-dummy/app/views/articles/guest.html.haml +1 -1
- data/spec/devise-dummy/app/views/articles/index.html.haml +1 -1
- data/spec/devise-dummy/app/views/comments/guest.html.haml +1 -1
- data/spec/devise-dummy/app/views/comments/index.html.haml +1 -1
- data/spec/devise-dummy/app/views/concertos/admin.html.haml +1 -1
- data/spec/devise-dummy/app/views/concertos/admin_account.html.haml +1 -1
- data/spec/devise-dummy/app/views/concertos/guest.html.haml +1 -1
- data/spec/devise-dummy/app/views/concertos/index.html.haml +1 -1
- data/spec/devise-dummy/app/views/users/index.html.haml +1 -1
- data/spec/devise-dummy/config/initializers/cantango.rb +3 -3
- data/spec/devise-dummy/config/{cantango_permissions.yml → permissions.yml} +2 -1
- data/spec/devise-integration/concerto_spec.rb +1 -1
- data/spec/dummy/app/models/user.rb +1 -0
- data/spec/dummy/app/views/articles/admin.html.haml +1 -1
- data/spec/dummy/app/views/articles/admin_account.html.haml +1 -1
- data/spec/dummy/app/views/articles/guest.html.haml +1 -1
- data/spec/dummy/app/views/articles/index.html.haml +1 -1
- data/spec/dummy/app/views/comments/guest.html.haml +1 -1
- data/spec/dummy/app/views/comments/index.html.haml +1 -1
- data/spec/dummy/app/views/concertos/admin.html.haml +1 -1
- data/spec/dummy/app/views/concertos/admin_account.html.haml +1 -1
- data/spec/dummy/app/views/concertos/guest.html.haml +1 -1
- data/spec/dummy/app/views/concertos/index.html.haml +1 -1
- data/spec/dummy/app/views/posts/admin.html.haml +1 -1
- data/spec/dummy/app/views/posts/admin_account.html.haml +1 -1
- data/spec/dummy/app/views/posts/guest.html.haml +1 -1
- data/spec/dummy/app/views/posts/index.html.haml +1 -1
- data/spec/dummy/app/views/users/admin.html.haml +1 -1
- data/spec/dummy/app/views/users/admin_account.html.haml +1 -1
- data/spec/dummy/app/views/users/guest.html.haml +1 -1
- data/spec/dummy/app/views/users/index.html.haml +1 -1
- data/spec/dummy/config/application.rb +1 -0
- data/spec/dummy/config/initializers/cantango.rb +1 -3
- data/spec/dummy/config/{cantango_permissions.yml → permissions.yml} +2 -2
- data/spec/dummy_spec_helper.rb +2 -0
- data/spec/entire_suite_spec.rb +2 -0
- data/spec/factories/user.rb +8 -0
- data/spec/factories/user_account.rb +6 -0
- data/spec/fixtures/config/permissions.yml +60 -19
- data/spec/fixtures/models/admin.rb +2 -0
- data/spec/fixtures/models/admin_account.rb +22 -0
- data/spec/fixtures/models/simple_roles.rb +5 -0
- data/spec/fixtures/models/user.rb +4 -0
- data/spec/helpers/dummy_app_ability.rb +2 -5
- data/spec/integration/cache_using_moneta_spec.rb +3 -1
- data/spec/integration/cache_using_session_spec.rb +2 -2
- data/spec/integration/user/articles_spec.rb +1 -1
- data/spec/integration/user/concerto_spec.rb +1 -1
- data/spec/spec_helper.rb +5 -5
- metadata +120 -95
- data/lib/cantango/ability/class_methods.rb +0 -27
- data/lib/cantango/api/aliases/account_permit.rb +0 -8
- data/lib/cantango/api/aliases/license.rb +0 -7
- data/lib/cantango/api/aliases/permit.rb +0 -9
- data/lib/cantango/api/aliases/role_group_permit.rb +0 -7
- data/lib/cantango/api/aliases/role_permit.rb +0 -7
- data/lib/cantango/api/aliases/user_permit.rb +0 -8
- data/lib/cantango/permission_engine/builder.rb +0 -6
- data/lib/cantango/permit_engine/role_permit/builder.rb +0 -46
- data/lib/cantango/rails/base_helpers.rb +0 -26
- data/lib/cantango/rails/controller_helpers.rb +0 -15
- data/lib/cantango/rails/view_helpers.rb +0 -15
- data/spec/active_record/scenarios/shared/permits/PERMITS README.textile +0 -3
- data/spec/active_record/scenarios/user_accounts/docs/USER_ACCOUNTS_SCENARIO.textile +0 -20
- data/spec/active_record/scenarios/user_accounts/docs/basic_rules_spec_possible_samples.txt +0 -84
- data/spec/factories.rb +0 -8
- data/spec/fixtures/config/cantango_permissions.yml +0 -48
@@ -1,5 +1,4 @@
|
|
1
|
-
require '
|
2
|
-
require 'cantango'
|
1
|
+
require 'spec_helper'
|
3
2
|
require 'fixtures/models'
|
4
3
|
|
5
4
|
class AdminPermit < CanTango::UserPermit
|
@@ -15,7 +14,7 @@ class AdminPermit < CanTango::UserPermit
|
|
15
14
|
end
|
16
15
|
|
17
16
|
|
18
|
-
describe CanTango::
|
17
|
+
describe CanTango::Permits::UserPermit do
|
19
18
|
let (:user) do
|
20
19
|
User.new 'kris'
|
21
20
|
end
|
@@ -0,0 +1,41 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
class AdminyPermit
|
4
|
+
end
|
5
|
+
|
6
|
+
class AdminyRolePermit
|
7
|
+
end
|
8
|
+
|
9
|
+
|
10
|
+
class MyAdminyPermit < CanTango::UserPermit
|
11
|
+
end
|
12
|
+
=begin
|
13
|
+
describe '#tango_permit macro' do
|
14
|
+
specify do
|
15
|
+
lambda { AdminPermit.tango_permit }.should raise_error
|
16
|
+
end
|
17
|
+
|
18
|
+
describe 'tango permit - hash only' do
|
19
|
+
specify do
|
20
|
+
lambda { AdminyRolePermit.tango_permit :type => :role }.should_not raise_error
|
21
|
+
end
|
22
|
+
subject { AdminyRolePermit.tango_permit :type => :role }
|
23
|
+
|
24
|
+
specify { subject[:name].should == :adminy }
|
25
|
+
specify { subject[:type].should == :role }
|
26
|
+
specify { subject[:account].should == nil }
|
27
|
+
end
|
28
|
+
|
29
|
+
describe 'Inherit from tango permit' do
|
30
|
+
specify do
|
31
|
+
lambda { MyAdminyPermit.tango_permit }.should_not raise_error
|
32
|
+
end
|
33
|
+
subject { MyAdminyPermit.tango_permit }
|
34
|
+
|
35
|
+
specify { subject[:name].should == :my }
|
36
|
+
specify { subject[:type].should == :user_type }
|
37
|
+
specify { subject[:account].should == nil }
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
=end
|
@@ -0,0 +1,46 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
module AdminAccountPermits
|
4
|
+
class AdminRolePermit < CanTango::RolePermit
|
5
|
+
end
|
6
|
+
end
|
7
|
+
|
8
|
+
class MusicianRolePermit < CanTango::RolePermit; end
|
9
|
+
class EditorsRoleGroupPermit < CanTango::RoleGroupPermit; end
|
10
|
+
class AdminAccountPermit < CanTango::AccountPermit; end
|
11
|
+
class AdminPermit < CanTango::UserPermit; end
|
12
|
+
|
13
|
+
describe CanTango::Permits::Permit do
|
14
|
+
|
15
|
+
it "should register RolePermit-based permits" do
|
16
|
+
CanTango.config.permits.admin_account.role[:admin].should == AdminAccountPermits::AdminRolePermit
|
17
|
+
CanTango.config.permits.role[:musician].should == MusicianRolePermit
|
18
|
+
end
|
19
|
+
|
20
|
+
it "should register RoleGroupPermit-based permits" do
|
21
|
+
CanTango.config.permits.role_group[:editors].should == EditorsRoleGroupPermit
|
22
|
+
end
|
23
|
+
|
24
|
+
it "should register UserPermit-based permits" do
|
25
|
+
CanTango.config.permits.user[:admin].should == AdminPermit
|
26
|
+
end
|
27
|
+
it "should register AccountPermit-based permits" do
|
28
|
+
CanTango.config.permits.account[:admin].should == AdminAccountPermit
|
29
|
+
end
|
30
|
+
|
31
|
+
context "registration of double-inherited permits (fx RolePermit ones) - specially for Kris ;)" do
|
32
|
+
before do
|
33
|
+
class GuitaristRolePermit < MusicianRolePermit; end
|
34
|
+
class AdminAccountPermits::AngryAdminRolePermit < AdminAccountPermits::AdminRolePermit; end
|
35
|
+
end
|
36
|
+
|
37
|
+
it "should register basic namespaced" do
|
38
|
+
CanTango.config.permits.role[:guitarist].should == GuitaristRolePermit
|
39
|
+
end
|
40
|
+
|
41
|
+
it "should register account-namespaced" do
|
42
|
+
CanTango.config.permits.admin_account.role[:angry_admin].should == AdminAccountPermits::AngryAdminRolePermit
|
43
|
+
end
|
44
|
+
|
45
|
+
end
|
46
|
+
end
|
@@ -0,0 +1,13 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe CanTango do
|
4
|
+
describe 'class level macros' do
|
5
|
+
subject { CanTango }
|
6
|
+
|
7
|
+
specify { lambda { CanTango::Cache::MonetaCache }.should raise_error }
|
8
|
+
specify { lambda { CanTango::Ability::Cache::MonetaCache }.should raise_error }
|
9
|
+
specify { lambda { CanTango::PermissionEngine::MonetaStore }.should raise_error }
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if admin_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if admin_can?(:delete, article)
|
19
19
|
|
20
20
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if admin_account_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if admin_account_can?(:delete, article)
|
19
19
|
|
20
20
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if guest_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if guest_can?(:delete, article)
|
19
19
|
|
20
20
|
|
@@ -15,7 +15,7 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if user_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if user_can?(:delete, article)
|
19
19
|
|
20
20
|
<!-- some dirty tricks to test caching -->
|
21
21
|
<%= "Cached the rules!" if current_ability.cached_rules === current_ability.rules %>
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_comment_path(comment)) if guest_can?(:edit, comment)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", comment_path(post), :method => 'delete') if guest_can?(:delete, comment)
|
19
19
|
|
20
20
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_comment_path(comment)) if user_can?(:edit, comment)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", comment_path(post), :method => 'delete') if user_can?(:delete, comment)
|
19
19
|
|
20
20
|
|
@@ -15,5 +15,5 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit #{concerto.title}", edit_concerto_path(concerto)) if admin_can?(:edit, concerto)
|
17
17
|
%td
|
18
|
-
= link_to("Delete #{concerto.title}",
|
18
|
+
= link_to("Delete #{concerto.title}", concerto_path(concerto), :method => 'delete') if admin_can?(:delete, concerto)
|
19
19
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if admin_account_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if admin_account_can?(:delete, article)
|
19
19
|
|
20
20
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if guest_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if guest_can?(:delete, article)
|
19
19
|
|
20
20
|
|
@@ -15,5 +15,5 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit #{concerto.title}", edit_concerto_path(concerto)) if user_can?(:edit, concerto)
|
17
17
|
%td
|
18
|
-
= link_to("Delete #{concerto.title}",
|
18
|
+
= link_to("Delete #{concerto.title}", concerto_path(concerto), :method => 'delete') if user_can?(:delete, concerto)
|
19
19
|
|
@@ -1,8 +1,8 @@
|
|
1
1
|
CanTango.configure do |config|
|
2
2
|
config.guest.user Proc.new { Guest.instance }
|
3
3
|
|
4
|
-
config.
|
5
|
-
config.
|
6
|
-
config.
|
4
|
+
config.cache_engine.set :on
|
5
|
+
config.permit_engine.set :on
|
6
|
+
config.permission_engine.set :on
|
7
7
|
end
|
8
8
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if admin_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if admin_can?(:delete, article)
|
19
19
|
|
20
20
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if admin_account_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if admin_account_can?(:delete, article)
|
19
19
|
|
20
20
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if guest_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if guest_can?(:delete, article)
|
19
19
|
|
20
20
|
|
@@ -15,7 +15,7 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if user_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if user_can?(:delete, article)
|
19
19
|
|
20
20
|
<!-- some dirty tricks to test caching -->
|
21
21
|
<%= "Cached the rules!" if current_ability.cached_rules === current_ability.rules %>
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_comment_path(comment)) if guest_can?(:edit, comment)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", comment_path(post), :method => 'delete') if guest_can?(:delete, comment)
|
19
19
|
|
20
20
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_comment_path(comment)) if user_can?(:edit, comment)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", comment_path(post), :method => 'delete') if user_can?(:delete, comment)
|
19
19
|
|
20
20
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if admin_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if admin_can?(:delete, article)
|
19
19
|
|
20
20
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if admin_account_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if admin_account_can?(:delete, article)
|
19
19
|
|
20
20
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_article_path(article)) if guest_can?(:edit, article)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", article_path(article), :method => 'delete') if guest_can?(:delete, article)
|
19
19
|
|
20
20
|
|
@@ -15,5 +15,5 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_concerto_path(concerto)) if user_can?(:edit, concerto)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", concerto_path(concerto), :method => 'delete') if user_can?(:delete, concerto)
|
19
19
|
|
@@ -15,6 +15,6 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_post_path(post)) if admin_account_can?(:edit, post)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", post_path(post), :method => 'delete') if admin_account_can?(:delete, post)
|
19
19
|
|
20
20
|
|
@@ -15,5 +15,5 @@
|
|
15
15
|
%td
|
16
16
|
= link_to("Edit", edit_user_path(user)) if admin_account_can?(:edit, user)
|
17
17
|
%td
|
18
|
-
= link_to("Delete",
|
18
|
+
= link_to("Delete", user_path(user), :method => 'delete') if admin_account_can?(:delete, user)
|
19
19
|
|