morpho 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0d84313d4452dbe5204a3dd23dac77e6e2cbd537efba0982b0e6ce3a9dfcd11
-  data.tar.gz: ec2199d2a15089e22b168b101953fd53926cf98c6615d1f9091f942e19475c2a
+  metadata.gz: d7fca5e64b05dd61217178c941e7f0dece7ad1f5088184e9463b80cd11c16414
+  data.tar.gz: e89d1a456a7b76f24f18bcdde9f5a71a3268258fe2b86f1e868b12cff77a106d
 SHA512:
-  metadata.gz: e8daf2d2f98414e9cda76198a80f75930cd67859c8db5d6da14ada1620c497cd826c6a27ec13d5aa27142938f69b46254da910c9f1054464418290489d5ba7fa
-  data.tar.gz: be14f1b03a1e9ce1788b1e7728f56675cfee839677ca530c3c8aac4921149d709ea08bf4257a76adc22721cd516793307ab7f5e04c5b8050846e6e2e94188431
+  metadata.gz: b36cf4a0152b861d01e3e4fe75c0f7c40f31ddfca3209ce07dfcc0f7fed4596d7cf3fc640b3ca188bfdb44de0a0523158b648e7dd074b49b77aa8bb5622cac03
+  data.tar.gz: 91a25b1c00d433111234446830d59eb26a538288519f0f7930434a26e9331178bd579793712683c75d7e94d2aa72320b7d0a961d5c75ff62a698f810503652f5

data/README.md

