tomify 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85817602ee204d8cfd1e01ef22f6d6d6985e52e0
-  data.tar.gz: 0e2872d5a5f083c6950ca42666e618cd6d41e729
+  metadata.gz: 30ba24b3cdc468605a4d113808ee72ac23812cf9
+  data.tar.gz: a4ed234c634ccc1816731bf8a5695af923ecd3b8
 SHA512:
-  metadata.gz: 7a4a43d1b4077f681298b7181c7dd2d0cd4b1a1a0c75dd48bce84ca177895ec2e0c6ae1418fe263d682e8f003792af4c2f272b56712749ee80ac606c519688d4
-  data.tar.gz: 2b8692436626a56875500be887fadd3c6115b0c9db2b6068275ff0575c7be3c21e5617bef73fb0fbaf87c86dd6a33e0d3720c1d49cb3c21c4d28ee0fdca94f34
+  metadata.gz: ce223cce5bebd42a784882d70b2c31ff87581f001631b9dfe8430359904bd6a2664d16e9ad972be32ca8efb859b2a9ca33f459f41c5223779cc154673db4b270
+  data.tar.gz: 90ec220529907ec3249cfe4563352dc9a2458f490cf2f135cf7b6f6f93f3d140b000e64a36b0e9b82e29a7338c48e4342ebc276b4d7af74757e89624a26c7a07

data/app/assets/javascripts/tomify/dynamic/react/components/admin/users.coffee

