johnhenry 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05d53368c408ca617aca46bd92678b3a420cc813
-  data.tar.gz: 9bd02164dcb22881191deedda0fb67646fc3610f
+  metadata.gz: f93e7fff2a12bff68441c0db79188fcdd07613cf
+  data.tar.gz: 89a18c14e02a9d9f8cad13941c5c6272eab9cf74
 SHA512:
-  metadata.gz: 07e9831345a739a24f31295cb1aa9454c0bc3a96e01d462ee50f73f9c93b2561353ca16c91979478e99f4559d01eec633c9c038eeb86916670885305efc611d0
-  data.tar.gz: 0c934d4871835a87aae74f802b79743f19b08bb9eb30c49777de4ce434d8bc5f930d285b290052ddf4fd0945a8d3301001029b686028085803bb53e9ebf0a391
+  metadata.gz: 93f52784d4c2a90cb88eaad1d6cccf14bd5c2f5b49ff836b31e8aab51b958bbc954fc6b45ee93ba0f084d0a864707f4fb3c2b3ef14835f58ee1b3e3f83dad5bc
+  data.tar.gz: ab0361fd3a187970178407a0a44c47ddfab574bf0bc4df32308707fca2a47754fe45bdd6eef6ceb2061f515fb6199426d24c8bb71d00918023b841c508967c7e

data/app/controllers/johnhenry/payments_controller.rb

@@ -34,9 +34,9 @@ class Johnhenry::PaymentsController < Johnhenry::ApplicationController
       if params[:email].present?
         #TODO DRY with other new user generation
         password = Devise.friendly_token.first(10)
-        user = User.create! email: params[:email],
-                            password: password,
-                            password_confirmation: password
+        user = JohnHenryUser.create! email: params[:email],
+                                     password: password,
+                                     password_confirmation: password
         sign_in(user)
       else
         return redirect_to '/', alert: 'You need an account to do that.'

data/app/models/john_henry_user.rb

@@ -0,0 +1,19 @@
+class JohnHenryUser < ActiveRecord::Base
+  self.table_name = 'users'
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+  after_save :send_signup_email
+
+  private
+
+    def send_signup_email
+      if Rails.application.config.respond_to?('send_johnhenry_signup_email') &&
+           Rails.application.config.send_johnhenry_signup_email
+        JohnHenryMailer.signup(self).deliver
+      else
+        Rails.logger.info "Skipped send_signup_email"
+      end
+    end
+end

data/app/views/johnhenry/shared/_signin_form.html.haml

@@ -1,4 +1,4 @@
-= form_for(User.new,
+= form_for(JohnHenryUser.new,
            as: :user,
            url: session_path(:user),
            class: 'require-validation') do |f|

data/lib/johnhenry/version.rb

@@ -1,3 +1,3 @@
 module JohnHenry
-  VERSION = '1.0.10'
+  VERSION = '1.0.11'
 end

data/lib/tasks/johnhenry_tasks.rake

@@ -120,8 +120,8 @@ EOS
     code = <<-EOS
 if Rails.env.development?
   EmailPreview.register 'Signup' do
-    user = User.new email: 'johnny.cage@gmail.com'
-    UserMailer.signup(user)
+    user = JohnHenryUser.new email: 'johnny.cage@gmail.com'
+    JohnHenryMailer.signup(user)
   end
 end
 EOS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: johnhenry
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Adam Derewecki
@@ -185,8 +185,8 @@ files:
 - app/controllers/johnhenry/sessions_controller.rb
 - app/helpers/johnhenry/application_helper.rb
 - app/mailers/john_henry_mailer.rb
+- app/models/john_henry_user.rb
 - app/models/payment.rb
-- app/models/user.rb
 - app/views/john_henry_mailer/signup.html.haml
 - app/views/johnhenry/devise/confirmations/new.html.haml
 - app/views/johnhenry/devise/mailer/confirmation_instructions.html.haml

data/app/models/user.rb

@@ -1,13 +0,0 @@
-class User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
-  after_save :send_signup_email
-
-  private
-
-    def send_signup_email
-      JohnHenryMailer.signup(self).deliver
-    end
-end