wbase 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bb278209387a6e44cfc1a8a2f5d15d78acc0281
-  data.tar.gz: d7ece99defd6938a780905f252740eb0ab5209fb
+  metadata.gz: c02021b862a568e2f067a1c92c42b1000238dc0e
+  data.tar.gz: 422f2f31a08e52e100b15097005a252da0fd252d
 SHA512:
-  metadata.gz: 5228b38ea63e37b204dbf6c5fd1f24fd42ed59f627509320642f9bc5f20e44fba5bbbd7bd9d8d87332dbcdad83d5c31d4177788b5f78eac7cbc7eac41ef3a93d
-  data.tar.gz: 647bf7555982e18f024a06442235f3722c9a0a55c1a31a58c4c297447ede084d56667c16254cfb7ca9e9b64920b2dc46cf3d6cb745f955f92e00d56a205ab278
+  metadata.gz: 5843bf47cb6a72ae144b6aaac8af0ee09f2542cbb06675317a37d20403d2504fcc3e470c3e7a5ce3d6572324f5755eef26b47ddfdc7a674ccbf586cd9a06f743
+  data.tar.gz: f7c7fcb39b03800d20daee5217e6e6e586edceb64e8b68f68be0124739aef44269d9a97c879f62d7beb8df4ca9b11f17e66d2c9078639283c483d951aa6a4f49

data/app/controllers/wbase/sessions_controller.rb

@@ -6,6 +6,7 @@ module Wbase
 
     def new
       @user = User.new
+      @user.email = cookies[:email] if cookies[:email]
     end
 
     def create

data/app/helpers/wbase/auth_helper.rb

@@ -36,6 +36,7 @@ module Wbase
       session[:token] = user.session_token
       session[:root] = user.root?
       user.update(login_at: Time.now)
+      cookies[:email] = user.email
     end
 
     def logout

data/app/models/wbase/userable.rb

@@ -6,7 +6,10 @@ module Wbase
 
     included do
       attr_reader :password
-      validates :email, presence: true, uniqueness: true
+      validates :email, presence: true
+      validates :email, uniqueness: {
+        message: 'Hmm. That email has already been taken. If you are a new consultant please email hello@roeme.com'
+      }
       validates :password, length: { minimum: 7, allow_nil: true }
       has_one :subscription, class_name: 'Wbase::Subscription'
       scope :verified, -> { where(verified: true) }

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

@@ -12,7 +12,7 @@
     <div class="form-group ">
       <div class="col-xs-12">
         <label for="email">Email</label>
-        <input class="form-control" id="email" type="email" name="user[email]" required="" placeholder="first.last@gmail.com">
+        <input class="form-control" id="email" type="email" name="user[email]" required="" placeholder="first.last@gmail.com" value="<%= @user.email %>" autocomplete="email">
       </div>
     </div>
 

data/lib/wbase/version.rb

@@ -1,3 +1,3 @@
 module Wbase
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wbase
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - CJ Avilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails