cantango 0.8.9 → 0.8.9.1

data/VERSION

@@ -1 +1 @@
-0.8.9
+0.8.9.1

data/cantango.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cantango"
-  s.version = "0.8.9"
+  s.version = "0.8.9.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-10-08"
+  s.date = "2011-10-11"
   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 = [

data/lib/cantango.rb

@@ -33,6 +33,15 @@ module CanTango
       config.permits.denied candidate, actions, subjects, *extra_args
     end
 
+    def debug_permits_registry
+      puts "permits registry:" << CanTango.config.permits.show_all.inspect
+    end
+
+    def debug_ability candidate, actions, subjects, *extra_args
+      puts "permits allowed:" << permits_allowed(candidate, actions, subjects, *extra_args).inspect
+      puts "permits denied:"  << permits_denied(candidate, actions, subjects, *extra_args).inspect
+    end
+
     def clear_permits_executed!
       config.permits.clear_executed!
     end

data/lib/cantango/configuration/models.rb

@@ -18,6 +18,10 @@ module CanTango
         end
       end
 
+      def available_models
+        ar_models.map(&:name)
+      end
+
       private
 
       def try_model model_string
@@ -30,10 +34,6 @@ module CanTango
         available_models.grep reg_exp
       end
  
-      def available_models
-        ar_models.map(&:name)
-      end
-
       def ar_models
         # Sugar-high #to_strings didn't work here!
         ActiveRecord::Base.descendants

data/lib/cantango/rails.rb

@@ -1,7 +1,7 @@
 module CanTango
   module Rails
     module Helpers
-      autoload_modules :ControllerHelper, :ViewHelper, :BaseHelper #, :RestHelper
+      autoload_modules :ControllerHelper, :ViewHelper, :BaseHelper, :RestHelper
     end
   end
 end

data/lib/cantango/rails/helpers/base_helper.rb

@@ -4,7 +4,7 @@ module CanTango
       module BaseHelper
         def self.included(base)
           include_apis(base)
-          # base.send :include, CanTango::Rails::Helpers::RestHelper
+          base.send :include, CanTango::Rails::Helpers::RestHelper
           base.extend ClassMethods
         end
 

data/lib/cantango/rails/helpers/rest_helper.rb

@@ -1,4 +1,4 @@
-class RestHelper
+module CanTango::Rails::Helpers::RestHelper
   CanTango.config.models.available_models.each do |model|
     class_eval %{
       def delete_#{model}_path obj, options = {}
@@ -16,19 +16,19 @@ class RestHelper
   def link_to_delete obj, user_type, options = {}
     return unless send(:"#{user_type}_can?", :delete, obj)
     # use i18n translation on label
-    link_to t(".delete"), send action_method(obj, :delete), obj, options
+    link_to t(".delete"), rest_action(obj, :delete, options)
   end
 
   def link_to_edit obj, user_type, options = {}
     return unless send(:"#{user_type}_can?", :edit, obj)
     # use i18n translation on label
-    link_to t(".edit"), send action_method(obj, :edit), obj, options
+    link_to t(".edit"), rest_action(obj, :edit, options)
   end
 
   def link_to_view obj, user_type, options = {}
     return unless send(:"#{user_type}_can?", :edit, obj)
     # use i18n translation on label
-    link_to t(".view"), send view_method(obj), obj, options)
+    link_to t(".view"), send(view_method(obj), obj, options)
   end
 
   protected
@@ -37,6 +37,10 @@ class RestHelper
     "#{obj.class.to_s.underscore}_path"
   end
 
+  def rest_action obj, action, options
+    send action_method(obj, :edit), obj, options
+  end
+
   def action_method obj, action
     "#{action}_#{obj.class.to_s.underscore}_path"
   end

data/lib/generators/cantango/base.rb

@@ -11,6 +11,7 @@ module Cantango
       CAN_ACTIONS.each do |action|
         class_eval %{
           class_option :#{action},      :type => :array,     :default => [],  :desc => "Models allowed to #{action}"
+          class_option :not_#{action},  :type => :array,     :default => [],  :desc => "Models not allowed to #{action}"
         }
       end
 
@@ -30,7 +31,28 @@ module Cantango
         }
       end
 
+      CAN_ACTIONS.each do |action|
+        class_eval %{
+          def not_#{action}
+            options[:not_#{action}]
+          end
+        }
+      end
+
       def rules_logic
+        can_logic
+        cannot_logic
+      end
+
+      def can_logic
+        CAN_ACTIONS.map do |action|
+          send(action).map do |c|
+            "can(:#{action}, #{act_model(c)})"
+          end.join("\n    ")
+        end.join("\n")
+      end
+
+      def cannot_logic
         CAN_ACTIONS.map do |action|
           send(action).map do |c|
             "can(:#{action}, #{act_model(c)})"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-08 00:00:00.000000000Z
+date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2158311360 !ruby/object:Gem::Requirement
+  requirement: &2158386120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2158311360
+  version_requirements: *2158386120
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2158310420 !ruby/object:Gem::Requirement
+  requirement: &2158385620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2158310420
+  version_requirements: *2158385620
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2158309000 !ruby/object:Gem::Requirement
+  requirement: &2158385140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158309000
+  version_requirements: *2158385140
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &2158307620 !ruby/object:Gem::Requirement
+  requirement: &2158384640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158307620
+  version_requirements: *2158384640
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2158305560 !ruby/object:Gem::Requirement
+  requirement: &2158384080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2158305560
+  version_requirements: *2158384080
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2158304220 !ruby/object:Gem::Requirement
+  requirement: &2158383580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *2158304220
+  version_requirements: *2158383580
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &2158302900 !ruby/object:Gem::Requirement
+  requirement: &2158383100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2158302900
+  version_requirements: *2158383100
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2158302380 !ruby/object:Gem::Requirement
+  requirement: &2158382600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158302380
+  version_requirements: *2158382600
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2158301860 !ruby/object:Gem::Requirement
+  requirement: &2158382080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158301860
+  version_requirements: *2158382080
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &2158301260 !ruby/object:Gem::Requirement
+  requirement: &2158381580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158301260
+  version_requirements: *2158381580
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &2158296100 !ruby/object:Gem::Requirement
+  requirement: &2158381100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2158296100
+  version_requirements: *2158381100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158294880 !ruby/object:Gem::Requirement
+  requirement: &2158380580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2158294880
+  version_requirements: *2158380580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2158293680 !ruby/object:Gem::Requirement
+  requirement: &2158380100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2158293680
+  version_requirements: *2158380100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158292980 !ruby/object:Gem::Requirement
+  requirement: &2158379600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2158292980
+  version_requirements: *2158379600
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2158291700 !ruby/object:Gem::Requirement
+  requirement: &2158379000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158291700
+  version_requirements: *2158379000
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -822,7 +822,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3737746753132701377
+      hash: 575876604542998821
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: