devise_russian 0.0.13 → 0.0.21

data/README.md

@@ -18,6 +18,23 @@ devise_russian
 
 Обратите внимание на метод providers модели Authentication: https://github.com/vav/devise_russian/blob/master/app/models/authentication.rb
 
+В случае необходимости задать свой список провайдеров:
+
+app/models/authentication_decorator.rb:
+
+    Authentication.class_eval do
+      def self.providers
+        [
+          ['facebook', 'Facebook'],
+          ['vkontakte', 'Vkontakte'],
+          ['odnoklassniki', 'Odnoklassniki'],
+          ['twitter', 'Twitter'],
+          ['github', 'Github'],
+          ['google_oauth2', 'Google']
+        ]
+      end
+    end
+
 В config/initializers/omniauth.rb:
 
     Rails.application.config.middleware.use OmniAuth::Builder do
@@ -30,6 +47,8 @@ devise_russian
       provider :odnoklassniki, "2222222", "HGF33GH3F3HGF3HGF3SD",
         :public_key => "DFKSFDKJHJHFJSDSADSD", :provider_ignores_state => true
 
+      ...
+
 Миграции:
 
     # Пользователи
@@ -97,26 +116,14 @@ devise_russian
 
 Прописываем роуты:
 
-    devise_for :users,
-      :path => "auth",
-      :path_names => {
-        :sign_in  => "login",
-        :sign_out => "logout",
-        :sign_up  => "register"
-      },
-      :controllers => {
-        :registrations => "registrations"
-      }
+config/routes.rb:
 
-    # Авторизации пользователя
-    resources :authentications, :only => [:index, :create, :destroy]
-
-    # Вход через социальные сети
-    match "/auth/:provider/callback", :to => "authentications#create"
-    match "/auth/failure", :to => "authentications#failure"
+    mount DeviseRussian::Engine => "/auth", :as => "devise_russian"
 
 Подключаем девайс и русский девайс в модели:
 
+app/models/user.rb:
+
     # Devise
     devise :database_authenticatable,
            :confirmable,
@@ -129,6 +136,25 @@ devise_russian
     # Russian Devise
     omniauthable
 
+    class << self
+      ...
+      # Вывод списка провайдеров на странице входа
+      def omniauth_enabled
+        false
+      end
+      ...
+    end
+
+Прописывем название и адрес сайта для подвала писем от Devise:
+
+    ru:
+      devise_russian:
+        my_authentications: Мои авторизации
+        authentication_not_found: Авторизация не найдена
+        mailer:
+          site_name: Мега-портал
+          site_url: "http://www.portal.ru"
+
 Ссылки на вход и регистрацию:
 
     <ul>
@@ -136,6 +162,4 @@ devise_russian
       <li><a href="/auth/register">Регистрация</a></li>
     </ul>
 
-Ну и так двлее. Настраивайте под себя!
-
-## P.S.: Поддержку не оказываю, включайте голову.
+Ну и так далее. Настраивайте под себя!

data/app/controllers/authentications_controller.rb

@@ -3,7 +3,7 @@ class AuthenticationsController < DeviseController
   before_filter :authenticate_user!, :except => [:create, :failure]
 
   def index
-    @meta_title = "Мои авторизации"
+    @meta_title = I18n.t("devise_russian.my_authentications")
     @authentications = current_user.authentications
   end
 
@@ -38,13 +38,13 @@ class AuthenticationsController < DeviseController
       flash[:notice] = I18n.t("devise.sessions.signed_out")
       redirect_to authentications_url
     else
-      flash[:error] = "Авторизация не найдена"
+      flash[:error] = I18n.t("devise_russian.authentication_not_found")
       redirect_to "/"
     end
   end
 
   def failure
-    redirect_to new_user_session_url #, :flash => {:error => "Не могу вас авторизовать: #{params[:message]}"}
+    redirect_to devise_russian.new_user_session_url
   end
 
   def devise_mapping

data/app/models/authentication.rb

@@ -1,35 +1,22 @@
 # coding: utf-8
 class Authentication < ActiveRecord::Base
-  attr_accessible :user_id, :provider, :uid, :name, :email
   validates_presence_of :provider, :uid
+  attr_accessible :user_id, :provider, :uid, :name, :email
+
   belongs_to :user
 
   xss_terminate
 
-  # PROVIDERS = [
-  #   ['facebook', 'Facebook'],
-  #   ['twitter', 'Twitter'],
-  #   ['vkontakte','Vkontakte'],
-  #   ['mailru','Mail.ru'],
-  #   ['open_id','OpenID'],
-  #   ['flickr','Flickr'],
-  #   ['odnoklassniki','Odnoklassniki'],
-  #   ['you_tube','YouTube']
-  # ]
-
-  def self.providers
-    [
-      ['facebook', 'Facebook'],
-      ['vkontakte', 'Vkontakte'],
-      ['odnoklassniki', 'Odnoklassniki']
-    ]
-  end
-
-  def provider_name
-    if provider == 'open_id'
-      "OpenID"
-    else
-      provider.titleize
+  class << self
+    def providers
+      [
+        ["facebook", "Facebook"],
+        ["vkontakte", "Vkontakte"],
+        ["odnoklassniki", "Odnoklassniki"]
+        # ['twitter', 'Twitter'],
+        # ['github', 'Github'],
+        # ['google_oauth2', 'Google']
+      ]
     end
   end
 end

