esp-auth 1.0.8 → 1.1.0

data/lib/esp_auth/engine.rb

@@ -39,9 +39,9 @@ module EspAuth
 
           def polymorphic_context_tree_for(form)
             form.input :polymorphic_context,  :as => :select,
-                                              :collection => current_user.contexts_tree,
+                                              :collection => current_user.context_tree,
                                               :member_value => ->(c) { [c.class.model_name.underscore, c.id].join('_') },
-                                              :member_label => ->(c) { (' ' * 2 * c.depth + c.title).html_safe },
+                                              :member_label => ->(c) { (' ' * 2 * c.absolute_depth + c.title).html_safe },
                                               :include_blank => t('commons.not_selected')
           end
       end
@@ -81,11 +81,16 @@ module EspAuth
             permissions.map(&:context).uniq
           end
 
-          define_method :contexts_tree do
-            contexts.flat_map{|c| c.respond_to?(:subtree) ? c.subtree : c}
-            .uniq
-            .flat_map{|c| c.respond_to?(:subcontexts) ? [c] + c.subcontexts : c }
-            .uniq
+          define_method :context_tree do
+            instance_variable_get(:@context_tree) || instance_variable_set(:@context_tree, contexts
+                                                                                          .flat_map{|c| c.respond_to?(:subtree) ? c.subtree : c}
+                                                                                          .uniq
+                                                                                          .flat_map{|c| c.respond_to?(:subcontexts) ? [c] + c.subcontexts : c }
+                                                                                          .uniq)
+          end
+
+          define_method :context_tree_of do | klass |
+            context_tree.select{|node| node.is_a?(klass)}
           end
 
           define_method :to_s do
@@ -157,6 +162,7 @@ module EspAuth
           has_many :permissions, :as => :context
           has_ancestry
 
+          alias_method :absolute_depth, :depth
           alias_attribute :to_s, :title
         end
 
@@ -166,7 +172,7 @@ module EspAuth
 
           alias_attribute :to_s, :title
 
-          def depth
+          def absolute_depth
             context.depth + 1
           end
         end

data/lib/esp_auth/version.rb

@@ -1,3 +1,3 @@
 module EspAuth
-  VERSION = "1.0.8"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-auth
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &19659740 !ruby/object:Gem::Requirement
+  requirement: &14292000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19659740
+  version_requirements: *14292000
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &19659200 !ruby/object:Gem::Requirement
+  requirement: &14291580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19659200
+  version_requirements: *14291580
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &19658580 !ruby/object:Gem::Requirement
+  requirement: &14290960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.12.alpha.4
   type: :runtime
   prerelease: false
-  version_requirements: *19658580
+  version_requirements: *14290960
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &19658160 !ruby/object:Gem::Requirement
+  requirement: &14306920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19658160
+  version_requirements: *14306920
 - !ruby/object:Gem::Dependency
   name: default_value_for
-  requirement: &19657580 !ruby/object:Gem::Requirement
+  requirement: &14306460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19657580
+  version_requirements: *14306460
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &19657140 !ruby/object:Gem::Requirement
+  requirement: &14306040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19657140
+  version_requirements: *14306040
 - !ruby/object:Gem::Dependency
   name: devise-russian
-  requirement: &19673000 !ruby/object:Gem::Requirement
+  requirement: &14305620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19673000
+  version_requirements: *14305620
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &19672580 !ruby/object:Gem::Requirement
+  requirement: &14305200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19672580
+  version_requirements: *14305200
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &19672160 !ruby/object:Gem::Requirement
+  requirement: &14304780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19672160
+  version_requirements: *14304780
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &19671740 !ruby/object:Gem::Requirement
+  requirement: &14300560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19671740
+  version_requirements: *14300560
 - !ruby/object:Gem::Dependency
   name: has_enum
-  requirement: &19671320 !ruby/object:Gem::Requirement
+  requirement: &14300140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19671320
+  version_requirements: *14300140
 - !ruby/object:Gem::Dependency
   name: has_scope
-  requirement: &19670900 !ruby/object:Gem::Requirement
+  requirement: &14299720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19670900
+  version_requirements: *14299720
 - !ruby/object:Gem::Dependency
   name: has_searcher
-  requirement: &19666680 !ruby/object:Gem::Requirement
+  requirement: &14299300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19666680
+  version_requirements: *14299300
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &19666260 !ruby/object:Gem::Requirement
+  requirement: &14323380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19666260
+  version_requirements: *14323380
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &19665840 !ruby/object:Gem::Requirement
+  requirement: &14322960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19665840
+  version_requirements: *14322960
 - !ruby/object:Gem::Dependency
   name: progress_bar
-  requirement: &19665420 !ruby/object:Gem::Requirement
+  requirement: &14322520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19665420
+  version_requirements: *14322520
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19665000 !ruby/object:Gem::Requirement
+  requirement: &14322080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19665000
+  version_requirements: *14322080
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &19689080 !ruby/object:Gem::Requirement
+  requirement: &14321620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19689080
+  version_requirements: *14321620
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &19688660 !ruby/object:Gem::Requirement
+  requirement: &14321180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19688660
+  version_requirements: *14321180
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &19688200 !ruby/object:Gem::Requirement
+  requirement: &14320720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19688200
+  version_requirements: *14320720
 - !ruby/object:Gem::Dependency
   name: whenever
-  requirement: &19687740 !ruby/object:Gem::Requirement
+  requirement: &14320280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19687740
+  version_requirements: *14320280
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &19687300 !ruby/object:Gem::Requirement
+  requirement: &14319840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19687300
+  version_requirements: *14319840
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &19686860 !ruby/object:Gem::Requirement
+  requirement: &14319380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19686860
+  version_requirements: *14319380
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &19686420 !ruby/object:Gem::Requirement
+  requirement: &14318940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19686420
+  version_requirements: *14318940
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &19685960 !ruby/object:Gem::Requirement
+  requirement: &14318480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +285,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19685960
+  version_requirements: *14318480
 - !ruby/object:Gem::Dependency
   name: russian
-  requirement: &19685520 !ruby/object:Gem::Requirement
+  requirement: &14318040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19685520
+  version_requirements: *14318040
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &19685060 !ruby/object:Gem::Requirement
+  requirement: &14317600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,10 +307,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19685060
+  version_requirements: *14317600
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &19684620 !ruby/object:Gem::Requirement
+  requirement: &14317160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,10 +318,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19684620
+  version_requirements: *14317160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19684160 !ruby/object:Gem::Requirement
+  requirement: &14316720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -329,10 +329,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19684160
+  version_requirements: *14316720
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &19683720 !ruby/object:Gem::Requirement
+  requirement: &14316280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -340,10 +340,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19683720
+  version_requirements: *14316280
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &19683280 !ruby/object:Gem::Requirement
+  requirement: &14315840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -351,10 +351,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19683280
+  version_requirements: *14315840
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &19682840 !ruby/object:Gem::Requirement
+  requirement: &14331760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -362,7 +362,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19682840
+  version_requirements: *14331760
 description: Description of EspAuth.
 email:
 - mail@openteam.ru
@@ -434,7 +434,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4425170649980545011
+      hash: 1663371989005486869
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -443,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4425170649980545011
+      hash: 1663371989005486869
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15