anadea-identity 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d260b5181f5424ced746062bfccaebbb78b2d994
-  data.tar.gz: e75f779744fdab3a0df14b1e8b9959773df385a9
+  metadata.gz: def097b4755e88a07d17eecba90fcd1c6b9d8a7c
+  data.tar.gz: 84fee48d01725a0c1af1f1909d9d79902f576d40
 SHA512:
-  metadata.gz: c35d7a55308dc24360f1b8e20530d49f5d31113a7418447a0a9a48fa45fe5f453257d9b66cffd91fc686e0e75fc5412fd91ea8f0981c433500c41d475f753a06
-  data.tar.gz: af1a7b36db1494d15e96fe2d24625325416f6e322c33a8d2ac0ff0f3bf3b3f6f8f2386b4d70fb272a204b93fbc768d27830d5268e8b20fdaa1ffd939aaaab005
+  metadata.gz: 1748897c4af3e599fe9d4139a99194b748746918d1bbc04eef4b16ab2c32e984a63c27cca498fa654e79272b2e394562fd398c8cf8a032e99f7a7378d8220f76
+  data.tar.gz: 4552d1ed458b5bfcedeeb8bb040243fb2feb6feddb7986a1af4198056a9fcbe6f1d253b76489f24ad1bc58ee20823e47b043167723a0d27536d66c952864faa1

data/README.md

@@ -78,7 +78,8 @@ email/пароль/подтверждение пароля), восстанов
   прочего. По умолчанию используется главный макет вашего приложения –
   `"application"`.
 
-* `config.auth_routes` – если задать `false`, маршруты подключены не будут и вы
+* `config.auth_routes` – позволяет передать опции для роутов Devise, подключаемых
+  приложением. Если указать `false`, маршруты подключены не будут и вы
   можете сами подключить их.
 
 Вы также можете использовать любые конфигурационные опции самого Devise.

data/config/routes.rb

@@ -1,8 +1,9 @@
 Rails.application.routes.draw do
   if Identity.auth_routes
-    devise_for :users,
-               class_name: Identity.user_class_name,
-               module: :devise,
-               controllers: { omniauth_callbacks: "identity/omniauth_callbacks" }
+    devise_for :users, Identity.auth_routes.reverse_merge(
+      class_name: Identity.user_class_name,
+      module: :devise,
+      controllers: { omniauth_callbacks: "identity/omniauth_callbacks" }
+    )
   end
 end

data/lib/identity.rb

@@ -14,14 +14,31 @@ module Identity
 
   mattr_accessor(:user_class_name) { "::User" }
   mattr_accessor(:layout) { 'application' }
-  mattr_accessor(:auth_routes) { true }
+  mattr_accessor(:auth_routes) { {} }
 
   def self.user_class
     user_class_name.constantize
   end
 
+
   def self.setup
     yield self
+
+    unless Identity.user_class.is_a? Identity::Mixins::User
+      Identity.user_class.include(Identity::Mixins::User)
+    end
+
+    ActiveRecord::Base.class_eval do
+      class << self
+        def inherited_with_identity_model(child)
+          if child.name == Identity.user_class_name
+            child.include(Identity::Mixins::User)
+          end
+          inherited_without_identity_model(child)
+        end
+        alias_method_chain :inherited, :identity_model
+      end
+    end
   end
 
   def self.method_missing(name, *args, &block)
@@ -33,7 +50,7 @@ module Identity
   end
 
   def self.delegate_to_devise?(name)
-    name.in? %w(omniauth) ||
+    name.in?(%w(omniauth)) ||
     name.ends_with?('=') && Devise.respond_to?(name)
   end
 

data/lib/identity/admin/user.rb

@@ -1,74 +1,72 @@
-if defined?(ActiveAdmin)
-  ActiveAdmin.register Identity.user_class, as: "Users" do
-    permit_params :email, :password, :password_confirmation
+ActiveAdmin.register Identity.user_class, as: "Users" do
+  permit_params :email, :password, :password_confirmation
 
-    filter :email
-    filter :active
-    filter :current_sign_in_at
-    filter :created_at
+  filter :email
+  filter :active
+  filter :current_sign_in_at
+  filter :created_at
 
-    scope :all
-    scope :active, default: true
+  scope :all
+  scope :active, default: true
 
-    index do
-      selectable_column
-      id_column
-      column :active
-      column :email
-      if Devise.mappings[:user].confirmable?
-        column :confirmed do |user|
-          status_tag user.confirmed_at ? 'yes' : 'no'
-        end
-      end
-      if Devise.mappings[:user].trackable?
-        column :current_sign_in_ip
-        column :current_sign_in_at
+  index do
+    selectable_column
+    id_column
+    column :active
+    column :email
+    if Devise.mappings[:user].confirmable?
+      column :confirmed do |user|
+        status_tag user.confirmed_at ? 'yes' : 'no'
       end
-      column :created_at
-      column :updated_at
-      actions
     end
+    if Devise.mappings[:user].trackable?
+      column :current_sign_in_ip
+      column :current_sign_in_at
+    end
+    column :created_at
+    column :updated_at
+    actions
+  end
 
-    show do
-      attributes_table do
-        row :active do |user|
-          status_tag user.active? ? 'yes' : 'no'
-        end
-        row :email
-        if Devise.mappings[:user].trackable?
-          row :sign_in_count
-          row :current_sign_in_ip
-          row :current_sign_in_at
-          row :last_sign_in_ip
-          row :last_sign_in_at
-        end
-
-        if Devise.mappings[:user].confirmable?
-          row :confirmed_at
-        end
+  show do
+    attributes_table do
+      row :active do |user|
+        status_tag user.active? ? 'yes' : 'no'
+      end
+      row :email
+      if Devise.mappings[:user].trackable?
+        row :sign_in_count
+        row :current_sign_in_ip
+        row :current_sign_in_at
+        row :last_sign_in_ip
+        row :last_sign_in_at
+      end
 
-        row :created_at
-        row :updated_at
+      if Devise.mappings[:user].confirmable?
+        row :confirmed_at
       end
+
+      row :created_at
+      row :updated_at
     end
+  end
 
-    form do |f|
-      inputs 'Basic' do
-        input :email
-        input :password
-        input :password_confirmation
-      end
-      f.actions
+  form do |f|
+    inputs 'Basic' do
+      input :email
+      input :password
+      input :password_confirmation
     end
+    f.actions
+  end
 
-    controller do
-      def update
-        if params[:identity_user][:password].blank? && params[:identity_user][:password_confirmation].blank?
-          params[:identity_user].delete("password")
-          params[:identity_user].delete("password_confirmation")
-        end
-        super
+  controller do
+    def update
+      if params[:identity_user][:password].blank? && params[:identity_user][:password_confirmation].blank?
+        params[:identity_user].delete("password")
+        params[:identity_user].delete("password_confirmation")
       end
+      super
     end
   end
 end

data/lib/identity/engine.rb

@@ -10,12 +10,8 @@ module Identity
     end
 
     initializer "identity-admin" do |app|
-      ActiveAdmin.application.load_paths.unshift(File.dirname(__FILE__) + "/admin")
-    end
-
-    initializer "identity-model" do
-      unless Identity.user_class.is_a?(Identity::Mixins::User)
-        Identity.user_class.include(Identity::Mixins::User)
+      if defined?(ActiveAdmin)
+        ActiveAdmin.application.load_paths.unshift(File.dirname(__FILE__) + "/admin")
       end
     end
   end

data/lib/identity/version.rb

@@ -1,3 +1,3 @@
 module Identity
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anadea-identity
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Anadea team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 3.2.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 3.2.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'