accountly 0.0.5 → 0.0.6

data/app/controllers/accountly/account_controller.rb

@@ -1,5 +1,3 @@
-module Accountly
-  class AccountController < ApplicationController
+class Accountly::AccountController < Account::AccountController
 
-  end
 end

data/app/models/accountly/update_email_user.rb

@@ -6,18 +6,11 @@ module Accountly
       update_attribute(:new_email_token, nil)
     end
 
-
-    def tokenmail(request)
-      AccountMailer.send(request, self).deliver
-    end
-
-
     def send_new_email_request
       return unless (confirmed? && generate_token(:new_email_token))
-      tokenmail(:new_email_request)
+      AccountMailer.send(:new_email_request, self).deliver
     end
 
-
     private
 
     def generate_token( token )

data/lib/accountly/version.rb

@@ -1,3 +1,3 @@
 module Accountly
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/generators/accountly/install_generator.rb

@@ -15,6 +15,11 @@ module Accountly
       directory "views", "app/views/accountly"
     end
 
+    # übergeordneter Account-Controller
+    def create_controllers
+      directory "controllers", "app/controllers"
+    end
+
     def create_locales
       template "config/locales/de.yml", "config/locales/de.accountly.yml"
       template "config/locales/en.yml", "config/locales/en.accountly.yml"

data/lib/generators/templates/controllers/account/account_controller.rb

@@ -0,0 +1,3 @@
+class Account::AccountController < ApplicationController
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: accountly
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -245,12 +245,9 @@ files:
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/en.bootstrap.yml
-- config/locales/de.yml~
-- config/routes.rb~
 - config/routes.rb
 - lib/accountly/engine.rb
 - lib/accountly/version.rb
-- lib/accountly/version.rb~
 - lib/generators/accountly/install_generator.rb
 - lib/generators/templates/db/migrate/add_new_email_to_users.rb
 - lib/generators/templates/views/usernames/new.html.haml
@@ -259,6 +256,7 @@ files:
 - lib/generators/templates/views/settings/index.html.haml
 - lib/generators/templates/views/account_mailer/new_email_request.text.haml
 - lib/generators/templates/views/common/_form_errors.html.haml
+- lib/generators/templates/controllers/account/account_controller.rb
 - lib/accountly.rb
 - MIT-LICENSE
 - Rakefile

data/config/locales/de.yml~

@@ -1,98 +0,0 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-de:
-  common:
-    button:
-      send: 'send'
-    form:
-      error: "error"
-
-  activemodel:
-    errors:
-      models:
-        accountly:
-          change_email_form:
-            attributes:
-              new_email:
-                blank: 'Bitte eine neue E-Mail angeben'
-                invalid: "Die E-Mail hat ein falsches Format."
-                duplicate: 'Diese E-Mail kann nicht gewählt werden.'
-              new_email_confirmation:
-                confirmation: 'Die E-Mail-Bestätigung war falsch'
-                blank: 'Bitte die E-Mail bestätigen'
-              password:
-                blank: 'Bitte auch das aktuelle Passwort angeben.'
-                invalid: 'Das aktuelle Passwort war nicht korrekt'
-        accountly:
-          username_form:
-            attributes:
-              new_username:
-                blank: 'Bitte einen Username angeben'
-                duplicate: 'Dieser Username kann nicht gewählt werden.'
-                too_short: 'Der neue Username ist zu kurz (mind. 5 Zeichen)'
-              new_username_confirmation:
-                confirmation: 'Die Bestätigung war falsch'
-                blank: 'Bitte den Username bestätigen'
-              original_password:
-                blank: 'Bitte auch das alte Passwort angeben.'
-                invalid: 'Das aktuelle Passwort war nicht korrekt'
-        password_forgotten_form:
-          attributes:
-            new_password:
-              too_short: 'Das neue Passwort ist zu kurz (mind. 5 Zeichen)'
-            new_password_confirmation:
-              confirmation: 'Die Passwortbestätigung war falsch.'
-        accountly:
-          password_form:
-            attributes:
-              original_password:
-                blank: 'Bitte auch das alte Passwort angeben.'
-                invalid: 'Das aktuelle Passwort war nicht korrekt'
-              new_password:
-                too_short: 'Das neue Passwort ist zu kurz (mind. 5 Zeichen)'
-              new_password_confirmation:
-                confirmation: 'Die Passwortbestätigung war falsch.'
-
-  accountly:
-    confirmation:
-      new_email:
-        flash:
-          success: "Deine neue E-Mail wurde gesetzt."
-    passwords:
-      new:
-        title: 'Passwort ändern'
-        label_original_password: 'aktuelles Passwort'
-        label_new_password: 'neues Passwort'
-        label_new_password_confirmation: 'neues Passwort wiederholen'
-      create:
-        notice:
-          success: "Dein Passwort wurde geändert."
-    usernames:
-      new:
-        title: 'Username ändern'
-        label_original_password: 'aktuelles Passwort'
-        label_new_username: 'neuer Username'
-        label_new_username_confirmation: 'neuen Username wiederholen'
-      create:
-        notice:
-          success: "Dein Username wurde geändert."
-    emails:
-      new:
-        title: "E-Mail ändern"
-        label_new_email: "Neue E-Mail"
-        label_new_email_confirmation: "E-Mail bestätigen"
-        label_password: "Passwort"
-      create:
-        flash:
-          success: 'Ein Bestätigungslink wurde an die neue E-Mail-Adresse versendet.'
-
-  account_mailer:
-      new_email_request:
-        subject: 'Neue E-Mail bestätigen'
-        body: "Hallo,
-  um die Änderung Deiner E-Mail-Adress bei XYZ abzuschließen klicke bitte auf folgenden Link:
-
-  %{url}
-
-  Vielen Dank"

data/config/routes.rb~

@@ -1,14 +0,0 @@
-Accountly::Engine.routes.draw do
-
-  root to: 'settings#index'
-
-  get 'settings' => 'settings#index'
-  resources :usernames, :only => [:new, :create]
-  resources :passwords, :only => [:new, :create]
-  resources :emails, :only => [:new, :create]
-  resources :users
-
-  match 'new_email(/:token)' => 'confirmation#new_email', as: 'confirm_new_email', via: [:get, :post]
-
-  default_url_options  :host => 'localhost:3000'
-end

data/lib/accountly/version.rb~

@@ -1,3 +0,0 @@
-module Accountly
-  VERSION = "0.0.4"
-end