cantango 0.8.6 → 0.8.6.1

data/Gemfile

@@ -5,7 +5,6 @@ group :default do
   gem 'cancan',           '>= 1.4'
   gem 'sugar-high',       '>= 0.6.0'
   gem 'sweetloader',      '~> 0.1.0'
-  gem 'sqlite3'
   gem 'hashie',           '>= 0.4'
 
   # adapters
@@ -52,6 +51,7 @@ group :development, :test do
   gem "rspec-rails",  '>= 2.6.1'  # needed in development to expose the rails generators
   gem 'forgery',      '>= 0.3' # needed in development when using rake db:seed
   gem 'factory_girl'
+  gem 'sqlite3'
 
   # Adapters
   gem 'sourcify'

data/README.textile

@@ -35,19 +35,18 @@ Run bundler in a terminal/console from the folder of your Gemfile (root folder o
 
 @$ bundle@
 
-h2. Update Sept 1, 2011
+h2. Update Sept 20, 2011
 
-Version *0.8.5.1* has been released.
+Version *0.8.6* has been released.
 
 CanTango now:
 
 * supports "sugar-high 0.6":https://github.com/kristianmandrup/sugar-high.
 * The ability cache has been refactored
-* Activated engines are now run in specified order
+* Engines can now be mounted/unmounted, activated/deactivated and the execution order specified
 * The ability cache rules compiler (for dynamic rules caching) and Moneta cache/store are now optional (enabled via adapters)
-* Permits are found and loaded using pre-registration via inheritance. You can also use the _tango_permit_ macro for more control.
-
-The wiki will soon be updated to reflect these improvements and changes.
+* Permits are loaded using pre-registration of permit classes either via inheritance or use of the _tango_permit_ macro.
+* Enhanced Permits debugging. Easily track which permits granted or declined certain abilities
 
 h2. Quickstart
 
@@ -75,7 +74,7 @@ The CanTango "Configuration":https://github.com/kristianmandrup/cantango/wiki/Co
 
 h3. Abilities via Permits and Permissions
 
-Abilities are Access Control rules. With CanTango, these can be defined in both:
+Abilities are Access Control rules. With CanTango, the AC rules can be defined in both:
 
 * "Permissions":https://github.com/kristianmandrup/cantango/wiki/Permissions (fx a yaml file)
 * "Permits":https://github.com/kristianmandrup/cantango/wiki/Permits (special classes)
@@ -92,32 +91,7 @@ Abilities can be defined for the following conceptual entities:
 
 h3. Debugging Abilities and Permits
 
-Each Permit is in effect an Ability on its own. This lets you easily investigate which Permits allowed or denied a certain action for a specific ability candidate (typically a user or user account). 
-
-Debugging Example:
-
-<pre>
-# First you must enable debug mode
-CanTango.debug!
-
-# And have the permit engine execute at least once
-user_can? :read, Article
-
-# Then you can debug the permits execution
-CanTango.permits_allowed current_user, :read, Article
-
-admin_can? :read, Article
-CanTango.permits_denied admin_user, :publish, [Article, Post]
-CanTango.permits_allowed admin_user, :write, Article
-
-CanTango.clear_executed_permits! # reset as if no permits have been executed
-
-user_can? :publish, Article
-CanTango.permits_denied current_user, [:write, publish], [Article, Post]
-
-guest_account_can? :publish, Article
-CanTango.permits_denied guest_account, :publish, [Article, Post], options
-</pre>
+See [[Debugging permits]]
 
 h3. Design overview
 

data/Rakefile

@@ -37,8 +37,8 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.8.6
+0.8.6.1

data/cantango.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cantango"
-  s.version = "0.8.6"
+  s.version = "0.8.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup", "Stanislaw Pankevich"]
-  s.date = "2011-09-16"
+  s.date = "2011-09-27"
   s.description = "Define your permission rules as role- or role group specific permits.\nIntegrates well with multiple Devise user acounts.\nIncludes rules caching.\nStore permissions in yaml file or key-value store"
   s.email = "kmandrup@gmail.com, s.pankevich@gmail.com"
   s.extra_rdoc_files = [
@@ -577,6 +577,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/tango_fixtures.rb",
     "spec/generators/cantango/account_role_permit_generator_spec.rb",
     "spec/generators/cantango/account_role_permits_generator_spec.rb",
+    "spec/generators/cantango/install_generator_spec.rb",
     "spec/generators/cantango/license_generator_spec.rb",
     "spec/generators/cantango/licenses_generator_spec.rb",
     "spec/generators/cantango/role_permit_generator_spec.rb",
@@ -646,11 +647,11 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<cancan>, [">= 1.4"])
       s.add_runtime_dependency(%q<sugar-high>, [">= 0.6.0"])
       s.add_runtime_dependency(%q<sweetloader>, ["~> 0.1.0"])
