lines-engine 0.5 → 0.6

data/app/assets/stylesheets/lines/fonts.scss

@@ -1,37 +1,4 @@
 @import url(//fonts.googleapis.com/css?family=Merriweather:400,400italic,700);
 @import url(//fonts.googleapis.com/css?family=Merriweather+Sans:400,700);
 @import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700,700italic,900);
-@import url(//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic&subset=latin,latin-ext);
-
-@font-face {
-  font-family: 'BPmono';
-  src: url('/assets/BPmono-webfont.eot');
-  src: url('/assets/BPmono-webfont.eot?#iefix') format('embedded-opentype'),
-  url('/assets/BPmono-webfont.woff') format('woff'),
-  url('/assets/BPmono-webfont.ttf') format('truetype'),
-  url('/assets/BPmono-webfont.svg#BPmono-webfont') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'BPmono';
-  src: url('/assets/BPmonoItalics-webfont.eot');
-  src: url('/assets/BPmonoItalics-webfont.eot?#iefix') format('embedded-opentype'),
-  url('/assets/BPmonoItalics-webfont.woff') format('woff'),
-  url('/assets/BPmonoItalics-webfont.ttf') format('truetype'),
-  url('/assets/BPmonoItalics-webfont.svg#BPmonoItalics-webfont') format('svg');
-  font-weight: normal;
-  font-style: italic;
-}
-
-@font-face {
-  font-family: 'BPmono';
-  src: url('/assets/BPmonoBold-webfont.eot');
-  src: url('/assets/BPmonoBold-webfont.eot?#iefix') format('embedded-opentype'),
-  url('/assets/BPmonoBold-webfont.woff') format('woff'),
-  url('/assets/BPmonoBold-webfont.ttf') format('truetype'),
-  url('/assets/BPmonoBold-webfont.svg#BPmonoBold-webfont') format('svg');
-  font-weight: bold;
-  font-style: normal;
-}
+@import url(//fonts.googleapis.com/css?family=Fira+Mono:400,700&subset=latin,latin-ext);

data/app/assets/stylesheets/lines/general.scss

@@ -5,6 +5,8 @@
   box-sizing: border-box;
 }
 
+html, body { font-size: 16px }
+
 body { height: 100%; background-color: #fff; }
 
 img, div { border: 0; display: block; }

data/app/assets/stylesheets/lines/media_queries.scss

@@ -8,11 +8,11 @@ smaller than 975px
 smaller than 800px
 *************************************************************************************/
 @media screen and (max-width: 800px) {
-  html { font-size: 16px; }
+  html, body { font-size: 16px; }
   .article {
-	  .article_header, .article_teaser, .article_content {
-	    & > * { padding: 0 8%; }
-	  }  	
+    .article_header, .article_teaser, .article_content {
+      & > * { padding: 0 8%; }
+    }
   }
 }
 
@@ -20,7 +20,7 @@ smaller than 800px
 smaller than 600px
 *************************************************************************************/
 @media screen and (max-width: 600px) {
-  html { font-size: 14px; }
+  html, body { font-size: 14px; }
   .article.small { width: 100%; max-width: 100%; }
 }
 
@@ -28,4 +28,10 @@ smaller than 600px
 smaller than 480px
 *************************************************************************************/
 @media screen and (max-width: 480px) {
+html, body { font-size: 14px; }
+  .article {
+    .article_header h1 {
+      font-size: 2.5em;
+    }
+  }
 }

data/app/assets/stylesheets/lines/variables_and_mixins.scss

@@ -4,9 +4,15 @@ $darkgrey: #333;
 $lightgrey: #666;
 $orange: #ee4422;
 
+$red: #c10020;
+$black: #100719;
+$grey: #9793a0;
+$white: #fff;
+
 $SourceSansPro: 'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;
 $MerriweatherSans: 'Merriweather Sans', 'Helvetica', 'Arial', sans-serif;
 $Merriweather: 'Merriweather', 'Georgia', serif;
+$Monospace: 'Fira mono', monospace;
 
 @mixin addTransition($x) {
   transition: all $x+s ease;

data/app/controllers/lines/articles_controller.rb

@@ -24,8 +24,9 @@ module Lines
           end
           
           if @articles.first_page?
-            @first_article = Article.published.first 
-            @first_article.teaser = nil unless @first_article.teaser.present?
+            if @first_article = Article.published.first
+              @first_article.teaser = nil unless @first_article.teaser.present?
+            end
           end
           
           set_meta_tags title: SITE_TITLE,

data/app/controllers/lines/password_resets_controller.rb

@@ -0,0 +1,84 @@
+require_dependency "lines/application_controller"
+
+module Lines
+  class PasswordResetsController < ApplicationController
+
+    layout 'lines/admin'
+
+    before_action :get_user,   only: [:edit, :update]
+    before_action :valid_user, only: [:edit, :update]
+
+    def new
+    end
+  
+    def create
+      @user = User.find_by(email: params[:password_reset][:email].downcase)
+      if @user
+        @user.create_reset_digest
+        @user.send_password_reset_email
+        flash[:info] = "Email sent with password reset instructions"
+        redirect_to root_url
+      else
+        flash.now[:error] = "Email address not found"
+        render 'new'
+      end
+    end
+
+    def edit
+    end
+
+    def update
+      if password_blank?
+        flash.now[:error] = "Password can't be blank"
+        render 'edit'
+      elsif wrong_password_confirmation?
+        flash.now[:error] = "Password confirmation does not match"
+        render 'edit'
+      elsif @user.update_attributes(user_params)
+        # deletr reset_digest and reset_sent_at
+        @user.update_attributes(reset_digest: nil, reset_sent_at: nil)        
+        flash[:success] = "Password has been reset. You can now log in with your new password."
+        redirect_to new_session_path
+      else
+        render 'edit'
+      end
+    end      
+
+
+    private
+
+      # Use strong_params
+      def user_params
+        params.require(:user).permit(:email, :password, :password_confirmation)
+      end
+
+      # Returns true if password is blank.
+      def password_blank?
+        params[:user][:password].blank?
+      end
+
+      def wrong_password_confirmation?
+        params[:user][:password] != params[:user][:password_confirmation]
+      end
+
+      # Checks expiration of reset token.
+      def check_expiration
+        if @user.password_reset_expired?
+          flash[:error] = "Password reset has expired."
+          redirect_to new_password_reset_url
+        end
+      end
+
+      def get_user
+        @user = User.find_by(email: params[:email])
+      end
+
+      # Confirms a valid user.
+      def valid_user
+        unless (@user && @user.authenticated?(:reset, params[:id]))
+          redirect_to root_url
+        end
+      end
+
+  end
+end

data/app/helpers/lines/application_helper.rb

@@ -8,9 +8,9 @@ module Lines
     # Renders the teaser for an article. 
     def render_teaser(article, article_counter=0)
       if article_counter < 0
-        teaser = article.teaser.present? ? markdown(article.teaser) : nil
+        teaser = article.teaser && article.teaser.present? ? markdown(article.teaser) : nil
       else
-        teaser = article.teaser.present? ? format_code(article.teaser) : format_code(article.content)
+        teaser = article.teaser && article.teaser.present? ? format_code(article.teaser) : format_code(article.content)
       end
       teaser
     end

data/app/mailers/lines/user_mailer.rb

@@ -0,0 +1,11 @@
+module Lines
+  class UserMailer < ActionMailer::Base
+    default from: CONFIG[:production]['from_email']
+    
+    def password_reset(user)
+      @user = user
+      mail to: user.email, subject: "Password reset"
+    end
+
+  end
+end

data/app/models/lines/user.rb

@@ -15,16 +15,53 @@
 module Lines
 
   class User < ActiveRecord::Base
-    # use bcrypt-ruby to encrypt passwords
+    # Use bcrypt-ruby to encrypt passwords
     has_secure_password validations: false
-    validates :password, length: { minimum: 6 }, allow_blank: false
-    validates :password, presence: true, on: :create
+    
+    attr_accessor :reset_token
 
     # Validations
     validates :password, length: { minimum: 6 }, if: :validate_password?
+    validates :password, presence: true, on: :create
     validates :email, uniqueness: true, presence: true
 
-    
+    # Sets +rest_digest+ and +reset_sent_at+ for password reset.
+    def create_reset_digest
+      self.reset_token = User.generate_token
+      update_attribute(:reset_digest,  User.digest(reset_token))
+      update_attribute(:reset_sent_at, Time.zone.now)
+    end
+
+    # Sends email with instructions how to reset password.
+    def send_password_reset_email
+      UserMailer.password_reset(self).deliver
+    end
+
+    # Returns true if the given token matches the digest.
+    def authenticated?(attribute, token)
+      digest = send("#{attribute}_digest")
+      return false if digest.nil?
+      BCrypt::Password.new(digest).is_password?(token)
+    end
+
+
+    # Generate a random token.
+    def User.generate_token
+      SecureRandom.urlsafe_base64
+    end
+
+    # Returns the hash digest of the given string.
+    def User.digest(string)
+      cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : BCrypt::Engine.cost
+      BCrypt::Password.create(string, cost: cost)
+    end
+
+    # Returns true if a password reset has expired.
+    def password_reset_expired?
+      reset_sent_at < 2.hours.ago
+    end
+
+
     private 
       # Returns +true+ if a password is submitted
       def validate_password?
@@ -32,5 +69,4 @@ module Lines
       end
 
   end
-
 end

data/app/views/layouts/lines/application.html.erb

@@ -32,6 +32,7 @@
 </header>
 
 <div class="container">
+  <%= render 'lines/shared/flash' %>
   <%= yield %>
 </div>
 

data/app/views/lines/password_resets/edit.html.erb

@@ -0,0 +1,26 @@
+<h1>Reset password</h1>
+
+<%= form_for(@user, url: password_reset_path(params[:id])) do |f| %>
+  <% if @user.errors.any? %>
+    <div id="error_explanation">
+      <div class="alert errors">
+        The form contains <%= pluralize(@user.errors.count, "error") %>.
+      </div>
+      <ul>
+      <% @user.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <%= hidden_field_tag :email, @user.email %>
+
+  <%= f.label :password %>
+  <%= f.password_field :password %>
+
+  <%= f.label :password_confirmation, "Confirmation" %>
+  <%= f.password_field :password_confirmation %>
+
+  <%= f.submit "Update password" %>
+<% end %>

data/app/views/lines/password_resets/new.html.erb

@@ -0,0 +1,8 @@
+<h1>Reset Password</h1>
+
+<%= form_for(:password_reset, url: password_resets_path) do |f| %>
+  <%= f.label :email %>
+  <%= f.email_field :email %>
+
+  <%= f.submit "Submit" %>
+<% end %>

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

@@ -18,5 +18,9 @@
       <%= submit_tag "Login" %>
       <a href="/">or go back to your blog.</a>
     </div>
+    <br style="clear: both;" />
+    <div class="additional_actions">
+      <%= link_to "Forgot password?", new_password_reset_path %>
+    </div>
   <% end %>
 </div>

data/app/views/lines/shared/_flash.html.erb

@@ -0,0 +1,8 @@
+<% flash.each do |name, msg| %>
+  <% if msg.is_a?(String) %>
+    <div class="alert alert-<%= name == :notice ? "success" : "error" %>">
+      <a class="close" data-dismiss="alert">&#215;</a>
+      <%= content_tag :div, msg, id: "flash_#{name}" %>
+    </div>
+  <% end %>
+<% end %>

data/app/views/lines/user_mailer/password_reset.html.erb

@@ -0,0 +1,10 @@
+<h1>Password reset</h1>
+
+<p>To reset your password click the link below:</p>
+
+<p><%= edit_password_reset_url(@user.reset_token, email: @user.email) %></p>
+
+<p>This link will expire in two hours.</p>
+
+<p>If you did not request your password to be reset, please ignore this email and
+your password will stay as it is.</p>

data/app/views/lines/user_mailer/password_reset.text.erb

@@ -0,0 +1,8 @@
+To reset your password click the link below:
+
+<%= edit_password_reset_url(@user.reset_token, email: @user.email) %>
+
+This link will expire in two hours.
+
+If you did not request your password to be reset, please ignore this email and
+your password will stay as it is.

data/certs/lines-engine.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDYDCCAkigAwIBAgIBATANBgkqhkiG9w0BAQUFADA7MQ0wCwYDVQQDDARpbmZv
+MRYwFAYKCZImiZPyLGQBGRYGb3BvbG9vMRIwEAYKCZImiZPyLGQBGRYCZGUwHhcN
+MTUwNDIxMTIyMzQ5WhcNMTYwNDIwMTIyMzQ5WjA7MQ0wCwYDVQQDDARpbmZvMRYw
+FAYKCZImiZPyLGQBGRYGb3BvbG9vMRIwEAYKCZImiZPyLGQBGRYCZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxEm+2kvkvFdAyi6VKiSPvEbFLgvC7
++MnhXzkFGLOb4UFNB0uSK2xGdBf2QVDWmK8W19UQNWoXHv5Pfni0wmUJ5yoP7lNg
+qMqZFK0tkDImsQRrfOndqNylVyy9vBn/YtyAYG/v+IGxEW59OoL1uvX4FnxJ3C07
+P8I0gWPUlw4/UFSpzTj1r4IEeN21oYlgCSz98O5vZVkRZAVNmotxcn/+vcpERjZ+
+ugolMzyEqC5Uztos/D4pSrtum/UIhDbYfzkoI78hZjsaKQQwbmJd9/WzI5FUqEhS
+ucANoSTcibahVQ5Qg1AedJCTgO5Z2NBdCSXce8q5wx5W7BqNPNjML5VpAgMBAAGj
+bzBtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSB4W9llLnHPI5e
+OUL+IbfDGahfYjAZBgNVHREEEjAQgQ5pbmZvQG9wb2xvby5kZTAZBgNVHRIEEjAQ
+gQ5pbmZvQG9wb2xvby5kZTANBgkqhkiG9w0BAQUFAAOCAQEAxSYCQ1c3Am0fpQZW
+NNOiHDAcn8k8B4rFp0/llzsIH0WOttTnhYYHqKdnpWJms2xPOPppb9MD8d+HpBn4
+mCIzpjfzE0RQ0RzzLUdfDXLJPjOaJ/vtKZMMBxfMivLfx8HZTGrVVVE3l8wPav/2
+CMUyx9n4Yn6xztVzRbadZp3Q1O/Bsg7dFz7xVkxUEaM1oHGFR+HrWRX2ZyDpaUHJ
+fNEZV3vwM6Ye3VRzeM3R7Z1R9e9FbUK6awQt/x4gAaI9m3LS85lbwuibKKpdYupp
+5BNWA8E1pTLFIGuj2vWGF3LmLHATeyBGXNDBRf6XZUG124zSK5pxkJ5zm2uBhu00
++pn0Gw==
+-----END CERTIFICATE-----

data/config/lines_config.yml

@@ -49,7 +49,10 @@ secret_token: "afa4a436180a2febe9b814c6a57b6f3ad298aa82ce0ab4c9e8238713764b665e9
 # Environment dependent configuration. Place your URLs here
 development:
   host: "localhost:3000"
+  from_email: 'noreply@example.com'
 test:
   host: "test.local"
+  from_email: 'noreply@example.com'
 production:
-  host: "blog.opoloo.com"
+  host: "blog.opoloo.com"
+  from_email: 'noreply@example.com'

data/config/routes.rb

@@ -1,10 +1,15 @@
 Lines::Engine.routes.draw do
 
+  get 'password_resets/new'
+
+  get 'password_resets/edit'
+
   get 'login', to: 'sessions#new', as: 'login'
   get 'logout', to: 'sessions#destroy', as: 'logout'
   get 'tags/:tag', to: 'articles#index', as: :tag
 
   resources :sessions
+  resources :password_resets,     only: [:new, :create, :edit, :update]
 
   resources :articles, only: [:index, :show] do
     get 'page/:page', action: :index, on: :collection

data/db/migrate/20150421093311_add_reset_password_fields_to_users.rb

@@ -0,0 +1,6 @@
+class AddResetPasswordFieldsToUsers < ActiveRecord::Migration
+  def change
+    add_column :lines_users, :reset_digest, :string
+    add_column :lines_users, :reset_sent_at, :datetime
+  end
+end

data/lib/generators/lines/copy_styles_generator.rb

@@ -0,0 +1,13 @@
+require 'rails/generators'
+
+module Lines
+  class CopyStylesGenerator < Rails::Generators::Base
+    source_root File.expand_path('..', __FILE__)
+
+    def copy_stylesheets
+      FileUtils.mkdir_p "app/assets/stylesheets/lines"
+      directory('../../../app/assets/stylesheets/lines/', 'app/assets/stylesheets/lines/', {:exclude_pattern => /admin/} )
+    end
+
+  end
+end