cantango 0.8.9.1 → 0.8.9.2

data/VERSION

@@ -1 +1 @@
-0.8.9.1
+0.8.9.2

data/cantango.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cantango"
-  s.version = "0.8.9.1"
+  s.version = "0.8.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup", "Stanislaw Pankevich"]

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

@@ -8,36 +8,40 @@ module CanTango::Rails::Helpers::RestHelper
   end
 
   def link_to_new obj, user_type, options = {}
-    return unless send(:"#{user_type}_can?", :create, obj)
+    return unless can_perform_action?(user_type, :create, obj)
     # use i18n translation on label
-    link_to t(".create"), action_method(obj, :new)
+    link_to t(".create"), send(action_method obj, :new, options)
   end
 
   def link_to_delete obj, user_type, options = {}
-    return unless send(:"#{user_type}_can?", :delete, obj)
+    return unless can_perform_action?(user_type, :delete, obj)
     # use i18n translation on label
-    link_to t(".delete"), rest_action(obj, :delete, options)
+    link_to t(".delete"), rest_obj_action(obj, :delete, options)
   end
 
   def link_to_edit obj, user_type, options = {}
-    return unless send(:"#{user_type}_can?", :edit, obj)
+    return unless can_perform_action?(user_type, :edit, obj)
     # use i18n translation on label
-    link_to t(".edit"), rest_action(obj, :edit, options)
+    link_to t(".edit"), rest_obj_action(obj, :edit, options)
   end
 
   def link_to_view obj, user_type, options = {}
-    return unless send(:"#{user_type}_can?", :edit, obj)
+    return unless can_perform_action?(user_type, :view, obj)
     # use i18n translation on label
     link_to t(".view"), send(view_method(obj), obj, options)
   end
 
   protected
 
+  def can_perform_action? user_type, action, obj
+    send(:"#{user_type}_can?", action, obj)
+  end
+
   def view_method obj
     "#{obj.class.to_s.underscore}_path"
   end
 
-  def rest_action obj, action, options
+  def rest_obj_action obj, action, options
     send action_method(obj, :edit), obj, options
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango
 version: !ruby/object:Gem::Version
-  version: 0.8.9.1
+  version: 0.8.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2158386120 !ruby/object:Gem::Requirement
+  requirement: &2158162380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2158386120
+  version_requirements: *2158162380
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2158385620 !ruby/object:Gem::Requirement
+  requirement: &2158161880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2158385620
+  version_requirements: *2158161880
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2158385140 !ruby/object:Gem::Requirement
+  requirement: &2158161400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158385140
+  version_requirements: *2158161400
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &2158384640 !ruby/object:Gem::Requirement
+  requirement: &2158160900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158384640
+  version_requirements: *2158160900
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2158384080 !ruby/object:Gem::Requirement
+  requirement: &2158160400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2158384080
+  version_requirements: *2158160400
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2158383580 !ruby/object:Gem::Requirement
+  requirement: &2158159920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *2158383580
+  version_requirements: *2158159920
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &2158383100 !ruby/object:Gem::Requirement
+  requirement: &2158159340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2158383100
+  version_requirements: *2158159340
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2158382600 !ruby/object:Gem::Requirement
+  requirement: &2158158780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158382600
+  version_requirements: *2158158780
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2158382080 !ruby/object:Gem::Requirement
+  requirement: &2158158300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158382080
+  version_requirements: *2158158300
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &2158381580 !ruby/object:Gem::Requirement
+  requirement: &2158157820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158381580
+  version_requirements: *2158157820
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &2158381100 !ruby/object:Gem::Requirement
+  requirement: &2158157320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2158381100
+  version_requirements: *2158157320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158380580 !ruby/object:Gem::Requirement
+  requirement: &2158156740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2158380580
+  version_requirements: *2158156740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2158380100 !ruby/object:Gem::Requirement
+  requirement: &2158156240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2158380100
+  version_requirements: *2158156240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158379600 !ruby/object:Gem::Requirement
+  requirement: &2158155760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2158379600
+  version_requirements: *2158155760
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2158379000 !ruby/object:Gem::Requirement
+  requirement: &2158155260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158379000
+  version_requirements: *2158155260
 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: 575876604542998821
+      hash: -112989363302876815
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: