esp-permissions 0.0.7.1 → 0.0.8

data/app/controllers/esp_permissions/users_controller.rb

@@ -3,6 +3,7 @@ class EspPermissions::UsersController < EspPermissions::ApplicationController
 
   actions :index, :new, :create, :destroy, :search
 
+  has_scope :with_permissions, :default => 1
   has_scope :page, :default => 1
 
   def search
@@ -17,6 +18,7 @@ class EspPermissions::UsersController < EspPermissions::ApplicationController
     def search_and_paginate_collection
       if params[:utf8]
         search_object = searcher_for(resource_instance_name)
+        search_object.permissions_count_gt = 1
         search_object.pagination = paginate_options
         search_object.results
       else

data/app/models/user_search.rb

@@ -1,5 +1,6 @@
 class UserSearch < Search
   column :keywords, :text
+  column :permissions_count_gt, :integer
 end
 
 # == Schema Information

data/lib/esp-permissions/version.rb

@@ -1,3 +1,3 @@
 module EspPermissions
-  VERSION = "0.0.7.1"
+  VERSION = "0.0.8"
 end

data/lib/generators/esp_permissions/install/install_generator.rb

@@ -25,6 +25,7 @@ module EspPermissions
       def create_migration
         migration_template 'db/migrate/esp_permissions_create_contexts.rb'
         migration_template 'db/migrate/esp_permissions_create_permissions.rb'
+        migration_template 'db/migrate/esp_permissions_add_permissions_count_to_users.rb'
       end
 
     end

data/lib/generators/esp_permissions/install/templates/app/models/permission.rb

@@ -1,6 +1,6 @@
 class Permission < ActiveRecord::Base
   belongs_to :context
-  belongs_to :user
+  belongs_to :user, :counter_cache => true
   has_enum :role, :scopes => true
 
   attr_accessor :user_search, :user_uid, :user_first_name, :user_last_name, :user_email

data/lib/generators/esp_permissions/install/templates/app/models/user.rb

@@ -10,8 +10,11 @@ class User < ActiveRecord::Base
 
   searchable do
     text :name, :email, :nickname, :phone, :last_name, :first_name
+    integer :permissions_count
   end
 
+  scope :with_permissions, where('permissions_count > 0')
+
   def self.from_omniauth(hash)
     User.find_or_initialize_by_uid(hash['uid']).tap do |user|
       user.update_attributes hash['info']

data/lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_add_permissions_count_to_users.rb

@@ -0,0 +1,5 @@
+class EspPermissionsAddPermissionsCountToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :permissions_count, :integer
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-permissions
 version: !ruby/object:Gem::Version
-  version: 0.0.7.1
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &23402120 !ruby/object:Gem::Requirement
+  requirement: &12246580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23402120
+  version_requirements: *12246580
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &23401700 !ruby/object:Gem::Requirement
+  requirement: &12246040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23401700
+  version_requirements: *12246040
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &23389060 !ruby/object:Gem::Requirement
+  requirement: &12245520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.12.alpha.2
   type: :runtime
   prerelease: false
-  version_requirements: *23389060
+  version_requirements: *12245520
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &23388640 !ruby/object:Gem::Requirement
+  requirement: &12245080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23388640
+  version_requirements: *12245080
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &23388160 !ruby/object:Gem::Requirement
+  requirement: &12244560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23388160
+  version_requirements: *12244560
 - !ruby/object:Gem::Dependency
   name: has_enum
-  requirement: &23387740 !ruby/object:Gem::Requirement
+  requirement: &12244140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23387740
+  version_requirements: *12244140
 - !ruby/object:Gem::Dependency
   name: has_searcher
-  requirement: &23387320 !ruby/object:Gem::Requirement
+  requirement: &12243680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23387320
+  version_requirements: *12243680
+- !ruby/object:Gem::Dependency
+  name: has_scope
+  requirement: &12243240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *12243240
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &23386900 !ruby/object:Gem::Requirement
+  requirement: &12242820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23386900
+  version_requirements: *12242820
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &23386480 !ruby/object:Gem::Requirement
+  requirement: &12242380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23386480
+  version_requirements: *12242380
 - !ruby/object:Gem::Dependency
   name: progress_bar