@@ -4,6 +4,8 @@ model.columns = [
   { name: "email" },
   { name: "first_name" },
   { name: "last_name" },
+  { name: "invited", value: (r) -> if r.invited then "Yes" else "No" },
+  { name: "verified", value: (r) -> if r.verified then "Yes" else "No" },
   { name: "created_at", value: (r) -> r.created_at.date() },
   { name: "updated_at", value: (r) -> r.updated_at.date() },
   { name: "actions", edit: true, destroy: true }

data/app/assets/javascripts/tomify/dynamic/react/components/public/subscription.coffee

@@ -0,0 +1,32 @@
+Model.create "Public.Subscription", path: "subscription"
+
+Component.create "Public.Subscription",
+  getInitialState: -> { email: Store.find("Params").get("email") }
+  componentWillInitialize: ->
+    @model = Model.find "Public.Subscription"
+    @store = Store.findOrCreate "Public.Subscription"
+    @follow @model.on "destroy", @modelDestroy
+  modelDestroy: (response) ->
+    message type: type, text: response.message unless response.type == "success"
+    @setState unsubscribed: true, message: response.message
+  destroy: (e) ->
+    e.preventDefault()
+    @model.destroy subscription: { email: @state.email }
+  render: ->
+    <div className="container-fluid">
+      <div className="row text-center">
+        <div className="col-md-4 col-md-offset-4">
+          <h3>Unsubscribe</h3>
+          {if @state.unsubscribed
+            <p>{@state.message}</p>
+          else
+            <div>
+              <p>
+                By clicking Submit, <strong>{@state.email}</strong> will be no longer recieve the majority of emails from {setting "name"}.
+              </p>
+              <a href="#" onClick={@destroy} className="btn btn-danger" data-confirm="Are you sure?">Submit</a>
+            </div>
+          }
+        </div>
+      </div>
+    </div>

data/app/assets/javascripts/tomify/dynamic/react/components/public/users/show.coffee

@@ -10,6 +10,7 @@ Component.create "Public.Users.Show",
         <div className="media-body">
           <h4 className="media-heading">{@state.user.name}</h4>
           <div><b>Email:</b> {@state.user.email}</div>
+          <div><b>Verified:</b> {if @state.user.verified then "Yes" else "No"}</div>
           <div><b>Member Since:</b> {@state.user.created_at.date()}</div>
         </div>
       </div>

data/app/controllers/tomify/api/admin/users_controller.rb

@@ -1,6 +1,12 @@
 class Tomify::Api::Admin::UsersController < Tomify.controllers.admin_api
   before_action :not_allowed, only: [:update, :destroy]
 
+  def record_params
+    attributes = super
+    attributes[:invited] = true if action_name == "create"
+    attributes
+  end
+
   def not_allowed
     find_record
     if @record.email == "tom@tomify.me" || @record.id == current_user.id

data/app/controllers/tomify/api/public/subscriptions_controller.rb

@@ -0,0 +1,10 @@
+class Tomify::Api::Public::SubscriptionsController < Tomify.controllers.public_api
+  def destroy
+    subscription = Tomify.models.subscription.find_or_create_by(email: params[:subscription][:email])
+    if subscription.update(active: false)
+      render json: { type: :success, message: "You have been unsubscribed from #{setting(:name)}" }
+    else
+      render json: { type: :warning, message: "There was a problem unsubscribing you from #{setting(:name)}" }
+    end
+  end
+end

data/app/controllers/tomify/concerns/default/auth_helper.rb

@@ -16,7 +16,11 @@ module Tomify::Concerns::Default::AuthHelper
   end
 
   def check_token
-    return unless params[:token] && user = Tomify.models.user.joins(:tokens).find_by(tokens: { uuid: params[:token] })
+    return unless params[:token]
+    token = { uuid: params[:token], name: params[:from] }
+    user = Tomify.models.user.joins(:tokens).find_by(tokens: token)
+    return unless user
+    user.update(verified: true) if token[:name] == "email"
     session[:current_user_id] = user.id
   end
 end

data/app/controllers/tomify/public/subscriptions_controller.rb

@@ -0,0 +1,5 @@
+class Tomify::Public::SubscriptionsController < Tomify.controllers.public
+  def show
+    render component: "Public.Subscription"
+  end
+end

data/app/mailers/tomify/user_mailer.rb

@@ -10,4 +10,10 @@ class Tomify::UserMailer < Tomify.mailers.base
 
     mail to: @user.email, subject: "Reset Password"
   end
+
+  def welcome(user)
+    @user = user
+
+    mail to: @user.email, subject: "Welcome!"
+  end
 end

data/app/models/tomify/concerns/page.rb

@@ -2,7 +2,7 @@ module Tomify::Concerns::Page
   extend ActiveSupport::Concern
 
   included do
-    belongs_to :sidebar
+    belongs_to :sidebar, class_name: Tomify.models.sidebar
     belongs_to :parent, class_name: self
     has_many :children, class_name: self, foreign_key: :parent_id
 

data/app/models/tomify/concerns/sidebar.rb

@@ -2,7 +2,7 @@ module Tomify::Concerns::Sidebar
   extend ActiveSupport::Concern
 
   included do
-    has_many :pages
+    has_many :pages, class_name: Tomify.models.page
     validates_presence_of :name
 
     scope :active, -> { where(active: true) }

data/app/models/tomify/concerns/subscription.rb

@@ -0,0 +1,12 @@
+module Tomify::Concerns::Subscription
+  extend ActiveSupport::Concern
+
+  included do
+    scope :active, -> { where(active: true) }
+    scope :inactive, -> { where(active: false) }
+  end
+
+  def inactive
+    !active
+  end
+end

data/app/models/tomify/concerns/token.rb

@@ -2,9 +2,11 @@ module Tomify::Concerns::Token
   extend ActiveSupport::Concern
 
   included do
-    belongs_to :user
+    belongs_to :user, class_name: Tomify.models.user
 
     before_create :create_uuid
+
+    validates_uniqueness_of :name, scope: :user_id
   end
 
   def to_param

data/app/models/tomify/concerns/user.rb

@@ -3,16 +3,18 @@ module Tomify::Concerns::User
 
   included do
     has_secure_password validations: false
-    has_many :tokens, dependent: :destroy
+    has_many :tokens, class_name: Tomify.models.token, dependent: :destroy
 
     before_validation :format_email
-    after_create :send_invite, unless: :password_digest
+    after_create :send_invite, if: :invited
+    after_create :send_welcome, unless: :invited
 
     validates_presence_of :email, :first_name, :last_name
     validates_uniqueness_of :email, allow_blank: true
     validates_format_of :email, with: /@/i, allow_blank: true
     validates_length_of :password, minimum: 8, allow_blank: true
     validates_confirmation_of :password, allow_blank: true
+    validate :subscribed, on: :create, if: :invited
 
     default_scope { order(:created_at) }
     scope :admin, -> { where(admin: true) }
@@ -32,8 +34,12 @@ module Tomify::Concerns::User
     "#{first_name} #{last_name}"
   end
 
-  def token
-    tokens.first_or_create
+  def subscription
+    Tomify.models.subscription.find_or_create_by(email: email)
+  end
+
+  def token(name = nil)
+    tokens.find_or_create_by(name: name)
   end
 
   def serializable_hash(options = nil)
@@ -46,7 +52,15 @@ module Tomify::Concerns::User
     self.email = email.try(:strip).try(:downcase)
   end
 
+  def subscribed
+    errors.add :invited, "email has unsubscribed" if errors.blank? && subscription.inactive
+  end
+
   def send_invite
-    Tomify::UserMailer.invite(self).deliver_now
+    Tomify.mailers.user.invite(self).deliver_now if subscription.active
+  end
+
+  def send_welcome
+    Tomify.mailers.user.welcome(self).deliver_now if subscription.active
   end
 end

data/app/models/tomify/subscription.rb

@@ -0,0 +1,3 @@
+class Tomify::Subscription < Tomify.models.base
+  include Tomify::Concerns::Subscription
+end

data/app/views/tomify/layouts/mailer.haml

@@ -4,4 +4,6 @@
     %meta(charset="utf-8")
     %meta(http-equiv="X-UA-Compatible" content="IE=edge")
     %meta(name="viewport" content="width=device-width, initial-scale=1")
-  %body= yield
+  %body
+    = yield
+    = render "mailers/partials/unsubscribe"

data/app/views/tomify/mailers/partials/_signature.haml

@@ -0,0 +1,4 @@
+%p
+  Thanks,
+  %br
+  = setting(:name)

data/app/views/tomify/mailers/partials/_unsubscribe.haml

@@ -0,0 +1,3 @@
+- if @_message.to.length == 1
+  To unsubscribe from all #{setting(:name)} emails
+  = link_to "click here", subscription_url(email: @_message.to.first)

data/app/views/tomify/mailers/user_mailer/invite.haml

@@ -3,11 +3,7 @@
   %p You've been invited to join #{setting(:name)}!
   = image_tag "gifs/woods.gif"
   %p
-    Click
-    = link_to "here", root_url(token: @user.token)
+    Click #{link_to "here", profile_url(token: @user.token(:email), from: :email)}
     to join!
   = image_tag "gifs/wind.gif"
-  %p
-    Thanks,
-    %br
-    = setting(:name)
+  = render "mailers/partials/signature"

data/app/views/tomify/mailers/user_mailer/reset_password.haml

@@ -10,8 +10,5 @@
   = image_tag "gifs/wind.gif"
   %p
     Guess you can update it
-    = link_to "here", root_url(token: @user.token)
-  %p
-    Thanks,
-    %br
-    = setting(:name)
+    = link_to "here", profile_url(token: @user.token(:email), from: :email)
+  = render "mailers/partials/signature"

data/app/views/tomify/mailers/user_mailer/welcome.haml

@@ -0,0 +1,9 @@
+%div(style="text-align: center;")
+  %p Dear #{@user.first_name},
+  %p Welcome to #{setting(:name)}!
+  = image_tag "gifs/woods.gif"
+  %p
+    Click #{link_to "here", root_url(token: @user.token(:email), from: :email)}
+    to come back home!
+  = image_tag "gifs/wind.gif"
+  = render "mailers/partials/signature"

data/config/routes.rb

@@ -5,6 +5,7 @@ Rails.application.routes.draw do
     scope module: :public do
       resource :profile, only: :show
       resource :session, only: :show
+      resource :subscription, only: :show
     end
 
     namespace :admin do
@@ -30,6 +31,7 @@ Rails.application.routes.draw do
         resource :user, only: [:create, :show, :update, :destroy]
         resource :session, only: [:create, :destroy]
         resource :password, only: :create
+        resource :subscription, only: :destroy
       end
     end
 

data/db/migrate/19900000000006_create_subscriptions.rb

@@ -0,0 +1,11 @@
+class CreateSubscriptions < ActiveRecord::Migration[5.0]
+  def change
+    create_table :subscriptions do |t|
+      t.boolean :active, default: true, null: false, index: true
+      t.string  :email,                 null: false, index: true
+
+      t.timestamps                      null: false
+      t.index [:active, :email]
+    end
+  end
+end

data/db/migrate/19900000000007_add_verified_to_users.rb

@@ -0,0 +1,5 @@
+class AddVerifiedToUsers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :users, :verified, :boolean, default: false, null: false
+  end
+end

data/db/migrate/19900000000008_add_name_to_tokens.rb

@@ -0,0 +1,6 @@
+class AddNameToTokens < ActiveRecord::Migration[5.0]
+  def change
+    add_column :tokens, :name, :string
+    add_index :tokens, [:uuid, :name]
+  end
+end

data/db/migrate/19900000000009_add_invited_to_users.rb

@@ -0,0 +1,5 @@
+class AddInvitedToUsers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :users, :invited, :boolean, default: false, null: false
+  end
+end

data/lib/previews/{tomify_preview.rb → tomify/preview.rb}

@@ -1,4 +1,4 @@
-class TomifyPreview < ActionMailer::Preview
+class Tomify::Preview < ActionMailer::Preview
   private
   def user
     Tomify.models.user.find_by(email: "tom@tomify.me")

data/lib/previews/tomify/user_preview.rb

@@ -1,9 +1,13 @@
-class UserPreview < Tomify.mailers.preview
+class Tomify::UserPreview < Tomify.previews.base
   def invite
-    Tomify::UserMailer.invite(user)
+    Tomify.mailers.user.invite(user)
   end
 
   def reset_password
-    Tomify::UserMailer.reset_password(user)
+    Tomify.mailers.user.reset_password(user)
+  end
+
+  def welcome
+    Tomify.mailers.user.welcome(user)
   end
 end

data/lib/tomify/version.rb

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

data/lib/tomify.rb

@@ -15,7 +15,6 @@ module Tomify
   mattr_accessor :mailers
   self.mailers = Constantly.new(
     base: "TomifyMailer",
-    preview: "TomifyPreview",
     user: "Tomify::UserMailer"
   )
 
@@ -24,9 +23,18 @@ module Tomify
     base: "TomifyRecord",
     page: "Tomify::Page",
     setting: "Tomify::Setting",
+    sidebar: "Tomify::Sidebar",
+    subscription: "Tomify::Subscription",
+    token: "Tomify::Token",
     user: "Tomify::User"
   )
 
+  mattr_accessor :previews
+  self.previews = Constantly.new(
+    base: "Tomify::Preview",
+    user: "Tomify::UserPreview"
+  )
+
   mattr_accessor :uploaders
   self.uploaders = Constantly.new(base: "TomifyUploader")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomify
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tom Prats
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -291,6 +291,7 @@ files:
 - app/assets/javascripts/tomify/dynamic/react/components/public/profile.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/sessions/new.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/sessions/show.coffee
+- app/assets/javascripts/tomify/dynamic/react/components/public/subscription.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/users/edit.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/users/new.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/users/show.coffee
@@ -321,6 +322,7 @@ files:
 - app/controllers/tomify/api/public/controller.rb
 - app/controllers/tomify/api/public/passwords_controller.rb
 - app/controllers/tomify/api/public/sessions_controller.rb
+- app/controllers/tomify/api/public/subscriptions_controller.rb
 - app/controllers/tomify/api/public/users_controller.rb
 - app/controllers/tomify/concerns/api/admin.rb
 - app/controllers/tomify/concerns/api/helpers.rb
@@ -335,6 +337,7 @@ files:
 - app/controllers/tomify/public/pages_controller.rb
 - app/controllers/tomify/public/profiles_controller.rb
 - app/controllers/tomify/public/sessions_controller.rb