-      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
       s.add_runtime_dependency(%q<hashie>, [">= 0.4"])
       s.add_development_dependency(%q<rspec-rails>, [">= 2.6.1"])
       s.add_development_dependency(%q<forgery>, [">= 0.3"])
       s.add_development_dependency(%q<factory_girl>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<sourcify>, [">= 0"])
       s.add_development_dependency(%q<dkastner-moneta>, [">= 1.0"])
       s.add_development_dependency(%q<rspec>, [">= 2.4.0"])
@@ -662,11 +663,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<cancan>, [">= 1.4"])
       s.add_dependency(%q<sugar-high>, [">= 0.6.0"])
       s.add_dependency(%q<sweetloader>, ["~> 0.1.0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<hashie>, [">= 0.4"])
       s.add_dependency(%q<rspec-rails>, [">= 2.6.1"])
       s.add_dependency(%q<forgery>, [">= 0.3"])
       s.add_dependency(%q<factory_girl>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<sourcify>, [">= 0"])
       s.add_dependency(%q<dkastner-moneta>, [">= 1.0"])
       s.add_dependency(%q<rspec>, [">= 2.4.0"])
@@ -679,11 +680,11 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<cancan>, [">= 1.4"])
     s.add_dependency(%q<sugar-high>, [">= 0.6.0"])
     s.add_dependency(%q<sweetloader>, ["~> 0.1.0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<hashie>, [">= 0.4"])
     s.add_dependency(%q<rspec-rails>, [">= 2.6.1"])
     s.add_dependency(%q<forgery>, [">= 0.3"])
     s.add_dependency(%q<factory_girl>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<sourcify>, [">= 0"])
     s.add_dependency(%q<dkastner-moneta>, [">= 1.0"])
     s.add_dependency(%q<rspec>, [">= 2.4.0"])

data/lib/cantango/permits/macros.rb

@@ -1,9 +1,9 @@
 class Module
   def tango_permit options = {}
-    name_from_class_name = CanTango::Permits::Permit.first_name self.to_s.split("::").last
+    name_from_class_name = CanTango::Permit.first_name self.to_s.split("::").last
     name = options[:name] || name_from_class_name
 
-    account_from_class_name = CanTango::Permits::Permit.first_name self.to_s.split("::").first if (self.to_s.split("::").size > 1)
+    account_from_class_name = CanTango::Permit.first_name self.to_s.split("::").first if (self.to_s.split("::").size > 1)
     account = options[:account] || account_from_class_name
 
     type = options[:type] || self.superclass.type

data/lib/generators/cantango/install/templates/permissions.yml

@@ -1,3 +1,5 @@
+account_types:
+user_types:
 roles:
 role_groups:
 licenses:

data/spec/generators/cantango/account_role_permit_generator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 require 'generator-spec'
 
 require_generator :cantango => :role_permit
@@ -12,11 +12,11 @@ RSpec::Generator.configure do |config|
 end
 
 
-describe CanTango::Generators::RolePermitGenerator do
+describe Cantango::Generators::RolePermitGenerator do
   use_helpers :special, :file
 
   setup_generator :permit do
-    tests CanTango::Generators::RolePermitGenerator 
+    tests Cantango::Generators::RolePermitGenerator
   end
 
   describe 'Run Permit generator' do

data/spec/generators/cantango/account_role_permits_generator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 require 'generator-spec'
 
 require_generator :cantango => :role_permits
@@ -6,22 +6,22 @@ require_generator :cantango => :role_permits
 RSpec::Generator.configure do |config|
   config.debug = true
   config.remove_temp_dir = true #false
-  config.default_rails_root(__FILE__) 
+  config.default_rails_root(__FILE__)
   config.lib = File.dirname(__FILE__) + '/../lib'
   config.logger = :stdout  # :file
 end
 
 
-describe CanTango::Generators::RolePermitsGenerator do
+describe Cantango::Generators::RolePermitsGenerator do
   use_helpers :controller, :special, :file
 
   setup_generator :permits do
-    tests CanTango::Generators::RolePermitsGenerator
+    tests Cantango::Generators::RolePermitsGenerator
   end
 
   describe 'result of running generator with default profile' do
     before :each do
-      @generator = with_generator do |g|    
+      @generator = with_generator do |g|
         g.run_generator "--orm mongoid --account editor".args
       end
     end
@@ -31,29 +31,29 @@ describe CanTango::Generators::RolePermitsGenerator do
         @generator.should generate_permit :admin
       end
 
-      it "should generate a permits initializer file with orm set to mongoid" do      
+      it "should generate a permits initializer file with orm set to mongoid" do
         File.read(initializer_file(:cantango)).should match /config.orm = :mongoid/
-      end      
+      end
     end
   end
 
   describe 'result of running generator with option to create permit for each registered role' do
     context "Registered roles :editor, :admin" do
       before :each do
-        @generator = with_generator do |g|    
+        @generator = with_generator do |g|
           g.run_generator "admin editor".args
         end
       end
-  
+
       it "should have created Guest and Admin permits" do
         @generator.should have_permit_files :guest, :admin
       end
-      
-      it "should have created the Editor permit for the :editor role and the permit should not use licenses" do      
+
+      it "should have created the Editor permit for the :editor role and the permit should not use licenses" do
         @generator.should have_permit_file :editor do |editor_permit|
-          editor_permit.should_not have_licenses :user_admin, :blogging 
+          editor_permit.should_not have_licenses :user_admin, :blogging
         end
       end
     end #ctx
-  end    
+  end
 end

data/spec/generators/cantango/install_generator_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'generator-spec'
+
+# require 'generators/cantango/install/install_generator'
+
+require_generator :cantango => :install
+
+RSpec::Generator.configure do |config|
+  config.debug = true
+  config.remove_temp_dir = false
+  config.default_rails_root(__FILE__)
+  config.lib = File.dirname(__FILE__) + '/../lib'
+  config.logger = :stdout  # :file
+end
+
+
+describe Cantango::Generators::InstallGenerator do
+  use_helpers :special, :file
+
+  setup_generator :permit do
+    tests Cantango::Generators::InstallGenerator
+  end
+
+  describe 'Run Install generator' do
+    before :each do
+      @gen_result = with_generator do |g|
+        g.run_generator
+      end
+    end
+
+    describe 'result of running Install generator' do
+      it "should create config files" do
+        @gen_result.should have_initializer_file :cantango do |file|
+          file.should have_content /engines/
+        end
+        @gen_result.should have_config_file :categories
+        @gen_result.should have_config_file :permissions
+      end
+    end
+  end
+end
+

data/spec/generators/cantango/license_generator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 require 'generator-spec'
 
 require_generator :cantango => :license
@@ -6,13 +6,13 @@ require_generator :cantango => :license
 RSpec::Generator.configure do |config|
   config.debug = true
   config.remove_temp_dir = true #false
-  config.default_rails_root(__FILE__) 
+  config.default_rails_root(__FILE__)
   config.lib = File.dirname(__FILE__) + '/../lib'
   config.logger = :stdout  # :file
 end
 
 
-describe CanTango::Generators::LicenseGenerator  do
+describe Cantango::Generators::LicenseGenerator  do
   use_helpers :special, :file
 
   setup_generator :license do

data/spec/generators/cantango/licenses_generator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 require 'generator-spec'
 
 require_generator :cantango => :licenses
@@ -12,11 +12,11 @@ RSpec::Generator.configure do |config|
 end
 
 
-describe CanTango::Generators::LicensesGenerator do
+describe Cantango::Generators::LicensesGenerator do
   use_helpers :controller, :special, :file
 
   setup_generator :licenses do
-    tests CanTango::Generators::LicensesGenerator
+    tests Cantango::Generators::LicensesGenerator
   end
 
   describe "Licenses: Profile Administration and Article Editing" do

data/spec/generators/cantango/role_permit_generator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 require 'generator-spec'
 
 require_generator :cantango => :role_permit
@@ -6,17 +6,17 @@ require_generator :cantango => :role_permit
 RSpec::Generator.configure do |config|
   config.debug = true
   config.remove_temp_dir = true #false
-  config.default_rails_root(__FILE__) 
+  config.default_rails_root(__FILE__)
   config.lib = File.dirname(__FILE__) + '/../lib'
   config.logger = :stdout  # :file
 end
 
 
-describe CanTango::Generators::RolePermitGenerator do
+describe Cantango::Generators::RolePermitGenerator do
   use_helpers :special, :file
 
   setup_generator :permit do
-    tests CanTango::Generators::RolePermitGenerator
+    tests Cantango::Generators::RolePermitGenerator
   end
 
   describe 'Run Permit generator' do

data/spec/generators/cantango/role_permits_generator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper' 
+require 'spec_helper'
 require 'generator-spec'
 
 require_generator :cantango => :role_permits
@@ -12,10 +12,10 @@ RSpec::Generator.configure do |config|
 end
 
 
-describe CanTango::Generators::RolePermitsGenerator do
+describe Cantango::Generators::RolePermitsGenerator do
   use_helpers :controller, :special, :file
     setup_generator :permits do
-    tests CanTango::Generators::RolePermitsGenerator
+    tests Cantango::Generators::RolePermitsGenerator
   end
 
   describe 'result of running generator with default profile' do
@@ -43,16 +43,16 @@ describe CanTango::Generators::RolePermitsGenerator do
           g.run_generator "admin editor".args
         end
       end
-  
+
       it "should have created Guest and Admin permits" do
         @generator.should have_permit_files :guest, :admin
       end
-      
+
       it "should have created the Editor permit for the :editor role and the permit should not use licenses" do      
         @generator.should have_permit_file :editor do |editor_permit|
           editor_permit.should_not have_licenses :user_admin, :blogging 
         end
       end
     end #ctx
-  end    
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000Z
+date: 2011-09-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2158759980 !ruby/object:Gem::Requirement
+  requirement: &2159452280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2158759980
+  version_requirements: *2159452280
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2158759180 !ruby/object:Gem::Requirement
+  requirement: &2159451800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2158759180
+  version_requirements: *2159451800
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2158752840 !ruby/object:Gem::Requirement
+  requirement: &2159451320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158752840
+  version_requirements: *2159451320
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &2158751900 !ruby/object:Gem::Requirement
+  requirement: &2159450840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,21 +55,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158751900
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &2158749860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2158749860
+  version_requirements: *2159450840
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2158748240 !ruby/object:Gem::Requirement
+  requirement: &2159450360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +66,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2158748240
+  version_requirements: *2159450360
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2158734040 !ruby/object:Gem::Requirement
+  requirement: &2159449880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *2158734040
+  version_requirements: *2159449880
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &2158732460 !ruby/object:Gem::Requirement
+  requirement: &2159449400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +88,21 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2158732460
+  version_requirements: *2159449400
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2158729700 !ruby/object:Gem::Requirement
+  requirement: &2159448920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2159448920
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2159448440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158729700
+  version_requirements: *2159448440
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &2158728640 !ruby/object:Gem::Requirement
+  requirement: &2159447960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158728640
+  version_requirements: *2159447960
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &2158727540 !ruby/object:Gem::Requirement
+  requirement: &2159447480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2158727540
+  version_requirements: *2159447480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158726640 !ruby/object:Gem::Requirement
+  requirement: &2159447000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2158726640
+  version_requirements: *2159447000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2158725840 !ruby/object:Gem::Requirement
+  requirement: &2159446520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2158725840
+  version_requirements: *2159446520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158724960 !ruby/object:Gem::Requirement
+  requirement: &2159446040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2158724960
+  version_requirements: *2159446040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2158724140 !ruby/object:Gem::Requirement
+  requirement: &2159445560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158724140
+  version_requirements: *2159445560
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -751,6 +751,7 @@ files:
 - spec/fixtures/tango_fixtures.rb
 - spec/generators/cantango/account_role_permit_generator_spec.rb
 - spec/generators/cantango/account_role_permits_generator_spec.rb
+- spec/generators/cantango/install_generator_spec.rb
 - spec/generators/cantango/license_generator_spec.rb
 - spec/generators/cantango/licenses_generator_spec.rb
 - spec/generators/cantango/role_permit_generator_spec.rb
@@ -820,7 +821,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2544503821884776922
+      hash: -2761645409637514242
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: