esp-permissions 0.0.1 → 0.0.2

data/app/assets/stylesheets/esp_permissions/pagination.sass

@@ -15,3 +15,5 @@
     &.current,
     &.gap
       cursor: default
+    &.current
+      background: #bbb

data/app/controllers/esp_permissions/users_controller.rb

@@ -15,7 +15,7 @@ class EspPermissions::UsersController < EspPermissions::ApplicationController
         search_object.pagination = paginate_options
         search_object.results
       else
-        end_of_association_chain
+        end_of_association_chain.per(per_page)
       end
     end
 
@@ -27,7 +27,6 @@ class EspPermissions::UsersController < EspPermissions::ApplicationController
     end
 
     def per_page
-      20
+      10
     end
-
 end

data/app/views/esp_permissions/permissions/new.html.erb

@@ -7,7 +7,7 @@
 </h3>
 <%= semantic_form_for resource, :url => esp_permissions.user_permissions_path(@user) do |form| %>
   <%= form.inputs do  %>
-    <%= form.input :context, :collection => current_user.availaible_contexts, :member_label => :context_title, :include_blank => t('permissions.not_selected') %>
+    <%= form.input :context, :collection => current_user.available_contexts, :member_label => :context_title, :include_blank => t('permissions.not_selected') %>
     <%= form.input :role, :as => :select, :collection => Permission.human_enums[:role].invert, :include_blank => t('permissions.not_selected') %>
   <% end %>
   <%= form.buttons :class => 'button-group' do %>

data/app/views/esp_permissions/users/index.html.erb

@@ -48,3 +48,6 @@
     </li>
   <% end %>
 </ul>
+
+
+<%= paginate collection %>

data/config/locales/ru.yml

@@ -2,11 +2,18 @@ ru:
   activerecord:
     attributes:
       permission:
-        context:                Категория
-        role:                   Роль
+        context:              Категория
+        role:                 Роль
 
     models:
-      permission:               Право доступа
+      permission:             Право доступа
+
+  views:
+    pagination:
+      next:                   "→"
+      last:                   Последняя страница
+      previous:               "←"
+      first:                  Первая страница
 
   permissions:
     'Are you sure?':          Вы уверены, в том что хотите удалить запись?

data/lib/esp-permissions/version.rb

@@ -1,3 +1,3 @@
 module EspPermissions
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

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

@@ -12,12 +12,12 @@ module EspPermissions
         Time.now.strftime('%Y%m%d%H%M%S')
       end
 
-#      def create_models
-#        template 'model.rb', 'app/models/user.rb'
-#      end
+     def create_models
+       template 'app/models/user.rb'
+     end
 
       def create_migration
-        migration_template 'migration.rb', 'db/migrate/esp_permissions_create_permissions.rb'
+        migration_template 'db/migrate/esp_permissions_create_permissions.rb'
       end
     end
   end

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

@@ -0,0 +1,49 @@
+class User < ActiveRecord::Base
+  devise :omniauthable, :trackable, :timeoutable
+  attr_accessible :name, :email, :nickname, :first_name, :last_name, :location, :description, :image, :phone, :urls, :raw_info
+
+  has_many :permissions
+
+  searchable do
+    text :name, :email, :nickname, :phone
+  end
+
+  def self.from_omniauth(hash)
+    User.find_or_initialize_by_uid(hash['uid']).tap do |user|
+      user.update_attributes hash['info']
+    end
+  end
+
+  def available_contexts
+    []
+  end
+end
+
+
+
+# == Schema Information
+#
+# Table name: users
+#
+#  id                 :integer         not null, primary key
+#  uid                :string(255)
+#  name               :text
+#  email              :text
+#  nickname           :text
+#  first_name         :text
+#  last_name          :text
+#  location           :text
+#  description        :text
+#  image              :text
+#  phone              :text
+#  urls               :text
+#  raw_info           :text
+#  sign_in_count      :integer         default(0)
+#  current_sign_in_at :datetime
+#  last_sign_in_at    :datetime
+#  current_sign_in_ip :string(255)
+#  last_sign_in_ip    :string(255)
+#  created_at         :datetime
+#  updated_at         :datetime
+#
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-permissions
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &20430700 !ruby/object:Gem::Requirement
+  requirement: &17113940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20430700
+  version_requirements: *17113940
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &20429460 !ruby/object:Gem::Requirement
+  requirement: &16983080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.alpha.2
   type: :runtime
   prerelease: false
-  version_requirements: *20429460
+  version_requirements: *16983080
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &20428620 !ruby/object:Gem::Requirement
+  requirement: &16981780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20428620
+  version_requirements: *16981780
 - !ruby/object:Gem::Dependency
   name: has_enum
-  requirement: &20427700 !ruby/object:Gem::Requirement
+  requirement: &16980020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20427700
+  version_requirements: *16980020
 - !ruby/object:Gem::Dependency
   name: has_searcher
-  requirement: &20426500 !ruby/object:Gem::Requirement
+  requirement: &16977920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20426500
+  version_requirements: *16977920
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &20425620 !ruby/object:Gem::Requirement
+  requirement: &16976960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20425620
+  version_requirements: *16976960
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &20298560 !ruby/object:Gem::Requirement
+  requirement: &16975640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20298560
+  version_requirements: *16975640
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &20297060 !ruby/object:Gem::Requirement
+  requirement: &16952800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20297060
+  version_requirements: *16952800
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &20295480 !ruby/object:Gem::Requirement
+  requirement: &16951560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20295480
+  version_requirements: *16951560
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &20293540 !ruby/object:Gem::Requirement
+  requirement: &16950560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20293540
+  version_requirements: *16950560
 - !ruby/object:Gem::Dependency
   name: sso_client
-  requirement: &20292380 !ruby/object:Gem::Requirement
+  requirement: &16949780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20292380
+  version_requirements: *16949780
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &20291440 !ruby/object:Gem::Requirement
+  requirement: &16948900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20291440
+  version_requirements: *16948900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &20264680 !ruby/object:Gem::Requirement
+  requirement: &16947380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20264680
+  version_requirements: *16947380
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &20263540 !ruby/object:Gem::Requirement
+  requirement: &16946000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20263540
+  version_requirements: *16946000
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &20262660 !ruby/object:Gem::Requirement
+  requirement: &16944760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20262660
+  version_requirements: *16944760
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &20261820 !ruby/object:Gem::Requirement
+  requirement: &16944040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20261820
+  version_requirements: *16944040
 description: Description of EspPermissions.
 email:
 - mail@openteam.ru
@@ -214,7 +214,8 @@ files:
 - config/routes.rb
 - config/locales/ru.yml
 - lib/generators/esp_permissions/install/install_generator.rb
-- lib/generators/esp_permissions/install/templates/migration.rb
+- lib/generators/esp_permissions/install/templates/app/models/user.rb
+- lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_create_permissions.rb
 - lib/esp-permissions/engine.rb
 - lib/esp-permissions/version.rb
 - lib/tasks/esp-permissions_tasks.rake
@@ -236,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2624684332384223134
+      hash: -556714408862913685
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -245,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2624684332384223134
+      hash: -556714408862913685
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10