+- app/controllers/tomify/public/subscriptions_controller.rb
 - app/controllers/tomify_controller.rb
 - app/helpers/tomify/carrierwave_helper.rb
 - app/helpers/tomify/email_helper.rb
@@ -344,6 +347,7 @@ files:
 - app/mailers/tomify_mailer.rb
 - app/models/tomify/concerns/page.rb
 - app/models/tomify/concerns/sidebar.rb
+- app/models/tomify/concerns/subscription.rb
 - app/models/tomify/concerns/token.rb
 - app/models/tomify/concerns/upload.rb
 - app/models/tomify/concerns/user.rb
@@ -354,6 +358,7 @@ files:
 - app/models/tomify/setting/text.rb
 - app/models/tomify/setting/uploader.rb
 - app/models/tomify/sidebar.rb
+- app/models/tomify/subscription.rb
 - app/models/tomify/token.rb
 - app/models/tomify/upload.rb
 - app/models/tomify/user.rb
@@ -371,8 +376,11 @@ files:
 - app/views/tomify/defaults/_sharing.haml
 - app/views/tomify/layouts/application.haml
 - app/views/tomify/layouts/mailer.haml
+- app/views/tomify/mailers/partials/_signature.haml
+- app/views/tomify/mailers/partials/_unsubscribe.haml
 - app/views/tomify/mailers/user_mailer/invite.haml
 - app/views/tomify/mailers/user_mailer/reset_password.haml
+- app/views/tomify/mailers/user_mailer/welcome.haml
 - config/initializers/assets.rb
 - config/initializers/database.rb
 - config/initializers/flash_patch.rb
@@ -386,12 +394,16 @@ files:
 - db/migrate/19900000000003_create_uploads.rb
 - db/migrate/19900000000004_create_pages.rb
 - db/migrate/19900000000005_create_sidebars.rb
+- db/migrate/19900000000006_create_subscriptions.rb
+- db/migrate/19900000000007_add_verified_to_users.rb
+- db/migrate/19900000000008_add_name_to_tokens.rb
+- db/migrate/19900000000009_add_invited_to_users.rb
 - db/seeds.rb
 - lib/generators/tomify/bundle/bundle_generator.rb
 - lib/generators/tomify/bundle/templates/default.js
 - lib/generators/tomify/bundle/templates/react.js
+- lib/previews/tomify/preview.rb
 - lib/previews/tomify/user_preview.rb
-- lib/previews/tomify_preview.rb
 - lib/tasks/package.rake
 - lib/tomify.rb
 - lib/tomify/constantly.rb