data/app/views/authentications/_collection.html.erb

@@ -34,4 +34,4 @@
 <% else %>
   <p>Авторизаций не найдено.</p>
 <% end %>
-<%= render "devise/shared/social_links" %>
+<%= render "devise/shared/social_links" if User.ommiauth_enabled %>

data/app/views/devise/confirmations/new.html.erb

@@ -7,5 +7,5 @@
     <%= f.email_field :email %></p>
     <p><%= f.submit "Отправить" %></p>
   <% end %>
-  <%= render :partial => "devise/shared/links" %>
+  <%= render "devise/shared/links" %>
 </div>

data/app/views/devise/mailer/_bottom.html.erb

@@ -1,5 +1,5 @@
 <p>===</p>
 
-<p>С уважением, администрация Доски объявлений Lipada</p>
+<p>С уважением, администрация <%= I18n.t("devise_russian.mailer.site_name") %></p>
 
-<p>http://lipada.ru</p>
+<p><%= I18n.t("devise_russian.mailer.site_url") %></p>

data/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -2,5 +2,5 @@
 <p>Кто-то отправил запрос на смену пароля. Вы можете сменить пароль, перейдя по ссылке ниже.</p>
 <p><%= link_to 'Сменить пароль', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
 <p>Если вы не посылали запрос, то просто проигнорируйте это письмо.</p>
-<p>Ваш парол останется прежним, пока вы не перейдете по указанной выше ссылке и не укажете новый.</p>
+<p>Ваш пароль останется прежним, пока вы не перейдете по указанной выше ссылке и не укажете новый.</p>
 <%= render "bottom" %>

data/app/views/devise/sessions/new.html.erb

@@ -11,6 +11,5 @@
     <% end -%>
     <p><%= f.submit "Войти" %></p>
   <% end %>
-  <%= render "devise/shared/social_links" %>
   <%= render "devise/shared/links" %>
 </div>

data/app/views/devise/shared/_links.erb

@@ -1,3 +1,4 @@
+<%= render "devise/shared/social_links" if User.omniauth_enabled %>
 <div class="links">
   <%- if controller_name != 'sessions' %>
     <p><%= link_to "Вход", new_session_path(resource_name) %></p>

data/config/initializers/devise.rb

@@ -0,0 +1,4 @@
+Devise.setup do |config|
+  config.router_name = :devise_russian
+  config.omniauth_path_prefix = "/auth"
+end

data/config/locales/devise.ru.yml

@@ -4,7 +4,6 @@ ru:
       not_found: "не найдено"
       already_confirmed: "уже было подтверждено"
       not_locked: "не было заблокировано"
-
   devise:
     failure:
       unauthenticated: 'Вам нужно войти или зарегистрироваться перед тем, как продолжить.'

data/config/locales/devise_russian.ru.yml

@@ -0,0 +1,7 @@
+ru:
+  devise_russian:
+    my_authentications: Мои авторизации
+    authentication_not_found: Авторизация не найдена
+    mailer:
+      site_name: ******************
+      site_url: "http://********************"

data/config/routes.rb

@@ -0,0 +1,22 @@
+# coding: utf-8
+DeviseRussian::Engine.routes.draw do
+  devise_for :users, {
+    :module => :devise,
+    :path => "",
+    :path_names => {
+      :sign_in  => "login",
+      :sign_out => "logout",
+      :sign_up  => "register"
+    },
+    :controllers => {
+      :registrations => "registrations"
+    }
+  }
+
+  # Авторизации пользователя
+  resources :authentications, :only => [:index, :create, :destroy]
+
+  # Вход через социальные сети
+  match "/:provider/callback", :to => "authentications#create"
+  match "/failure", :to => "authentications#failure"
+end

data/devise_russian.gemspec

@@ -17,7 +17,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_dependency "xss_terminate", ">= 0.2"
   gem.add_dependency "devise", ">= 2.2.3"
   gem.add_dependency "omniauth", ">= 1.1.3"
   gem.add_dependency "omniauth-oauth2", ">= 1.1.1"
+  gem.add_dependency "useful_helpers", ">= 0.0.1"
 end

data/lib/devise_russian/engine.rb

@@ -1,10 +1,9 @@
 module DeviseRussian
   class Engine < ::Rails::Engine
     isolate_namespace DeviseRussian
-    engine_name 'devise_russian'
+    engine_name "devise_russian"
 
     initializer "devise_russian.includers" do |app|
-      # ActionController::Base.send :include, DeviseRussian::Controllers::Base
       ActiveRecord::Base.send :include, DeviseRussian::Models::Base
     end
   end

data/lib/devise_russian/models/base.rb

