esp-permissions 0.0.13 → 0.0.14

data/lib/esp-permissions/version.rb

@@ -1,3 +1,3 @@
 module EspPermissions
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

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

@@ -6,7 +6,7 @@ class Ability
     alias_action :create, :read, :update, :destroy, :to => :modify
 
     can :modify, Context do | context |
-      user.permissions.where(:role => :manager).where(:context_id => context.ancestor_ids + [context.id]).exists?
+      user.permissions.for_roles(:manager).for_context(context).exists?
     end
 
     can :modify, Permission do | permission |

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

@@ -1,26 +1,28 @@
 class Permission < ActiveRecord::Base
+  attr_accessor :user_search, :user_uid, :user_first_name, :user_last_name, :user_email
+
   belongs_to :context
   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
+  scope :for_roles,   ->(*roles)  { where(:role => roles) }
+  scope :for_context, ->(context) { where(:context_id => (context.ancestor_ids + [context.id])) }
 
-  before_validation :reset_user_id, :unless => :user_id?
+  before_validation :reset_user_attributes, :unless => :user_id?
 
   validates_presence_of :role, :user, :context
 
+  validates_uniqueness_of :role, :scope => [:user_id, :context_id]
+
+  has_enum :role
+
   private
-    def reset_user_id
+    def reset_user_attributes
       self.user_id = nil
-      clear_attr_accessors
-      self.errors[:user_search] = ::I18n.t('activerecord.errors.models.permission.attributes.user_id.blank')
-    end
-
-    def clear_attr_accessors
       self.user_uid = nil
       self.user_first_name = nil
       self.user_last_name = nil
       self.user_email = nil
+      self.errors[:user_search] = ::I18n.t('activerecord.errors.models.permission.attributes.user_id.blank')
     end
 end
 

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

@@ -0,0 +1,5 @@
+class EspPermissionsAddRoleUserIdContextIdIndexToPermissions < ActiveRecord::Migration
+  def change
+    add_index :permissions, :role, :context_id, :user_id
+  end
+end

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

@@ -5,7 +5,6 @@ class EspPermissionsCreateContexts < ActiveRecord::Migration
       t.string :title
       t.string :ancestry
       t.string :weight
-      t.integer :position
       t.timestamps
     end
     add_index :contexts, :weight

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-permissions
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &19825220 !ruby/object:Gem::Requirement
+  requirement: &23762420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19825220
+  version_requirements: *23762420
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &19824580 !ruby/object:Gem::Requirement
+  requirement: &23762000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19824580
+  version_requirements: *23762000
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &19823780 !ruby/object:Gem::Requirement
+  requirement: &23761500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.12.alpha.2
   type: :runtime
   prerelease: false
-  version_requirements: *19823780
+  version_requirements: *23761500
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &19823160 !ruby/object:Gem::Requirement
+  requirement: &23761080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19823160
+  version_requirements: *23761080
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &19822420 !ruby/object:Gem::Requirement
+  requirement: &23760620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19822420
+  version_requirements: *23760620
 - !ruby/object:Gem::Dependency
   name: has_enum
-  requirement: &19821800 !ruby/object:Gem::Requirement
+  requirement: &23760200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19821800
+  version_requirements: *23760200
 - !ruby/object:Gem::Dependency
   name: has_scope
-  requirement: &19821100 !ruby/object:Gem::Requirement
+  requirement: &23759780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19821100
+  version_requirements: *23759780
 - !ruby/object:Gem::Dependency
   name: has_searcher
-  requirement: &19820640 !ruby/object:Gem::Requirement
+  requirement: &23759360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19820640
+  version_requirements: *23759360
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &19820220 !ruby/object:Gem::Requirement
+  requirement: &23758880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19820220
+  version_requirements: *23758880
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &19819700 !ruby/object:Gem::Requirement
+  requirement: &23758460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19819700
+  version_requirements: *23758460
 - !ruby/object:Gem::Dependency
   name: progress_bar
-  requirement: &19819280 !ruby/object:Gem::Requirement
+  requirement: &23758040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19819280
+  version_requirements: *23758040
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19818860 !ruby/object:Gem::Requirement
+  requirement: &23757620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19818860
+  version_requirements: *23757620
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &19818440 !ruby/object:Gem::Requirement
+  requirement: &23757200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19818440
+  version_requirements: *23757200
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &19818020 !ruby/object:Gem::Requirement
+  requirement: &23756780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19818020
+  version_requirements: *23756780
 - !ruby/object:Gem::Dependency
   name: sso_client
-  requirement: &19817600 !ruby/object:Gem::Requirement
+  requirement: &23756360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19817600
+  version_requirements: *23756360
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &19817180 !ruby/object:Gem::Requirement
+  requirement: &23755940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19817180
+  version_requirements: *23755940
 - !ruby/object:Gem::Dependency
   name: whenever
-  requirement: &19816620 !ruby/object:Gem::Requirement
+  requirement: &23755520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19816620
+  version_requirements: *23755520
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &19816000 !ruby/object:Gem::Requirement
+  requirement: &23755100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19816000
+  version_requirements: *23755100
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &19815460 !ruby/object:Gem::Requirement
+  requirement: &23754680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19815460
+  version_requirements: *23754680
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &19815040 !ruby/object:Gem::Requirement
+  requirement: &23754260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19815040
+  version_requirements: *23754260
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &19814600 !ruby/object:Gem::Requirement
+  requirement: &23753840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19814600
+  version_requirements: *23753840
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &19813980 !ruby/object:Gem::Requirement
+  requirement: &23753420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19813980
+  version_requirements: *23753420
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &19813320 !ruby/object:Gem::Requirement
+  requirement: &23753000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19813320
+  version_requirements: *23753000
+- !ruby/object:Gem::Dependency
+  name: russian
+  requirement: &23752580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *23752580
 - !ruby/object:Gem::Dependency
   name: ryba
-  requirement: &19812600 !ruby/object:Gem::Requirement
+  requirement: &23752160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +285,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19812600
+  version_requirements: *23752160
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &19811960 !ruby/object:Gem::Requirement
+  requirement: &23751740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +296,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19811960
+  version_requirements: *23751740
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &19811280 !ruby/object:Gem::Requirement
+  requirement: &23751320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +307,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19811280
+  version_requirements: *23751320
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19810640 !ruby/object:Gem::Requirement
+  requirement: &23750860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,10 +318,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19810640
+  version_requirements: *23750860
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &19810000 !ruby/object:Gem::Requirement
+  requirement: &23750440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,10 +329,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19810000
+  version_requirements: *23750440
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &19809380 !ruby/object:Gem::Requirement
+  requirement: &23750020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -329,10 +340,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19809380
+  version_requirements: *23750020
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &19808680 !ruby/object:Gem::Requirement
+  requirement: &23749600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -340,7 +351,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19808680
+  version_requirements: *23749600
 description: Description of EspPermissions.
 email:
 - mail@openteam.ru
@@ -377,6 +388,7 @@ files:
 - lib/generators/esp_permissions/install/templates/app/models/ability.rb
 - lib/generators/esp_permissions/install/templates/config/schedule.rb
 - lib/generators/esp_permissions/install/templates/config/locales/permissions_enum.ru.yml
+- lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_add_role_user_id_context_id_index_to_permissions.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
@@ -402,7 +414,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1397279406002446305
+      hash: -3814911068645841062
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -411,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1397279406002446305
+      hash: -3814911068645841062
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10