-  requirement: &23386060 !ruby/object:Gem::Requirement
+  requirement: &12241960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23386060
+  version_requirements: *12241960
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &23385640 !ruby/object:Gem::Requirement
+  requirement: &12241540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23385640
+  version_requirements: *12241540
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &23385220 !ruby/object:Gem::Requirement
+  requirement: &12240920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23385220
+  version_requirements: *12240920
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &23384800 !ruby/object:Gem::Requirement
+  requirement: &12215580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23384800
+  version_requirements: *12215580
 - !ruby/object:Gem::Dependency
   name: sso_client
-  requirement: &23384380 !ruby/object:Gem::Requirement
+  requirement: &12215160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +175,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23384380
+  version_requirements: *12215160
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &23383880 !ruby/object:Gem::Requirement
+  requirement: &12214660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +186,10 @@ dependencies:
         version: 0.9.0.rc9
   type: :runtime
   prerelease: false
-  version_requirements: *23383880
+  version_requirements: *12214660
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &23383460 !ruby/object:Gem::Requirement
+  requirement: &12214240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +197,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23383460
+  version_requirements: *12214240
 - !ruby/object:Gem::Dependency
   name: whenever
-  requirement: &23383000 !ruby/object:Gem::Requirement
+  requirement: &12213780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +208,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23383000
+  version_requirements: *12213780
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &23382380 !ruby/object:Gem::Requirement
+  requirement: &12213360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23382380
+  version_requirements: *12213360
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &23381920 !ruby/object:Gem::Requirement
+  requirement: &12212940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23381920
+  version_requirements: *12212940
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &23381400 !ruby/object:Gem::Requirement
+  requirement: &12212520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23381400
+  version_requirements: *12212520
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &23363240 !ruby/object:Gem::Requirement
+  requirement: &12212100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23363240
+  version_requirements: *12212100
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &23362820 !ruby/object:Gem::Requirement
+  requirement: &12211680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +263,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23362820
+  version_requirements: *12211680
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &23362400 !ruby/object:Gem::Requirement
+  requirement: &12211260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +274,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23362400
+  version_requirements: *12211260
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &23361980 !ruby/object:Gem::Requirement
+  requirement: &12210840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +285,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23361980
+  version_requirements: *12210840
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &23361540 !ruby/object:Gem::Requirement
+  requirement: &12210420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +296,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23361540
+  version_requirements: *12210420
 - !ruby/object:Gem::Dependency
   name: ryba
-  requirement: &23361080 !ruby/object:Gem::Requirement
+  requirement: &12210000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +307,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23361080
+  version_requirements: *12210000
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &23360620 !ruby/object:Gem::Requirement
+  requirement: &12209580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,10 +318,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23360620
+  version_requirements: *12209580
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &23360180 !ruby/object:Gem::Requirement
+  requirement: &12209160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,10 +329,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23360180
+  version_requirements: *12209160
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &23359760 !ruby/object:Gem::Requirement
+  requirement: &12208740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -329,7 +340,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23359760
+  version_requirements: *12208740
 description: Description of EspPermissions.
 email:
 - mail@openteam.ru
@@ -365,6 +376,7 @@ files:
 - lib/generators/esp_permissions/install/templates/config/schedule.rb
 - lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_create_permissions.rb
 - lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_create_contexts.rb
+- lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_add_permissions_count_to_users.rb
 - lib/esp-permissions/engine.rb
 - lib/esp-permissions/version.rb
 - lib/tasks/esp-permissions_tasks.rake
@@ -386,7 +398,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3009214921157908264
+      hash: -1237247969969571249
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -395,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3009214921157908264
+      hash: -1237247969969571249
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10