@@ -9,6 +9,11 @@ module DeviseRussian
       module ClassMethods
         def omniauthable
           has_many :authentications, :dependent => :destroy
+
+          def ommiauth_enabled
+            true
+          end
+
           unless included_modules.include? InstanceMethods
             include InstanceMethods
           end
@@ -22,18 +27,12 @@ module DeviseRussian
           user_email = omniauth['extra']['raw_info']['email'] rescue nil
           user_name = omniauth['extra']['raw_info']['first_name'] rescue nil
 
-          # Facebook omniauth: #<OmniAuth::AuthHash credentials=#<Hashie::Mash expires=true expires_at=1368497603 token="AAAHyrzX1f8gBAEZBgtqQZCcLHgRDMbioJ6cltTxqTd3qlnvY1JXAtOivUKu8DzVfKf3f2x7ZCbZAF6qciuww2qVGVrFq6yoVxwZCHPZCn0HgZDZD"> extra=#<Hashie::Mash raw_info=#<Hashie::Mash email="lapida@ya.ru" first_name="Lipada" gender="male" hometown=#<Hashie::Mash id="111803002172556" name="Tomsk, Russia"> id="100005327070305" last_name="Ru" link="http://www.facebook.com/profile.php?id=100005327070305" locale="ru_RU" name="Lipada  Ru" timezone=7 updated_time="2013-02-20T15:25:45+0000" verified=true>> info=#<OmniAuth::AuthHash::InfoHash email="lapida@ya.ru" first_name="Lipada" image="http://graph.facebook.com/100005327070305/picture?type=square" last_name="Ru" name="Lipada  Ru" urls=#<Hashie::Mash Facebook="http://www.facebook.com/profile.php?id=100005327070305"> verified=true> provider="facebook" uid="100005327070305">
-
-          # Vkontakte omniauth: #<OmniAuth::AuthHash credentials=#<Hashie::Mash expires=true expires_at=1363456283 token="46de998d8c438603e0d92af694d47744260b89f1e493ffa2403c41ca98aaf9a26aae375a384e0817711c5"> extra=#<Hashie::Mash raw_info=#<Hashie::Mash city="144" country="1" first_name="Lipada" last_name="Ru" nickname="" online=0 photo="https://vk.com/images/camera_c.gif" photo_big="https://vk.com/images/camera_a.gif" screen_name="id201853841" sex=2 uid=201853841>> info=#<OmniAuth::AuthHash::InfoHash first_name="Lipada" image="https://vk.com/images/camera_c.gif" last_name="Ru" location="Россия, Томск" name="Lipada Ru" nickname="" urls=#<Hashie::Mash Vkontakte="http://vk.com/id201853841">> provider="vkontakte" uid=201853841>
-
-          # Odnoklassniki omniauth: #<OmniAuth::AuthHash credentials=#<Hashie::Mash expires=false token="2aipa.2-71160004l6v6h3r406y3k6bsrv9"> extra=#<Hashie::Mash raw_info=#<Hashie::Mash age=25 birthday="1987-07-14" first_name="Lipada" gender="male" has_email=true last_name="ru" locale="ru" location=#<Hashie::Mash city="Томск" country="RUSSIAN_FEDERATION"> name="Lipada ru" online="web" pic_1="http://i503.odnoklassniki.ru/res/stub_50x50.gif" pic_2="http://usd8.odnoklassniki.ru/res/stub_128x96.gif" uid="555839750549">> info=#<OmniAuth::AuthHash::InfoHash first_name="Lipada" image="http://i503.odnoklassniki.ru/res/stub_50x50.gif" last_name="ru" name="Lipada ru" urls=#<Hashie::Mash Odnoklassniki="http://www.odnoklassniki.ru/profile/555839750549">> provider="odnoklassniki" uid="555839750549">
-
           if with_self
             self.email = user_email if user_email && self.email.blank?
             self.name = user_name if user_name && self.name.blank?
           end
 
-          self.authentications.build(
+          self.authentications.new(
             :provider => provider,
             :uid => uid,
             :email => user_email,

data/lib/devise_russian/version.rb

@@ -1,3 +1,3 @@
 module DeviseRussian
-  VERSION = "0.0.13"
+  VERSION = "0.0.21"
 end

data/lib/devise_russian.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require "devise"
 require "devise_russian/models/base"
 require "devise_russian/engine"
 require "devise_russian/version"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_russian
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: xss_terminate
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: useful_helpers
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 description: Часто используемые наработки по джему Devise. Включает решение по авторизации
   в социальных сетях
 email:
@@ -174,7 +206,10 @@ files:
 - app/views/devise/shared/_social_links.html.erb
 - app/views/devise/unlocks/new.html.erb
 - config/ca-bundle.crt
+- config/initializers/devise.rb
 - config/locales/devise.ru.yml
+- config/locales/devise_russian.ru.yml
+- config/routes.rb
 - devise_russian.gemspec
 - lib/devise_russian.rb
 - lib/devise_russian/engine.rb