@@ -21,6 +21,45 @@ Or install it yourself as:
 $ gem install morpho
 ```
 
+## Validators
+
+### Contain number validator
+
+Value must contain at least 1 number.
+
+options:
+  * **message**: A custom message. Defaults to `I18n.t('morpho.labels.validators.contain_number')`
+
+```ruby
+class User < ApplicationRecord
+  validates :password, :'morpho/validators/contain_number' => true
+end
+```
+
+### Contain uppercase validator
+Value must contain at least 1 uppercase letter.
+
+options:
+  * **message**: A custom message. Defaults to `I18n.t('morpho.labels.validators.contain_uppercase')`
+
+```ruby
+class User < ApplicationRecord
+  validates :password, :'morpho/validators/contain_uppercase' => true
+end
+```
+
+### Contain symbol validator
+Value must contain at least 1 special char.
+
+options:
+  * **message**: A custom message. Defaults to `I18n.t('morpho.labels.validators.contain_symbol')`
+  
+```ruby
+class User < ApplicationRecord
+  validates :password, :'morpho/validators/contain_symbol' => true
+end
+```
+
 ## Contributing
 Contribution directions go here.
 

data/app/api/morpho/entities/authentication_token.rb

@@ -1,6 +1,6 @@
 module Morpho
   module Entities
-    class AuthenticationToken < ::Grape::Entity
+    class AuthenticationToken < ::Morpho::Entities::Base
       expose :token, documentation: { type: 'string', desc: 'User authentication token', required: true }
       expose :expires_at, documentation: { type: 'string', desc: 'Authentication token expiration date in millis', required: true }
     end

data/app/api/morpho/entities/base.rb

@@ -0,0 +1,7 @@
+module Morpho
+  module Entities
+    class Base < ::Grape::Entity
+      root 'data', 'data'
+    end
+  end
+end

data/app/api/morpho/entities/user.rb

@@ -1,6 +1,7 @@
 module Morpho
   module Entities
-    class User < ::Grape::Entity
+    class User < ::Morpho::Entities::Base
+      root 'data', 'data'
       expose :email, documentation: { type: 'string', desc: 'User email address' }
     end
   end

data/app/api/morpho/entities/user_sign_in.rb

@@ -1,6 +1,6 @@
 module Morpho
   module Entities
-    class UserSignIn < ::Grape::Entity
+    class UserSignIn < ::Morpho::Entities::Base
       expose :email, documentation: { type: 'string', desc: 'User email address' }
       expose :password, documentation: { type: 'string', desc: 'User password' }
     end

data/app/api/morpho/entities/user_sign_up.rb

@@ -1,6 +1,6 @@
 module Morpho
   module Entities
-    class UserSignUp < ::Grape::Entity
+    class UserSignUp < ::Morpho::Entities::Base
       expose :email, documentation: { type: 'string', desc: 'User email address' }
       expose :password, documentation: { type: 'string', desc: 'User password' }
       expose :password_confirmation, documentation: { type: 'string', desc: 'User password confirmation' }

data/app/api/morpho/resources/users.rb

@@ -8,10 +8,10 @@ module Morpho
           success Morpho::Entities::User
         end
         params do
-          requires :user, type: Morpho::Entities::UserSignUp
+          requires :data, type: Morpho::Entities::UserSignUp
         end
         post do
-          register(params[:user])
+          register(params[:data])
         end
       end
     end

data/app/mailers/morpho/application_mailer.rb

@@ -1,5 +1,17 @@
 module Morpho
   class ApplicationMailer < ActionMailer::Base
     layout 'mailer'
+
+    before_action :attach_logo!
+
+    protected
+
+    def attach_logo!
+      attachments.inline['logo.png'] = File.read(
+        Rails.root.join('public', 'images', 'mailer-logo.png')
+      )
+    rescue StandardError
+      # do nothing
+    end
   end
 end

data/app/models/morpho/user.rb

@@ -5,7 +5,10 @@ module Morpho
     has_many :authentications, dependent: :destroy
     accepts_nested_attributes_for :authentications
 
-    validates :password, length: { minimum: 12 }
+    validates :password, length: { minimum: 12 },
+              :'morpho/validators/contain_number' => true,
+              :'morpho/validators/contain_uppercase' => true,
+              :'morpho/validators/contain_symbol' => true
     validates :password, confirmation: true
     validates :email, uniqueness: true
     validates_email_format_of :email

data/app/views/morpho/user_mailer/activation_needed_email.html.erb

@@ -1,7 +1,4 @@
-<p>Welcome <%= @user.email %>,</p>
-
-<p>You have successfully signed up, you're just a step behind to finish.</p>
-
-<p>To verify your user email address and activate your user account, just follow this <a href=" <%= @url %>">link</a>.</p>
-
-<p>Thanks for joining and have a great day!</p>
+<%= raw(I18n.t('morpho.mailer.activation_needed.body_html', 
+  email: @user.email,
+  url: @url
+)) %>

data/app/views/morpho/user_mailer/activation_needed_email.text.erb

@@ -1,7 +1,4 @@
-Welcome <%= @user.email %>,
-
-You have successfully signed up, you're just a step behind to finish.
-
-To verify your user email address and activate your user account, just follow this link: <%= @url %>.
-
-Thanks for joining and have a great day!
+<%= raw(I18n.t('morpho.mailer.activation_needed.body_text', 
+  email: @user.email,
+  url: @url
+)) %>

data/app/views/morpho/user_mailer/activation_success_email.html.erb

@@ -1,7 +1,4 @@
-<p>Congratulations, <%= @user.email %>!</p>
-
-<p>You have successfully activated your user account.</p>
-
-<p>To login to the site, just follow this link: <%= @url %>.</p>
-
-<p>Thanks for joining and have a great day!</p>
+<%= raw(I18n.t('morpho.mailer.activation_success.body_html', 
+  email: @user.email,
+  url: @url
+)) %>

data/app/views/morpho/user_mailer/activation_success_email.text.erb

@@ -1,7 +1,4 @@
-Congratulations, <%= @user.email %>!
-
-You have successfully activated your user account.
-
-To login to the site, just follow this link: <%= @url %>.
-
-Thanks for joining and have a great day!
+<%= raw(I18n.t('morpho.mailer.activation_success.body_text', 
+  email: @user.email,
+  url: @url
+)) %>

data/app/views/morpho/user_mailer/reset_password_email.html.erb

@@ -1,7 +1,4 @@
-<p>Hello <%= @user.email %>,</p>
-
-<p>You have requested to reset your password.</p>
-
-<p>To choose a new password, just follow this <a href=" <%= @url %>">link</a>.</p>
-
-<p>Have a great day!</p>
+<%= raw(I18n.t('morpho.mailer.reset_password.body_html', 
+  email: @user.email,
+  url: @url
+)) %>

data/app/views/morpho/user_mailer/reset_password_email.text.erb

@@ -1,7 +1,4 @@
-Hello <%= @user.email %>,
-
-You have requested to reset your password.
-
-To choose a new password, just follow this link: <%= @url %>.
-
-Have a great day!
+<%= raw(I18n.t('morpho.mailer.reset_password.body_text', 
+  email: @user.email,
+  url: @url
+)) %>

data/app/views/morpho/user_mailer/unlock_token_email.html.erb

@@ -1,7 +1,5 @@
-<p>Hello <%= @user.email %>,</p>
+<%= raw(I18n.t('morpho.mailer.unlock_token.body_html', 
+  email: @user.email,
+  url: @url
+)) %>
 
-<p>Your account has been locked due to failed login attempts activity.</p>
-
-<p>To unlock your account now, just follow this <a href=" <%= @url %>">link</a>. Anyway it will be automatically unlocked in an hour.</p>
-
-<p>Have a great day!</p>

data/app/views/morpho/user_mailer/unlock_token_email.text.erb

@@ -1,7 +1,5 @@
-Hello <%= @user.email %>,
+<%= raw(I18n.t('morpho.mailer.unlock_token.body_text', 
+  email: @user.email,
+  url: @url
+)) %>
 
-Your account has been locked due to failed login attempts activity.
-
-To unlock your account now, just follow this link: <%= @url %>. Anyway it will be automatically unlocked in an hour.
-
-Have a great day!

data/config/locales/morpho.en.yml

@@ -1,6 +1,10 @@
 en:
   morpho:
     labels:
+      validators:
+        contain_symbol: 'must contain a symbol'
+        contain_number: 'must contain a number'
+        contain_uppercase: 'must contain a uppercase letter'
       sessions:
         sign_in: 'Sign in'
         sign_up: 'Sign up with a new user account'
@@ -62,12 +66,68 @@ en:
     mailer:
       activation_needed:
         subject: 'You have successfully signed up'
+        body_html: |
+          <p>Welcome %{email},</p>
+          <p>You have successfully signed up, you're just a step behind to finish.</p>
+          <p>To verify your user email address and activate your user account, just follow this <a href="%{url}">link</a>.</p>
+          <p>Thanks for joining and have a great day!</p>
+        body_text: |
+          Welcome %{email},
+
+          You have successfully signed up, you're just a step behind to finish.
+
+          To verify your user email address and activate your user account, just follow this link: %{url}.
+
+          Thanks for joining and have a great day!
       activation_success:
         subject: 'Your account is now activated'
+        body_html: |
+          <p>Congratulations, %{email}!</p>
+          <p>You have successfully activated your user account.</p>
+          <p>To login to the site, just follow this link: %{url}.</p>
+          <p>Thanks for joining and have a great day!</p>
+
+        body_text: |
+          Congratulations, %{email}!
+
+          You have successfully activated your user account.
+
+          To login to the site, just follow this link: %{url}.
+
+          Thanks for joining and have a great day!
+
       reset_password:
         subject: 'You have requested to reset your password'
+        body_html: |
+          <p>Hello %{email},</p>
+          <p>You have requested to reset your password.</p>
+          <p>To choose a new password, just follow this <a href="%{url}">link</a>.</p>
+          <p>Have a great day!</p>
+        body_text: |
+          Hello %{email},
+
+          You have requested to reset your password.
+
+          To choose a new password, just follow this link: %{url}.
+
+          Have a great day!
+
       unlock_token:
         subject: 'Your account has been locked'
+        body_html: |
+          <p>Hello %{email},</p>
+          <p>Your account has been locked due to failed login attempts activity.</p>
+          <p>To unlock your account now, just follow this <a href=" %{url}">link</a>. Anyway it will be automatically unlocked in an hour.</p>
+          <p>Have a great day!</p>
+        body_text: |
+          Hello %{email},
+
+          Your account has been locked due to failed login attempts activity.
+
+          To unlock your account now, just follow this link: %{url}. Anyway it will be automatically unlocked in an hour.
+
+          Have a great day!
+
     api:
       messages:
         bad_request: 'Bad request'

data/config/locales/morpho.es.yml

@@ -0,0 +1,66 @@
+es:
+  morpho:
+    mailer:
+      activation_needed:
+        subject: 'Te has registrado correctamente'
+        body_html: |
+          <p>Bienvenido %{email},</p>
+          <p>Te has registrado exitosamente, solo estás un paso atrás para terminar.</p>
+          <p>Para verificar su dirección de correo electrónico de usuario y activar su cuenta de usuario, simplemente siga este <a href="%{url}">enlace</a>.</p>
+          <p>Gracias por unirte y que tengas un gran día!</p>
+        body_text: |
+          Bienvenido %{email},
+
+          Te has registrado exitosamente, solo estás un paso atrás para terminar.
+
+          Para verificar su dirección de correo electrónico de usuario y activar su cuenta de usuario, simplemente siga este enlace: %{url}.
+
+          Gracias por unirte y que tengas un gran día!
+      activation_success:
+        subject: 'Tu cuenta ya está activada'
+        body_html: |
+          <p>Felicidades, %{email}!</p>
+          <p>Has activado exitosamente tu cuenta de usuario.</p>
+          <p>Para iniciar sesión en el sitio, simplemente siga este enlace: %{url}.</p>
+          <p>Gracias por unirte y que tengas un gran día!</p>
+
+        body_text: |
+          Felicidades, %{email}!
+
+          Has activado exitosamente tu cuenta de usuario.
+
+          Para iniciar sesión en el sitio, simplemente siga este enlace: %{url}.
+
+          Gracias por unirte y que tengas un gran día!
+
+      reset_password:
+        subject: 'Has solicitado restablecer tu contraseña'
+        body_html: |
+          <p>Hola %{email},</p>
+          <p>Has solicitado restablecer tu contraseña.</p>
+          <p>Para elegir una nueva contraseña, simplemente siga este <a href="%{url}">enlace</a>.</p>
+          <p>¡Que tengas un gran día!</p>
+        body_text: |
+          Hola %{email},
+
+          Has solicitado restablecer tu contraseña.
+
+          Para elegir una nueva contraseña, simplemente siga este: %{url}.
+
+          ¡Que tengas un gran día!
+
+      unlock_token:
+        subject: 'Su cuenta ha sido bloqueada'
+        body_html: |
+          <p>Hola %{email},</p>
+          <p>Su cuenta ha sido bloqueada debido a una actividad fallida de intentos de inicio de sesión.</p>
+          <p>Para desbloquear tu cuenta ahora, solo sigue este <a href=" %{url}">enlace</a>. De todos modos se desbloqueará automáticamente en una hora.</p>
+          <p>¡Que tengas un gran día!</p>
+        body_text: |
+          Hola %{email},
+
+          Su cuenta ha sido bloqueada debido a una actividad fallida de intentos de inicio de sesión.
+
+          Para desbloquear tu cuenta ahora, solo sigue este enlace: %{url}. De todos modos se desbloqueará automáticamente en una hora.
+
+          ¡Que tengas un gran día!

data/lib/generators/morpho/install/templates/config/initializers/morpho.rb

@@ -1,12 +1,12 @@
 Morpho.configure do |config|
-  config.host = 'localhost:3000'
-  config.mailer.from = ''
-  config.mailer.address = 'smtp.mailtrap.io'
-  config.mailer.user_name = ''
-  config.mailer.password = ''
-  config.mailer.port = 2525
-  config.mailer.authentication = 'login'
-  config.mailer.enable_starttls_auto = false
+  config.host = ENV.fetch('HOST', 'localhost:3000')
+  config.mailer.from = ENV.fetch('MAILER_FROM', 'no-reply@example.com')
+  config.mailer.address = ENV.fetch('MAILER_ADDRESS', 'smtp.mailtrap.io')
+  config.mailer.user_name = ENV.fetch('MAILER_USER_NAME', '')
+  config.mailer.password = ENV.fetch('MAILER_PASSWORD', '')
+  config.mailer.port = ENV.fetch('MAILER_PORT', 2525)
+  config.mailer.authentication = ENV.fetch('MAILER_AUTHENTICATION').to_s.to_sym
+  config.mailer.enable_starttls_auto = ENV.fetch('MAILER_ENABLE_STARTTLS_AUTO', false)
   config.jwt.secret = ''
   config.jwt.algorithm = 'HS256'
   config.jwt.header = 'Authorization'
@@ -14,4 +14,4 @@ Morpho.configure do |config|
   config.api.title = ''
   config.api.description = ''
   config.auth.failed_login_attempts_limit = 5
-end
+end

data/lib/morpho/configurations/mailer.rb

@@ -8,8 +8,12 @@ module Morpho
       attr_accessor :port
       attr_accessor :authentication
       attr_accessor :enable_starttls_auto
+      attr_accessor :perform_deliveries
+      attr_accessor :delivery_method
 
       def initialize
+        self.perform_deliveries = true
+        self.delivery_method = :smtp
         self.from = ''
         self.address = ''
         self.user_name = ''

data/lib/morpho/engine.rb

@@ -14,18 +14,21 @@ module Morpho
     end
 
     initializer 'morpho.configurations', after: :load_config_initializers do |app|
-      ActionMailer::Base.delivery_method = :smtp
-      ActionMailer::Base.perform_deliveries = true
+      mailer = ActionMailer::Base
+      mailer.delivery_method = Morpho.config.mailer.delivery_method
+                                     .to_s.to_sym
+      mailer.perform_deliveries = Morpho.config.mailer
+                                        .perform_deliveries
 
-      ActionMailer::Base.default_options = {
+      mailer.default_options = {
         from: Morpho.config.mailer.from
       }
 
-      ActionMailer::Base.default_url_options = {
+      mailer.default_url_options = {
         host: Morpho.config.host
       }
 
-      ActionMailer::Base.smtp_settings = {
+      mailer.smtp_settings = {
         address: Morpho.config.mailer.address,
         port: Morpho.config.mailer.port,
         user_name: Morpho.config.mailer.user_name,
@@ -34,5 +37,21 @@ module Morpho
         enable_starttls_auto: Morpho.config.mailer.enable_starttls_auto
       }
     end
+
+    def self.controllers_path
+      Pathname.new(
+        Morpho::Engine.root.join(
+          'app', 'controllers', 'morpho'
+        )
+      )
+    end
+
+    def self.models_path
+      Pathname.new(
+        Morpho::Engine.root.join(
+          'app', 'models', 'morpho'
+        )
+      )
+    end
   end
 end

data/lib/morpho/validators/contain_number_validator.rb

@@ -0,0 +1,17 @@
+module Morpho
+  module Validators
+    class ContainNumberValidator < ActiveModel::EachValidator
+      NUMBER_FORMAT = /\A(?=.*\d)/x
+
+      def validate_each(record, attribute, value)
+        unless value =~ self.class::NUMBER_FORMAT
+          record.errors.add(
+            attribute,
+            options[:message] ||
+            I18n.t('morpho.labels.validators.contain_number')
+          )
+        end
+      end
+    end
+  end
+end

data/lib/morpho/validators/contain_symbol_validator.rb

@@ -0,0 +1,17 @@
+module Morpho
+  module Validators
+    class ContainSymbolValidator < ActiveModel::EachValidator
+      SYMBOL_FORMAT = /\A(?=.*[[:^alnum:]])/x
+
+      def validate_each(record, attribute, value)
+        unless value =~ self.class::SYMBOL_FORMAT
+          record.errors.add(
+            attribute,
+            options[:message] ||
+            I18n.t('morpho.labels.validators.contain_symbol')
+          )
+        end
+      end
+    end
+  end
+end

data/lib/morpho/validators/contain_uppercase_validator.rb

@@ -0,0 +1,17 @@
+module Morpho
+  module Validators
+    class ContainUppercaseValidator < ActiveModel::EachValidator
+      UPPERCASE_FORMAT = /\A(?=.*[A-Z])/x
+
+      def validate_each(record, attribute, value)
+        unless value =~ self.class::UPPERCASE_FORMAT
+          record.errors.add(
+            attribute,
+            options[:message] ||
+            I18n.t('morpho.labels.validators.contain_uppercase')
+          )
+        end
+      end
+    end
+  end
+end

data/lib/morpho/version.rb

@@ -1,3 +1,3 @@
 module Morpho
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/morpho.rb

@@ -2,6 +2,9 @@ require 'morpho/loader'
 require 'morpho/engine'
 require 'morpho/version'
 require 'morpho/configuration'
+require 'morpho/validators/contain_number_validator'
+require 'morpho/validators/contain_uppercase_validator'
+require 'morpho/validators/contain_symbol_validator'
 
 module Morpho
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morpho
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Hugo Gilmar Erazo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -237,6 +237,7 @@ files:
 - app/api/concerns/morpho/grape/user_registration.rb
 - app/api/concerns/morpho/grape/user_unlock.rb
 - app/api/morpho/entities/authentication_token.rb
+- app/api/morpho/entities/base.rb
 - app/api/morpho/entities/user.rb
 - app/api/morpho/entities/user_sign_in.rb
 - app/api/morpho/entities/user_sign_up.rb
@@ -286,6 +287,7 @@ files:
 - config/initializers/simple_form.rb
 - config/initializers/sorcery.rb
 - config/locales/morpho.en.yml
+- config/locales/morpho.es.yml
 - config/routes.rb
 - db/migrate/20180919162009_sorcery_core.rb
 - db/migrate/20180919162055_sorcery_remember_me.rb
@@ -295,7 +297,7 @@ files:
 - db/migrate/20180919162059_sorcery_activity_logging.rb
 - db/migrate/20180919162100_sorcery_external.rb
 - lib/generators/morpho/install/install_generator.rb
-- lib/generators/morpho/install/templates/app/api/morphp/api.rb
+- lib/generators/morpho/install/templates/app/api/morpho/api.rb
 - lib/generators/morpho/install/templates/config/initializers/morpho.rb
 - lib/generators/morpho/install/templates/public/favicon-16x16.png
 - lib/generators/morpho/install/templates/public/favicon-32x32.png
@@ -308,6 +310,9 @@ files:
 - lib/morpho/configurations/mailer.rb
 - lib/morpho/engine.rb
 - lib/morpho/loader.rb
+- lib/morpho/validators/contain_number_validator.rb
+- lib/morpho/validators/contain_symbol_validator.rb
+- lib/morpho/validators/contain_uppercase_validator.rb
 - lib/morpho/version.rb
 - lib/tasks/morpho_tasks.rake
 - lib/templates/erb/scaffold/_form.html.erb